From d79f46e408bd578966ee262b1d7bff439543addd Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 19 Jul 2024 08:04:40 +1000
Subject: [PATCH 01/27] `vertex/angler2`: reduce firmware size (#24140)

---
 keyboards/vertex/angler2/keyboard.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/vertex/angler2/keyboard.json b/keyboards/vertex/angler2/keyboard.json
index 9b9d2266140..02541f6c866 100644
--- a/keyboards/vertex/angler2/keyboard.json
+++ b/keyboards/vertex/angler2/keyboard.json
@@ -10,8 +10,8 @@
     },
     "features": {
         "bootmagic": true,
-        "command": true,
-        "console": true,
+        "command": false,
+        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
@@ -42,7 +42,6 @@
             "knight": true,
             "christmas": true,
             "static_gradient": true,
-            "rgb_test": true,
             "alternating": true,
             "twinkle": true
         }

From 11031adc1bd1e925651bc826f1d908229b9373e1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 19 Jul 2024 15:53:56 +1000
Subject: [PATCH 02/27] `clueboard/66/rev3`: reduce firmware size (#24152)

---
 keyboards/clueboard/66/rev3/keyboard.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/clueboard/66/rev3/keyboard.json b/keyboards/clueboard/66/rev3/keyboard.json
index 0aa3e7096fc..4553979d8a2 100644
--- a/keyboards/clueboard/66/rev3/keyboard.json
+++ b/keyboards/clueboard/66/rev3/keyboard.json
@@ -9,7 +9,7 @@
     "backlight": true,
     "bootmagic": false,
     "command": false,
-    "console": true,
+    "console": false,
     "extrakey": true,
     "mousekey": true,
     "nkro": true,
@@ -30,7 +30,6 @@
       "knight": true,
       "rainbow_mood": true,
       "rainbow_swirl": true,
-      "rgb_test": true,
       "snake": true,
       "static_gradient": true,
       "twinkle": true

From 56323f75c62e9c8c773de8ffa9f3da6440bb3382 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 19 Jul 2024 15:54:50 +1000
Subject: [PATCH 03/27] `pixelspace/capsule65i`: reduce firmware size (#24150)

---
 keyboards/pixelspace/capsule65i/keyboard.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/pixelspace/capsule65i/keyboard.json b/keyboards/pixelspace/capsule65i/keyboard.json
index d08fd2e355e..f8c9dc9c1d1 100644
--- a/keyboards/pixelspace/capsule65i/keyboard.json
+++ b/keyboards/pixelspace/capsule65i/keyboard.json
@@ -10,8 +10,8 @@
     },
     "features": {
         "bootmagic": true,
-        "command": true,
-        "console": true,
+        "command": false,
+        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
@@ -37,7 +37,6 @@
             "knight": true,
             "christmas": true,
             "static_gradient": true,
-            "rgb_test": true,
             "alternating": true,
             "twinkle": true
         }

From a6857872f2955c82810b37ca02e6a91788744b2b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 19 Jul 2024 15:56:00 +1000
Subject: [PATCH 04/27] `kopibeng/xt60`/`xt60_singa`: reduce firmware size
 (#24149)

---
 keyboards/kopibeng/xt60/keyboard.json                  | 7 +++----
 keyboards/kopibeng/xt60/keymaps/default/keymap.c       | 9 ---------
 keyboards/kopibeng/xt60/keymaps/via/keymap.c           | 9 ---------
 keyboards/kopibeng/xt60_singa/keyboard.json            | 7 +++----
 keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c | 9 ---------
 keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c     | 9 ---------
 6 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/keyboards/kopibeng/xt60/keyboard.json b/keyboards/kopibeng/xt60/keyboard.json
index 2901c056dd9..a170d36e417 100644
--- a/keyboards/kopibeng/xt60/keyboard.json
+++ b/keyboards/kopibeng/xt60/keyboard.json
@@ -17,8 +17,7 @@
             "breathing": true,
             "rainbow_mood": true,
             "rainbow_swirl": true,
-            "static_gradient": true,
-            "rgb_test": true
+            "static_gradient": true
         }
     },
     "ws2812": {
@@ -26,8 +25,8 @@
     },
     "features": {
         "bootmagic": true,
-        "command": true,
-        "console": true,
+        "command": false,
+        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
diff --git a/keyboards/kopibeng/xt60/keymaps/default/keymap.c b/keyboards/kopibeng/xt60/keymaps/default/keymap.c
index 845118d1abb..cb8f395f08a 100644
--- a/keyboards/kopibeng/xt60/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/xt60/keymaps/default/keymap.c
@@ -44,14 +44,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
 	),
-	
-	// 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
index 845118d1abb..cb8f395f08a 100644
--- a/keyboards/kopibeng/xt60/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/xt60/keymaps/via/keymap.c
@@ -44,14 +44,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
 	),
-	
-	// 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_singa/keyboard.json b/keyboards/kopibeng/xt60_singa/keyboard.json
index 688fa2f73aa..280a58c07b3 100644
--- a/keyboards/kopibeng/xt60_singa/keyboard.json
+++ b/keyboards/kopibeng/xt60_singa/keyboard.json
@@ -17,8 +17,7 @@
             "breathing": true,
             "rainbow_mood": true,
             "rainbow_swirl": true,
-            "static_gradient": true,
-            "rgb_test": true
+            "static_gradient": true
         }
     },
     "ws2812": {
@@ -26,8 +25,8 @@
     },
     "features": {
         "bootmagic": true,
-        "command": true,
-        "console": true,
+        "command": false,
+        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
diff --git a/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c b/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c
index 845118d1abb..cb8f395f08a 100644
--- a/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c
+++ b/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c
@@ -44,14 +44,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
 	),
-	
-	// 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_singa/keymaps/via/keymap.c b/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c
index 845118d1abb..cb8f395f08a 100644
--- a/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c
+++ b/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c
@@ -44,14 +44,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
 	),
-	
-	// 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
-	),
 };
 

