diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index 0f49f93104..ef18f83329 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -42,6 +42,8 @@ static const SerialConfig ble_uart_config = {
 
 static uint8_t led_mcu_wakeup[11] = {0x7b, 0x10, 0x43, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x02};
 
+static uint8_t led_enabled = 1;
+
 ble_capslock_t ble_capslock = {._dummy = {0}, .caps_lock = false};
 
 #ifdef RGB_MATRIX_ENABLE
@@ -226,6 +228,68 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 else ap2_led_enable();
                 return true;
             #endif
+            
+            case KC_AP_RGB_VAI:
+				if (record->event.pressed) {
+					if (get_mods() & MOD_MASK_SHIFT) {
+						rgb_matrix_increase_hue();
+						return false;
+					} else if (get_mods() & MOD_MASK_CTRL) {
+						rgb_matrix_decrease_hue();
+						return false;
+					} else {
+						rgb_matrix_increase_val();
+					}
+				}
+                return true;
+                
+            case KC_AP_RGB_VAD:
+				if (record->event.pressed) {
+					if (get_mods() & MOD_MASK_SHIFT) {
+						rgb_matrix_increase_sat();
+						return false;
+					} else if (get_mods() & MOD_MASK_CTRL) {
+						rgb_matrix_decrease_sat();
+						return false;
+					} else {
+						rgb_matrix_decrease_val();
+					}
+				}
+                return true;
+                
+            case KC_AP_RGB_TOG:
+				if (record->event.pressed) {
+					if (get_mods() & MOD_MASK_SHIFT) {
+						rgb_matrix_increase_speed();
+						return false;
+					} else if (get_mods() & MOD_MASK_CTRL) {
+						rgb_matrix_decrease_speed();
+						return false;
+					} else {
+						if (led_enabled) {
+							ap2_led_disable();
+							rgb_matrix_disable();
+							led_enabled = 0;
+						} else {
+							ap2_led_enable();
+							rgb_matrix_enable();
+							led_enabled = 1;
+						}
+						return true;
+					}
+				}
+                return true;
+                
+            case KC_AP_RGB_MOD:
+				if (record->event.pressed) {
+					if (get_mods() & MOD_MASK_CTRL) {
+						rgb_matrix_step_reverse();
+						return false;
+					} else {
+						rgb_matrix_step();	
+					}
+				}
+                return true;
 
             default:
                 break;
diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
index 143904b6ad..393d9b4731 100644
--- a/keyboards/annepro2/annepro2.h
+++ b/keyboards/annepro2/annepro2.h
@@ -58,6 +58,10 @@ enum AP2KeyCodes {
     KC_AP_LED_PREV_PROFILE,
     KC_AP_LED_NEXT_INTENSITY,
     KC_AP_LED_SPEED,
+    KC_AP_RGB_VAI,
+    KC_AP_RGB_VAD,
+    KC_AP_RGB_TOG,
+    KC_AP_RGB_MOD,
     AP2_SAFE_RANGE,
 };
 
diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c
index 8f5b639bb8..8af2d9a32c 100644
--- a/keyboards/annepro2/keymaps/default/keymap.c
+++ b/keyboards/annepro2/keymaps/default/keymap.c
@@ -83,7 +83,7 @@ enum anne_pro_layers {
   /*
   * Layer FN2
   * ,-----------------------------------------------------------------------------------------.
-  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 | HUE | SAT | BRI | SPD | MOD | TOG |    Bksp   |
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 | F7 | F8 | MOD | TOG | BRI- | BRI+ |    Bksp   |
   * |-----------------------------------------------------------------------------------------+
   * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
   * |-----------------------------------------------------------------------------------------+
@@ -96,11 +96,11 @@ enum anne_pro_layers {
   *
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
-    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, RGB_TOG, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
-    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
-    _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
-    _______, _______,    _______,                                     _______,                   _______, MO(FN1), MO(FN2), _______
+    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
+    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,        _______,
+    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,
+    _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______,       KC_INS,        KC_DEL,        _______,
+    _______, _______,    _______,                                     _______,                   _______,       MO(FN1),       MO(FN2),       _______
  ),
 };
 // clang-format on
diff --git a/keyboards/frooastboard/walnut/config.h b/keyboards/frooastboard/walnut/config.h
new file mode 100644
index 0000000000..081a084d16
--- /dev/null
+++ b/keyboards/frooastboard/walnut/config.h
@@ -0,0 +1,55 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+#define ISSI_TIMEOUT 100
+#define ISSI_PERSISTENCE 0
+#define ISSI_PWM_FREQUENCY 0b010
+#define ISSI_SWPULLUP PUR_0R
+#define ISSI_CSPULLUP PUR_0R
+#define DRIVER_COUNT 1
+#define DRIVER_LED_TOTAL 48
+#define DRIVER_ADDR_1 0b1010000
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 191
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#define RGB_MATRIX_STARTUP_HUE 0
+#define RGB_MATRIX_STARTUP_SAT 255
+#define RGB_MATRIX_STARTUP_SPD 191
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
new file mode 100644
index 0000000000..7a8276f3ff
--- /dev/null
+++ b/keyboards/frooastboard/walnut/info.json
@@ -0,0 +1,259 @@
+{
+    "keyboard_name": "Frooastboard Walnut",
+    "manufacturer": "Frooastside",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut",
+    "maintainer": "Frooastside",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
+        "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"]
+    },
+    "usb": {
+        "vid": "0x4642",
+        "pid": "0x776E",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_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 }
+            ]
+        },
+        "LAYOUT_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": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
+                { "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": [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 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/frooastboard/walnut/keymaps/default/keymap.c b/keyboards/frooastboard/walnut/keymaps/default/keymap.c
new file mode 100644
index 0000000000..195b3c150b
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keymaps/default/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_MENU, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_all(
+		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  EE_CLR,           KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAI, RGB_HUI, RGB_SPI,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
+		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+};
diff --git a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..a65dfe3a6e
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_ansi(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_MENU, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_ansi(
+		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  EE_CLR,           KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAI, RGB_HUI, RGB_SPI,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
+		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+};
diff --git a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..8dd069ba3e
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_iso(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_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_ENT,           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_BSLS,
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_MENU, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_iso(
+		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  EE_CLR,           KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,          RGB_SAI, RGB_HUI, RGB_SPI,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
+		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+};
diff --git a/keyboards/frooastboard/walnut/keymaps/via/config.h b/keyboards/frooastboard/walnut/keymaps/via/config.h
new file mode 100644
index 0000000000..0ef255fb51
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keymaps/via/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define VIA_CUSTOM_LIGHTING_ENABLE
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/frooastboard/walnut/keymaps/via/keymap.c b/keyboards/frooastboard/walnut/keymaps/via/keymap.c
new file mode 100644
index 0000000000..84b73e2186
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keymaps/via/keymap.c
@@ -0,0 +1,131 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_MENU, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_all(
+		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  EE_CLR,           KC_PSCR, KC_SCRL, KC_PAUS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
+		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+};
+
+#if defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
+
+// VIA supports only 4 discrete values for effect speed; map these to some
+// useful speed values for RGB Matrix.
+enum speed_values {
+    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
+    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
+    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
+    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
+};
+
+static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
+    switch (rgblight_speed) {
+        case 0:
+            return RGBLIGHT_SPEED_0;
+        case 1:
+            return RGBLIGHT_SPEED_1;
+        case 2:
+        default:
+            return RGBLIGHT_SPEED_2;
+        case 3:
+            return RGBLIGHT_SPEED_3;
+    }
+}
+
+static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
+    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
+        return 0;
+    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
+        return 1;
+    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
+        return 2;
+    } else {
+        return 3;
+    }
+}
+
+void via_qmk_rgblight_get_value(uint8_t *data) {
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_rgblight_brightness: {
+            value_data[0] = rgb_matrix_get_val();
+            break;
+        }
+        case id_qmk_rgblight_effect: {
+            value_data[0] = rgb_matrix_is_enabled() ? rgb_matrix_get_mode() : 0;
+            break;
+        }
+        case id_qmk_rgblight_effect_speed: {
+            value_data[0] = speed_to_rgblight(rgb_matrix_get_speed());
+            break;
+        }
+        case id_qmk_rgblight_color: {
+            value_data[0] = rgb_matrix_get_hue();
+            value_data[1] = rgb_matrix_get_sat();
+            break;
+        }
+    }
+}
+
+void via_qmk_rgblight_set_value(uint8_t *data) {
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_rgblight_brightness: {
+            rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
+            break;
+        }
+        case id_qmk_rgblight_effect: {
+            if (value_data[0] == 0) {
+                rgb_matrix_disable_noeeprom();
+            } else {
+                rgb_matrix_enable_noeeprom();
+                rgb_matrix_mode_noeeprom(value_data[0]);
+            }
+            break;
+        }
+        case id_qmk_rgblight_effect_speed: {
+            rgb_matrix_set_speed_noeeprom(speed_from_rgblight(value_data[0]));
+            break;
+        }
+        case id_qmk_rgblight_color: {
+            rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
+            break;
+        }
+    }
+}
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    uint8_t *command_id   = &(data[0]);
+    uint8_t *command_data = &(data[1]);
+    switch (*command_id) {
+        case id_lighting_set_value:
+            via_qmk_rgblight_set_value(command_data);
+            break;
+        case id_lighting_get_value:
+            via_qmk_rgblight_get_value(command_data);
+            break;
+        case id_lighting_save:
+            eeconfig_update_rgb_matrix();
+            break;
+        default:
+            // Unhandled message.
+            *command_id = id_unhandled;
+            break;
+    }
+}
+
+#endif // defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
diff --git a/keyboards/frooastboard/walnut/keymaps/via/rules.mk b/keyboards/frooastboard/walnut/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/frooastboard/walnut/readme.md b/keyboards/frooastboard/walnut/readme.md
new file mode 100644
index 0000000000..c4baa40ce4
--- /dev/null
+++ b/keyboards/frooastboard/walnut/readme.md
@@ -0,0 +1,27 @@
+# Frooastboard Walnut
+
+![frooastboard/walnut](https://i.imgur.com/4erTDZqh.jpg)
+
+This is the Frooastboard Walnut keyboard. It is made of walnut wood, has 48 underglow LEDs and a solid aluminum base plate. It uses a USB Type-C connector and will likely be available for sale soon.
+
+* Keyboard Maintainer: [Frooastside](https://github.com/Frooastside)
+* Hardware Supported: Frooastboard Walnut
+* Hardware Availability: [Frooastboard Github](https://github.com/Frooastside/Frooastboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make frooastboard/walnut:default
+
+Flashing example for this keyboard:
+
+    make frooastboard/walnut:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk
new file mode 100644
index 0000000000..d0bb93e136
--- /dev/null
+++ b/keyboards/frooastboard/walnut/rules.mk
@@ -0,0 +1,5 @@
+# Build Options
+#   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
new file mode 100644
index 0000000000..0b84d3c577
--- /dev/null
+++ b/keyboards/frooastboard/walnut/walnut.c
@@ -0,0 +1,86 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "walnut.h"
+
+#if defined(RGB_MATRIX_ENABLE)
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |        G location
+ *   |  |        |        B location
+ *   |  |        |        | */
+    {0, K_1,     J_1,     L_1},
+    {0, K_2,     J_2,     L_2},
+    {0, K_3,     J_3,     L_3},
+    {0, K_4,     J_4,     L_4},
+    {0, K_5,     J_5,     L_5},
+    {0, K_6,     J_6,     L_6},
+    {0, K_7,     J_7,     L_7},
+    {0, K_8,     J_8,     L_8},
+    {0, K_9,     J_9,     L_9},
+    {0, K_10,    J_10,    L_10},
+    {0, K_11,    J_11,    L_11},
+    {0, K_12,    J_12,    L_12},
+    {0, H_1,     G_1,     I_1},
+    {0, H_2,     G_2,     I_2},
+    {0, H_3,     G_3,     I_3},
+    {0, H_4,     G_4,     I_4},
+    {0, H_5,     G_5,     I_5},
+    {0, H_6,     G_6,     I_6},
+    {0, H_7,     G_7,     I_7},
+    {0, H_8,     G_8,     I_8},
+    {0, H_9,     G_9,     I_9},
+    {0, H_10,    G_10,    I_10},
+    {0, H_11,    G_11,    I_11},
+    {0, H_12,    G_12,    I_12},
+    {0, E_1,     D_1,     F_1},
+    {0, E_2,     D_2,     F_2},
+    {0, E_3,     D_3,     F_3},
+    {0, E_4,     D_4,     F_4},
+    {0, E_5,     D_5,     F_5},
+    {0, E_6,     D_6,     F_6},
+    {0, E_7,     D_7,     F_7},
+    {0, E_8,     D_8,     F_8},
+    {0, E_9,     D_9,     F_9},
+    {0, E_10,    D_10,    F_10},
+    {0, E_11,    D_11,    F_11},
+    {0, E_12,    D_12,    F_12},
+    {0, B_1,     A_1,     C_1},
+    {0, B_2,     A_2,     C_2},
+    {0, B_3,     A_3,     C_3},
+    {0, B_4,     A_4,     C_4},
+    {0, B_5,     A_5,     C_5},
+    {0, B_6,     A_6,     C_6},
+    {0, B_7,     A_7,     C_7},
+    {0, B_8,     A_8,     C_8},
+    {0, B_9,     A_9,     C_9},
+    {0, B_10,    A_10,    C_10},
+    {0, B_11,    A_11,    C_11},
+    {0, B_12,    A_12,    C_12}
+};
+
+led_config_t g_led_config = {
+    {
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED },
+        { NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED,   NO_LED }
+    }, {
+        {0, 62},   {0, 50},   {0, 38},   {0, 26},   {0, 14},   {0, 2},
+        {0, 2},    {12, 2},   {24, 2},   {36, 2},   {48, 2},   {60, 2},   {72, 2},   {84, 2},   {96, 2},   {108, 2},  {120, 2},  {132, 2},  {144, 2},  {156, 2},  {168, 2},  {180, 2},  {192, 2},  {204, 2},
+        {204, 2},  {204, 14}, {204, 26}, {204, 38}, {204, 50}, {204, 62},
+        {204, 62}, {192, 62}, {180, 62}, {168, 62}, {156, 62}, {144, 62}, {132, 62}, {120, 62}, {108, 62}, {96, 62},  {84, 62},  {72, 62},  {60, 62},  {48, 62},  {36, 62},  {24, 62},  {12, 62},  {0, 62}
+    }, {
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+    }
+};
+
+#endif // defined(RGB_MATRIX_ENABLE)
diff --git a/keyboards/frooastboard/walnut/walnut.h b/keyboards/frooastboard/walnut/walnut.h
new file mode 100644
index 0000000000..3ceb9bd689
--- /dev/null
+++ b/keyboards/frooastboard/walnut/walnut.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Simon Benezan (@Frooastside)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
new file mode 100644
index 0000000000..ea68effd4f
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID    0x4B42
+#define PRODUCT_ID   0x0011
+#define DEVICE_VER   0x0001 
+#define MANUFACTURER KBDFANS
+#define PRODUCT      TIGER80
+
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+#define MATRIX_ROW_PINS { B0, E6, B1, B4, D1, D2 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B5, B6, C6, E2, D0 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN B2
+#define LED_PIN_ON_STATE 1
+
+#define RGB_DI_PIN B3
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
+#define RGBLIGHT_DEFAULT_SPD 15
+#define RGBLED_NUM 20
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 10
+#define RGBLIGHT_VAL_STEP 10
+#define RGBLIGHT_SLEEP
+#endif
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
new file mode 100644
index 0000000000..32709fa2d3
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "tiger80", 
+    "url": "", 
+    "maintainer": "kbdfans", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/tiger80/keymaps/default/keymap.c b/keyboards/kbdfans/tiger80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..94a0fb1a22
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_all(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SLCK, KC_PAUS, 
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+};
diff --git a/keyboards/kbdfans/tiger80/keymaps/via/keymap.c b/keyboards/kbdfans/tiger80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2732c23fde
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_all(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_SLCK, KC_PAUS, 
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 
+        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+    ),
+
+    [_LAYER3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/kbdfans/tiger80/keymaps/via/rules.mk b/keyboards/kbdfans/tiger80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f87b150df9
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LT0_ENABLE = yes
diff --git a/keyboards/kbdfans/tiger80/readme.md b/keyboards/kbdfans/tiger80/readme.md
new file mode 100644
index 0000000000..60190805d7
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/readme.md
@@ -0,0 +1,21 @@
+# TIGER80
+
+A customizable 80% HOTSWAP keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: KBDFANS
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/tiger80:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbdfans/tiger80/rules.mk b/keyboards/kbdfans/tiger80/rules.mk
new file mode 100644
index 0000000000..85eec9079f
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kbdfans/tiger80/tiger80.c b/keyboards/kbdfans/tiger80/tiger80.c
new file mode 100644
index 0000000000..8348a142a2
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/tiger80.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include "tiger80.h"
diff --git a/keyboards/kbdfans/tiger80/tiger80.h b/keyboards/kbdfans/tiger80/tiger80.h
new file mode 100644
index 0000000000..cc48ca1ad6
--- /dev/null
+++ b/keyboards/kbdfans/tiger80/tiger80.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K3F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K3E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K4E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,      K4F,      \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C,   K0D,   K0E,   K0F }, \
+    { K10, K11,   K12, K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D,   K1E,   K1F }, \
+    { K20, K21,   K22, K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,   K2E,   K2F }, \
+    { K30, K31,   K32, K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B,   KC_NO, K3D,   K4E,   K3F }, \
+    { K40, KC_NO, K42, K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A, K4B,   KC_NO, K4D,   K4E,   K4F }, \
+    { K50, K51,   K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO,   KC_NO, K5A, K5B,   K5C,   K5D,   K5E,   K5F } \
+}