The Key Company project consolidation (#9547)

* Consolidate TKC projects and increase VIA keymap count to 4.

* Updated readme files.

* Removed config.h via limitation of 2 dynamic keymaps

* Reduce dynamic keymaps from 4 to 3 due to EEPROM space limitations.

* Update dynamic_keymap.c

* Restore 4 dynamic keymaps for VIA in TKC projects.

* Update quantum/dynamic_keymap.c

47 files changed, 85 insertions, 7 deletions

diff --git a/keyboards/m0lly/keymaps/via/config.h b/keyboards/m0lly/keymaps/via/config.h
deleted file mode 100644
index 579212d4a..000000000
--- a/keyboards/m0lly/keymaps/via/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/candybar/bootloader_defs.h b/keyboards/tkc/candybar/bootloader_defs.h
index 43eb7b2f6..43eb7b2f6 100644
--- a/keyboards/candybar/bootloader_defs.h
+++ b/keyboards/tkc/candybar/bootloader_defs.h
diff --git a/keyboards/candybar/chconf.h b/keyboards/tkc/candybar/chconf.h
index 03f63da36..03f63da36 100644
--- a/keyboards/candybar/chconf.h
+++ b/keyboards/tkc/candybar/chconf.h
diff --git a/keyboards/candybar/halconf.h b/keyboards/tkc/candybar/halconf.h
index 16f32117d..16f32117d 100644
--- a/keyboards/candybar/halconf.h
+++ b/keyboards/tkc/candybar/halconf.h
diff --git a/keyboards/candybar/lefty/config.h b/keyboards/tkc/candybar/lefty/config.h
index e8a1f0081..e8a1f0081 100644
--- a/keyboards/candybar/lefty/config.h
+++ b/keyboards/tkc/candybar/lefty/config.h
diff --git a/keyboards/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json
index 1ef3dcd54..1ef3dcd54 100644
--- a/keyboards/candybar/lefty/info.json
+++ b/keyboards/tkc/candybar/lefty/info.json
diff --git a/keyboards/candybar/lefty/keymaps/default/keymap.c b/keyboards/tkc/candybar/lefty/keymaps/default/keymap.c
index 153fd99c5..153fd99c5 100644
--- a/keyboards/candybar/lefty/keymaps/default/keymap.c
+++ b/keyboards/tkc/candybar/lefty/keymaps/default/keymap.c
diff --git a/keyboards/candybar/lefty/keymaps/via/keymap.c b/keyboards/tkc/candybar/lefty/keymaps/via/keymap.c
index 153fd99c5..fd927195b 100644
--- a/keyboards/candybar/lefty/keymaps/via/keymap.c
+++ b/keyboards/tkc/candybar/lefty/keymaps/via/keymap.c
@@ -18,6 +18,8 @@
 
 #define _BL 0
 #define _FL 1
+#define _AL 2
+#define _LL 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
@@ -35,4 +37,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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/candybar/lefty/keymaps/via/rules.mk b/keyboards/tkc/candybar/lefty/keymaps/via/rules.mk
index 036bd6d1c..036bd6d1c 100644
--- a/keyboards/candybar/lefty/keymaps/via/rules.mk
+++ b/keyboards/tkc/candybar/lefty/keymaps/via/rules.mk
diff --git a/keyboards/candybar/lefty/lefty.c b/keyboards/tkc/candybar/lefty/lefty.c
index 920811b83..920811b83 100644
--- a/keyboards/candybar/lefty/lefty.c
+++ b/keyboards/tkc/candybar/lefty/lefty.c
diff --git a/keyboards/candybar/lefty/lefty.h b/keyboards/tkc/candybar/lefty/lefty.h
index 07af4b31b..07af4b31b 100644
--- a/keyboards/candybar/lefty/lefty.h
+++ b/keyboards/tkc/candybar/lefty/lefty.h
diff --git a/keyboards/candybar/righty/readme.md b/keyboards/tkc/candybar/lefty/readme.md
index d3aa86730..75ca1cbd8 100644
--- a/keyboards/candybar/righty/readme.md
+++ b/keyboards/tkc/candybar/lefty/readme.md
@@ -10,6 +10,6 @@ The Key Company Candybar is a staggered 40% board with a numpad utilizing the ST
 
 Make example for this keyboard (after setting up your build environment):
 
-    make candybar/righty:default:dfu-util
+    make tkc/candybar/lefty:default:dfu-util
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk
index 52ef91c47..52ef91c47 100644
--- a/keyboards/candybar/lefty/rules.mk
+++ b/keyboards/tkc/candybar/lefty/rules.mk
diff --git a/keyboards/candybar/mcuconf.h b/keyboards/tkc/candybar/mcuconf.h
index faca3defd..faca3defd 100644
--- a/keyboards/candybar/mcuconf.h
+++ b/keyboards/tkc/candybar/mcuconf.h
diff --git a/keyboards/candybar/righty/config.h b/keyboards/tkc/candybar/righty/config.h
index 500453784..500453784 100644
--- a/keyboards/candybar/righty/config.h
+++ b/keyboards/tkc/candybar/righty/config.h
diff --git a/keyboards/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json
index 81dc4f8ec..81dc4f8ec 100644
--- a/keyboards/candybar/righty/info.json
+++ b/keyboards/tkc/candybar/righty/info.json
diff --git a/keyboards/candybar/righty/keymaps/default/keymap.c b/keyboards/tkc/candybar/righty/keymaps/default/keymap.c
index 8f4cc08c7..8f4cc08c7 100644
--- a/keyboards/candybar/righty/keymaps/default/keymap.c
+++ b/keyboards/tkc/candybar/righty/keymaps/default/keymap.c
diff --git a/keyboards/candybar/righty/keymaps/via/keymap.c b/keyboards/tkc/candybar/righty/keymaps/via/keymap.c
index 8f4cc08c7..fb8ac93d4 100644
--- a/keyboards/candybar/righty/keymaps/via/keymap.c
+++ b/keyboards/tkc/candybar/righty/keymaps/via/keymap.c
@@ -18,6 +18,8 @@
 
 #define _BL 0
 #define _FL 1
+#define _AL 2
+#define _LL 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: Base Layer (Default Layer)
@@ -35,4 +37,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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/candybar/righty/keymaps/via/rules.mk b/keyboards/tkc/candybar/righty/keymaps/via/rules.mk
index 036bd6d1c..036bd6d1c 100644
--- a/keyboards/candybar/righty/keymaps/via/rules.mk
+++ b/keyboards/tkc/candybar/righty/keymaps/via/rules.mk
diff --git a/keyboards/candybar/lefty/readme.md b/keyboards/tkc/candybar/righty/readme.md
index 595472067..4e2a0f847 100644
--- a/keyboards/candybar/lefty/readme.md
+++ b/keyboards/tkc/candybar/righty/readme.md
@@ -10,6 +10,6 @@ The Key Company Candybar is a staggered 40% board with a numpad utilizing the ST
 
 Make example for this keyboard (after setting up your build environment):
 
-    make candybar/lefty:default:dfu-util
+    make tkc/candybar/righty:default:dfu-util
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/candybar/righty/righty.c b/keyboards/tkc/candybar/righty/righty.c
index c3b611574..c3b611574 100644
--- a/keyboards/candybar/righty/righty.c
+++ b/keyboards/tkc/candybar/righty/righty.c
diff --git a/keyboards/candybar/righty/righty.h b/keyboards/tkc/candybar/righty/righty.h
index 67e023883..67e023883 100644
--- a/keyboards/candybar/righty/righty.h
+++ b/keyboards/tkc/candybar/righty/righty.h
diff --git a/keyboards/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk
index 52ef91c47..52ef91c47 100644
--- a/keyboards/candybar/righty/rules.mk
+++ b/keyboards/tkc/candybar/righty/rules.mk
diff --git a/keyboards/m0lly/README.md b/keyboards/tkc/m0lly/README.md
index e0c8b45d9..9af80c7e9 100644
--- a/keyboards/m0lly/README.md
+++ b/keyboards/tkc/m0lly/README.md
@@ -12,6 +12,6 @@ Hardware Availability: [TheKey.Company](https://thekey.company)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make m0lly:default
+    make tkc/m0lly: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/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 29bd8411e..29bd8411e 100644
--- a/keyboards/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
diff --git a/keyboards/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index f2ac456b1..f2ac456b1 100644
--- a/keyboards/m0lly/info.json
+++ b/keyboards/tkc/m0lly/info.json
diff --git a/keyboards/m0lly/keymaps/default/keymap.c b/keyboards/tkc/m0lly/keymaps/default/keymap.c
index 27e83cd21..27e83cd21 100644
--- a/keyboards/m0lly/keymaps/default/keymap.c
+++ b/keyboards/tkc/m0lly/keymaps/default/keymap.c
diff --git a/keyboards/m0lly/keymaps/via/keymap.c b/keyboards/tkc/m0lly/keymaps/via/keymap.c
index 2e5900f16..b72b8f035 100644
--- a/keyboards/m0lly/keymaps/via/keymap.c
+++ b/keyboards/tkc/m0lly/keymaps/via/keymap.c
@@ -21,6 +21,8 @@
 enum {
   BASE = 0,
   FUNCTION,
+  ALTERNATE,
+  LAST,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -66,6 +68,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX,          _______, _______, _______, XXXXXXX,
     _______, _______, _______,                   _______,                        _______, _______, MO(FUNCTION), _______,                  _______, XXXXXXX, _______, _______
   ),
+  [ALTERNATE] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   XXXXXXX, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, XXXXXXX,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          _______, _______, _______, _______,
+    _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX,          _______, _______, _______, XXXXXXX,
+    _______, _______, _______,                   _______,                        _______, _______, MO(FUNCTION), _______,                  _______, XXXXXXX, _______, _______
+  ),
+    [LAST] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   XXXXXXX, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, XXXXXXX,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          _______, _______, _______, _______,
+    _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX,          _______, _______, _______, XXXXXXX,
+    _______, _______, _______,                   _______,                        _______, _______, MO(FUNCTION), _______,                  _______, XXXXXXX, _______, _______
+  ),
 };
 
 #ifdef OLED_DRIVER_ENABLE