From 6fbe91aecdb8bc5b65eafb8ab4ab70a2410d9c7a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 20 Jul 2024 19:56:51 +1000
Subject: [PATCH 05/27] `keychron/q2`: fix RGB Matrix config for JIS variant
 (#24138)

---
 keyboards/keychron/q2/jis/config.h            |  3 -
 keyboards/keychron/q2/jis/keyboard.json       | 57 ++++++++++---------
 keyboards/keychron/q2/jis_encoder/config.h    |  3 -
 .../keychron/q2/jis_encoder/keyboard.json     | 57 ++++++++++---------
 4 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/keyboards/keychron/q2/jis/config.h b/keyboards/keychron/q2/jis/config.h
index 0d811e08452..18e37b06fee 100644
--- a/keyboards/keychron/q2/jis/config.h
+++ b/keyboards/keychron/q2/jis/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 71
-
 #define SNLED27351_CURRENT_TUNE { 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D }
 
 /* Enable caps-lock LED */
diff --git a/keyboards/keychron/q2/jis/keyboard.json b/keyboards/keychron/q2/jis/keyboard.json
index 834b89332e2..6e5a0b8fc2f 100644
--- a/keyboards/keychron/q2/jis/keyboard.json
+++ b/keyboards/keychron/q2/jis/keyboard.json
@@ -5,21 +5,21 @@
     },
     "rgb_matrix": {
         "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 4, "flags": 1}, 
-            {"matrix": [0, 1], "x": 15, "y": 4, "flags": 4}, 
-            {"matrix": [0, 2], "x": 29, "y": 4, "flags": 4}, 
-            {"matrix": [0, 3], "x": 44, "y": 4, "flags": 4}, 
-            {"matrix": [0, 4], "x": 59, "y": 4, "flags": 4}, 
-            {"matrix": [0, 5], "x": 73, "y": 4, "flags": 4}, 
-            {"matrix": [0, 6], "x": 88, "y": 4, "flags": 4}, 
-            {"matrix": [0, 7], "x": 103, "y": 4, "flags": 4}, 
-            {"matrix": [0, 8], "x": 117, "y": 4, "flags": 4}, 
-            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4}, 
-            {"matrix": [0, 10], "x": 146, "y": 4, "flags": 4}, 
-            {"matrix": [0, 11], "x": 161, "y": 4, "flags": 4}, 
-            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4}, 
-            {"matrix": [0, 13], "x": 190, "y": 4, "flags": 4}, 
-            {"matrix": [3, 1], "x": 205, "y": 4, "flags": 1},
+            {"matrix": [0, 0], "x": 0, "y": 4, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 4, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 4, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 4, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 4, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 4, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 4, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 4, "flags": 4},
+            {"matrix": [0, 8], "x": 118, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 4, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4},
+            {"matrix": [0, 13], "x": 191, "y": 4, "flags": 4},
+            {"matrix": [3, 1], "x": 206, "y": 4, "flags": 1},
             {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
 
             {"matrix": [1, 0], "x": 4, "y": 19, "flags": 1},
@@ -31,10 +31,10 @@
             {"matrix": [1, 6], "x": 95, "y": 19, "flags": 4},
             {"matrix": [1, 7], "x": 110, "y": 19, "flags": 4},
             {"matrix": [1, 8], "x": 125, "y": 19, "flags": 4},
-            {"matrix": [1, 9], "x": 139, "y": 19, "flags": 4},
+            {"matrix": [1, 9], "x": 140, "y": 19, "flags": 4},
             {"matrix": [1, 10], "x": 154, "y": 19, "flags": 4},
-            {"matrix": [1, 11], "x": 168, "y": 19, "flags": 4},
-            {"matrix": [1, 12], "x": 183, "y": 19, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 19, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 19, "flags": 4},
             {"matrix": [1, 14], "x": 224, "y": 19, "flags": 1},
 
             {"matrix": [2, 0], "x": 6, "y": 34, "flags": 1},
@@ -45,12 +45,12 @@
             {"matrix": [2, 5], "x": 84, "y": 34, "flags": 4},
             {"matrix": [2, 6], "x": 99, "y": 34, "flags": 4},
             {"matrix": [2, 7], "x": 114, "y": 34, "flags": 4},
-            {"matrix": [2, 8], "x": 128, "y": 34, "flags": 4},
+            {"matrix": [2, 8], "x": 129, "y": 34, "flags": 4},
             {"matrix": [2, 9], "x": 143, "y": 34, "flags": 4},
             {"matrix": [2, 10], "x": 158, "y": 34, "flags": 4},
-            {"matrix": [2, 11], "x": 172, "y": 34, "flags": 4},
+            {"matrix": [2, 11], "x": 173, "y": 34, "flags": 4},
             {"matrix": [2, 13], "x": 187, "y": 34, "flags": 4},
-            {"matrix": [1, 13], "x": 207, "y": 29, "flags": 1},
+            {"matrix": [1, 13], "x": 204, "y": 26, "flags": 1},
             {"matrix": [2, 14], "x": 224, "y": 34, "flags": 1},
 
             {"matrix": [3, 0], "x": 9, "y": 49, "flags": 1},
@@ -62,9 +62,10 @@
             {"matrix": [3, 7], "x": 106, "y": 49, "flags": 4},
             {"matrix": [3, 8], "x": 121, "y": 49, "flags": 4},
             {"matrix": [3, 9], "x": 136, "y": 49, "flags": 4},
-            {"matrix": [3, 10], "x": 150, "y": 49, "flags": 4},
-            {"matrix": [3, 11], "x": 179, "y": 49, "flags": 4},
-            {"matrix": [3, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [3, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 180, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 195, "y": 49, "flags": 1},
             {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
 
             {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
@@ -73,12 +74,12 @@
             {"matrix": [4, 3], "x": 51, "y": 64, "flags": 1},
             {"matrix": [4, 6], "x": 92, "y": 64, "flags": 4},
             {"matrix": [4, 9], "x": 134, "y": 64, "flags": 1},
-            {"matrix": [4, 10], "x": 150, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 151, "y": 64, "flags": 1},
             {"matrix": [4, 11], "x": 165, "y": 64, "flags": 1},
-            {"matrix": [4, 12], "x": 179, "y": 64, "flags": 1},
-            {"matrix": [4, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
             {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
-            {"matrix": [4, 14], "x": 223, "y": 64, "flags": 1}
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
         ]
     },
     "layouts": {
diff --git a/keyboards/keychron/q2/jis_encoder/config.h b/keyboards/keychron/q2/jis_encoder/config.h
index 0d811e08452..18e37b06fee 100644
--- a/keyboards/keychron/q2/jis_encoder/config.h
+++ b/keyboards/keychron/q2/jis_encoder/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 71
-
 #define SNLED27351_CURRENT_TUNE { 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D }
 
 /* Enable caps-lock LED */
diff --git a/keyboards/keychron/q2/jis_encoder/keyboard.json b/keyboards/keychron/q2/jis_encoder/keyboard.json
index 32b691742bb..11204e720f1 100644
--- a/keyboards/keychron/q2/jis_encoder/keyboard.json
+++ b/keyboards/keychron/q2/jis_encoder/keyboard.json
@@ -11,21 +11,21 @@
     },
     "rgb_matrix": {
         "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 4, "flags": 1}, 
-            {"matrix": [0, 1], "x": 15, "y": 4, "flags": 4}, 
-            {"matrix": [0, 2], "x": 29, "y": 4, "flags": 4}, 
-            {"matrix": [0, 3], "x": 44, "y": 4, "flags": 4}, 
-            {"matrix": [0, 4], "x": 59, "y": 4, "flags": 4}, 
-            {"matrix": [0, 5], "x": 73, "y": 4, "flags": 4}, 
-            {"matrix": [0, 6], "x": 88, "y": 4, "flags": 4}, 
-            {"matrix": [0, 7], "x": 103, "y": 4, "flags": 4}, 
-            {"matrix": [0, 8], "x": 117, "y": 4, "flags": 4}, 
-            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4}, 
-            {"matrix": [0, 10], "x": 146, "y": 4, "flags": 4}, 
-            {"matrix": [0, 11], "x": 161, "y": 4, "flags": 4}, 
-            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4}, 
-            {"matrix": [0, 13], "x": 190, "y": 4, "flags": 4}, 
-            {"matrix": [3, 1], "x": 205, "y": 4, "flags": 1},
+            {"matrix": [0, 0], "x": 0, "y": 4, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 4, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 4, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 4, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 4, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 4, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 4, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 4, "flags": 4},
+            {"matrix": [0, 8], "x": 118, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 4, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4},
+            {"matrix": [0, 13], "x": 191, "y": 4, "flags": 4},
+            {"matrix": [3, 1], "x": 206, "y": 4, "flags": 1},
             {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
 
             {"matrix": [1, 0], "x": 4, "y": 19, "flags": 1},
@@ -37,10 +37,10 @@
             {"matrix": [1, 6], "x": 95, "y": 19, "flags": 4},
             {"matrix": [1, 7], "x": 110, "y": 19, "flags": 4},
             {"matrix": [1, 8], "x": 125, "y": 19, "flags": 4},
-            {"matrix": [1, 9], "x": 139, "y": 19, "flags": 4},
+            {"matrix": [1, 9], "x": 140, "y": 19, "flags": 4},
             {"matrix": [1, 10], "x": 154, "y": 19, "flags": 4},
-            {"matrix": [1, 11], "x": 168, "y": 19, "flags": 4},
-            {"matrix": [1, 12], "x": 183, "y": 19, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 19, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 19, "flags": 4},
             {"matrix": [1, 14], "x": 224, "y": 19, "flags": 1},
 
             {"matrix": [2, 0], "x": 6, "y": 34, "flags": 1},
@@ -51,12 +51,12 @@
             {"matrix": [2, 5], "x": 84, "y": 34, "flags": 4},
             {"matrix": [2, 6], "x": 99, "y": 34, "flags": 4},
             {"matrix": [2, 7], "x": 114, "y": 34, "flags": 4},
-            {"matrix": [2, 8], "x": 128, "y": 34, "flags": 4},
+            {"matrix": [2, 8], "x": 129, "y": 34, "flags": 4},
             {"matrix": [2, 9], "x": 143, "y": 34, "flags": 4},
             {"matrix": [2, 10], "x": 158, "y": 34, "flags": 4},
-            {"matrix": [2, 11], "x": 172, "y": 34, "flags": 4},
+            {"matrix": [2, 11], "x": 173, "y": 34, "flags": 4},
             {"matrix": [2, 13], "x": 187, "y": 34, "flags": 4},
-            {"matrix": [1, 13], "x": 207, "y": 29, "flags": 1},
+            {"matrix": [1, 13], "x": 204, "y": 26, "flags": 1},
             {"matrix": [2, 14], "x": 224, "y": 34, "flags": 1},
 
             {"matrix": [3, 0], "x": 9, "y": 49, "flags": 1},
@@ -68,9 +68,10 @@
             {"matrix": [3, 7], "x": 106, "y": 49, "flags": 4},
             {"matrix": [3, 8], "x": 121, "y": 49, "flags": 4},
             {"matrix": [3, 9], "x": 136, "y": 49, "flags": 4},
-            {"matrix": [3, 10], "x": 150, "y": 49, "flags": 4},
-            {"matrix": [3, 11], "x": 179, "y": 49, "flags": 4},
-            {"matrix": [3, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [3, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 180, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 195, "y": 49, "flags": 1},
             {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
 
             {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
@@ -79,12 +80,12 @@
             {"matrix": [4, 3], "x": 51, "y": 64, "flags": 1},
             {"matrix": [4, 6], "x": 92, "y": 64, "flags": 4},
             {"matrix": [4, 9], "x": 134, "y": 64, "flags": 1},
-            {"matrix": [4, 10], "x": 150, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 151, "y": 64, "flags": 1},
             {"matrix": [4, 11], "x": 165, "y": 64, "flags": 1},
-            {"matrix": [4, 12], "x": 179, "y": 64, "flags": 1},
-            {"matrix": [4, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
             {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
-            {"matrix": [4, 14], "x": 223, "y": 64, "flags": 1}
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
         ]
     },
     "layouts": {

From 2fb9816c7775f1ed5a649f7d2269be3816159ccf Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 20 Jul 2024 14:03:57 +0100
Subject: [PATCH 06/27] Remove incorrect use of split.main (#24158)

---
 keyboards/aidansmithdotdev/sango/keyboard.json    | 1 -
 keyboards/takashicompany/heavy_left/keyboard.json | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/keyboards/aidansmithdotdev/sango/keyboard.json b/keyboards/aidansmithdotdev/sango/keyboard.json
index 6c62ac9bd2a..deb26f86b62 100644
--- a/keyboards/aidansmithdotdev/sango/keyboard.json
+++ b/keyboards/aidansmithdotdev/sango/keyboard.json
@@ -120,7 +120,6 @@
             "matrix": [4, 7]
         },
         "enabled": true,
-        "main": "matrix_grid",
         "matrix_pins": {
             "right": {
                 "cols": ["GP7", "GP8", "GP9", "GP11", "GP12", "GP13", "GP14", "GP15"],
diff --git a/keyboards/takashicompany/heavy_left/keyboard.json b/keyboards/takashicompany/heavy_left/keyboard.json
index e0c020d0fdf..3109e1ad83f 100644
--- a/keyboards/takashicompany/heavy_left/keyboard.json
+++ b/keyboards/takashicompany/heavy_left/keyboard.json
@@ -45,8 +45,7 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
-        "main": "eeprom"
+        "soft_serial_pin": "D2"
     },
     "development_board": "promicro",
     "layouts": {

From eb60235cd58d4591ee05620a0ad3cbc2061054b5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 21 Jul 2024 07:53:04 +1000
Subject: [PATCH 07/27] `handwired/tractyl_manuform/5x6_right/arduinomicro`:
 reduce size (#24159)

---
 .../tractyl_manuform/5x6_right/arduinomicro/keyboard.json    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
index eebc5d5546c..df810f2881e 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
@@ -15,5 +15,8 @@
         }
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "build": {
+        "lto": true
+    }
 }

From f04fd13dff8b132cfb4055ad27dc505e9277d96f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 21 Jul 2024 07:57:10 +1000
Subject: [PATCH 08/27] `mechlovin/delphine/rgb_led`: reduce size (#24160)

---
 keyboards/mechlovin/delphine/rgb_led/keyboard.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyboards/mechlovin/delphine/rgb_led/keyboard.json b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
index 35a163c05f8..d6e7a27f813 100644
--- a/keyboards/mechlovin/delphine/rgb_led/keyboard.json
+++ b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
@@ -23,7 +23,6 @@
             "knight": true,
             "christmas": true,
             "static_gradient": true,
-            "rgb_test": true,
             "alternating": true,
             "twinkle": true
         }
@@ -62,8 +61,6 @@
             "pixel_rain": true,
             "pixel_flow": true,
             "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
             "solid_reactive_simple": true,
             "solid_reactive": true,
             "solid_reactive_wide": true,

From fab50be817ab11237d0e2c79c16da93dcbb153b4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 21 Jul 2024 07:59:45 +1000
Subject: [PATCH 09/27] `mwstudio/mw75`: reduce size (#24161)

---
 keyboards/mwstudio/mw75/keyboard.json         |  2 --
 .../mwstudio/mw75/keymaps/default/keymap.c    | 19 -------------------
 keyboards/mwstudio/mw75/keymaps/via/keymap.c  | 19 -------------------
 3 files changed, 40 deletions(-)

diff --git a/keyboards/mwstudio/mw75/keyboard.json b/keyboards/mwstudio/mw75/keyboard.json
index d19d6b49ba1..d9e540bca44 100644
--- a/keyboards/mwstudio/mw75/keyboard.json
+++ b/keyboards/mwstudio/mw75/keyboard.json
@@ -38,8 +38,6 @@
             "hue_wave": true,
             "pixel_fractal": true,
             "pixel_rain": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
             "solid_reactive_simple": true,
             "solid_reactive": true,
             "solid_reactive_wide": true,
diff --git a/keyboards/mwstudio/mw75/keymaps/default/keymap.c b/keyboards/mwstudio/mw75/keymaps/default/keymap.c
index 12ac4ce74a4..1a7b9bf0677 100644
--- a/keyboards/mwstudio/mw75/keymaps/default/keymap.c
+++ b/keyboards/mwstudio/mw75/keymaps/default/keymap.c
@@ -36,23 +36,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
         _______, _______, _______,                            _______,                   RGB_MOD, _______,          RGB_SPD, RGB_VAD, RGB_SPI
     ),
-
-    [2] = LAYOUT(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______, _______, _______, _______,     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
-    ),
-
-    [3] = LAYOUT(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______, _______, _______, _______,     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
-    ),
-
 };
diff --git a/keyboards/mwstudio/mw75/keymaps/via/keymap.c b/keyboards/mwstudio/mw75/keymaps/via/keymap.c
index 12ac4ce74a4..1a7b9bf0677 100644
--- a/keyboards/mwstudio/mw75/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw75/keymaps/via/keymap.c
@@ -36,23 +36,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
         _______, _______, _______,                            _______,                   RGB_MOD, _______,          RGB_SPD, RGB_VAD, RGB_SPI
     ),
-
-    [2] = LAYOUT(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______, _______, _______, _______,     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
-    ),
-
-    [3] = LAYOUT(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______, _______, _______, _______,     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
-    ),
-
 };

From f2c789bb4af7ce52ca0e118c868d623347433301 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sun, 21 Jul 2024 00:56:39 +0100
Subject: [PATCH 10/27] Fix build failures noticed in #24163 CI log. (#24164)

---
 .../dailycraft/claw44/keymaps/oled/config.h   |  2 +-
 .../dactyl_minidox/keymaps/dlford/rules.mk    |  2 ++
 keyboards/jian/keymaps/left_hand/keymap.c     | 28 +++++++++----------
 keyboards/sofle/keymaps/rgb_default/config.h  |  3 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/keyboards/dailycraft/claw44/keymaps/oled/config.h b/keyboards/dailycraft/claw44/keymaps/oled/config.h
index 5379ce677d5..f84bf23dd8c 100644
--- a/keyboards/dailycraft/claw44/keymaps/oled/config.h
+++ b/keyboards/dailycraft/claw44/keymaps/oled/config.h
@@ -19,4 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define MASTER_LEFT
-#define OLED_FONT_H "keyboards/claw44/lib/glcdfont.c"
+#define OLED_FONT_H "claw44/lib/glcdfont.c"
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
index d24f7a0cbd8..78e059df96e 100644
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
@@ -11,6 +11,8 @@ INDICATOR_LIGHTS = yes      # Enable indicator lights for caps lock, etc.
 # KEY_OVERRIDE_ENABLE = yes   # Override key combos
 # COMBO_ENABLE = yes          # Custom key combos
 
+RGB_MATRIX_ENABLE = yes
+
 LTO_ENABLE = yes
 RGBLIGHT_SUPPORTED = yes
 RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index 3f67215b8b7..b3cf6bd3674 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -1,17 +1,17 @@
  /* Copyright 2020 KGOH
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * 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
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E,                 KC_R,                KC_T,                     KC_T,                KC_R,                KC_E,                 KC_W,    KC_Q,    LGUI_T(KC_GRV), KC_LSFT,
            KC_LCTL,        KC_A, KC_S, KC_D,                 KC_F,                KC_G,                     KC_G,                KC_F,                KC_D,                 KC_S,    KC_A,    KC_LCTL,
            KC_LALT,        KC_Z, KC_X, KC_C,                 KC_V,                KC_B,                     KC_B,                KC_V,                KC_C,                 KC_X,    KC_Z,    KC_LALT,
-                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT),      LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC),
+                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT),      LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC)
 ),
 [_DFLT_R] = LAYOUT(
   KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,                KC_U,    KC_Y,                     KC_Y,                KC_U,    KC_I,               KC_O,    KC_P,    KC_LBRC, KC_RBRC,
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 314322c9293..0929487978c 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -69,10 +69,11 @@
 	//#define RGBLIGHT_EFFECT_TWINKLE
 
     #define RGBLIGHT_LED_COUNT 70
-	//#define RGBLED_SPLIT
+	#undef RGBLED_SPLIT
 	#define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet
 
 	//#define RGBLIGHT_LED_COUNT 30
+    #undef RGBLIGHT_LIMIT_VAL
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
     #define RGBLIGHT_SAT_STEP 17

From b6e1a209505246302743b7187b562a37a8bc092a Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Sun, 21 Jul 2024 21:29:45 +0100
Subject: [PATCH 11/27] Keycult TKL (#24148)

Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/keycult/keycult_tkl/keyboard.json   | 208 ++++++++++++++++++
 .../keycult_tkl/keymaps/default/keymap.c      |  35 +++
 .../keycult/keycult_tkl/keymaps/via/keymap.c  |  35 +++
 .../keycult/keycult_tkl/keymaps/via/rules.mk  |   1 +
 keyboards/keycult/keycult_tkl/readme.md       |  32 +++
 keyboards/keycult/keycult_tkl/rules.mk        |   2 +
 6 files changed, 313 insertions(+)
 create mode 100644 keyboards/keycult/keycult_tkl/keyboard.json
 create mode 100644 keyboards/keycult/keycult_tkl/keymaps/default/keymap.c
 create mode 100644 keyboards/keycult/keycult_tkl/keymaps/via/keymap.c
 create mode 100644 keyboards/keycult/keycult_tkl/keymaps/via/rules.mk
 create mode 100644 keyboards/keycult/keycult_tkl/readme.md
 create mode 100644 keyboards/keycult/keycult_tkl/rules.mk

diff --git a/keyboards/keycult/keycult_tkl/keyboard.json b/keyboards/keycult/keycult_tkl/keyboard.json
new file mode 100644
index 00000000000..81687f13bde
--- /dev/null
+++ b/keyboards/keycult/keycult_tkl/keyboard.json
@@ -0,0 +1,208 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "Keycult TKL",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
+        "rows": ["B11", "B10", "B2", "B1", "A9", "A5"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6336",
+        "vid": "0x8968"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "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": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "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": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"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": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keycult/keycult_tkl/keymaps/default/keymap.c b/keyboards/keycult/keycult_tkl/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0f67593ea0b
--- /dev/null
+++ b/keyboards/keycult/keycult_tkl/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2024 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_tkl_ansi( /* 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_SCRL, 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(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_tkl_ansi( /* FN */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, KC_VOLD, KC_MUTE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,
+    _______, _______, _______,                   _______,                                     _______, _______, _______, _______, _______, _______, _______),
+
+};
diff --git a/keyboards/keycult/keycult_tkl/keymaps/via/keymap.c b/keyboards/keycult/keycult_tkl/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9c12c11abf3
--- /dev/null
+++ b/keyboards/keycult/keycult_tkl/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2024 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_tkl_ansi( /* 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_SCRL, 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(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_tkl_ansi( /* FN */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, KC_VOLD, KC_MUTE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,
+    _______, _______, _______,                   _______,                                     _______, _______, _______, _______, _______, _______, _______),
+
+};
\ No newline at end of file
diff --git a/keyboards/keycult/keycult_tkl/keymaps/via/rules.mk b/keyboards/keycult/keycult_tkl/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/keycult/keycult_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keycult/keycult_tkl/readme.md b/keyboards/keycult/keycult_tkl/readme.md
new file mode 100644
index 00000000000..6ed9159a1c7
--- /dev/null
+++ b/keyboards/keycult/keycult_tkl/readme.md
@@ -0,0 +1,32 @@
+# Keycult TKL
+
+This is a TKL layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](https://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A TKL keyboard with STM32F072CB or APM compatible
+* Hardware Availability: https://keycult.com/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keycult/keycult_tkl: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 dfu-util (`make keycult/keycult_tkl:<keymap>:dfu-util`)
diff --git a/keyboards/keycult/keycult_tkl/rules.mk b/keyboards/keycult/keycult_tkl/rules.mk
new file mode 100644
index 00000000000..0ab54aaaf71
--- /dev/null
+++ b/keyboards/keycult/keycult_tkl/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

From ee1505971f92267c8e2a094cfbcdc4dea02b5ba5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 00:52:31 +1000
Subject: [PATCH 12/27] `handwired/hnah108`: reduce firmware size (#24168)

---
 keyboards/handwired/hnah108/keyboard.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/handwired/hnah108/keyboard.json b/keyboards/handwired/hnah108/keyboard.json
index e062dcee6f2..3099ed85485 100644
--- a/keyboards/handwired/hnah108/keyboard.json
+++ b/keyboards/handwired/hnah108/keyboard.json
@@ -39,8 +39,6 @@
             "pixel_rain": true,
             "pixel_flow": true,
             "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
             "solid_reactive_simple": true,
             "solid_reactive": true,
             "solid_reactive_wide": true,

From 8d5517fa633e7cefeb8e7cf06b430318d1f0401a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 01:04:34 +1000
Subject: [PATCH 13/27] `doro67/rgb`: reduce firmware size (#24169)

---
 keyboards/doro67/rgb/keyboard.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/doro67/rgb/keyboard.json b/keyboards/doro67/rgb/keyboard.json
index 9b660fd1aec..8f372dc9c7f 100644
--- a/keyboards/doro67/rgb/keyboard.json
+++ b/keyboards/doro67/rgb/keyboard.json
@@ -39,8 +39,6 @@
         "pixel_rain": true,
         "pixel_flow": true,
         "pixel_fractal": true,
-        "typing_heatmap": true,
-        "digital_rain": true,
         "solid_reactive_simple": true,
         "solid_reactive": true,
         "solid_reactive_wide": true,

From 4e2effc538f1ec4a2b11a2e37ff1fab139be319c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 01:16:00 +1000
Subject: [PATCH 14/27] `rubi`: reduce firmware size (#24170)

---
 keyboards/rubi/keyboard.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/rubi/keyboard.json b/keyboards/rubi/keyboard.json
index cb94b586156..aa58208219c 100644
--- a/keyboards/rubi/keyboard.json
+++ b/keyboards/rubi/keyboard.json
@@ -22,6 +22,9 @@
             "resync": true
         }
     },
+   "build": {
+      "lto": true
+   },
    "matrix_pins": {
       "cols": ["B3", "B2", "B1", "F7"],
       "rows": ["F0", "F1", "F4", "F5", "F6"]

From 82f9019cc9f8a84b2ce2ed6cdd3acf3778dade22 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 01:29:40 +1000
Subject: [PATCH 15/27] `melgeek/mojo68/rev1`: reduce firmware size (#24171)

---
 keyboards/melgeek/mojo68/rev1/keyboard.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/melgeek/mojo68/rev1/keyboard.json b/keyboards/melgeek/mojo68/rev1/keyboard.json
index b97de4fbd2c..7f218392929 100755
--- a/keyboards/melgeek/mojo68/rev1/keyboard.json
+++ b/keyboards/melgeek/mojo68/rev1/keyboard.json
@@ -45,8 +45,6 @@
             "hue_breathing": true,
             "hue_pendulum": true,
             "hue_wave": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
             "solid_reactive_simple": true,
             "solid_reactive": true,
             "solid_reactive_wide": true,

From d09c11dc787d3b04dd28db23bf96da456f2e4410 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 02:12:34 +1000
Subject: [PATCH 16/27] `kprepublic/bm40hsrgb/rev2`: reduce firmware size
 (#24176)

---
 keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json b/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
index cfaabd5c9ef..525a6088ed3 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
@@ -14,6 +14,9 @@
         "command": false,
         "nkro": false
     },
+    "build": {
+        "lto": true
+    },
     "usb": {
         "vid": "0x4B50",
         "pid": "0x3430",

From 4bcc80ad464c413ec1e27670638bda8e35a505f9 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 02:12:55 +1000
Subject: [PATCH 17/27] `merge/um80`: reduce firmware size (#24177)

---
 keyboards/merge/um80/keyboard.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/merge/um80/keyboard.json b/keyboards/merge/um80/keyboard.json
index 5a369877f88..1cbac749f7b 100644
--- a/keyboards/merge/um80/keyboard.json
+++ b/keyboards/merge/um80/keyboard.json
@@ -42,6 +42,9 @@
         "sleep": true,
         "split_count": [48, 52]
     },
+    "build": {
+        "lto": true
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

From af70e3759a465d67033525c4af8a4ac54a5a3cbe Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Tue, 23 Jul 2024 19:37:19 +0900
Subject: [PATCH 18/27] [docs] update serial.md (#24182)

capabilites -> capabilities
---
 docs/drivers/serial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/drivers/serial.md b/docs/drivers/serial.md
index 364e951b869..75d11bc93bc 100644
--- a/docs/drivers/serial.md
+++ b/docs/drivers/serial.md
@@ -1,6 +1,6 @@
 # 'serial' Driver
 
-The Serial driver powers the [Split Keyboard](../features/split_keyboard) feature. Several implementations are available that cater to the platform and capabilites of MCU in use. Note that none of the drivers support split keyboards with more than two halves.
+The Serial driver powers the [Split Keyboard](../features/split_keyboard) feature. Several implementations are available that cater to the platform and capabilities of MCU in use. Note that none of the drivers support split keyboards with more than two halves.
 
 | Driver                                  | AVR                | ARM                | Connection between halves                                                                     |
 | --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- |

From d079372580c2c731d300b43f38e9d46fd3c7655b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 21:03:02 +1000
Subject: [PATCH 19/27] `meme`: adjust layout names (#24178)

---
 keyboards/meme/keyboard.json            | 15 +++++++++++----
 keyboards/meme/keymaps/default/keymap.c |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/keyboards/meme/keyboard.json b/keyboards/meme/keyboard.json
index 021c8f998ae..27acfc5a33f 100644
--- a/keyboards/meme/keyboard.json
+++ b/keyboards/meme/keyboard.json
@@ -33,8 +33,15 @@
   },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
+  "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_ansi_blocker", "65_ansi_blocker_split_bs"],
+  "layout_aliases": {
+    "LAYOUT_normie": "LAYOUT_65_ansi",
+    "LAYOUT_spicy": "LAYOUT_65_ansi_split_bs",
+    "LAYOUT_dank": "LAYOUT_65_ansi_blocker",
+    "LAYOUT_meme": "LAYOUT_65_ansi_blocker_split_bs",
+  },
   "layouts": {
-    "LAYOUT_spicy": {
+    "LAYOUT_65_ansi_split_bs": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
         {"matrix": [1, 0], "x": 1, "y": 0},
@@ -111,7 +118,7 @@
         {"matrix": [9, 7], "x": 15, "y": 4}
       ]
     },
-    "LAYOUT_normie": {
+    "LAYOUT_65_ansi": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
         {"matrix": [1, 0], "x": 1, "y": 0},
@@ -187,7 +194,7 @@
         {"matrix": [9, 7], "x": 15, "y": 4}
       ]
     },
-    "LAYOUT_dank": {
+    "LAYOUT_65_ansi_blocker": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
         {"matrix": [1, 0], "x": 1, "y": 0},
@@ -262,7 +269,7 @@
         {"matrix": [9, 7], "x": 15, "y": 4}
       ]
     },
-    "LAYOUT_meme": {
+    "LAYOUT_65_ansi_blocker_split_bs": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
         {"matrix": [1, 0], "x": 1, "y": 0},
diff --git a/keyboards/meme/keymaps/default/keymap.c b/keyboards/meme/keymaps/default/keymap.c
index c84ca220bde..ef7139235a9 100644
--- a/keyboards/meme/keymaps/default/keymap.c
+++ b/keyboards/meme/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_spicy(
+[0] = LAYOUT_65_ansi_split_bs(
     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_BSLS, 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_RCTL, KC_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,

From 622dc5625042bc765bb3ff96e3601b5caddf4512 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 23 Jul 2024 21:20:17 +1000
Subject: [PATCH 20/27] `kingly_keys/ave`: adjust layout names (#24179)

---
 keyboards/kingly_keys/ave/ortho/keyboard.json         | 11 ++++++++---
 .../kingly_keys/ave/ortho/keymaps/default/keymap.c    | 10 +++++-----
 keyboards/kingly_keys/ave/staggered/keyboard.json     |  8 ++++++--
 .../ave/staggered/keymaps/default/keymap.c            | 10 +++++-----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/keyboards/kingly_keys/ave/ortho/keyboard.json b/keyboards/kingly_keys/ave/ortho/keyboard.json
index d277e68e47f..27fb2666a2a 100644
--- a/keyboards/kingly_keys/ave/ortho/keyboard.json
+++ b/keyboards/kingly_keys/ave/ortho/keyboard.json
@@ -45,8 +45,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "layout_aliases": {
+    "LAYOUT_ortho_all": "LAYOUT_all",
+    "LAYOUT_ortho_2x2u": "LAYOUT_2x2u_space",
+    "LAYOUT_ortho_big_boy": "LAYOUT_7u_space"
+  },
   "layouts": {
-    "LAYOUT_ortho_all": {
+    "LAYOUT_all": {
        "layout": [
           {"matrix": [0, 0], "x": 0, "y": 0},
           {"matrix": [0, 1], "x": 1.5, "y": 0},
@@ -111,7 +116,7 @@
           {"matrix": [4, 12], "x": 12.5, "y": 4.5}
       ]
     },
-    "LAYOUT_ortho_2x2u": {
+    "LAYOUT_2x2u_space": {
         "layout": [
           {"matrix": [0, 0], "x": 0, "y": 0},
           {"matrix": [0, 1], "x": 1.5, "y": 0},
@@ -174,7 +179,7 @@
           {"matrix": [4, 12], "x": 12.5, "y": 4.5}
        ]
      },
-     "LAYOUT_ortho_big_boy": {
+     "LAYOUT_7u_space": {
         "layout": [
           {"matrix": [0, 0], "x": 0, "y": 0},
           {"matrix": [0, 1], "x": 1.5, "y": 0},
diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
index db0dfe46f69..d23666862ee 100644
--- a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │End │ │CTL │GUI │ALT │FUNC│LOWR│    │    │RISE│Left│Down│ Up │Rght│
     * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
     */
-    [_QWERTY] = LAYOUT_ortho_all(
+    [_QWERTY] = LAYOUT_all(
         KC_MUTE,      KC_ESC,                                                                       KC_BSLS,   KC_MINUS,   KC_EQUAL,
         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_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,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │STOP│ │    │    │    │    │    │    │    │    │    │    │    │    │
     * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
     */
-    [_LOWER] = LAYOUT_ortho_all(
+    [_LOWER] = LAYOUT_all(
         _______,      _______,                                                                                           KC_LBRC,   KC_RBRC,   KC_GRAVE,
         KC_MPLY,      _______,   KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      _______,
         KC_MNXT,      _______,   KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,    KC_PERC,   KC_CIRC,   KC_AMPR,   KC_ASTR,   KC_LPRN,   KC_RPRN,   KC_DQT,
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
     * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
     */
-    [_RAISE] = LAYOUT_ortho_all(
+    [_RAISE] = LAYOUT_all(
         KC_PSCR,      _______,                                                                                           KC_LCBR,   KC_RCBR,   KC_TILD,
         _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
         _______,      KC_CAPS,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
     * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
     */
-    [_FUNCTION] = LAYOUT_ortho_all(
+    [_FUNCTION] = LAYOUT_all(
         TD(TD_RST),   RGB_TOG,                                                                                           KC_F11,    KC_F12,    KC_F13,
         _______,      _______,   KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    _______,
         _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
 //  * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
 //  */
-//  [<LAYER>] = LAYOUT_ortho_all(
+//  [<LAYER>] = LAYOUT_all(
 //      _______,      _______,                                                                                           _______,   _______,   _______,
 //      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
 //      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
diff --git a/keyboards/kingly_keys/ave/staggered/keyboard.json b/keyboards/kingly_keys/ave/staggered/keyboard.json
index 3f5bf70ce89..5fcb1657e38 100644
--- a/keyboards/kingly_keys/ave/staggered/keyboard.json
+++ b/keyboards/kingly_keys/ave/staggered/keyboard.json
@@ -45,8 +45,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "layout_aliases": {
+    "LAYOUT_staggered": "LAYOUT_all",
+    "LAYOUT_staggered_big_boy": "LAYOUT_6u25_space"
+  },
   "layouts": {
-    "LAYOUT_staggered": {
+    "LAYOUT_all": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
 
@@ -111,7 +115,7 @@
         {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.25}
       ]
     },
-    "LAYOUT_staggered_big_boy": {
+    "LAYOUT_6u25_space": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
 
diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
index b5631ad436d..8d9c6a045ff 100644
--- a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │End │ │LCtrl│GUI │ALT  │    LOWR      │          │RAlt │RCTL│FUNC │
     * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
     */
-    [_QWERTY] = LAYOUT_staggered(
+    [_QWERTY] = LAYOUT_all(
         KC_MUTE,      KC_ESC,                                                                       KC_LPRN,   KC_RPRN,   KC_SCLN,
         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_BSPC,
         KC_PGUP,      KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,      KC_L,           KC_ENT,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │ _  │ │     │    │     │              │          │     │    │     │
     * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
     */
-    [_LOWER] = LAYOUT_staggered(
+    [_LOWER] = LAYOUT_all(
         _______,      _______,                                                                                           KC_LBRC,   KC_RBRC,    KC_COLON,
         KC_MINUS,     KC_GRAVE,   KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,     KC_9,      KC_0,       _______,
         KC_BSLS,      KC_TILD,    KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,    KC_PERC,   KC_CIRC,   KC_AMPR,   KC_ASTR,   _______,      TD(TD_DBQT),
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │    │ │     │    │     │              │          │     │ ?  │     │
     * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
     */
-    [_RAISE] = LAYOUT_staggered(
+    [_RAISE] = LAYOUT_all(
         KC_PSCR,      _______,                                                                                           KC_LCBR,   KC_RCBR,   KC_PLUS,
         _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_UP,     _______,   _______,
         _______,      KC_CAPS,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_LEFT,   KC_RIGHT,        _______,
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * │    │ │     │    │     │              │          │     │    │     │
     * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
     */
-    [_FUNCTION] = LAYOUT_staggered(
+    [_FUNCTION] = LAYOUT_all(
         TD(TD_RST),   RGB_TOG,                                                                                           KC_F11,    KC_F12,    KC_F13,
         _______,      _______,   KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    _______,
         _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,       KC_EQUAL,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  * │    │ │     │    │     │              │          │     │    │     │
 //  * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
 //  */
-//  [<_LAYER>] = LAYOUT_staggered(
+//  [<_LAYER>] = LAYOUT_all(
 //      _______,      _______,                                                                                           _______,   _______,   _______,
 //      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
 //      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,         _______,

From 60c5ad821cbaf07ddca29cfad9f3c6629f8e658c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 00:05:50 +0100
Subject: [PATCH 21/27] Bump actions/labeler from 4 to 5 (#22608)

* Bump actions/labeler from 4 to 5

Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: zvecr <git@zvecr.com>
---
 .github/labeler.yml           | 82 ++++++++++++++++++++---------------
 .github/workflows/labeler.yml | 15 +++----
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 95eaa49252d..f0e72786b21 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,46 +1,56 @@
 core:
-  - quantum/**/*
-  - tmk_core/**/*
-  - drivers/**/*
-  - tests/**/*
-  - util/**/*
-  - platforms/**/*
-  - builddefs/**/*
-  - Makefile
-  - '*.mk'
+  - changed-files:
+    - any-glob-to-any-file:
+      - quantum/**
+      - tmk_core/**
+      - drivers/**
+      - tests/**
+      - util/**
+      - platforms/**
+      - builddefs/*.mk
+      - Makefile
+      - '*.mk'
 dependencies:
-  - any:
-    - 'lib/**/*'
-    - '!lib/python/**/*'
+  - all:
+    - changed-files:
+      - any-glob-to-any-file: lib/**
+      - all-globs-to-all-files: '!lib/python/**'
 keyboard:
-  - any:
-    - 'keyboards/**/*'
-    - '!keyboards/**/keymaps/**/*'
+  - all:
+    - changed-files:
+      - any-glob-to-any-file: keyboards/**
+      - all-globs-to-all-files: '!keyboards/**/keymaps/**'
 keymap:
-  - users/**/*
-  - layouts/**/*
-  - keyboards/**/keymaps/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - users/**
+      - layouts/**
+      - keyboards/**/keymaps/**
 via:
-  - keyboards/**/keymaps/via/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - keyboards/**/keymaps/via/*
 cli:
-  - requirements.txt
-  - lib/python/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - requirements.txt
+      - lib/python/**
 python:
-  - '**/*.py'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '**/*.py'
 documentation:
-  - docs/**/*
-translation:
-  - docs/fr-fr/**/*
-  - docs/es/**/*
-  - docs/ja/**/*
-  - docs/he-il/**/*
-  - docs/pt-br/**/*
-  - docs/zh-cn/**/*
-  - docs/de/**/*
-  - docs/ru-ru/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - docs/**
+      - builddefs/docsgen/**
 CI:
-  - .github/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - .github/**
 dd:
-  - data/constants/**/*
-  - data/mappings/**/*
-  - data/schemas/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - data/constants/**
+      - data/mappings/**
+      - data/schemas/**
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index fa4b8981add..2dc354dda20 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,18 +1,13 @@
 name: "Pull Request Labeler"
 
-permissions:
-  contents: read
-  pull-requests: write
-
 on:
-  pull_request_target:
-    types: [opened, synchronize, reopened, ready_for_review, locked]
+- pull_request_target
 
 jobs:
   triage:
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        configuration-path: '.github/labeler.yml'
+    - uses: actions/labeler@v5

From 8c5acdea12543dbc86e9b85fe41cbb98d90bbd18 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 24 Jul 2024 04:50:38 +0100
Subject: [PATCH 22/27] Update to automatic-approve-action fork (#24188)

---
 .github/workflows/auto_approve.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
index 1db1c49a9bb..d526db397c5 100644
--- a/.github/workflows/auto_approve.yml
+++ b/.github/workflows/auto_approve.yml
@@ -13,8 +13,8 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: mheap/automatic-approve-action@v1
+    - uses: zvecr/automatic-approve-action@safe_files
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
-        workflows: "format.yml,lint.yml,unit_test.yml"
-        dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"
+        workflows: "labeler.yml,lint.yml,docs.yml"
+        safe_files: "keyboards/,docs/"

From 8c35011d0aa242e9f6271d3a66ae6924d52bbed6 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 24 Jul 2024 15:16:51 +1000
Subject: [PATCH 23/27] [CLI] Only generate files if contents change. (#24038)

Don't overwrite if the content doesn't change.
---
 lib/python/qmk/commands.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 3db8353bfda..df6ed6b88ab 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -101,6 +101,12 @@ def dump_lines(output_file, lines, quiet=True):
     if output_file and output_file.name != '-':
         output_file.parent.mkdir(parents=True, exist_ok=True)
         if output_file.exists():
+            with open(output_file, 'r', encoding='utf-8', newline='\n') as f:
+                existing = f.read()
+            if existing == generated:
+                if not quiet:
+                    cli.log.info(f'No changes to {output_file.name}.')
+                return
             output_file.replace(output_file.parent / (output_file.name + '.bak'))
         output_file.write_text(generated, encoding='utf-8')
 

From cf84ea766289dee4de3f93f87dd316478ff13fd7 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Fri, 26 Jul 2024 01:41:54 +0100
Subject: [PATCH 24/27] Fix Reverb lockup when using GCC14 (#24199)

---
 keyboards/dasky/reverb/graphics/display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/dasky/reverb/graphics/display.c b/keyboards/dasky/reverb/graphics/display.c
index 13ac13ddb35..476a222f015 100644
--- a/keyboards/dasky/reverb/graphics/display.c
+++ b/keyboards/dasky/reverb/graphics/display.c
@@ -9,6 +9,7 @@
 #include <math.h>
 
 static painter_image_handle_t reverb_logo;
+static painter_image_handle_t splash_image;
 static deferred_token         display_task_token;
 static uint32_t               key_pressed_count = 0;
 
@@ -32,7 +33,6 @@ void display_init_kb(void) {
     if (!display_init_user()) {
         return;
     }
-    painter_image_handle_t splash_image;
     splash_image = qp_load_image_mem(gfx_splash);
     reverb_logo  = qp_load_image_mem(gfx_reverb);
     qp_drawimage(reverb_display, 0, 0, splash_image);

From d538451adb2a49bc1401aa90f4a66814dd723642 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:16:15 +0100
Subject: [PATCH 25/27] Remove AVR GCC version warning (#24206)

---
 lib/python/qmk/cli/doctor/check.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/python/qmk/cli/doctor/check.py b/lib/python/qmk/cli/doctor/check.py
index cd69cdd11c8..d563811aba9 100644
--- a/lib/python/qmk/cli/doctor/check.py
+++ b/lib/python/qmk/cli/doctor/check.py
@@ -53,11 +53,6 @@ def _check_avr_gcc_version():
     version_number = ESSENTIAL_BINARIES['avr-gcc']['output'].strip()
     cli.log.info('Found avr-gcc version %s', version_number)
 
-    parsed_version = _parse_gcc_version(version_number)
-    if parsed_version['major'] > 8:
-        cli.log.warning('{fg_yellow}We do not recommend avr-gcc newer than 8. Downgrading to 8.x is recommended.')
-        return CheckStatus.WARNING
-
     return CheckStatus.OK
 
 

From 73cb6fd89f9cc0dc2a9eaa07ec24bae146d31662 Mon Sep 17 00:00:00 2001
From: Cipulot <40441626+Cipulot@users.noreply.github.com>
Date: Wed, 31 Jul 2024 00:21:42 +0300
Subject: [PATCH 26/27] cipulot/ec_60x: Fix VIA layout options (#24217)

This fixes the issue of one layout option not being applied correctly because it was out of bound.
---
 keyboards/cipulot/ec_60x/keymaps/via/config.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 keyboards/cipulot/ec_60x/keymaps/via/config.h

diff --git a/keyboards/cipulot/ec_60x/keymaps/via/config.h b/keyboards/cipulot/ec_60x/keymaps/via/config.h
new file mode 100644
index 00000000000..08a4c0f74c6
--- /dev/null
+++ b/keyboards/cipulot/ec_60x/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2024 Cipulot
+ *
+ * This program is free software: you can 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
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

From c7662e4f36116600c8b4d24944a17d5ac0a99845 Mon Sep 17 00:00:00 2001
From: akyp <archerkeyboard2022@gmail.com>
Date: Wed, 31 Jul 2024 08:07:51 +0800
Subject: [PATCH 27/27] [Keyboard] Add archerkeyboard/desire65 (#23776)

Co-authored-by: jack <0x6a73@protonmail.com>
---
 .../archerkeyboard/desire65/keyboard.json     | 192 ++++++++++++++++++
 .../desire65/keymaps/default/keymap.c         |  24 +++
 .../desire65/keymaps/via/keymap.c             |  24 +++
 .../desire65/keymaps/via/rules.mk             |   1 +
 keyboards/archerkeyboard/desire65/readme.md   |  27 +++
 5 files changed, 268 insertions(+)
 create mode 100644 keyboards/archerkeyboard/desire65/keyboard.json
 create mode 100644 keyboards/archerkeyboard/desire65/keymaps/default/keymap.c
 create mode 100644 keyboards/archerkeyboard/desire65/keymaps/via/keymap.c
 create mode 100644 keyboards/archerkeyboard/desire65/keymaps/via/rules.mk
 create mode 100644 keyboards/archerkeyboard/desire65/readme.md

diff --git a/keyboards/archerkeyboard/desire65/keyboard.json b/keyboards/archerkeyboard/desire65/keyboard.json
new file mode 100644
index 00000000000..eb1c2a1245e
--- /dev/null
+++ b/keyboards/archerkeyboard/desire65/keyboard.json
@@ -0,0 +1,192 @@
+{
+    "manufacturer": "archerkeyboard",
+    "keyboard_name": "desire65",
+    "maintainer": "akyp",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "GP18"
+    },
+    "matrix_pins": {
+        "cols": ["GP21", "GP29", "GP1", "GP0", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP2", "GP5", "GP4", "GP3"],
+        "rows": ["GP24", "GP25", "GP19", "GP16", "GP17"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood",
+            "val": 128
+        },
+        "driver": "ws2812",
+        "led_count": 17,
+        "sleep": true
+    },
+    "url": "https://archerkeyboard.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0002",
+        "vid": "0x0361"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP26"
+    },
+    "community_layouts": ["65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 12], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 13], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 2], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Left", "matrix": [4, 13], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 12], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 13], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 2], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Left", "matrix": [4, 13], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/archerkeyboard/desire65/keymaps/default/keymap.c b/keyboards/archerkeyboard/desire65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ef19ddca0db
--- /dev/null
+++ b/keyboards/archerkeyboard/desire65/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 ArcherKeyboard (archerkeyboard2022@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_65_ansi_blocker_tsangan_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_BSLS, 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,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    [1] = LAYOUT_65_ansi_blocker_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_INS,  _______, KC_PSCR, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, _______,
+        _______, _______, _______,                            _______,                                     _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+};
diff --git a/keyboards/archerkeyboard/desire65/keymaps/via/keymap.c b/keyboards/archerkeyboard/desire65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ef19ddca0db
--- /dev/null
+++ b/keyboards/archerkeyboard/desire65/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 ArcherKeyboard (archerkeyboard2022@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_65_ansi_blocker_tsangan_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_BSLS, 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,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+    [1] = LAYOUT_65_ansi_blocker_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_INS,  _______, KC_PSCR, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, _______,
+        _______, _______, _______,                            _______,                                     _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+};
diff --git a/keyboards/archerkeyboard/desire65/keymaps/via/rules.mk b/keyboards/archerkeyboard/desire65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/archerkeyboard/desire65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/archerkeyboard/desire65/readme.md b/keyboards/archerkeyboard/desire65/readme.md
new file mode 100644
index 00000000000..5d170ad475f
--- /dev/null
+++ b/keyboards/archerkeyboard/desire65/readme.md
@@ -0,0 +1,27 @@
+# desire65
+
+![desire65](https://i.imgur.com/bTjvGzC.jpg)
+
+A desirable 65% keyboard
+
+* Keyboard Maintainer: [ArcherKeyboard](https://github.com/akyp)
+* Hardware Supported: Desire65 PCB
+* Hardware Availability: [Open source on GitHub](https://github.com/akyp/desire65-pcb)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make archerkeyboard/desire65:default
+
+Flashing example for this keyboard:
+
+    make archerkeyboard/desire65: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**: Hold the "USB_BOOT" button on the back of the PCB (the one closest to the MCU) and briefly press the "RESET" button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file