Merge branch 'develop'

8 files changed, 227 insertions, 289 deletions

diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
index 1c168e0433..32d34ead42 100644
--- a/keyboards/frooastboard/nano/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 8
 
 #define RGBLIGHT_SLEEP
@@ -27,7 +26,6 @@
 
 #define RGBLIGHT_DEFAULT_HUE 234
 
-#define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_DEFAULT_VAL 190
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index fae1349a65..d1a77d256d 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -7,26 +7,11 @@
     "layouts": {
         "LAYOUT": {
           "layout": [
-            {
-              "label": "Z",
-              "x": 0,
-              "y": 0
-            },
-            {
-              "label": "X",
-              "x": 1,
-              "y": 0
-            },
-            {
-              "label": "Esc",
-              "x": 0,
-              "y": 1
-            },
-            {
-              "label": "~",
-              "x": 1,
-              "y": 1
-            }
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1}
           ]
         }
     },
@@ -39,6 +24,9 @@
         "pid": "0x6F21",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B4"
+    },
     "bootmagic": {
         "matrix": [1, 1]
     },
diff --git a/keyboards/frooastboard/nano/nano.c b/keyboards/frooastboard/nano/nano.c
deleted file mode 100644
index 584176a4e9..0000000000
--- a/keyboards/frooastboard/nano/nano.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021-2022 frooastside
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nano.h"
diff --git a/keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/nano/nano.h
deleted file mode 100644
index 76d1a42eac..0000000000
--- a/keyboards/frooastboard/nano/nano.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021-2022 frooastside
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
index a57272c765..ee18003f57 100644
--- a/keyboards/frooastboard/walnut/info.json
+++ b/keyboards/frooastboard/walnut/info.json
@@ -14,6 +14,9 @@
         "mousekey": false,
         "nkro": true
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3737"
+    },
     "build": {
         "lto": true
     },
@@ -34,229 +37,229 @@
     "layouts": {
         "LAYOUT_tkl_nofrow_ansi": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [1, 0], "x": 8, "y": 0 },