@@ -81,6 +97,12 @@ void oled_task_user(void) {
         case FUNCTION:
             oled_write_P(PSTR("Function\n"), false);
             break;
+                case ALTERNATE:
+            oled_write_P(PSTR("Alternate\n"), false);
+            break;
+                case LAST:
+            oled_write_P(PSTR("Last\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);
diff --git a/keyboards/m0lly/keymaps/via/rules.mk b/keyboards/tkc/m0lly/keymaps/via/rules.mk
index 1e5b99807..1e5b99807 100644
--- a/keyboards/m0lly/keymaps/via/rules.mk
+++ b/keyboards/tkc/m0lly/keymaps/via/rules.mk
diff --git a/keyboards/m0lly/m0lly.c b/keyboards/tkc/m0lly/m0lly.c
index e47f9531e..e47f9531e 100644
--- a/keyboards/m0lly/m0lly.c
+++ b/keyboards/tkc/m0lly/m0lly.c
diff --git a/keyboards/m0lly/m0lly.h b/keyboards/tkc/m0lly/m0lly.h
index 0c62876ef..0c62876ef 100644
--- a/keyboards/m0lly/m0lly.h
+++ b/keyboards/tkc/m0lly/m0lly.h
diff --git a/keyboards/m0lly/rules.mk b/keyboards/tkc/m0lly/rules.mk
index 05e629075..05e629075 100644
--- a/keyboards/m0lly/rules.mk
+++ b/keyboards/tkc/m0lly/rules.mk
diff --git a/keyboards/tkc1800/README.md b/keyboards/tkc/tkc1800/README.md
index e154770d7..5382b91b3 100644
--- a/keyboards/tkc1800/README.md
+++ b/keyboards/tkc/tkc1800/README.md
@@ -12,6 +12,6 @@ Hardware Availability: [TheKey.Company](https://thekey.company/collections/tkc-1
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tkc1800:default
+    make tkc/tkc1800: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/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index 9c35699c9..9c35699c9 100644
--- a/keyboards/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
diff --git a/keyboards/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index 3e3ab1484..3e3ab1484 100644
--- a/keyboards/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
diff --git a/keyboards/tkc1800/keymaps/default/keymap.c b/keyboards/tkc/tkc1800/keymaps/default/keymap.c
index 4f4c7f8e9..4f4c7f8e9 100644
--- a/keyboards/tkc1800/keymaps/default/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/default/keymap.c
diff --git a/keyboards/tkc1800/keymaps/smt/keymap.c b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
index 9b6ad80d3..9b6ad80d3 100644
--- a/keyboards/tkc1800/keymaps/smt/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
diff --git a/keyboards/tkc1800/keymaps/via/keymap.c b/keyboards/tkc/tkc1800/keymaps/via/keymap.c
index 76fdf0540..55c2874c6 100644
--- a/keyboards/tkc1800/keymaps/via/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/via/keymap.c
@@ -20,6 +20,8 @@
 enum {
   BASE = 0,
   FUNCTION,
+  ALTERNATE,
+  LAST,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -75,6 +77,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______,      _______,     _______, _______, _______, XXXXXXX, \
     _______, _______, _______,                   _______,                            _______, _______, _______,      _______, _______, _______,     _______, _______, _______  \
   ),
+  [ALTERNATE] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, \
+                                                                                                                                           _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   XXXXXXX, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          _______, _______, _______, _______, \
+    _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______,      _______,     _______, _______, _______, XXXXXXX, \
+    _______, _______, _______,                   _______,                            _______, _______, _______,      _______, _______, _______,     _______, _______, _______  \
+  ),
+    [LAST] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, \
+                                                                                                                                           _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   XXXXXXX, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          _______, _______, _______, _______, \
+    _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______,      _______,     _______, _______, _______, XXXXXXX, \
+    _______, _______, _______,                   _______,                            _______, _______, _______,      _______, _______, _______,     _______, _______, _______  \
+  ),
 };
 
 #ifdef OLED_DRIVER_ENABLE
@@ -90,6 +110,12 @@ void oled_task_user(void) {
         case FUNCTION:
             oled_write_P(PSTR("Function\n"), false);
             break;
+                case ALTERNATE:
+            oled_write_P(PSTR("Alternate\n"), false);
+            break;
+                case LAST:
+            oled_write_P(PSTR("Last\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);
diff --git a/keyboards/tkc1800/keymaps/via/rules.mk b/keyboards/tkc/tkc1800/keymaps/via/rules.mk
index 1e5b99807..1e5b99807 100644
--- a/keyboards/tkc1800/keymaps/via/rules.mk
+++ b/keyboards/tkc/tkc1800/keymaps/via/rules.mk
diff --git a/keyboards/tkc1800/keymaps/wkl/keymap.c b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c
index 3c65b61d1..3c65b61d1 100644
--- a/keyboards/tkc1800/keymaps/wkl/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c
diff --git a/keyboards/tkc1800/keymaps/yanfali/keymap.c b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
index bbffc2d20..bbffc2d20 100644
--- a/keyboards/tkc1800/keymaps/yanfali/keymap.c
+++ b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c
diff --git a/keyboards/tkc1800/keymaps/yanfali/rules.mk b/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk
index b595964f7..b595964f7 100644
--- a/keyboards/tkc1800/keymaps/yanfali/rules.mk
+++ b/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk
diff --git a/keyboards/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk
index fa90e9980..fa90e9980 100644
--- a/keyboards/tkc1800/rules.mk
+++ b/keyboards/tkc/tkc1800/rules.mk
diff --git a/keyboards/tkc1800/tkc1800.c b/keyboards/tkc/tkc1800/tkc1800.c
index 4232c97d5..4232c97d5 100644
--- a/keyboards/tkc1800/tkc1800.c
+++ b/keyboards/tkc/tkc1800/tkc1800.c
diff --git a/keyboards/tkc1800/tkc1800.h b/keyboards/tkc/tkc1800/tkc1800.h
index 4d1686cf1..4d1686cf1 100644
--- a/keyboards/tkc1800/tkc1800.h
+++ b/keyboards/tkc/tkc1800/tkc1800.h
diff --git a/keyboards/tkc1800/keymaps/via/config.h b/keyboards/tkc1800/keymaps/via/config.h
deleted file mode 100644
index 579212d4a..000000000
--- a/keyboards/tkc1800/keymaps/via/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index 10d8c9eb6..27ee6a284 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -35,7 +35,11 @@
 // Explicitly override it if the keyboard uses a microcontroller with
 // more EEPROM *and* it makes sense to increase it.
 #ifndef DYNAMIC_KEYMAP_EEPROM_MAX_ADDR
-#    define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023
+#    if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
+#        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+#    else
+#        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023
+#    endif
 #endif
 
 // If DYNAMIC_KEYMAP_EEPROM_ADDR not explicitly defined in config.h,