-                { "matrix": [1, 1], "x": 9, "y": 0 },
-                { "matrix": [1, 2], "x": 10, "y": 0 },
-                { "matrix": [1, 3], "x": 11, "y": 0 },
-                { "matrix": [1, 4], "x": 12, "y": 0 },
-                { "matrix": [1, 5], "x": 13, "y": 0, "w": 2 },
-                { "matrix": [5, 5], "x": 15.5, "y": 0 },
-                { "matrix": [5, 6], "x": 16.5, "y": 0 },
-                { "matrix": [5, 7], "x": 17.5, "y": 0 },
-                { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "matrix": [2, 1], "x": 1.5, "y": 1 },
-                { "matrix": [2, 2], "x": 2.5, "y": 1 },
-                { "matrix": [2, 3], "x": 3.5, "y": 1 },
-                { "matrix": [2, 4], "x": 4.5, "y": 1 },
-                { "matrix": [2, 5], "x": 5.5, "y": 1 },
-                { "matrix": [2, 6], "x": 6.5, "y": 1 },
-                { "matrix": [2, 7], "x": 7.5, "y": 1 },
-                { "matrix": [3, 0], "x": 8.5, "y": 1 },
-                { "matrix": [3, 1], "x": 9.5, "y": 1 },
-                { "matrix": [3, 2], "x": 10.5, "y": 1 },
-                { "matrix": [3, 3], "x": 11.5, "y": 1 },
-                { "matrix": [3, 4], "x": 12.5, "y": 1 },
-                { "matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5 },
-                { "matrix": [7, 5], "x": 15.5, "y": 1 },
-                { "matrix": [7, 6], "x": 16.5, "y": 1 },
-                { "matrix": [7, 7], "x": 17.5, "y": 1 },
-                { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "matrix": [4, 1], "x": 1.75, "y": 2 },
-                { "matrix": [4, 2], "x": 2.75, "y": 2 },
-                { "matrix": [4, 3], "x": 3.75, "y": 2 },
-                { "matrix": [4, 4], "x": 4.75, "y": 2 },
-                { "matrix": [4, 5], "x": 5.75, "y": 2 },
-                { "matrix": [4, 6], "x": 6.75, "y": 2 },
-                { "matrix": [4, 7], "x": 7.75, "y": 2 },
-                { "matrix": [5, 0], "x": 8.75, "y": 2 },
-                { "matrix": [5, 1], "x": 9.75, "y": 2 },
-                { "matrix": [5, 2], "x": 10.75, "y": 2 },
-                { "matrix": [5, 3], "x": 11.75, "y": 2 },
-                { "matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25 },
-                { "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "matrix": [6, 2], "x": 2.25, "y": 3 },
-                { "matrix": [6, 3], "x": 3.25, "y": 3 },
-                { "matrix": [6, 4], "x": 4.25, "y": 3 },
-                { "matrix": [6, 5], "x": 5.25, "y": 3 },
-                { "matrix": [6, 6], "x": 6.25, "y": 3 },
-                { "matrix": [6, 7], "x": 7.25, "y": 3 },
-                { "matrix": [7, 0], "x": 8.25, "y": 3 },
-                { "matrix": [7, 1], "x": 9.25, "y": 3 },
-                { "matrix": [7, 2], "x": 10.25, "y": 3 },
-                { "matrix": [7, 3], "x": 11.25, "y": 3 },
-                { "matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75 },
-                { "matrix": [3, 6], "x": 16.5, "y": 3 },
-                { "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25 },
-                { "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25 },
-                { "matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25 },
-                { "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25 },
-                { "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25 },
-                { "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25 },
-                { "matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25 },
-                { "matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25 },
-                { "matrix": [1, 6], "x": 15.5, "y": 4 },
-                { "matrix": [3, 7], "x": 16.5, "y": 4 },
-                { "matrix": [1, 7], "x": 17.5, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [1, 0], "x": 8, "y": 0},
+                {"matrix": [1, 1], "x": 9, "y": 0},
+                {"matrix": [1, 2], "x": 10, "y": 0},
+                {"matrix": [1, 3], "x": 11, "y": 0},
+                {"matrix": [1, 4], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 3], "x": 3.5, "y": 1},
+                {"matrix": [2, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.5, "y": 1},
+                {"matrix": [2, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 0], "x": 8.5, "y": 1},
+                {"matrix": [3, 1], "x": 9.5, "y": 1},
+                {"matrix": [3, 2], "x": 10.5, "y": 1},
+                {"matrix": [3, 3], "x": 11.5, "y": 1},
+                {"matrix": [3, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 5], "x": 15.5, "y": 1},
+                {"matrix": [7, 6], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [4, 7], "x": 7.75, "y": 2},
+                {"matrix": [5, 0], "x": 8.75, "y": 2},
+                {"matrix": [5, 1], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2},
+                {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "x": 5.25, "y": 3},
+                {"matrix": [6, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 0], "x": 8.25, "y": 3},
+                {"matrix": [7, 1], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [7, 3], "x": 11.25, "y": 3},
+                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 16.5, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [1, 6], "x": 15.5, "y": 4},
+                {"matrix": [3, 7], "x": 16.5, "y": 4},
+                {"matrix": [1, 7], "x": 17.5, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_iso": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [1, 0], "x": 8, "y": 0 },
-                { "matrix": [1, 1], "x": 9, "y": 0 },
-                { "matrix": [1, 2], "x": 10, "y": 0 },
-                { "matrix": [1, 3], "x": 11, "y": 0 },
-                { "matrix": [1, 4], "x": 12, "y": 0 },
-                { "matrix": [1, 5], "x": 13, "y": 0, "w": 2 },
-                { "matrix": [5, 5], "x": 15.5, "y": 0 },
-                { "matrix": [5, 6], "x": 16.5, "y": 0 },
-                { "matrix": [5, 7], "x": 17.5, "y": 0 },
-                { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "matrix": [2, 1], "x": 1.5, "y": 1 },
-                { "matrix": [2, 2], "x": 2.5, "y": 1 },
-                { "matrix": [2, 3], "x": 3.5, "y": 1 },
-                { "matrix": [2, 4], "x": 4.5, "y": 1 },
-                { "matrix": [2, 5], "x": 5.5, "y": 1 },
-                { "matrix": [2, 6], "x": 6.5, "y": 1 },
-                { "matrix": [2, 7], "x": 7.5, "y": 1 },
-                { "matrix": [3, 0], "x": 8.5, "y": 1 },
-                { "matrix": [3, 1], "x": 9.5, "y": 1 },
-                { "matrix": [3, 2], "x": 10.5, "y": 1 },
-                { "matrix": [3, 3], "x": 11.5, "y": 1 },
-                { "matrix": [3, 4], "x": 12.5, "y": 1 },
-                { "matrix": [7, 5], "x": 15.5, "y": 1 },
-                { "matrix": [7, 6], "x": 16.5, "y": 1 },
-                { "matrix": [7, 7], "x": 17.5, "y": 1 },
-                { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "matrix": [4, 1], "x": 1.75, "y": 2 },
-                { "matrix": [4, 2], "x": 2.75, "y": 2 },
-                { "matrix": [4, 3], "x": 3.75, "y": 2 },
-                { "matrix": [4, 4], "x": 4.75, "y": 2 },
-                { "matrix": [4, 5], "x": 5.75, "y": 2 },
-                { "matrix": [4, 6], "x": 6.75, "y": 2 },
-                { "matrix": [4, 7], "x": 7.75, "y": 2 },
-                { "matrix": [5, 0], "x": 8.75, "y": 2 },
-                { "matrix": [5, 1], "x": 9.75, "y": 2 },
-                { "matrix": [5, 2], "x": 10.75, "y": 2 },
-                { "matrix": [5, 3], "x": 11.75, "y": 2 },
-                { "matrix": [5, 4], "x": 12.75, "y": 2 },
-                { "matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-                { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 },
-                { "matrix": [6, 1], "x": 1.25, "y": 3 },
-                { "matrix": [6, 2], "x": 2.25, "y": 3 },
-                { "matrix": [6, 3], "x": 3.25, "y": 3 },
-                { "matrix": [6, 4], "x": 4.25, "y": 3 },
-                { "matrix": [6, 5], "x": 5.25, "y": 3 },
-                { "matrix": [6, 6], "x": 6.25, "y": 3 },
-                { "matrix": [6, 7], "x": 7.25, "y": 3 },
-                { "matrix": [7, 0], "x": 8.25, "y": 3 },
-                { "matrix": [7, 1], "x": 9.25, "y": 3 },
-                { "matrix": [7, 2], "x": 10.25, "y": 3 },
-                { "matrix": [7, 3], "x": 11.25, "y": 3 },
-                { "matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75 },
-                { "matrix": [3, 6], "x": 16.5, "y": 3 },
-                { "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25 },
-                { "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25 },
-                { "matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25 },
-                { "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25 },
-                { "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25 },
-                { "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25 },
-                { "matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25 },
-                { "matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25 },
-                { "matrix": [1, 6], "x": 15.5, "y": 4 },
-                { "matrix": [3, 7], "x": 16.5, "y": 4 },
-                { "matrix": [1, 7], "x": 17.5, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [1, 0], "x": 8, "y": 0},
+                {"matrix": [1, 1], "x": 9, "y": 0},
+                {"matrix": [1, 2], "x": 10, "y": 0},
+                {"matrix": [1, 3], "x": 11, "y": 0},
+                {"matrix": [1, 4], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 3], "x": 3.5, "y": 1},
+                {"matrix": [2, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.5, "y": 1},
+                {"matrix": [2, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 0], "x": 8.5, "y": 1},
+                {"matrix": [3, 1], "x": 9.5, "y": 1},
+                {"matrix": [3, 2], "x": 10.5, "y": 1},
+                {"matrix": [3, 3], "x": 11.5, "y": 1},
+                {"matrix": [3, 4], "x": 12.5, "y": 1},
+                {"matrix": [7, 5], "x": 15.5, "y": 1},
+                {"matrix": [7, 6], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [4, 7], "x": 7.75, "y": 2},
+                {"matrix": [5, 0], "x": 8.75, "y": 2},
+                {"matrix": [5, 1], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2},
+                {"matrix": [5, 4], "x": 12.75, "y": 2},
+                {"matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 3},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "x": 5.25, "y": 3},
+                {"matrix": [6, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 0], "x": 8.25, "y": 3},
+                {"matrix": [7, 1], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [7, 3], "x": 11.25, "y": 3},
+                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 16.5, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [1, 6], "x": 15.5, "y": 4},
+                {"matrix": [3, 7], "x": 16.5, "y": 4},
+                {"matrix": [1, 7], "x": 17.5, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [1, 0], "x": 8, "y": 0 },
-                { "matrix": [1, 1], "x": 9, "y": 0 },
-                { "matrix": [1, 2], "x": 10, "y": 0 },
-                { "matrix": [1, 3], "x": 11, "y": 0 },
-                { "matrix": [1, 4], "x": 12, "y": 0 },
-                { "matrix": [1, 5], "x": 13, "y": 0, "w": 2 },
-                { "matrix": [5, 5], "x": 15.5, "y": 0 },
-                { "matrix": [5, 6], "x": 16.5, "y": 0 },
-                { "matrix": [5, 7], "x": 17.5, "y": 0 },
-                { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "matrix": [2, 1], "x": 1.5, "y": 1 },
-                { "matrix": [2, 2], "x": 2.5, "y": 1 },
-                { "matrix": [2, 3], "x": 3.5, "y": 1 },
-                { "matrix": [2, 4], "x": 4.5, "y": 1 },
-                { "matrix": [2, 5], "x": 5.5, "y": 1 },
-                { "matrix": [2, 6], "x": 6.5, "y": 1 },
-                { "matrix": [2, 7], "x": 7.5, "y": 1 },
-                { "matrix": [3, 0], "x": 8.5, "y": 1 },
-                { "matrix": [3, 1], "x": 9.5, "y": 1 },
-                { "matrix": [3, 2], "x": 10.5, "y": 1 },
-                { "matrix": [3, 3], "x": 11.5, "y": 1 },
-                { "matrix": [3, 4], "x": 12.5, "y": 1 },
-                { "matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5 },
-                { "matrix": [7, 5], "x": 15.5, "y": 1 },
-                { "matrix": [7, 6], "x": 16.5, "y": 1 },
-                { "matrix": [7, 7], "x": 17.5, "y": 1 },
-                { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "matrix": [4, 1], "x": 1.75, "y": 2 },
-                { "matrix": [4, 2], "x": 2.75, "y": 2 },
-                { "matrix": [4, 3], "x": 3.75, "y": 2 },
-                { "matrix": [4, 4], "x": 4.75, "y": 2 },
-                { "matrix": [4, 5], "x": 5.75, "y": 2 },
-                { "matrix": [4, 6], "x": 6.75, "y": 2 },
-                { "matrix": [4, 7], "x": 7.75, "y": 2 },
-                { "matrix": [5, 0], "x": 8.75, "y": 2 },
-                { "matrix": [5, 1], "x": 9.75, "y": 2 },
-                { "matrix": [5, 2], "x": 10.75, "y": 2 },
-                { "matrix": [5, 3], "x": 11.75, "y": 2 },
-                { "matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25 },
-                { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 },
-                { "matrix": [6, 1], "x": 1.25, "y": 3 },
-                { "matrix": [6, 2], "x": 2.25, "y": 3 },
-                { "matrix": [6, 3], "x": 3.25, "y": 3 },
-                { "matrix": [6, 4], "x": 4.25, "y": 3 },
-                { "matrix": [6, 5], "x": 5.25, "y": 3 },
-                { "matrix": [6, 6], "x": 6.25, "y": 3 },
-                { "matrix": [6, 7], "x": 7.25, "y": 3 },
-                { "matrix": [7, 0], "x": 8.25, "y": 3 },
-                { "matrix": [7, 1], "x": 9.25, "y": 3 },
-                { "matrix": [7, 2], "x": 10.25, "y": 3 },
-                { "matrix": [7, 3], "x": 11.25, "y": 3 },
-                { "matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75 },
-                { "matrix": [3, 6], "x": 16.5, "y": 3 },
-                { "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25 },
-                { "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25 },
-                { "matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25 },
-                { "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25 },
-                { "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25 },
-                { "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25 },
-                { "matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25 },
-                { "matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25 },
-                { "matrix": [1, 6], "x": 15.5, "y": 4 },
-                { "matrix": [3, 7], "x": 16.5, "y": 4 },
-                { "matrix": [1, 7], "x": 17.5, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [1, 0], "x": 8, "y": 0},
+                {"matrix": [1, 1], "x": 9, "y": 0},
+                {"matrix": [1, 2], "x": 10, "y": 0},
+                {"matrix": [1, 3], "x": 11, "y": 0},
+                {"matrix": [1, 4], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 3], "x": 3.5, "y": 1},
+                {"matrix": [2, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.5, "y": 1},
+                {"matrix": [2, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 0], "x": 8.5, "y": 1},
+                {"matrix": [3, 1], "x": 9.5, "y": 1},
+                {"matrix": [3, 2], "x": 10.5, "y": 1},
+                {"matrix": [3, 3], "x": 11.5, "y": 1},
+                {"matrix": [3, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 5], "x": 15.5, "y": 1},
+                {"matrix": [7, 6], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [4, 7], "x": 7.75, "y": 2},
+                {"matrix": [5, 0], "x": 8.75, "y": 2},
+                {"matrix": [5, 1], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2},
+                {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 3},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "x": 5.25, "y": 3},
+                {"matrix": [6, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 0], "x": 8.25, "y": 3},
+                {"matrix": [7, 1], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [7, 3], "x": 11.25, "y": 3},
+                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 16.5, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [1, 6], "x": 15.5, "y": 4},
+                {"matrix": [3, 7], "x": 16.5, "y": 4},
+                {"matrix": [1, 7], "x": 17.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk
index d0bb93e136..c529890fb5 100644
--- a/keyboards/frooastboard/walnut/rules.mk
+++ b/keyboards/frooastboard/walnut/rules.mk
@@ -2,4 +2,3 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes         # Enable keyboard RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3737  # Select RGB matrix driver
diff --git a/keyboards/frooastboard/walnut/walnut.c b/keyboards/frooastboard/walnut/walnut.c
index da398205a0..7163af011d 100644
--- a/keyboards/frooastboard/walnut/walnut.c
+++ b/keyboards/frooastboard/walnut/walnut.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Simon Benezan (@Frooastside)
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "walnut.h"
+#include "quantum.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 
diff --git a/keyboards/frooastboard/walnut/walnut.h b/keyboards/frooastboard/walnut/walnut.h
deleted file mode 100644
index 3ceb9bd689..0000000000
--- a/keyboards/frooastboard/walnut/walnut.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Simon Benezan (@Frooastside)
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "quantum.h"