diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9862ff502c53..19dd7c70a990 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -74,31 +74,10 @@ jobs:
         fi
         exit $exit_code
 
-    - name: Verify at most one added keyboard
+    - name: Verify keyboard aliases
       if: always()
       shell: 'bash {0}'
       run: |
         git reset --hard
         git clean -xfd
-
-        # Get the keyboard list and count for the target branch
-        git checkout -f ${{ github.base_ref }}
-        git pull --ff-only
-        QMK_KEYBOARDS_BASE=$(qmk list-keyboards)
-        QMK_KEYBOARDS_BASE_COUNT=$(qmk list-keyboards | wc -l)
-
-        # Get the keyboard list and count for the PR
-        git checkout -f ${{ github.head_ref }}
-        git merge --no-commit --squash ${{ github.base_ref }}
-        QMK_KEYBOARDS_PR=$(qmk list-keyboards)
-        QMK_KEYBOARDS_PR_COUNT=$(qmk list-keyboards | wc -l)
-
-        echo "::group::Keyboards changes in this PR"
-        diff -d -U 0 <(echo "$QMK_KEYBOARDS_BASE") <(echo "$QMK_KEYBOARDS_PR") | grep -vE '^(---|\+\+\+|@@)' | sed -e 's@^-@Removed: @g' -e 's@^+@  Added: @g'
-        echo "::endgroup::"
-
-        if [[ $QMK_KEYBOARDS_PR_COUNT -gt $(($QMK_KEYBOARDS_BASE_COUNT + 1)) ]]; then
-            echo "More than one keyboard added in this PR -- see the PR Checklist."
-            echo "::error::More than one keyboard added in this PR -- see the PR Checklist."
-            exit 1
-        fi
+        qmk ci-validate-aliases
diff --git a/.gitignore b/.gitignore
index e9e7b27e6c61..f6401d9f832e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,5 +108,6 @@ compile_commands.json
 .clangd/
 .cache/
 
-# VIA(L) json files that don't belong in QMK repo
+# VIA(L) files that don't belong in QMK repo
 via*.json
+/keyboards/**/keymaps/vial/*
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index e93ab97cc134..6ae6bc686b37 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -495,10 +495,10 @@ check-size: top-symbols
 top-symbols: build
 	echo "###########################################"
 	echo "# Highest flash usage:"
-	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [t] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [RrTt] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
 	echo "###########################################"
 	echo "# Highest RAM usage:"
-	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [dbv] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [BbCDdGgSs] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
 	echo "###########################################"
 endif
 
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index ab9a4a0e4527..76ad55f7da1d 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -190,4 +190,9 @@
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"},
+
+    // Items we want flagged in lint
+    "VIAL_KEYBOARD_UID": {"info_key": "_invalid.vial_uid", "invalid": true},
+    "VIAL_UNLOCK_COMBO_COLS": {"info_key": "_invalid.vial_unlock_cols", "invalid": true},
+    "VIAL_UNLOCK_COMBO_ROWS": {"info_key": "_invalid.vial_unlock_rows", "invalid": true}
 }
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 60c5deaad5e0..8e4265dc0115 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -4,6 +4,13 @@
     //     "target": "<keyboard_folder>"
     // }
     //
+
+    /* This list of aliases is for testing purposes -- ensures "linked list" recursive traversal works correctly. */
+    "_test_a": { "target": "_test_b" },
+    "_test_b": { "target": "_test_c" },
+    "_test_c": { "target": "planck/rev6" },
+
+    /* The main list of aliases for moved keyboards within QMK. */
     "2_milk": {
         "target": "spaceman/2_milk"
     },
@@ -35,7 +42,7 @@
         "target": "amjkeyboard/amjpad"
     },
     "angel64": {
-        "target": "angel64/alpha"
+        "target": "kakunpc/angel64/alpha"
     },
     "ashpil/modelm_usbc": {
         "target": "ibm/model_m/ashpil_usbc"
@@ -47,10 +54,10 @@
         "target": "viktus/at101_bh"
     },
     "atom47/rev2": {
-        "target": "maartenwut/atom47/rev2"
+        "target": "evyd13/atom47/rev2"
     },
     "atom47/rev3": {
-        "target": "maartenwut/atom47/rev3"
+        "target": "evyd13/atom47/rev3"
     },
     "bakeneko60": {
         "target": "kkatano/bakeneko60"
@@ -65,7 +72,7 @@
         "target": "bear_face/v1"
     },
     "bm16a": {
-        "target": "kprepublic/bm16a"
+        "target": "kprepublic/bm16a/v1"
     },
     "bm16s": {
         "target": "kprepublic/bm16s"
@@ -77,16 +84,16 @@
         "target": "kprepublic/bm43a"
     },
     "bm60poker": {
-        "target": "kprepublic/bm60poker"
+        "target": "kprepublic/bm60hsrgb_poker/rev1"
     },
     "bm60rgb": {
-        "target": "kprepublic/bm60rgb"
+        "target": "kprepublic/bm60hsrgb/rev1"
     },
     "bm60rgb_iso": {
-        "target": "kprepublic/bm60rgb_iso"
+        "target": "kprepublic/bm60hsrgb_iso/rev1"
     },
     "bm68rgb": {
-        "target": "kprepublic/bm68rgb"
+        "target": "kprepublic/bm68hsrgb/rev1"
     },
     "bpiphany/pegasushoof": {
         "target": "bpiphany/pegasushoof/2013"
@@ -140,7 +147,10 @@
         "target": "jagdpietr/drakon"
     },
     "durgod/k320": {
-        "target": "durgod/k3x0/k320"
+        "target": "durgod/k320/base"
+    },
+    "durgod/k3x0/k320": {
+        "target": "durgod/k320/base"
     },
     "durgod/hades": {
         "target": "durgod/dgk6x/hades_ansi"
@@ -269,7 +279,7 @@
         "target": "idb/idb_60"
     },
     "idobo": {
-        "target": "idobao/id75"
+        "target": "idobao/id75/v1"
     },
     "jacky_studio/piggy60": {
         "target": "jacky_studio/piggy60/rev1"
@@ -401,7 +411,7 @@
         "target": "mechlovin/adelais/rgb_led/rev1"
     },
     "mechlovin/adelais/standard_led": {
-        "target": "mechlovin/adelais/standard_led/rev2"
+        "target": "mechlovin/adelais/standard_led/arm/rev2"
     },
     "mechlovin/delphine": {
         "target": "mechlovin/delphine/mono_led"
@@ -455,10 +465,10 @@
         "target": "pabile/p20/ver1"
     },
     "pancake/feather": {
-        "target": "spaceman/pancake/feather"
+        "target": "spaceman/pancake/rev1/feather"
     },
     "pancake/promicro": {
-        "target": "spaceman/pancake/promicro"
+        "target": "spaceman/pancake/rev1/promicro"
     },
     "peiorisboards/ixora": {
         "target": "coarse/ixora"
@@ -467,7 +477,7 @@
         "target": "dm9records/plaid"
     },
     "plain60": {
-        "target": "maartenwut/plain60"
+        "target": "evyd13/plain60"
     },
     "ploopyco/trackball": {
         "target": "ploopyco/trackball/rev1_005"
@@ -503,10 +513,10 @@
         "target": "wilba_tech/rama_works_u80_a"
     },
     "ramonimbao/herringbone": {
-        "target": "ramonimbao/herringbone/v1"
+        "target": "rmi_kb/herringbone/v1"
     },
     "ramonimbao/mona": {
-        "target": "ramonimbao/mona/v1"
+        "target": "rmi_kb/mona/v1"
     },
     "rgbkb/pan": {
         "target": "rgbkb/pan/rev1/32a"
@@ -542,10 +552,10 @@
         "target": "tkw/stoutgat/v1"
     },
     "suihankey": {
-        "target": "suihankey/split/alpha"
+        "target": "kakunpc/suihankey/split/alpha"
     },
     "ta65": {
-        "target": "maartenwut/ta65"
+        "target": "evyd13/ta65"
     },
     "tartan": {
         "target": "dm9records/tartan"
@@ -563,13 +573,13 @@
         "target": "matthewdias/txuu"
     },
     "underscore33": {
-        "target": "underscore33/rev1"
+        "target": "tominabox1/underscore33/rev1"
     },
     "vinta": {
         "target": "coarse/vinta"
     },
     "wasdat": {
-        "target": "maartenwut/wasdat"
+        "target": "evyd13/wasdat"
     },
     "westfoxtrot/cypher": {
         "target": "westfoxtrot/cypher/rev1"
@@ -581,10 +591,10 @@
         "target": "xiudi/xd002"
     },
     "xd004": {
-        "target": "xiudi/xd004"
+        "target": "xiudi/xd004/v1"
     },
     "xd60": {
-        "target": "xiudi/xd60"
+        "target": "xiudi/xd60/rev2"
     },
     "xd68": {
         "target": "xiudi/xd68"
@@ -831,7 +841,7 @@
         "target": "kagizaraya/halberd"
     },
     "handwired/hillside/0_1": {
-        "target": "handwired/hillside/48"
+        "target": "hillside/48/0_1"
     },
     "hecomi/alpha": {
         "target": "takashiski/hecomi/alpha"
@@ -843,10 +853,10 @@
         "target": "bpiphany/hid_liber"
     },
     "id67/default_rgb": {
-        "target": "idobao/id67/default_rgb"
+        "target": "idobao/id67"
     },
     "id67/rgb": {
-        "target": "idobao/id67/rgb"
+        "target": "idobao/id67"
     },
     "id80": {
         "target": "idobao/id80/v2/ansi"
@@ -1236,7 +1246,7 @@
         "target": "marksard/treadstone48/rev2"
     },
     "tronguylabs/m122_3270": {
-        "target": "ibm/model_m_122/m122_3270"
+        "target": "ibm/model_m_122/m122_3270/teensy"
     },
     "ua62": {
         "target": "nacly/ua62"
@@ -1290,7 +1300,7 @@
         "target": "ydkb/yd68"
     },
     "ymd75": {
-        "target": "ymdk/ymd75"
+        "target": "ymdk/ymd75/rev1"
     },
     "ymd96": {
         "target": "ymdk/ymd96"
diff --git a/docs/cli.md b/docs/cli.md
index 8684479d0c1d..feb5458d3954 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -6,7 +6,7 @@ The QMK CLI makes building and working with QMK keyboards easier. We have provid
 
 ### Requirements :id=requirements
 
-QMK requires Python 3.6 or greater. We try to keep the number of requirements small but you will also need to install the packages listed in [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt). These are installed automatically when you install the QMK CLI.
+QMK requires Python 3.7 or greater. We try to keep the number of requirements small but you will also need to install the packages listed in [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt). These are installed automatically when you install the QMK CLI.
 
 ### Install Using Homebrew (macOS, some Linux) :id=install-using-homebrew
 
@@ -20,7 +20,7 @@ qmk setup  # This will clone `qmk/qmk_firmware` and optionally set up your build
 
 ### Install Using pip :id=install-using-easy_install-or-pip
 
-If your system is not listed above you can install QMK manually. First ensure that you have Python 3.6 (or later) installed and have installed pip. Then install QMK with this command:
+If your system is not listed above you can install QMK manually. First ensure that you have Python 3.7 (or later) installed and have installed pip. Then install QMK with this command:
 
 ```
 python3 -m pip install qmk
diff --git a/docs/cli_development.md b/docs/cli_development.md
index d878deff17c4..8d4ee625352f 100644
--- a/docs/cli_development.md
+++ b/docs/cli_development.md
@@ -44,7 +44,7 @@ def hello(cli):
 
 First we import the `cli` object from `milc`. This is how we interact with the user and control the script's behavior. We use `@cli.argument()` to define a command line flag, `--name`. This also creates a configuration variable named `hello.name` (and the corresponding `user.name`) which the user can set so they don't have to specify the argument. The `cli.subcommand()` decorator designates this function as a subcommand. The name of the subcommand will be taken from the name of the function.
 
-Once inside our function we find a typical "Hello, World!" program. We use `cli.log` to access the underlying [Logger Object](https://docs.python.org/3.6/library/logging.html#logger-objects), whose behavior is user controllable. We also access the value for name supplied by the user as `cli.config.hello.name`. The value for `cli.config.hello.name` will be determined by looking at the `--name` argument supplied by the user, if not provided it will use the value in the `qmk.ini` config file, and if neither of those is provided it will fall back to the default supplied in the `cli.argument()` decorator.
+Once inside our function we find a typical "Hello, World!" program. We use `cli.log` to access the underlying [Logger Object](https://docs.python.org/3.7/library/logging.html#logger-objects), whose behavior is user controllable. We also access the value for name supplied by the user as `cli.config.hello.name`. The value for `cli.config.hello.name` will be determined by looking at the `--name` argument supplied by the user, if not provided it will use the value in the `qmk.ini` config file, and if neither of those is provided it will fall back to the default supplied in the `cli.argument()` decorator.
 
 # User Interaction
 
@@ -56,13 +56,13 @@ There are two main methods for outputting text in a subcommand- `cli.log` and `c
 
 You can use special tokens to colorize your text, to make it easier to understand the output of your program. See [Colorizing Text](#colorizing-text) below.
 
-Both of these methods support built-in string formatting using python's [printf style string format operations](https://docs.python.org/3.6/library/stdtypes.html#old-string-formatting). You can use tokens such as `%s` and `%d` within your text strings then pass the values as arguments. See our Hello, World program above for an example.
+Both of these methods support built-in string formatting using python's [printf style string format operations](https://docs.python.org/3.7/library/stdtypes.html#old-string-formatting). You can use tokens such as `%s` and `%d` within your text strings then pass the values as arguments. See our Hello, World program above for an example.
 
 You should never use the format operator (`%`) directly, always pass values as arguments.
 
 ### Logging (`cli.log`)
 
-The `cli.log` object gives you access to a [Logger Object](https://docs.python.org/3.6/library/logging.html#logger-objects). We have configured our log output to show the user a nice emoji for each log level (or the log level name if their terminal does not support unicode.) This way the user can tell at a glance which messages are most important when something goes wrong.
+The `cli.log` object gives you access to a [Logger Object](https://docs.python.org/3.7/library/logging.html#logger-objects). We have configured our log output to show the user a nice emoji for each log level (or the log level name if their terminal does not support unicode.) This way the user can tell at a glance which messages are most important when something goes wrong.
 
 The default log level is `INFO`. If the user runs `qmk -v <subcommand>` the default log level will be set to `DEBUG`.
 
diff --git a/docs/coding_conventions_python.md b/docs/coding_conventions_python.md
index 2b6870344873..1ed27ee46abb 100644
--- a/docs/coding_conventions_python.md
+++ b/docs/coding_conventions_python.md
@@ -317,7 +317,7 @@ At the time of this writing our tests are not very comprehensive. Looking at the
 
 ## Integration Tests
 
-Integration tests can be found in `lib/python/qmk/tests/test_cli_commands.py`. This is where CLI commands are actually run and their overall behavior is verified. We use [`subprocess`](https://docs.python.org/3.6/library/subprocess.html#module-subprocess) to launch each CLI command and a combination of checking output and returncode to determine if the right thing happened.
+Integration tests can be found in `lib/python/qmk/tests/test_cli_commands.py`. This is where CLI commands are actually run and their overall behavior is verified. We use [`subprocess`](https://docs.python.org/3.7/library/subprocess.html#module-subprocess) to launch each CLI command and a combination of checking output and returncode to determine if the right thing happened.
 
 ## Unit Tests
 
diff --git a/docs/feature_tri_layer.md b/docs/feature_tri_layer.md
index aa6c87719ca6..ade0040cc7b1 100644
--- a/docs/feature_tri_layer.md
+++ b/docs/feature_tri_layer.md
@@ -40,7 +40,7 @@ Eg, if you wanted to set the "Adjust" layer to be layer 5, you'd add this to you
 | `set_tri_layer_lower_layer(layer)`           | Changes the "lower" layer*.                     |
 | `set_tri_layer_upper_layer(layer)`           | Changes the "upper" layer*.                     |
 | `set_tri_layer_adjust_layer(layer)`          | Changes the "adjust" layer*.                    |
-| `set_tri_layer_layers(lower, upper, adjust)` | Stes the "lower", "upper" and "adjust" layers*. |
+| `set_tri_layer_layers(lower, upper, adjust)` | Sets the "lower", "upper" and "adjust" layers*. |
 | `get_tri_layer_lower_layer()`                | Gets the current "lower" layer.                 |
 | `get_tri_layer_upper_layer()`                | Gets the current "upper" layer.                 |
 | `get_tri_layer_adjust_layer()`               | Gets the current "adjust" layer.                |
diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index 341084f9260a..2c6d2ef002e5 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -140,7 +140,7 @@ To set the list of enabled input modes, add the `UNICODE_SELECTED_MODES` define
 ```c
 #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 // or
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MAC, UNICODE_MODE_WINCOMPOSE
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
 ```
 
 These modes can then be cycled through using the `UC_NEXT` and `UC_PREV` keycodes. You can also switch to any input mode, even if it is not specified in `UNICODE_SELECTED_MODES`, using their respective keycodes.
@@ -151,7 +151,7 @@ If your keyboard has working EEPROM, it will remember the last used input mode a
 
 ### ** macOS **
 
-**Mode Name:** `UNICODE_MODE_MAC`
+**Mode Name:** `UNICODE_MODE_MACOS`
 
 macOS has built-in support for Unicode input as its own input source. It supports all possible code points by way of surrogate pairs for code points above `U+FFFF`.
 
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 9bf1b8d0056c..38c268369433 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -138,7 +138,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - standard layouts preferred in these keymaps, if possible
     - should use [encoder map feature](https://docs.qmk.fm/#/feature_encoders?id=encoder-map), rather than `encoder_update_user()`
     - default keymap should not enable VIA -- the VIA integration documentation requires a keymap called `via`
-- submitters can have a personal (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
+- submitters can add an example (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
 - submitters can also have a "manufacturer-matching" keymap that mirrors existing functionality of the commercial product, if porting an existing board
 - Do not include VIA json files in the PR. These do not belong in the QMK repository as they are not used by QMK firmware -- they belong in the [VIA Keyboard Repo](https://github.com/the-via/keyboards)
 - Do not include KLE json files in the PR. These have no use within QMK.
diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index c4b42f38ddd2..b7e803154b3c 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -235,7 +235,7 @@ Where 'n' matches the peripheral number of your selected USART on the MCU.
 
 The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of the PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation is fully supported. The Half-duplex operation mode uses the built-in pull-ups and GPIO manipulation on the RP2040 to drive the line high by default. An external pull-up is therefore not necessary.
 
-Configure the hardware via your config.h:
+You may optionally switch the PIO peripheral used with the following define in config.h:
 ```c
 #define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral
 ```
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index f8cad20ce0c0..9b79cfa905ef 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -170,7 +170,7 @@ To configure it, add this to your rules.mk:
 WS2812_DRIVER = vendor
 ```
 
-Configure the hardware via your config.h:
+You may optionally switch the PIO peripheral used with the following define in config.h:
 ```c
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
 ```
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/config.h b/keyboards/4pplet/waffling60/rev_e_ansi/config.h
new file mode 100644
index 000000000000..521ddf96a183
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#define WS2812_EXTERNAL_PULLUP
+
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/info.json b/keyboards/4pplet/waffling60/rev_e_ansi/info.json
new file mode 100644
index 000000000000..c2514700ff00
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/info.json
@@ -0,0 +1,255 @@
+{
+    "manufacturer": "4pplet",
+    "keyboard_name": "waffling60 Rev E ANSI HS",
+    "maintainer": "4pplet",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 17
+    },
+    "url": "https://github.com/4pplet/waffling60",
+    "usb": {
+        "device_version": "0.0.5",
+        "pid": "0x0015",
+        "vid": "0x4444"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 4], "x":4, "y":4, "w":3},
+                {"label": "Space", "matrix": [4, 6], "x":7, "y":4},
+                {"label": "Space", "matrix": [4, 8], "x":8, "y":4, "w":3},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x":4, "y":4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Bsp", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Win", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x":4, "y":4, "w": 7},
+                {"label": "Win", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4},
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..706428c00e72
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,                        KC_TRNS,  KC_TRNS, KC_TRNS)
+};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..706428c00e72
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,                        KC_TRNS,  KC_TRNS, KC_TRNS)
+};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/matrix_diagram.md b/keyboards/4pplet/waffling60/rev_e_ansi/matrix_diagram.md
new file mode 100644
index 000000000000..ae47900a9baa
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Waffling60 Rev E ANSI Hotswap
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │1D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │      
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤  
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ 
+│30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                           │4B  │4C  │4D  │ Tsangan/WKL/HHKB
+└────┴────┴────┴─────────────────────────────┴────┴────┴────┘
+┌─────┬───┬─────┬───────────┬───┬───────────┬─────┬───┬─────┐
+│40   │41 │42   │44         │46 │48         │4B   │4C │4D   │ 7u split spacebar
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40   │41 │46                                     │4C │4D   │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/readme.md b/keyboards/4pplet/waffling60/rev_e_ansi/readme.md
new file mode 100644
index 000000000000..1b70d5aba864
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/readme.md
@@ -0,0 +1,26 @@
+# waffling60 Rev. E ANSI
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. Revision E adds underglow and rotary encoder support.
+
+More info: https://github.com/4pplet/waffling60
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_e_ansi:default
+
+Flashing example for this keyboard:
+
+    make 4pplet/waffling60/rev_e_ansi:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+How to enter bootloader (DFU):
+* Short the reset-header (labled BL/RESET) on the back of the PCB for about 2 seconds for the keyboard to enter DFU. When in DFU, it's ready to flash the firmware. If using a APM MCU it will not automatically reset after flash. Simply short the reset-header for a very short time to just reset the PCB, alternatively unplug and repluck the USB-cable to the keyboard.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_e_ansi/rules.mk
new file mode 100644
index 000000000000..04fe1eba2acd
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/acheron/themis/87h/87h.c b/keyboards/acheron/themis/87h/87h.c
new file mode 100644
index 000000000000..dada30ff873f
--- /dev/null
+++ b/keyboards/acheron/themis/87h/87h.c
@@ -0,0 +1,25 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        led_state.caps_lock ? rgblight_setrgb_at(0xAA,0xAA,0xAA,0) : rgblight_setrgb_at(0x00,0x00,0x00,0) ;
+    }
+    return res;
+}
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
new file mode 100644
index 000000000000..8a1ff4858323
--- /dev/null
+++ b/keyboards/acheron/themis/87h/config.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define RGBLED_NUM 1
+
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+#define WEAR_LEVELING_BACKING_SIZE 8192
diff --git a/keyboards/acheron/themis/87h/halconf.h b/keyboards/acheron/themis/87h/halconf.h
new file mode 100644
index 000000000000..485d48ef3067
--- /dev/null
+++ b/keyboards/acheron/themis/87h/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/info.json
new file mode 100644
index 000000000000..ed5d48690d30
--- /dev/null
+++ b/keyboards/acheron/themis/87h/info.json
@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "Themis 87H Rev. Alpha",
+    "usb": {
+        "pid": "0x5448",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A8" ,"C9" ,"C8" ,"B14","B12","B10","B1" ,"B0" ,"A7" ,"A6" ,"A5" ,"A4" ,"C5" ,"C7" ,"B3" ,"A2" ,"C12","D2" ],
+        "rows": ["A15","A10","C6" ,"C4" ,"A3" ,"A1" ,"C11","C10","B4"]
+    },
+    "features": {
+        "bootmagic": true,
+        "lto":       true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": false,
+        "rgblight":  true,
+        "audio":     false,
+        "encoder":   false,
+        "nkro":      true
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Escape", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label":"F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label":"F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label":"F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label":"F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label":"F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label":"F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label":"F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label":"F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label":"F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label":"F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label":"F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label":"F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label":"Print Screen", "matrix": [6, 14], "x": 15.25, "y": 0},
+                {"label":"Scroll Lock", "matrix": [6, 17], "x": 16.25, "y": 0},
+                {"label":"Pause", "matrix": [6, 16], "x": 17.25, "y": 0},
+
+                {"label":"`~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label":"1!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label":"2@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label":"3#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label":"4$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label":"5%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label":"6^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label":"7&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label":"8*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label":"9(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label":"0)", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label":"-_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label":"=+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label":"Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label":"Insert", "matrix": [7, 14], "x": 15.25, "y": 1.25},
+                {"label":"Home", "matrix": [7, 17], "x": 16.25, "y": 1.25},
+                {"label":"Page Up","matrix": [7, 16], "x": 17.25, "y": 1.25},
+
+                {"label":"Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label":"Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label":"W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label":"E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label":"R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label":"T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label":"Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label":"U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label":"I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label":"O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label":"P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label":"[{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label":"]}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label":"\\|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label":"Delete", "matrix": [8, 14], "x": 15.25, "y": 2.25},
+                {"label":"End", "matrix": [8, 17], "x": 16.25, "y": 2.25},
+                {"label":"Page Down", "matrix": [8, 16], "x": 17.25, "y": 2.25},
+
+                {"label":"Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label":"A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label":"S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label":"D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label":"F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label":"G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label":"H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label":"J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label":"K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label":"L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label":";:", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label":"\'\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label":"Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label":"Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label":"Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label":"X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label":"C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label":"V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label":"B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label":"N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label":"M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label":",<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label":".>", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label":"/?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label":"Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label":"Up",  "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label":"LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label":"Lwin", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label":"LAlt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label":"Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label":"RAlt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label":"RWin", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label":"MO(1)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label":"RCtrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label":"Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label":"Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label":"Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/themis/87h/keymaps/default/keymap.c b/keyboards/acheron/themis/87h/keymaps/default/keymap.c
new file mode 100755
index 000000000000..4728331f05ff
--- /dev/null
+++ b/keyboards/acheron/themis/87h/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_ansi(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_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, MO(1)  , KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/acheron/themis/87h/keymaps/via/keymap.c b/keyboards/acheron/themis/87h/keymaps/via/keymap.c
new file mode 100755
index 000000000000..4728331f05ff
--- /dev/null
+++ b/keyboards/acheron/themis/87h/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_ansi(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_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, MO(1)  , KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/rules.mk b/keyboards/acheron/themis/87h/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/via/rules.mk
rename to keyboards/acheron/themis/87h/keymaps/via/rules.mk
diff --git a/keyboards/acheron/themis/87h/mcuconf.h b/keyboards/acheron/themis/87h/mcuconf.h
new file mode 100644
index 000000000000..3d1d05c307c4
--- /dev/null
+++ b/keyboards/acheron/themis/87h/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/acheron/themis/87h/rules.mk b/keyboards/acheron/themis/87h/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/acheron/themis/87htsc/87htsc.c b/keyboards/acheron/themis/87htsc/87htsc.c
new file mode 100644
index 000000000000..dada30ff873f
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/87htsc.c
@@ -0,0 +1,25 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        led_state.caps_lock ? rgblight_setrgb_at(0xAA,0xAA,0xAA,0) : rgblight_setrgb_at(0x00,0x00,0x00,0) ;
+    }
+    return res;
+}
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
new file mode 100644
index 000000000000..8a1ff4858323
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define RGBLED_NUM 1
+
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+#define WEAR_LEVELING_BACKING_SIZE 8192
diff --git a/keyboards/acheron/themis/87htsc/halconf.h b/keyboards/acheron/themis/87htsc/halconf.h
new file mode 100644
index 000000000000..485d48ef3067
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/info.json
new file mode 100644
index 000000000000..854ad5a7d58e
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/info.json
@@ -0,0 +1,135 @@
+{
+    "keyboard_name": "Themis 87H-T-SC Rev. Alpha",
+    "usb": {
+        "pid": "0x5449",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A8" ,"C9" ,"C8" ,"B14","B12","B10","B1" ,"B0" ,"A7" ,"A6" ,"A5" ,"A4" ,"C5" ,"C7" ,"B3" ,"A2" ,"C12","D2" ],
+        "rows": ["A15","A10","C6" ,"C4" ,"A3" ,"A1" ,"C11","C10","B4"]
+    },
+    "features": {
+        "bootmagic": true,
+        "lto":       true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": false,
+        "rgblight":  true,
+        "audio":     false,
+        "encoder":   false,
+        "nkro":      true
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Escape", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label":"F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label":"F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label":"F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label":"F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label":"F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label":"F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label":"F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label":"F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label":"F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label":"F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label":"F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label":"F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label":"Print Screen", "matrix": [6, 14], "x": 15.25, "y": 0},
+                {"label":"Scroll Lock", "matrix": [6, 17], "x": 16.25, "y": 0},
+                {"label":"Pause", "matrix": [6, 16], "x": 17.25, "y": 0},
+
+                {"label":"`~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label":"1!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label":"2@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label":"3#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label":"4$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label":"5%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label":"6^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label":"7&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label":"8*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label":"9(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label":"0)", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label":"-_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label":"=+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label":"Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label":"Insert", "matrix": [7, 14], "x": 15.25, "y": 1.25},
+                {"label":"Home", "matrix": [7, 17], "x": 16.25, "y": 1.25},
+                {"label":"Page Up","matrix": [7, 16], "x": 17.25, "y": 1.25},
+
+                {"label":"Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label":"Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label":"W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label":"E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label":"R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label":"T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label":"Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label":"U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label":"I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label":"O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label":"P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label":"[{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label":"]}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label":"\\|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label":"Delete", "matrix": [8, 14], "x": 15.25, "y": 2.25},
+                {"label":"End", "matrix": [8, 17], "x": 16.25, "y": 2.25},
+                {"label":"Page Down", "matrix": [8, 16], "x": 17.25, "y": 2.25},
+
+                {"label":"Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label":"A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label":"S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label":"D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label":"F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label":"G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label":"H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label":"J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label":"K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label":"L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label":";:", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label":"\'\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label":"Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label":"Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label":"Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label":"X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label":"C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label":"V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label":"B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label":"N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label":"M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label":",<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label":".>", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label":"/?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label":"Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label":"Up",  "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label":"LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label":"Lwin", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label":"LAlt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label":"Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label":"RAlt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label":"RWin", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label":"RCtrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label":"Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label":"Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label":"Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/themis/87htsc/keymaps/default/keymap.c b/keyboards/acheron/themis/87htsc/keymaps/default/keymap.c
new file mode 100755
index 000000000000..7b29220ec8d4
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Gondolindrim
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_ansi_tsangan(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_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, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi_tsangan(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/acheron/themis/87htsc/keymaps/via/keymap.c b/keyboards/acheron/themis/87htsc/keymaps/via/keymap.c
new file mode 100755
index 000000000000..7b29220ec8d4
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Gondolindrim
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_ansi_tsangan(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_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, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi_tsangan(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/acheron/themis/87htsc/keymaps/via/rules.mk b/keyboards/acheron/themis/87htsc/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/acheron/themis/87htsc/mcuconf.h b/keyboards/acheron/themis/87htsc/mcuconf.h
new file mode 100644
index 000000000000..3d1d05c307c4
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/acheron/themis/87htsc/rules.mk b/keyboards/acheron/themis/87htsc/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/acheron/themis/88htsc/88htsc.c b/keyboards/acheron/themis/88htsc/88htsc.c
new file mode 100644
index 000000000000..dada30ff873f
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/88htsc.c
@@ -0,0 +1,25 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        led_state.caps_lock ? rgblight_setrgb_at(0xAA,0xAA,0xAA,0) : rgblight_setrgb_at(0x00,0x00,0x00,0) ;
+    }
+    return res;
+}
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
new file mode 100644
index 000000000000..8a1ff4858323
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define RGBLED_NUM 1
+
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+#define WEAR_LEVELING_BACKING_SIZE 8192
diff --git a/keyboards/acheron/themis/88htsc/halconf.h b/keyboards/acheron/themis/88htsc/halconf.h
new file mode 100644
index 000000000000..485d48ef3067
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/info.json
new file mode 100644
index 000000000000..cfce0702eb40
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/info.json
@@ -0,0 +1,137 @@
+{
+    "keyboard_name": "Themis 88H-T-SC Rev. Alpha",
+    "usb": {
+        "pid": "0x5450",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A8" ,"C9" ,"C8" ,"B14","B12","B10","B1" ,"B0" ,"A7" ,"A6" ,"A5" ,"A4" ,"C5" ,"C7" ,"B3" ,"A2" ,"C12","D2" ],
+        "rows": ["A15","A10","C6" ,"C4" ,"A3" ,"A1" ,"C11","C10","B4"]
+    },
+    "features": {
+        "bootmagic": true,
+        "lto":       true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": false,
+        "rgblight":  true,
+        "audio":     false,
+        "encoder":   false,
+        "nkro":      true
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_f13_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label":"Escape", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label":"F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label":"F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label":"F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label":"F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label":"F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label":"F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label":"F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label":"F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label":"F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label":"F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label":"F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label":"F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label":"F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label":"Print Screen", "matrix": [6, 14], "x": 15.25, "y": 0},
+                {"label":"Scroll Lock", "matrix": [6, 17], "x": 16.25, "y": 0},
+                {"label":"Pause", "matrix": [6, 16], "x": 17.25, "y": 0},
+
+                {"label":"`~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label":"1!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label":"2@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label":"3#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label":"4$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label":"5%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label":"6^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label":"7&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label":"8*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label":"9(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label":"0)", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label":"-_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label":"=+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label":"Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label":"Insert", "matrix": [7, 14], "x": 15.25, "y": 1.25},
+                {"label":"Home", "matrix": [7, 17], "x": 16.25, "y": 1.25},
+                {"label":"Page Up","matrix": [7, 16], "x": 17.25, "y": 1.25},
+
+                {"label":"Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label":"Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label":"W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label":"E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label":"R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label":"T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label":"Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label":"U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label":"I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label":"O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label":"P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label":"[{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label":"]}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label":"\\|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label":"Delete", "matrix": [8, 14], "x": 15.25, "y": 2.25},
+                {"label":"End", "matrix": [8, 17], "x": 16.25, "y": 2.25},
+                {"label":"Page Down", "matrix": [8, 16], "x": 17.25, "y": 2.25},
+
+                {"label":"Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label":"A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label":"S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label":"D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label":"F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label":"G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label":"H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label":"J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label":"K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label":"L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label":";:", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label":"\'\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label":"Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label":"Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label":"Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label":"X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label":"C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label":"V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label":"B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label":"N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label":"M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label":",<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label":".>", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label":"/?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label":"Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label":"Up",  "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label":"LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label":"Lwin", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label":"LAlt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label":"Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label":"RAlt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label":"RWin", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label":"RCtrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label":"Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label":"Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label":"Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/themis/88htsc/keymaps/default/keymap.c b/keyboards/acheron/themis/88htsc/keymaps/default/keymap.c
new file mode 100755
index 000000000000..725b294b0d65
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Gondolindrim
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_f13_ansi_tsangan(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13,  KC_PSCR, KC_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, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/acheron/themis/88htsc/keymaps/via/keymap.c b/keyboards/acheron/themis/88htsc/keymaps/via/keymap.c
new file mode 100755
index 000000000000..725b294b0d65
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Gondolindrim
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_f13_ansi_tsangan(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_F13,  KC_PSCR, KC_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, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk b/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/acheron/themis/88htsc/mcuconf.h b/keyboards/acheron/themis/88htsc/mcuconf.h
new file mode 100644
index 000000000000..3d1d05c307c4
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/acheron/themis/88htsc/rules.mk b/keyboards/acheron/themis/88htsc/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/acheron/themis/info.json b/keyboards/acheron/themis/info.json
new file mode 100644
index 000000000000..4f9d3b61e615
--- /dev/null
+++ b/keyboards/acheron/themis/info.json
@@ -0,0 +1,8 @@
+{
+    "manufacturer": "AcheronProject",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0xAC11"
+    }
+}
diff --git a/keyboards/acheron/themis/readme.md b/keyboards/acheron/themis/readme.md
new file mode 100644
index 000000000000..8c0c7e63e54f
--- /dev/null
+++ b/keyboards/acheron/themis/readme.md
@@ -0,0 +1,23 @@
+# Acheron Themis QMK firmware
+
+![themis](https://i.imgur.com/kwemOsJh.png)
+
+The Themis is Acheron Project's open-source, freely available tenkeyless (TKL) keyboard Printed Circuit Boards (PCB) which features:
+
+- No LED lighting
+- Solderless ("hotswap") MX switches support
+- Fixed layout for each variant
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: open-source PCB using the [Joker template](https://acheronproject.com/joker_mcus/joker/). First units were manufactured using STM32F4x1 microcontroller;
+* Hardware Availability: open-source PCBs
+
+In order to flash this PCB, first build the default layout (after setting up your build environment):
+
+    make acheron/themis/<revision>:default
+
+After building or downloading the firmware, put the PCB into DFU mode by holding the reset button for at least five seconds and upload the firmware onto the microcontroller through a utility like `dfu-util` or QMK Toolbox. Alternatively, you can build and flash using:
+
+    make acheron/themis/<revision>:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/blu/vimclutch/info.json b/keyboards/blu/vimclutch/info.json
index bb9586b61f84..cbee78735cfb 100644
--- a/keyboards/blu/vimclutch/info.json
+++ b/keyboards/blu/vimclutch/info.json
@@ -11,8 +11,9 @@
     "development_board": "promicro",
     "diode_direction": "ROW2COL",
     "matrix_pins": {
-        "cols": ["B3", "B2", "B6"],
-        "rows": ["B5"]
+        "direct": [
+            ["B3", "B2", "B6"]
+        ]
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/blu/vimclutch/readme.md b/keyboards/blu/vimclutch/readme.md
index bbc6b9826066..94ebc183332b 100644
--- a/keyboards/blu/vimclutch/readme.md
+++ b/keyboards/blu/vimclutch/readme.md
@@ -19,8 +19,6 @@ Here are some included keymaps and their modes to get you started:
 * vc_i: the same as default but using `i` instead of `a`
 * vim_ai: vim clutch only, selectable between `a` and `i`
 
-Also includes a mode for single-keypress in case of "push to talk clutch"
-
 Make example for this keyboard after setting up your development environment:
 
     make blu/vimclutch:default
@@ -34,3 +32,7 @@ Flashing example for this keyboard:
 Reset button on the reverse side of the enclosure for initializing flashing.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Hardware Revision Compatibility
+This keyboard as-it-is in the QMK repository at the is only designed to work with Revision B (and possibly beyond!)
+
diff --git a/keyboards/boardsource/unicorne/unicorne.c b/keyboards/boardsource/unicorne/unicorne.c
index 0c443722e027..22cd1e4a37d8 100644
--- a/keyboards/boardsource/unicorne/unicorne.c
+++ b/keyboards/boardsource/unicorne/unicorne.c
@@ -20,13 +20,13 @@ bool oled_task_kb(void) {
                 oled_write_raw(layer_zero, sizeof(layer_zero));
                 break;
             case 1:
-                oled_write_raw(layer_zero, sizeof(layer_zero));
+                oled_write_raw(layer_one, sizeof(layer_one));
                 break;
             case 2:
-                oled_write_raw(layer_zero, sizeof(layer_zero));
+                oled_write_raw(layer_two, sizeof(layer_two));
                 break;
             case 3:
-                oled_write_raw(layer_zero, sizeof(layer_zero));
+                oled_write_raw(layer_three, sizeof(layer_three));
                 break;
         }
     } else {
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json
index 3fd95577d892..49aaaddd5254 100644
--- a/keyboards/cannonkeys/is0gr/info.json
+++ b/keyboards/cannonkeys/is0gr/info.json
@@ -18,8 +18,8 @@
     "url": "https://cannonkeys.com",
     "usb": {
         "device_version": "0.0.1",
-        "pid": "0xCA04",
-        "vid": "0x0028"
+        "pid": "0x0028",
+        "vid": "0xCA04"
     },
     "community_layouts": ["ortho_1x1"],
     "layouts": {
@@ -29,4 +29,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
index ed49188c5e91..0dc219faccc7 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
@@ -30,68 +30,28 @@ enum discpline_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        FN_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,           KC_HOME,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                       KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* QWERTY: Default Layer
-  * ,--------------------------------------------------------------.
-  * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backs|  `~|
-  * |---------------------------------------------------------------|
-  * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|Del|
-  * |---------------------------------------------------------------|
-  * |Fn/CL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|   Enter|PgU|
-  * |---------------------------------------------------------------|
-  * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgD|
-  * |---------------------------------------------------------------|
-  * |Ctrl|Gui |Alt |         Space    |Gui |Alt |Ctrl|  |Lef|Dow|Rig|
-  * `---------------------------------------------------------------'
-  */
-  [_QWERTY] = LAYOUT_65_ansi(
-    KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4, KC_5, KC_6, KC_7, KC_8,   KC_9,  KC_0,   KC_MINS, KC_EQL, KC_BSPC,  KC_GRV,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R, KC_T, KC_Y, KC_U, KC_I,   KC_O,  KC_P,   KC_LBRC,KC_RBRC, KC_BSLS,  KC_DEL,
-    FN_ESC,  KC_A,    KC_S,    KC_D,  KC_F, KC_G, KC_H, KC_J, KC_K,   KC_L,  KC_SCLN,KC_QUOT,         KC_ENT,  KC_HOME,
-    KC_LSFT,  KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,        KC_RSFT, KC_UP,    KC_END,
-    KC_LCTL,  KC_LGUI, KC_LALT,            KC_SPC,                  KC_RALT, KC_RGUI, KC_RCTL,KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* Workman
-   * ,---------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backs|  `~|
-   * |---------------------------------------------------------------|
-   * |Tab  |  Q|  D|  R|  W|  B|  J|  F|  U|  P|  ;|  [|  ]|   \| Del|
-   * |---------------------------------------------------------------|
-   * |Fn/CL |  A|  S|  H|  T|  G|  Y|  N|  E|  O|  I|  '|  Enter| PgU|
-   * |---------------------------------------------------------------|
-   * |Shift   |  Z|  X|  M|  C|  V|  K|  L|  ,|  .|  /|Shift |Up| PgD|
-   * |---------------------------------------------------------------|
-   * |Ctrl|Alt |Gui |         Space    |Gui |Alt |Ctrl|  |Lef|Dow|Rig|
-   * `---------------------------------------------------------------'
-   */
-  [_WORKMAN] = LAYOUT_65_ansi(
-      KC_ESC,  KC_1,   KC_2,   KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS,  KC_EQL, KC_BSPC, KC_GRV,
-      KC_TAB,  KC_Q,   KC_D,   KC_R, KC_W, KC_B, KC_J, KC_F, KC_U,    KC_P,   KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-      FN_ESC,  KC_A,   KC_S,   KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E,    KC_O,   KC_I,    KC_QUOT,          KC_ENT, KC_HOME,
-      KC_LSFT,  KC_Z,   KC_X,   KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH,         KC_RSFT,  KC_UP,   KC_END,
-      KC_LCTL,  KC_LGUI,KC_LALT,            KC_SPC,                  KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [_WORKMAN] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,   KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        FN_ESC,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,   KC_I,    KC_QUOT, KC_ENT,           KC_HOME,
+        KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                       KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    /* Function
-     * ,---------------------------------------------------------------.
-     * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|     |     |
-     * |---------------------------------------------------------------|
-     * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |INS|
-     * |---------------------------------------------------------------|
-     * |      |   |   |   |   |   |   |   |   |   |   |   |        |HME|
-     * |---------------------------------------------------------------|
-     * |    |   |   |   |   |   |   |   |   |   |   |   |      |VL+|END|
-     * |---------------------------------------------------------------|
-     * |    |    |    |      PLY/PS      |    |    |    |  |PRV|VL-|NXT|
-     * `---------------------------------------------------------------'
-     */
     [_FUNC] = LAYOUT_65_ansi(
-      _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,   QK_BOOT,
-      _______,KC_WH_U,KC_BTN1,KC_MS_U,KC_BTN2,_______,_______,AG_NORM,AG_SWAP,QWERTY,WORKMAN,_______,_______,_______,   KC_INS,
-      _______,KC_WH_D,KC_MS_L,KC_MS_D,KC_MS_R,_______,_______,_______,_______,_______,_______,_______,       _______,  KC_PGUP,
-      _______,KC_WH_L,KC_BTN3,KC_WH_R,_______,_______,_______,_______,_______,_______,_______,        _______,KC_VOLU, KC_PGDN,
-      _______,_______,_______,                        KC_MPLY,                _______,_______,_______,KC_MPRV,KC_VOLD, KC_MNXT
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   AG_NORM,  AG_SWAP, QWERTY,  WORKMAN, KC_TRNS, KC_INS,
+        KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP,
+        KC_TRNS, KC_WH_L, KC_BTN3, KC_WH_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_VOLU, KC_PGDN,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                     KC_TRNS, KC_TRNS, KC_TRNS,         KC_MPRV, KC_VOLD, KC_MNXT
     ),
 };
 
diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h
new file mode 100644
index 000000000000..335648df9ab7
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#define SPI_MOSI_PIN A7
+#define SPI_MISO_PIN A6
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B15
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 68
+#define DRIVER_2_LED_TOTAL 54
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/darkproject/kd87a_bfg_edition/halconf.h b/keyboards/darkproject/kd87a_bfg_edition/halconf.h
new file mode 100644
index 000000000000..8f61d3fc64ff
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2022 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/darkproject/kd87a_bfg_edition/info.json b/keyboards/darkproject/kd87a_bfg_edition/info.json
new file mode 100644
index 000000000000..1cf428a97f15
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/info.json
@@ -0,0 +1,274 @@
+{
+    "manufacturer": "Kd87a_bfg_edition",
+    "keyboard_name": "Kd87a_bfg_edition",
+    "maintainer": "Gsky",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B12"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [87, 35],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 30, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 50, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 65, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 75, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 85, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 95, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 110, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 120, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 130, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 155, "y": 0 },
+            { "flags": 4, "matrix": [10, 0], "x": 165, "y": 0 },
+            { "flags": 4, "matrix": [9, 6], "x": 175, "y": 0 },
+
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 15 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 15 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 15 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 15 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 15 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 15 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 15 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 15 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 15 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 15 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 15 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 15 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 15 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 15 },
+            { "flags": 4, "matrix": [11, 6], "x": 155, "y": 15 },
+            { "flags": 4, "matrix": [0, 2], "x": 165, "y": 15 },
+            { "flags": 4, "matrix": [1, 5], "x": 175, "y": 15 },
+
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 25 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 25 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 25 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 25 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 25 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 25 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 25 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 25 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 25 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 25 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 25 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 25 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 25 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 25 },
+            { "flags": 4, "matrix": [6, 5], "x": 155, "y": 25 },
+            { "flags": 4, "matrix": [7, 5], "x": 165, "y": 25 },
+            { "flags": 4, "matrix": [2, 5], "x": 175, "y": 25 },
+
+            { "flags": 8, "matrix": [2, 1], "x": 0, "y": 35 },
+            { "flags": 4, "matrix": [1, 2], "x": 17.5, "y": 35 },
+            { "flags": 4, "matrix": [2, 2], "x": 27.5, "y": 35 },
+            { "flags": 4, "matrix": [3, 2], "x": 37.5, "y": 35 },
+            { "flags": 4, "matrix": [4, 2], "x": 47.5, "y": 35 },
+            { "flags": 4, "matrix": [4, 3], "x": 57.5, "y": 35 },
+            { "flags": 4, "matrix": [5, 3], "x": 67.5, "y": 35 },
+            { "flags": 4, "matrix": [5, 2], "x": 77.5, "y": 35 },
+            { "flags": 4, "matrix": [6, 2], "x": 87.5, "y": 35 },
+            { "flags": 4, "matrix": [7, 2], "x": 97.5, "y": 35 },
+            { "flags": 4, "matrix": [8, 2], "x": 107.5, "y": 35 },
+            { "flags": 4, "matrix": [8, 3], "x": 117.5, "y": 35 },
+            { "flags": 4, "matrix": [10, 4], "x": 127.5, "y": 35 },
+
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 45 },
+            { "flags": 4, "matrix": [1, 4], "x": 22.5, "y": 45 },
+            { "flags": 4, "matrix": [2, 4], "x": 32.5, "y": 45 },
+            { "flags": 4, "matrix": [3, 4], "x": 42.5, "y": 45 },
+            { "flags": 4, "matrix": [4, 4], "x": 52.5, "y": 45 },
+            { "flags": 4, "matrix": [4, 5], "x": 62.5, "y": 45 },
+            { "flags": 4, "matrix": [5, 5], "x": 72.5, "y": 45 },
+            { "flags": 4, "matrix": [5, 4], "x": 82.5, "y": 45 },
+            { "flags": 4, "matrix": [6, 4], "x": 92.5, "y": 45 },
+            { "flags": 4, "matrix": [7, 4], "x": 102.5, "y": 45 },
+            { "flags": 4, "matrix": [8, 5], "x": 112.5, "y": 45 },
+            { "flags": 4, "matrix": [9, 1], "x": 122.5, "y": 45 },
+            { "flags": 4, "matrix": [3, 5], "x": 165, "y": 45 },
+
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 55 },
+            { "flags": 4, "matrix": [9, 0], "x": 12.5, "y": 55 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 55 },
+            { "flags": 4, "matrix": [9, 4], "x": 37.5, "y": 55 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 55 },
+            { "flags": 4, "matrix": [9, 2], "x": 112.5, "y": 55 },
+            { "flags": 4, "matrix": [8, 4], "x": 125, "y": 55 },
+            { "flags": 4, "matrix": [0, 4], "x": 137.5, "y": 55 },
+            { "flags": 4, "matrix": [0, 3], "x": 155, "y": 55 },
+            { "flags": 4, "matrix": [7, 3], "x": 165, "y": 55 },
+            { "flags": 4, "matrix": [0, 5], "x": 175, "y": 55 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.3",
+        "pid": "0xE393",
+        "vid": "0x342D"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "ESC", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 7.5, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 8.5, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 9.5, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 11, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 12, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 13, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 14, "y": 0 },
+                { "label": "Printscreen", "matrix": [9, 7], "x": 15.5, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [10, 0], "x": 16.5, "y": 0 },
+                { "label": "Pause Break", "matrix": [9, 6], "x": 17.5, "y": 0 },
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1.5 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1.5 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1.5 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1.5 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1.5 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1.5 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1.5 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1.5 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1.5 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1.5 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1.5 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1.5 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1.5 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1.5 },
+                { "label": "INS", "matrix": [11, 6], "x": 15.5, "y": 1.5 },
+                { "label": "Home", "matrix": [0, 2], "x": 16.5, "y": 1.5 },
+                { "label": "PgUp", "matrix": [1, 5], "x": 17.5, "y": 1.5 },
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2.5 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2.5 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2.5 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2.5 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2.5 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2.5 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2.5 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2.5 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2.5 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2.5 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2.5 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2.5 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2.5 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "label": "Delete", "matrix": [6, 5], "x": 15.5, "y": 2.5 },
+                { "label": "End", "matrix": [7, 5], "x": 16.5, "y": 2.5 },
+                { "label": "PgDn", "matrix": [2, 5], "x": 17.5, "y": 2.5 },
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3.5 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.5 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.5 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.5 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.5 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3.5 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3.5 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3.5 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3.5 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3.5 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3.5 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4.5 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.5 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.5 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.5 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.5 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.5 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4.5 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4.5 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4.5 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4.5 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.5 },
+                { "label": "Shift", "matrix": [9, 1], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "label": "Up", "matrix": [3, 5], "x": 16.5, "y": 4.5 },
+                { "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5.5 },
+                { "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5.5 },
+                { "label": "Alt", "matrix": [9, 5], "w": 1.25, "x": 10, "y": 5.5 },
+                { "label": "FN", "matrix": [9, 2], "w": 1.25, "x": 11.25, "y": 5.5 },
+                { "label": "APP", "matrix": [8, 4], "w": 1.25, "x": 12.5, "y": 5.5 },
+                { "label": "Ctrl", "matrix": [0, 4], "w": 1.25, "x": 13.75, "y": 5.5 },
+                { "label": "Left", "matrix": [0, 3], "x": 15.5, "y": 5.5 },
+                { "label": "Down", "matrix": [7, 3], "x": 16.5, "y": 5.5 },
+                { "label": "Right", "matrix": [0, 5], "x": 17.5, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
new file mode 100644
index 000000000000..0ce0799e14cb
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
@@ -0,0 +1,174 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "kd87a_bfg_edition.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, Esc
+
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   1, Esc
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   2, F1
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   3, F2
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   4, F3
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   5, F4
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   6, F5
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   7, F6
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   8, F7
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   9, F8
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  10, F9
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  11, F10
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  12, F11
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  13, F12
+    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  14, Printscreen
+    {1, CS1_SW3,   CS2_SW3,   CS3_SW3},   //  15, Scroll Lock
+    {1, CS1_SW4,   CS2_SW4,   CS3_SW4},   //  16, Pause Break
+
+    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  17, `
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  18, 1
+    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  19, 2
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  20, 3
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  21, 4
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  22, 5
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  23, 6
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  24, 7
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  25, 8
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  26, 9
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  27, 0
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  28, -
+    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  29, =
+    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  30, Backspace
+    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  31, Insert
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  32, Home
+    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  33, Page Up
+
+    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  34, Tab
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  35, Q
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  36, W
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  37, E
+    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  38, R
+    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  39, T
+    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  40, Y
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  41, U
+    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  42, I
+    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  43, O
+    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  44, P
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  45, [
+    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  46, ]
+    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  47, "\\"
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  48, Delete
+    {1, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  49, END
+    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  50, Page down
+
+    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  51, Caps Lock
+    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  52, A
+    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  53, S
+    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  54, D
+    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  55, F
+    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  56, G
+    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  57, H
+    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  58, J
+    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  59, K
+    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  60, L
+    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  61, ;
+    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  62, '
+    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  63, Enter
+    
+    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  64, Shift_L
+    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  65, Z
+    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  66, X
+    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  67, C
+    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  68, V
+    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  69, B
+    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  70, N
+    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  71, M
+    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  72, ,
+    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  73, .
+    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  74, /
+    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  75, Shift_R
+    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  76, Up
+    
+    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  77, Ctrl_L
+    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  78, Win_L
+    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  79, Alt_L
+    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  80, Space
+    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  81, Alt_R
+    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  82, FN
+    {0, CS16_SW11, CS17_SW11, CS18_SW11}, //  83, APP
+    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  84, Ctrl_R
+    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  85, Left
+    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  86, Down
+    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  87, Right
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C0);
+    setPinOutput(C15);
+    keyboard_pre_init_user();
+};
+void housekeeping_task_kb(void) {
+    writePin(C15, keymap_config.no_gui);
+};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case KC_SIRI:
+            if (record->event.pressed) {
+                host_consumer_send(0xCF);
+            } else {
+                host_consumer_send(0);
+            }
+            return false; /* Skip all further processing of this key */
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.h b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.h
new file mode 100644
index 000000000000..e2c656eb0eb2
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+enum keyboard_keycodes {
+    KC_SIRI = QK_KB_0
+};
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4abb1bdc9158
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+enum custom_layers {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = LAYOUT_tkl_ansi(
+  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,  MO(Winfn),KC_APP,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT_tkl_ansi(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,            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_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_APP,    KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,            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,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_MOD,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  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_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_MOD,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
\ No newline at end of file
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
new file mode 100644
index 000000000000..71fbfa4ff203
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+enum custom_layers {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = LAYOUT_tkl_ansi(
+  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_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,  MO(Winfn),KC_APP,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT_tkl_ansi(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,            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_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_APP,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,            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,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_MOD,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  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_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_MOD,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/rules.mk b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/darkproject/kd87a_bfg_edition/mcuconf.h b/keyboards/darkproject/kd87a_bfg_edition/mcuconf.h
new file mode 100644
index 000000000000..440f78d2bc27
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2022 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/darkproject/kd87a_bfg_edition/readme.md b/keyboards/darkproject/kd87a_bfg_edition/readme.md
new file mode 100644
index 000000000000..83cc8a923db9
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/readme.md
@@ -0,0 +1,24 @@
+# KD87A_BFG_Edition 
+![KD87A_BFG_Edition](https://imgur.com/uOUvWvwh.png)
+
+An 87 keys keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [GSKY](https://github.com/gksygithub)
+* Hardware Supported: KD87A_BFG_Edition
+* Hardware Availability: [GSKY GitHub](https://github.com/gksygithub/keyboard1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make darkproject/kd87a_bfg_edition:default
+
+Flashing example for this keyboard:
+
+    make darkproject/kd87a_bfg_edition:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB back side after the USB cable is connected
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+ESC will reset the board to bootloader mode
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/darkproject/kd87a_bfg_edition/rules.mk b/keyboards/darkproject/kd87a_bfg_edition/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 2ee29f792db8..c8046d40e4f3 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -34,7 +34,8 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "bootloader": "uf2boot",
+    "board": "STM32_F103_STM32DUINO"
     "layouts": {
         "LAYOUT_7u_space": {
             "layout": [
diff --git a/keyboards/enter67/info.json b/keyboards/enter67/info.json
new file mode 100644
index 000000000000..df1d7f6b5b33
--- /dev/null
+++ b/keyboards/enter67/info.json
@@ -0,0 +1,106 @@
+{
+    "manufacturer": "KipperSun",
+    "keyboard_name": "enter67",
+    "maintainer": "KipperSun",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B15",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B14", "A9", "A10", "A8", "B6", "B7", "B5", "B4"],
+        "rows": ["A1", "A2", "A3", "A4", "A5"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xAA66",
+        "vid": "0x4040"
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "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, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K91", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K92", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/enter67/keymaps/default/keymap.c
new file mode 100644
index 000000000000..1f3d16c0953d
--- /dev/null
+++ b/keyboards/enter67/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0]=LAYOUT_65_ansi_blocker(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1]=LAYOUT_65_ansi_blocker(
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/keymap.c b/keyboards/enter67/keymaps/via/keymap.c
new file mode 100644
index 000000000000..1f3d16c0953d
--- /dev/null
+++ b/keyboards/enter67/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0]=LAYOUT_65_ansi_blocker(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1]=LAYOUT_65_ansi_blocker(
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/rules.mk b/keyboards/enter67/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/enter67/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/enter67/readme.md b/keyboards/enter67/readme.md
new file mode 100644
index 000000000000..8a4890ff1d5b
--- /dev/null
+++ b/keyboards/enter67/readme.md
@@ -0,0 +1,26 @@
+# ENTER67 - PCB
+
+![enter67](https://imgur.com/igF8Lurh.jpg)
+
+67 layout PCB, with option for stepped Caps Lock
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: enter67 PCB
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make enter67:default
+    
+Flashing example for this keyboard:
+
+    make enter67: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/enter67/rules.mk b/keyboards/enter67/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/enter67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/enviousdesign/60f/info.json b/keyboards/enviousdesign/60f/info.json
new file mode 100644
index 000000000000..20876aa0b846
--- /dev/null
+++ b/keyboards/enviousdesign/60f/info.json
@@ -0,0 +1,227 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "EnvKB 60F V1",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP16", "GP17", "GP18", "GP19", "GP20", "GP21", "GP22", "GP26", "GP27"],
+        "rows": ["GP11", "GP12", "GP13", "GP14", "GP15"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA400",
+        "vid": "0xE739"
+    },
+    "community_layouts": ["60_ansi", "60_iso"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
+                {"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
+                {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+                {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
+                {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
+                {"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 2, "w": 1.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
+                {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/enviousdesign/60f/keymaps/default/keymap.c b/keyboards/enviousdesign/60f/keymaps/default/keymap.c
new file mode 100644
index 000000000000..42f84afed7e3
--- /dev/null
+++ b/keyboards/enviousdesign/60f/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,  
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),   KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,  
+        QK_BOOT, KC_VOLU, KC_UP,   KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INSERT,KC_HOME,KC_PGUP, KC_TRNS,  
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_CALCULATOR,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS,  
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_APP,           KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/enviousdesign/60f/keymaps/via/keymap.c b/keyboards/enviousdesign/60f/keymaps/via/keymap.c
new file mode 100644
index 000000000000..42f84afed7e3
--- /dev/null
+++ b/keyboards/enviousdesign/60f/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,  
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),   KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,  
+        QK_BOOT, KC_VOLU, KC_UP,   KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INSERT,KC_HOME,KC_PGUP, KC_TRNS,  
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_CALCULATOR,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS,  
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_APP,           KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/enviousdesign/60f/keymaps/via/rules.mk b/keyboards/enviousdesign/60f/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/60f/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/60f/readme.md b/keyboards/enviousdesign/60f/readme.md
new file mode 100644
index 000000000000..5098f22327d6
--- /dev/null
+++ b/keyboards/enviousdesign/60f/readme.md
@@ -0,0 +1,31 @@
+# EnvKB 60F
+
+![Image of the EnvKB 60F PCB](https://i.imgur.com/c5xMEg0h.png)
+
+
+A low cost Standard 60% Design which takes inspiration from the CFTKB Mysterium.
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: EnvKB 60F (Pi Pico)
+* Hardware Availability: [GitHub](https://github.com/Envious-Data/Env-KB60F)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/60f:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/60f:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the Tab key.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+
diff --git a/keyboards/enviousdesign/60f/rules.mk b/keyboards/enviousdesign/60f/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/60f/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/65m/info.json b/keyboards/enviousdesign/65m/info.json
new file mode 100644
index 000000000000..232893246261
--- /dev/null
+++ b/keyboards/enviousdesign/65m/info.json
@@ -0,0 +1,393 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "EnvKB 65M",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP21", "GP20", "GP19", "GP18", "GP17"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xA279",
+        "vid": "0xE739"
+    },
+    "layouts": {
+        "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": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "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": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "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": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/65m/keymaps/default/keymap.c b/keyboards/enviousdesign/65m/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4efa8abf9232
--- /dev/null
+++ b/keyboards/enviousdesign/65m/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, 
+        KC_TAB,  		  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, 		  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, 
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_HOME,  KC_PGUP,
+        KC_LCTL, KC_LWIN,          KC_LALT, KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(2),   MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN
+    ),
+    [1] = 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_TRNS, 
+        KC_TRNS, 		  KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, KC_END,  KC_INS, 
+        QK_BOOTLOADER, KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_DEL
+    )
+};
+
diff --git a/keyboards/enviousdesign/65m/keymaps/via/keymap.c b/keyboards/enviousdesign/65m/keymaps/via/keymap.c
new file mode 100644
index 000000000000..4efa8abf9232
--- /dev/null
+++ b/keyboards/enviousdesign/65m/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, 
+        KC_TAB,  		  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, 		  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, 
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_HOME,  KC_PGUP,
+        KC_LCTL, KC_LWIN,          KC_LALT, KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(2),   MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN
+    ),
+    [1] = 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_TRNS, 
+        KC_TRNS, 		  KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, KC_END,  KC_INS, 
+        QK_BOOTLOADER, KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_DEL
+    )
+};
+
diff --git a/keyboards/enviousdesign/65m/keymaps/via/rules.mk b/keyboards/enviousdesign/65m/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/65m/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/65m/readme.md b/keyboards/enviousdesign/65m/readme.md
new file mode 100644
index 000000000000..76180843f329
--- /dev/null
+++ b/keyboards/enviousdesign/65m/readme.md
@@ -0,0 +1,30 @@
+# EnvKB 65M
+
+![image of EnvKB 65M PCB](https://i.imgur.com/3d76sz9h.png)
+
+A low cost 65% kit featuring split space and an attempt at fitting a standard keycap set.
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: EnvKB 65M (Pi Pico)
+* Hardware Availability: [Mechboards](https://mechboards.co.uk/products/envkb-65-kit), [GitHub](https://github.com/Envious-Data/Env-KB65M)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/65m:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/65m:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the Control key in the bottom-left.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+
diff --git a/keyboards/enviousdesign/65m/rules.mk b/keyboards/enviousdesign/65m/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/65m/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/commissions/mini1800/info.json b/keyboards/enviousdesign/commissions/mini1800/info.json
new file mode 100644
index 000000000000..9303e7af2346
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/info.json
@@ -0,0 +1,110 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Mini1800",
+    "maintainer": "Envious.Design",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0xE739",
+        "pid": "0xC001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "num_lock": "GP8",
+        "caps_lock": "GP10",
+    }
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["GP4", "GP3", "GP2", "GP1", "GP0"],
+        "cols": ["GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP27", "GP28", "GP5", "GP6", "GP7"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14.5, "y": 0 },
+                { "matrix": [0, 15], "x": 15.5, "y": 0 },
+                { "matrix": [0, 16], "x": 16.5, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "w": 1.5, "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "x": 14.5, "y": 1 },
+                { "matrix": [1, 15], "x": 15.5, "y": 1 },
+                { "matrix": [1, 16], "x": 16.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "w": 1.75, "x": 11.75, "y": 2 },
+                { "matrix": [2, 14], "x": 14.5, "y": 2 },
+                { "matrix": [2, 15], "x": 15.5, "y": 2 },
+                { "matrix": [2, 16], "x": 16.5, "y": 2 },
+                { "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 2, "y": 3 },
+                { "matrix": [3, 2], "x": 3, "y": 3 },
+                { "matrix": [3, 3], "x": 4, "y": 3 },
+                { "matrix": [3, 4], "x": 5, "y": 3 },
+                { "matrix": [3, 5], "x": 6, "y": 3 },
+                { "matrix": [3, 6], "x": 7, "y": 3 },
+                { "matrix": [3, 7], "x": 8, "y": 3 },
+                { "matrix": [3, 8], "x": 9, "y": 3 },
+                { "matrix": [3, 9], "x": 10, "y": 3 },
+                { "matrix": [3, 11], "w": 1.75, "x": 11, "y": 3 },
+                { "matrix": [3, 12], "x": 13, "y": 3.25 },
+                { "matrix": [3, 14], "x": 14.5, "y": 3 },
+                { "matrix": [3, 15], "x": 15.5, "y": 3 },
+                { "matrix": [3, 16], "x": 16.5, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 },
+                { "matrix": [4, 6], "w": 2.75, "x": 6.5, "y": 4 },
+                { "matrix": [4, 8], "w": 1.25, "x": 9.25, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10.5, "y": 4 },
+                { "matrix": [4, 11], "x": 12, "y": 4.25 },
+                { "matrix": [4, 12], "x": 13, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
+                { "matrix": [4, 15], "x": 15.5, "y": 4 },
+                { "matrix": [4, 16], "x": 16.5, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/commissions/mini1800/keymaps/default/keymap.c b/keyboards/enviousdesign/commissions/mini1800/keymaps/default/keymap.c
new file mode 100644
index 000000000000..c095531fe6a1
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,    KC_PGUP, KC_PGDN, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,             KC_7,    KC_8,    KC_9,
+        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,                       KC_4,    KC_5,    KC_6,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_SLSH, KC_RSFT,               KC_UP,          KC_1,    KC_2,    KC_3,
+        KC_LCTL, KC_LGUI, KC_LALT,          LT(1,KC_SPC),     KC_SPC,           KC_RALT, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT,        KC_0,    LT(1,KC_DOT)
+    ),
+
+    [1] = LAYOUT(
+        KC_PWR,  KC_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_HOME, KC_END,  KC_MSTP,
+        KC_CAPS, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_PAUS, KC_PSCR, KC_RBRC, KC_SLEP,             KC_P7,   KC_P8,   KC_P9,
+        KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,                      KC_P4,   KC_P5,   KC_P6,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_TRNS, KC_TRNS, KC_DOT,  KC_TRNS,               KC_VOLU,        KC_P1,   KC_P2,   KC_P3,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_MPLY,          KC_TRNS, KC_TRNS,               KC_MPRV, KC_VOLD, KC_MNXT,        KC_P0,   KC_PDOT
+    ),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,
+        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/enviousdesign/commissions/mini1800/keymaps/via/keymap.c b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/keymap.c
new file mode 100644
index 000000000000..c095531fe6a1
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,    KC_PGUP, KC_PGDN, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_BSPC,             KC_7,    KC_8,    KC_9,
+        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,                       KC_4,    KC_5,    KC_6,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_SLSH, KC_RSFT,               KC_UP,          KC_1,    KC_2,    KC_3,
+        KC_LCTL, KC_LGUI, KC_LALT,          LT(1,KC_SPC),     KC_SPC,           KC_RALT, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT,        KC_0,    LT(1,KC_DOT)
+    ),
+
+    [1] = LAYOUT(
+        KC_PWR,  KC_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_HOME, KC_END,  KC_MSTP,
+        KC_CAPS, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_PAUS, KC_PSCR, KC_RBRC, KC_SLEP,             KC_P7,   KC_P8,   KC_P9,
+        KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,                      KC_P4,   KC_P5,   KC_P6,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_TRNS, KC_TRNS, KC_DOT,  KC_TRNS,               KC_VOLU,        KC_P1,   KC_P2,   KC_P3,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_MPLY,          KC_TRNS, KC_TRNS,               KC_MPRV, KC_VOLD, KC_MNXT,        KC_P0,   KC_PDOT
+    ),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, QK_BOOT,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,
+        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/enviousdesign/commissions/mini1800/keymaps/via/rules.mk b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/commissions/mini1800/mini1800.c b/keyboards/enviousdesign/commissions/mini1800/mini1800.c
new file mode 100644
index 000000000000..f35be22d1342
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/mini1800.c
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "quantum.h"
+
+void matrix_init_user(void) {
+  setPinOutput(GP9); //init gpio
+  writePinLow(GP9);
+  setPinOutput(GP11); //init and turn off inverted power led
+  writePinHigh(GP11);
+}
+
+//layer, capslock and numlock
+layer_state_t layer_state_set_user(layer_state_t state) {
+	writePin(GP9, layer_state_cmp(state, 1));
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    led_state.num_lock = !led_state.num_lock;
+    led_update_ports(led_state);
+    return false;
+}
+
diff --git a/keyboards/enviousdesign/commissions/mini1800/readme.md b/keyboards/enviousdesign/commissions/mini1800/readme.md
new file mode 100644
index 000000000000..874cbcec6093
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/readme.md
@@ -0,0 +1,27 @@
+# mini1800
+
+![mini1800](https://i.imgur.com/t55hjq8.jpeg)
+
+*A mini1800 layout commission keyboard for LASERman71 utilising the RP2040 MCU*
+
+* Keyboard Maintainer: [Adam](https://github.com/envious-data)
+* Hardware Supported: *Onboard RP2040 MCU*
+* Hardware Availability: *None Yet*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/commissions/mini1800:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/commissions/mini1800:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+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 `QK_BOOT` if it is available
diff --git a/keyboards/enviousdesign/commissions/mini1800/rules.mk b/keyboards/enviousdesign/commissions/mini1800/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/readme.md b/keyboards/enviousdesign/delirium/readme.md
new file mode 100644
index 000000000000..157a960303e7
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/readme.md
@@ -0,0 +1,32 @@
+# EnvKB DELIRIUM
+
+![Image of EnvKB TKL PCB](https://i.imgur.com/a7UaS4mh.png)
+
+A low cost standard TKL design which takes inspiration from the CFTKB Mysterium. All versions are designed for reference Pi Picos.
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: 
+  * Delirium Prototype (`tkl/rev0`)
+  * Delirium (`tkl/rev1`)
+  * Delirium RGB (`tkl/rgb`)
+* Hardware Availability: [Mechboards](https://mechboards.co.uk/products/envkb-delirium-tkl-kit), [GitHub](https://github.com/Envious-Data/Env-KB)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/tkl/rgb:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/tkl/rgb:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the Esc key.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
diff --git a/keyboards/enviousdesign/delirium/rev0/info.json b/keyboards/enviousdesign/delirium/rev0/info.json
new file mode 100644
index 000000000000..f1eb3dc59b04
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev0/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Delirium Prototype",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP20", "GP21", "GP22", "GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xA100",
+        "vid": "0xE739"
+    },
+    "community_layouts": ["tkl_iso"],
+    "layouts": {
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5},
+                {"label": "3,14", "matrix": [2, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "5,6", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/delirium/rev0/keymaps/default/keymap.c b/keyboards/enviousdesign/delirium/rev0/keymaps/default/keymap.c
new file mode 100644
index 000000000000..1e0e273fa42a
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev0/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_tkl_iso(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_iso(
+        QK_BOOTLOADER,    KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,   KC_MUTE, KC_VOLD, KC_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,           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/enviousdesign/delirium/rev0/rules.mk b/keyboards/enviousdesign/delirium/rev0/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev0/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rev1/info.json b/keyboards/enviousdesign/delirium/rev1/info.json
new file mode 100644
index 000000000000..e548d0281417
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/info.json
@@ -0,0 +1,305 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Delirium",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP20", "GP21", "GP22", "GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA500",
+        "vid": "0xE739"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "AltGr", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "AltGr", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "AltGr", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/delirium/rev1/keymaps/default/keymap.c b/keyboards/enviousdesign/delirium/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..02a2b616efba
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_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_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOTLOADER,    KC_F13,   KC_F14, KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLD, KC_VOLU,
+	    
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                             KC_TRNS, KC_APP,           KC_TRNS, KC_EXEC,  KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/enviousdesign/delirium/rev1/keymaps/via/keymap.c b/keyboards/enviousdesign/delirium/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..02a2b616efba
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_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_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOTLOADER,    KC_F13,   KC_F14, KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLD, KC_VOLU,
+	    
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                             KC_TRNS, KC_APP,           KC_TRNS, KC_EXEC,  KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/enviousdesign/delirium/rev1/keymaps/via/rules.mk b/keyboards/enviousdesign/delirium/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/delirium/rev1/rules.mk b/keyboards/enviousdesign/delirium/rev1/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rgb/info.json b/keyboards/enviousdesign/delirium/rgb/info.json
new file mode 100644
index 000000000000..ad7d45d3cf75
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/info.json
@@ -0,0 +1,239 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Delirium RGB",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP20", "GP21", "GP22", "GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 64,
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "multisplash": true
+        },
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 123, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 156, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 169, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 182, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 198, "y": 0, "flags": 4},
+            {"matrix": [0, 16], "x": 211, "y": 0, "flags": 4},
+            {"matrix": [0, 17], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
+            {"matrix": [1, 1], "x": 13, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 26, "y": 17, "flags": 4},
+            {"matrix": [1, 3], "x": 39, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 5], "x": 65, "y": 17, "flags": 4},
+            {"matrix": [1, 6], "x": 78, "y": 17, "flags": 4},
+            {"matrix": [1, 7], "x": 91, "y": 17, "flags": 4},
+            {"matrix": [1, 8], "x": 104, "y": 17, "flags": 4},
+            {"matrix": [1, 9], "x": 117, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 130, "y": 17, "flags": 4},
+            {"matrix": [1, 11], "x": 143, "y": 17, "flags": 4},
+            {"matrix": [1, 12], "x": 156, "y": 17, "flags": 4},
+            {"matrix": [1, 14], "x": 175, "y": 17, "flags": 4},
+            {"matrix": [1, 15], "x": 198, "y": 17, "flags": 4},
+            {"matrix": [1, 16], "x": 211, "y": 17, "flags": 4},
+            {"matrix": [1, 17], "x": 224, "y": 17, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 29, "flags": 4},
+            {"matrix": [2, 2], "x": 19, "y": 29, "flags": 4},
+            {"matrix": [2, 3], "x": 32, "y": 29, "flags": 4},
+            {"matrix": [2, 4], "x": 45, "y": 29, "flags": 4},
+            {"matrix": [2, 5], "x": 58, "y": 29, "flags": 4},
+            {"matrix": [2, 6], "x": 71, "y": 29, "flags": 4},
+            {"matrix": [2, 7], "x": 84, "y": 29, "flags": 4},
+            {"matrix": [2, 8], "x": 97, "y": 29, "flags": 4},
+            {"matrix": [2, 9], "x": 110, "y": 29, "flags": 4},
+            {"matrix": [2, 10], "x": 123, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 136, "y": 29, "flags": 4},
+            {"matrix": [2, 12], "x": 149, "y": 29, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 29, "flags": 4},
+            {"matrix": [3, 14], "x": 175, "y": 29, "flags": 4},
+            {"matrix": [2, 15], "x": 198, "y": 29, "flags": 4},
+            {"matrix": [2, 16], "x": 211, "y": 29, "flags": 4},
+            {"matrix": [2, 17], "x": 224, "y": 29, "flags": 4},
+            {"matrix": [3, 0], "x": 5, "y": 41, "flags": 8},
+            {"matrix": [3, 2], "x": 23, "y": 41, "flags": 4},
+            {"matrix": [3, 3], "x": 36, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 49, "y": 41, "flags": 4},
+            {"matrix": [3, 5], "x": 62, "y": 41, "flags": 4},
+            {"matrix": [3, 6], "x": 75, "y": 41, "flags": 4},
+            {"matrix": [3, 7], "x": 88, "y": 41, "flags": 4},
+            {"matrix": [3, 8], "x": 101, "y": 41, "flags": 4},
+            {"matrix": [3, 9], "x": 114, "y": 41, "flags": 4},
+            {"matrix": [3, 10], "x": 127, "y": 41, "flags": 4},
+            {"matrix": [3, 11], "x": 140, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 153, "y": 41, "flags": 4},
+            {"matrix": [3, 13], "x": 166, "y": 41, "flags": 4},
+            {"matrix": [4, 0], "x": 2, "y": 52, "flags": 4},
+            {"matrix": [4, 1], "x": 16, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 170, "y": 52, "flags": 4},
+            {"matrix": [4, 16], "x": 211, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 18, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 34, "y": 64, "flags": 4},
+            {"matrix": [5, 6], "x": 83, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 131, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 148, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 164, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 180, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 198, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 211, "y": 64, "flags": 4},
+            {"matrix": [5, 17], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA400",
+        "vid": "0xE739"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP0"
+    },
+    "community_layouts": ["tkl_iso"],
+    "layouts": {
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
+                {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0, "w": 1},
+                {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0, "w": 1},
+                {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0, "w": 1},
+                {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0, "w": 1},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0, "w": 1},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0, "w": 1},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0, "w": 1},
+                {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 1},
+                {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0, "w": 1},
+                {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0, "w": 1},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5, "w": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5, "w": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5, "w": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5, "w": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5, "w": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5, "w": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5, "w": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5, "w": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5, "w": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5, "w": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5, "w": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5, "w": 1},
+                {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5, "w": 1},
+                {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5, "w": 1},
+                {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5, "w": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5, "w": 1},
+                {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5, "w": 1},
+                {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5, "w": 1},
+                {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5, "w": 1},
+                {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5, "w": 1},
+                {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5, "w": 1},
+                {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5, "w": 1},
+                {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5, "w": 1},
+                {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5, "w": 1},
+                {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5, "w": 1},
+                {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5, "w": 1},
+                {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5, "w": 1},
+                {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5, "w": 1},
+                {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5, "w": 1},
+                {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5, "w": 1},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5, "w": 1},
+                {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5, "w": 1},
+                {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5, "w": 1},
+                {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5, "w": 1},
+                {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5, "w": 1},
+                {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5, "w": 1},
+                {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5, "w": 1},
+                {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5, "w": 1},
+                {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5, "w": 1},
+                {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5, "w": 1},
+                {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5, "w": 1},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 1},
+                {"label": "3,14", "matrix": [3, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5, "w": 1},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5, "w": 1},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5, "w": 1},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5, "w": 1},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5, "w": 1},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5, "w": 1},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5, "w": 1},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5, "w": 1},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5, "w": 1},
+                {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5, "w": 1},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "5,6", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5, "w": 1},
+                {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5, "w": 1},
+                {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5, "w": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/enviousdesign/delirium/rgb/keymaps/default/keymap.c b/keyboards/enviousdesign/delirium/rgb/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d791874aff03
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_tkl_iso(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+        KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_iso(
+        QK_BOOTLOADER,    KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLD, KC_VOLU,
+	    
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_SAI, RGB_VAI,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_RMOD,RGB_SAD, RGB_VAD,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_SPI,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                             KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, RGB_HUI, RGB_SPD, RGB_HUD
+    )
+};
+
diff --git a/keyboards/enviousdesign/delirium/rgb/rgb.c b/keyboards/enviousdesign/delirium/rgb/rgb.c
new file mode 100644
index 000000000000..e6a3354b299e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/rgb.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(50, 16, 16, 16); // assuming caps lock is at led #50
+    } 
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(14, 16, 16, 16); // assuming scroll lock is at led #14
+    }
+    if (get_highest_layer(layer_state) == 1) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(83, 16, 16 ,16);
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/enviousdesign/delirium/rgb/rules.mk b/keyboards/enviousdesign/delirium/rgb/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/mcro/readme.md b/keyboards/enviousdesign/mcro/readme.md
new file mode 100644
index 000000000000..378fab8c3efa
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/readme.md
@@ -0,0 +1,30 @@
+# EnvKB MCRO
+
+![Image of EnvKB MCRO PCB](https://i.imgur.com/QnANWnBh.png)
+
+A small 12 Key macro pad for various uses
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: EnvKB MCRO (Pi Pico)
+* Hardware Availability: [GitHub](https://github.com/Envious-Data/Env-MCRO)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/mcro:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/mcro:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+
diff --git a/keyboards/enviousdesign/mcro/rev1/info.json b/keyboards/enviousdesign/mcro/rev1/info.json
new file mode 100644
index 000000000000..fe6a4ffe77c8
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/info.json
@@ -0,0 +1,44 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "MCRO",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP18", "GP19", "GP20", "GP21"],
+        "rows": ["GP4", "GP11", "GP15"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA300",
+        "vid": "0xE739"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x4": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
+                {"label": "F17", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1},
+                {"label": "F18", "matrix": [1, 1], "x": 1, "y": 1.25, "w": 1},
+                {"label": "F19", "matrix": [1, 2], "x": 2, "y": 1.25, "w": 1},
+                {"label": "F20", "matrix": [1, 3], "x": 3, "y": 1.25, "w": 1},
+                {"label": "F21", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1},
+                {"label": "F22", "matrix": [2, 1], "x": 1, "y": 2.5, "w": 1},
+                {"label": "F23", "matrix": [2, 2], "x": 2, "y": 2.5, "w": 1},
+                {"label": "F24", "matrix": [2, 3], "x": 3, "y": 2.5, "w": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/mcro/rev1/keymaps/default/keymap.c b/keyboards/enviousdesign/mcro/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e9def4a38fcf
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_ortho_3x4(
+         KC_F13, KC_F14, KC_F15, KC_F16,
+         KC_F17, KC_F18, KC_F19, KC_F20,
+         KC_F21, KC_F22, KC_F23, KC_F24
+    )
+};
+
diff --git a/keyboards/enviousdesign/mcro/rev1/keymaps/via/keymap.c b/keyboards/enviousdesign/mcro/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..35b46697c141
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_ortho_3x4(
+        KC_F13, KC_F14, KC_F15, KC_F16,
+        KC_F17, KC_F18, KC_F19, KC_F20,
+        KC_F21, KC_F22, KC_F23, KC_F24
+    )
+};
+
diff --git a/keyboards/enviousdesign/mcro/rev1/keymaps/via/rules.mk b/keyboards/enviousdesign/mcro/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/mcro/rev1/rules.mk b/keyboards/enviousdesign/mcro/rev1/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/era/sirind/klein_hs/config.h b/keyboards/era/sirind/klein_hs/config.h
new file mode 100644
index 000000000000..bbd438736357
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 eerraa
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* BACKLIGHT PWM */
+#define BACKLIGHT_PWM_DRIVER PWMD7
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/halconf.h b/keyboards/era/sirind/klein_hs/halconf.h
new file mode 100644
index 000000000000..f57e86df018d
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 eerraa
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/info.json b/keyboards/era/sirind/klein_hs/info.json
new file mode 100644
index 000000000000..6d677f6748d1
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/info.json
@@ -0,0 +1,467 @@
+{
+    "manufacturer": "SIRIND",
+    "keyboard_name": "Klein_HS",
+    "maintainer": "eerraa",
+    "backlight": {
+        "levels": 5,
+        "pin": "GP15"
+    },
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+    },
+    "indicators": {
+        "caps_lock": "GP16",
+        "on_state": 0,
+        "scroll_lock": "GP17"
+    },
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP24", "GP25", "GP26", "GP27", "GP28", "GP29", "GP11", "GP10", "GP9", "GP8", "GP7", "GP1", "GP2", "GP3"],
+        "rows": ["GP18", "GP19", "GP20", "GP21", "GP14", "GP5", "GP6", "GP4", "GP13", "GP12"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x4552"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "x": 17.75, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "x": 16.75, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 2.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "x": 17.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "x": 16.75, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "x": 17, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 2.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "x": 17.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rsft": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "x": 17.75, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "x": 17.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_arrow_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "x": 17, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/keymaps/default/keymap.c b/keyboards/era/sirind/klein_hs/keymaps/default/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2018-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,
+        KC_PGUP,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_PGDN,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,
+                  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,               KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+                  KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),                        KC_SPC,             KC_RALT,            KC_LEFT,  KC_DOWN,  KC_RCTL
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_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_LSFT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                  KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/keymaps/via/keymap.c b/keyboards/era/sirind/klein_hs/keymaps/via/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2018-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,
+        KC_PGUP,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_PGDN,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,
+                  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,               KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+                  KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),                        KC_SPC,             KC_RALT,            KC_LEFT,  KC_DOWN,  KC_RCTL
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_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_LSFT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                  KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/keymaps/via/rules.mk b/keyboards/era/sirind/klein_hs/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/mcuconf.h b/keyboards/era/sirind/klein_hs/mcuconf.h
new file mode 100644
index 000000000000..b82cc49d7d07
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 eerraa
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM7
+#define RP_PWM_USE_PWM7 TRUE
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/readme.md b/keyboards/era/sirind/klein_hs/readme.md
new file mode 100644
index 000000000000..86343271bbd2
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/readme.md
@@ -0,0 +1,23 @@
+# Mont Cervin Klein
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: SIRIND Klein_HS
+* Hardware availability: [Syryan](https://srind.mysoho.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/sirind/klein_hs:default
+
+Flashing example for this keyboard:
+
+    make era/sirind/klein_hs: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 ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/rules.mk b/keyboards/era/sirind/klein_hs/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/era/sirind/klein_sd/config.h b/keyboards/era/sirind/klein_sd/config.h
new file mode 100644
index 000000000000..ae1d4a9e1d0f
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 eerraa
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* BACKLIGHT PWM */
+#define BACKLIGHT_PWM_DRIVER PWMD7
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
+
+/* RGB Matrix */
+#define RGB_MATRIX_DEFAULT_VAL 60
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/halconf.h b/keyboards/era/sirind/klein_sd/halconf.h
new file mode 100644
index 000000000000..f57e86df018d
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 eerraa
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/info.json b/keyboards/era/sirind/klein_sd/info.json
new file mode 100644
index 000000000000..53f89f2cb704
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/info.json
@@ -0,0 +1,588 @@
+{
+    "manufacturer": "SIRIND",
+    "keyboard_name": "Klein_SD",
+    "maintainer": "eerraa",
+    "backlight": {
+        "pin": "GP15"
+    },
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "GP16",
+        "on_state": 0,
+        "scroll_lock": "GP17"
+    },
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP24", "GP25", "GP26", "GP27", "GP28", "GP29", "GP11", "GP10", "GP9", "GP7", "GP6", "GP5", "GP4", "GP3"],
+        "rows": ["GP18", "GP19", "GP20", "GP21", "GP14", "GP2", "GP1", "GP8", "GP12", "GP13"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 7], "x": 97, "y": 10, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 8, "flags": 4},
+            {"matrix": [0, 5], "x": 72, "y": 5, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 3, "flags": 4},
+            {"matrix": [0, 3], "x": 46, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 2, "flags": 4},
+            {"matrix": [0, 1], "x": 20, "y": 2, "flags": 4},
+            {"matrix": [0, 0], "x": 4, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 1, "y": 13, "flags": 1},
+            {"matrix": [1, 1], "x": 21, "y": 15, "flags": 1},
+            {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 50, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 63, "y": 17, "flags": 4},
+            {"matrix": [1, 5], "x": 76, "y": 20, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 22, "flags": 4},
+            {"matrix": [1, 7], "x": 101, "y": 24, "flags": 4},
+            {"matrix": [2, 6], "x": 90, "y": 36, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 33, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 31, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 29, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 29, "flags": 4},
+            {"matrix": [2, 1], "x": 18, "y": 29, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 27, "flags": 1},
+            {"matrix": [3, 1], "x": 21, "y": 42, "flags": 1},
+            {"matrix": [3, 2], "x": 42, "y": 42, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 43, "flags": 4},
+            {"matrix": [3, 4], "x": 68, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 81, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 93, "y": 50, "flags": 4},
+            {"matrix": [4, 6], "x": 97, "y": 64, "flags": 1},
+            {"matrix": [4, 5], "x": 77, "y": 60, "flags": 4},
+            {"matrix": [4, 3], "x": 53, "y": 57, "flags": 1},
+            {"matrix": [4, 1], "x": 16, "y": 55, "flags": 1},
+            {"matrix": [0, 8], "x": 130, "y": 9, "flags": 4},
+            {"matrix": [0, 9], "x": 143, "y": 7, "flags": 4},
+            {"matrix": [0, 10], "x": 156, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 2, "flags": 4},
+            {"matrix": [0, 12], "x": 182, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 195, "y": 2, "flags": 4},
+            {"matrix": [0, 15], "x": 214, "y": 2, "flags": 1},
+            {"matrix": [1, 15], "x": 220, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 191, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 178, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 164, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 152, "y": 18, "flags": 4},
+            {"matrix": [1, 9], "x": 139, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 126, "y": 23, "flags": 4},
+            {"matrix": [2, 8], "x": 131, "y": 36, "flags": 4},
+            {"matrix": [2, 9], "x": 144, "y": 33, "flags": 4},
+            {"matrix": [2, 10], "x": 156, "y": 31, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 29, "flags": 4},
+            {"matrix": [2, 12], "x": 182, "y": 29, "flags": 4},
+            {"matrix": [2, 13], "x": 195, "y": 29, "flags": 4},
+            {"matrix": [2, 15], "x": 216, "y": 29, "flags": 1},
+            {"matrix": [3, 15], "x": 216, "y": 42, "flags": 1},
+            {"matrix": [3, 13], "x": 192, "y": 42, "flags": 4},
+            {"matrix": [3, 12], "x": 179, "y": 42, "flags": 4},
+            {"matrix": [3, 11], "x": 166, "y": 43, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 140, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 128, "y": 50, "flags": 4},
+            {"matrix": [4, 9], "x": 141, "y": 61, "flags": 4},
+            {"matrix": [4, 11], "x": 168, "y": 57, "flags": 1},
+            {"matrix": [4, 13], "x": 192, "y": 55, "flags": 1},
+            {"matrix": [4, 14], "x": 205, "y": 55, "flags": 1},
+            {"matrix": [4, 15], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0005",
+        "vid": "0x4552"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "x": 17.75, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "x": 16.75, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 2.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "x": 17.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "x": 16.75, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "x": 17, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 2.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "x": 17.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rsft": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "x": 17.75, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "x": 17.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_arrow_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "x": 17.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [6, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [7, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [8, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "x": 17, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/keymaps/default/keymap.c b/keyboards/era/sirind/klein_sd/keymaps/default/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2018-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,
+        KC_PGUP,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_PGDN,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,
+                  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,               KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+                  KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),                        KC_SPC,             KC_RALT,            KC_LEFT,  KC_DOWN,  KC_RCTL
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_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_LSFT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                  KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/keymaps/via/keymap.c b/keyboards/era/sirind/klein_sd/keymaps/via/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2018-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,
+        KC_PGUP,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_PGDN,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,
+                  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,               KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+                  KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),                        KC_SPC,             KC_RALT,            KC_LEFT,  KC_DOWN,  KC_RCTL
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_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_LSFT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                  KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/keymaps/via/rules.mk b/keyboards/era/sirind/klein_sd/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/mcuconf.h b/keyboards/era/sirind/klein_sd/mcuconf.h
new file mode 100644
index 000000000000..b82cc49d7d07
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 eerraa
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM7
+#define RP_PWM_USE_PWM7 TRUE
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/readme.md b/keyboards/era/sirind/klein_sd/readme.md
new file mode 100644
index 000000000000..a021b843d787
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/readme.md
@@ -0,0 +1,23 @@
+# Mont Cervin Klein
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: SIRIND Klein_SD
+* Hardware availability: [Syryan](https://srind.mysoho.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/sirind/klein_sd:default
+
+Flashing example for this keyboard:
+
+    make era/sirind/klein_sd: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 ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/rules.mk b/keyboards/era/sirind/klein_sd/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/etiennecollin/wave/info.json b/keyboards/etiennecollin/wave/info.json
new file mode 100644
index 000000000000..5e31a1ca2afd
--- /dev/null
+++ b/keyboards/etiennecollin/wave/info.json
@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "Wave",
+    "maintainer": "etiennecollin",
+    "manufacturer": "Etienne Collin",
+    "url": "https://github.com/etiennecollin/wave",
+    "bootloader_instructions": "Press the button marked RESET on the PCB or bridge the pins marked RST and GND on the Elite-C",
+    "tags": ["ortho", "split"],
+
+    "build": {
+        "lto": true
+    },
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
+    "usb": {
+        "device_version": "0.0.1",
+        "vid": "0x6967",
+        "pid": "0x0000"
+    },
+
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D4", "D0", "D1", "D3"],
+            ["B6", "B5", "B4", "E6", "D7"],
+            ["F6", "F7", "B1", "B3", "B2"],
+            ["NO_PIN", "NO_PIN", "F5", "F4", "B0"]
+        ]
+    },
+    "community_layouts": ["split_3x5_3"],
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "usb_detect": {
+            "enabled": true
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["D3", "D1", "D0", "D4", "C6"],
+                    ["D7", "E6", "B4", "B5", "B6"],
+                    ["B2", "B3", "B1", "F7", "F6"],
+                    ["B0", "F4", "F5", "NO_PIN", "NO_PIN"]
+                ]
+            }
+        }
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.93 },
+                { "matrix": [0, 1], "x": 1, "y": 0.31 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.28 },
+                { "matrix": [0, 4], "x": 4, "y": 0.42 },
+
+                { "matrix": [4, 0], "x": 7, "y": 0.42 },
+                { "matrix": [4, 1], "x": 8, "y": 0.28 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 3], "x": 10, "y": 0.31 },
+                { "matrix": [4, 4], "x": 11, "y": 0.93 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1.93 },
+                { "matrix": [1, 1], "x": 1, "y": 1.31 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.28 },
+                { "matrix": [1, 4], "x": 4, "y": 1.42 },
+
+                { "matrix": [5, 0], "x": 7, "y": 1.42 },
+                { "matrix": [5, 1], "x": 8, "y": 1.28 },
+                { "matrix": [5, 2], "x": 9, "y": 1 },
+                { "matrix": [5, 3], "x": 10, "y": 1.31 },
+                { "matrix": [5, 4], "x": 11, "y": 1.93 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2.93 },
+                { "matrix": [2, 1], "x": 1, "y": 2.31 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2.28 },
+                { "matrix": [2, 4], "x": 4, "y": 2.42 },
+
+                { "matrix": [6, 0], "x": 7, "y": 2.42 },
+                { "matrix": [6, 1], "x": 8, "y": 2.28 },
+                { "matrix": [6, 2], "x": 9, "y": 2 },
+                { "matrix": [6, 3], "x": 10, "y": 2.31 },
+                { "matrix": [6, 4], "x": 11, "y": 2.93 },
+
+                { "matrix": [3, 2], "x": 2.8, "y": 3.5 },
+                { "matrix": [3, 3], "x": 3.8, "y": 3.75 },
+                { "matrix": [3, 4], "x": 4.8, "y": 3.5, "h": 1.5 },
+
+                { "matrix": [7, 0], "x": 6.2, "y": 3.5, "h": 1.5 },
+                { "matrix": [7, 1], "x": 7.2, "y": 3.75 },
+                { "matrix": [7, 2], "x": 8.2, "y": 3.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/etiennecollin/wave/keymaps/default/config.h b/keyboards/etiennecollin/wave/keymaps/default/config.h
new file mode 100644
index 000000000000..8d60295560f3
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/default/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2023 Etienne Collin (@etiennecollin)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Activate caps word by pressing Left Shift + Right Shift
+#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
+
+// Enable rapid switch from tap to hold, disables double tap hold auto-repeat
+#define QUICK_TAP_TERM 0
+
+// Maximum time between taps of tap dances
+#define TAPPING_TERM 175
+
+// Perform hold action if pressing a dual-role key, tapping another key and
+// releasing the dual-role key withing tapping term
+#define PERMISSIVE_HOLD
+
+// Perform hold action if pressing a dual-role key, pressing another key,
+// releasing the dual-role key and releasing the other key withing tapping term
+#define HOLD_ON_OTHER_KEY_PRESS
\ No newline at end of file
diff --git a/keyboards/etiennecollin/wave/keymaps/default/keymap.json b/keyboards/etiennecollin/wave/keymaps/default/keymap.json
new file mode 100644
index 000000000000..993a1b854c12
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/default/keymap.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "author": "etiennecollin",
+    "keyboard": "etiennecollin/wave",
+    "notes": "This is a keymap file for etiennecollin/wave",
+    "keymap": "default",
+    "layout": "LAYOUT_split_3x5_3",
+    "config": {
+        "features": {
+            "caps_word": true
+        }
+    },
+    "layers": [
+        [
+            "KC_Q",         "KC_W",         "KC_E",         "KC_R",         "KC_T",     "KC_Y",    "KC_U",          "KC_I",         "KC_O",         "KC_P",
+            "LGUI_T(KC_A)", "LALT_T(KC_S)", "LCTL_T(KC_D)", "LSFT_T(KC_F)", "KC_G",     "KC_H",    "LSFT_T(KC_J)",  "LCTL_T(KC_K)", "LALT_T(KC_L)", "LGUI_T(KC_SCLN)",
+            "KC_Z",         "KC_X",         "KC_C",         "KC_V",         "KC_B",     "KC_N",    "KC_M",          "KC_COMM",      "KC_DOT",       "KC_SLSH",
+                            "KC_ESC",       "KC_SPC",       "KC_TAB",       "KC_ENT",   "KC_BSPC", "MO(1)"
+        ],
+        [
+            "KC_1",         "KC_2",         "KC_3",         "KC_4",         "KC_5",     "KC_6",    "KC_7",          "KC_8",         "KC_9",         "KC_0",
+            "KC_EXLM",      "KC_AT",        "KC_HASH",      "KC_DLR",       "KC_PERC",  "KC_CIRC", "KC_AMPR",       "KC_ASTR",      "KC_LPRN",      "KC_RPRN",
+            "XXXXXXX",      "XXXXXXX",      "XXXXXXX",      "XXXXXXX",      "XXXXXXX",  "XXXXXXX", "XXXXXXX",       "XXXXXXX",      "XXXXXXX",      "XXXXXXX",
+                            "XXXXXXX",      "XXXXXXX",      "XXXXXXX",      "XXXXXXX",  "XXXXXXX", "_______"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/etiennecollin/wave/keymaps/default/readme.md b/keyboards/etiennecollin/wave/keymaps/default/readme.md
new file mode 100644
index 000000000000..16586cc1f7eb
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/default/readme.md
@@ -0,0 +1,6 @@
+# Default keymap
+
+This is a really simple QWERTY keymap with a single number/symbol layer.
+It uses home row modifiers and the caps word feature because of the limited number of keys.
+
+For a more complete layout, see the `feature` layout.
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/config.h b/keyboards/etiennecollin/wave/keymaps/feature/config.h
new file mode 100644
index 000000000000..42421b33d396
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/config.h
@@ -0,0 +1,42 @@
+/* Copyright 2023 Etienne Collin (@etiennecollin)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// Activate caps word by pressing Left Shift + Right Shift
+#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
+
+// Maximum time between taps of tap dances
+#define TAPPING_TERM 175
+
+// Max time between taps to prevent hold function and hold auto-repeat
+#define QUICK_TAP_TERM 100
+
+// Perform hold action if pressing a dual-role key, tapping another key and
+// releasing the dual-role key withing tapping term
+#define PERMISSIVE_HOLD
+
+// Mouse key speed and acceleration.
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_INTERVAL       16
+#define MOUSEKEY_WHEEL_DELAY    0
+#define MOUSEKEY_MAX_SPEED      6
+#define MOUSEKEY_TIME_TO_MAX    64
+
+// Thumb Combos
+#define COMBO_COUNT 2
+#define COMBO_TERM 200
+#define EXTRA_SHORT_COMBOS
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/keymap.c b/keyboards/etiennecollin/wave/keymaps/feature/keymap.c
new file mode 100644
index 000000000000..24bc85d5b499
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/keymap.c
@@ -0,0 +1,191 @@
+/* Copyright 2023 Etienne Collin (@etiennecollin)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    COL,
+    QWE,
+    GAM,
+    MED,
+    NAV,
+    MOS,
+    SYM,
+    NUM,
+    FUN,
+    SYS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [COL] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |   q   |   w   |   f   |   p   |   b   |                    |   j   |   l   |   u   |   y   |   '   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |   a   |   r   |   s   |   t   |   g   |                    |   m   |   n   |   e   |   i   |   o   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |   z   |   x   |   c   |   d   |   v   |                    |   k   |   h   |   ,   |   .   |   /   |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |  esc  |  spc  |  tab  |                    |  ent  |  bsp  |  del  |
+  //                 --------+-------+--------                    --------+-------+--------
+    KC_Q,               KC_W,               KC_F,               KC_P,               KC_B,               KC_J,               KC_L,               KC_U,               KC_Y,               KC_QUOT,
+    LGUI_T(KC_A),       LALT_T(KC_R),       LCTL_T(KC_S),       LSFT_T(KC_T),       KC_G,               KC_M,               LSFT_T(KC_N),       LCTL_T(KC_E),       LALT_T(KC_I),       LGUI_T(KC_O),
+    KC_Z,               KC_X,               KC_C,               KC_D,               KC_V,               KC_K,               KC_H,               KC_COMM,            KC_DOT,             KC_SLSH,
+                                            LT(MED, KC_ESC),    LT(NAV, KC_SPC),    LT(MOS, KC_TAB),    LT(SYM, KC_ENT),    LT(NUM, KC_BSPC),    LT(FUN, KC_DEL)
+  ),
+  [QWE] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |   q   |   w   |   e   |   r   |   t   |                    |   y   |   u   |   i   |   o   |   p   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |   a   |   s   |   d   |   f   |   g   |                    |   h   |   j   |   k   |   l   |   '   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |   z   |   x   |   c   |   v   |   b   |                    |   n   |   m   |   ,   |   .   |   /   |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |  esc  |  spc  |  tab  |                    |  ent  |  bsp  |  del  |
+  //                 --------+-------+--------                    --------+-------+--------
+    KC_Q,               KC_W,               KC_E,               KC_R,               KC_T,               KC_Y,               KC_U,               KC_I,               KC_O,               KC_P,
+    LGUI_T(KC_A),       LALT_T(KC_S),       LCTL_T(KC_D),       LSFT_T(KC_F),       KC_G,               KC_H,               LSFT_T(KC_J),       LCTL_T(KC_K),       LALT_T(KC_L),       LGUI_T(KC_QUOT),
+    KC_Z,               KC_X,               KC_C,               KC_V,               KC_B,               KC_N,               KC_M,               KC_COMM,            KC_DOT,             KC_SLSH,
+                                            LT(MED, KC_ESC),    LT(NAV, KC_SPC),    LT(MOS, KC_TAB),    LT(SYM, KC_ENT),    LT(NUM, KC_BSPC),    LT(FUN, KC_DEL)
+  ),
+  [GAM] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |  tab  |   q   |   w   |   e   |   r   |                    |   t   |   y   |   u   |   i   |   o   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  sht  |   a   |   s   |   d   |   f   |                    |   g   |   h   |   j   |   k   |   l   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  ctl  |   z   |   x   |   c   |   v   |                    |   b   |   n   |   m   |   ,   |   .   |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |  alt  |  cps  |  spc  |                    |  ent  |  bsp  |  esc  |
+  //                 --------+-------+--------                    --------+-------+--------
+    KC_TAB,             KC_Q,               KC_W,               KC_E,               KC_R,               KC_T,               KC_Y,               KC_U,               KC_I,               KC_O,
+    KC_LSFT,            KC_A,               KC_S,               KC_D,               KC_F,               KC_G,               KC_H,               KC_J,               KC_K,               KC_L,
+    KC_LCTL,            KC_Z,               KC_X,               KC_C,               KC_V,               KC_B,               KC_N,               KC_M,               KC_COMM,            KC_DOT,
+                                            KC_LALT,            KC_CAPS,            KC_SPC,             LT(SYM, KC_ENT),    LT(NUM, KC_BSPC),   LT(FUN, KC_ESC)
+  ),
+  [MED] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |       |       |       |       |       |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  gui  |  alt  |  ctl  |  sht  |       |                    |       |  prev | vol - | vol + |  next |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |       |       |       |       |       |                    |       |       |       |       |       |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |  ___  |       |       |                    |  stop | pause |  mute |
+  //                 --------+-------+--------                    --------+-------+--------
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+    KC_LGUI,            KC_LALT,            KC_LCTL,            KC_LSFT,            XXXXXXX,            XXXXXXX,            KC_MPRV,            KC_VOLD,            KC_VOLU,            KC_MNXT,
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_MRWD,            XXXXXXX,            XXXXXXX,            KC_MFFD,
+                                            _______,            XXXXXXX,            XXXXXXX,            KC_MSTP,            KC_MPLY,            KC_MUTE
+  ),
+  [NAV] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |       |       |       |       |       |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  gui  |  alt  |  ctl  |  sht  |       |                    |  cps  |   ←   |   ↓   |   ↑   |   →   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |       |       |       |       |       |                    | insrt | home  | pageu | paged |  end  |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |       |  ___  |       |                    |  ent  |  bsp  |  del  |
+  //                 --------+-------+--------                    --------+-------+--------
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+    KC_LGUI,            KC_LALT,            KC_LCTL,            KC_LSFT,            XXXXXXX,            KC_CAPS,            KC_LEFT,            KC_DOWN,            KC_UP,              KC_RGHT,
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_INS,             KC_HOME,            KC_PGDN,            KC_PGUP,            KC_END,
+                                            XXXXXXX,            _______,            XXXXXXX,            KC_ENT,             KC_BSPC,            KC_DEL
+  ),
+  [MOS] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |       |       |       |       |       |                    |       | acc0  | acc1  |  acc2 |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  gui  |  alt  |  ctl  |  sht  |       |                    |       |   ←   |   ↓   |   ↑   |   →   |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |       |       |       |       |       |                    |       |  w←   |  w↓   |  w↑   |  w→   |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |       |       |  ___  |                    | left  | right |  mid  |
+  //                 --------+-------+--------                    --------+-------+--------
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_ACL0,            KC_ACL1,            KC_ACL2,            XXXXXXX,
+    KC_LGUI,            KC_LALT,            KC_LCTL,            KC_LSFT,            XXXXXXX,            XXXXXXX,            KC_MS_L,            KC_MS_D,            KC_MS_U,            KC_MS_R,
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_WH_L,            KC_WH_D,            KC_WH_U,            KC_WH_R,
+                                            XXXXXXX,            XXXXXXX,            _______,            KC_BTN1,            KC_BTN2,            KC_BTN3
+  ),
+  [SYM] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |   {   |   &   |   *   |   (   |   }   |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |   :   |   $   |   %   |   ^   |   +   |                    |       |  sht  |  ctl  |  alt  |  gui  |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |   ~   |   !   |   @   |   #   |   |   |                    |       |       |       |       |       |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |   (   |   )   |   _   |                    |  ___  |       |       |
+  //                 --------+-------+--------                    --------+-------+--------
+    KC_LCBR,            KC_AMPR,            KC_ASTR,            KC_LPRN,            KC_RCBR,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+    KC_COLN,            KC_DLR,             KC_PERC,            KC_CIRC,            KC_PLUS,            XXXXXXX,            KC_LSFT,            KC_LCTL,            KC_LALT,            KC_LGUI,
+    KC_TILD,            KC_EXLM,            KC_AT,              KC_HASH,            KC_PIPE,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+                                            KC_LPRN,            KC_RPRN,            KC_UNDS,            _______,            XXXXXXX,            XXXXXXX
+  ),
+  [NUM] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |  [ {  |  7 &  |  8 *  |  9 (  |  ] }  |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  ; :  |  4 $  |  5 %  |  6 ^  |  = +  |                    |       |  sht  |  ctl  |  alt  |  gui  |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  ` ~  |  1 !  |  2 @  |  3 #  |  \ |  |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |  . >  |  0 )  |  - _  |                    |       |  ___  |       |
+  //                 --------+-------+--------                    --------+-------+--------
+    KC_LBRC,            KC_7,               KC_8,               KC_9,               KC_RBRC,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+    KC_SCLN,            KC_4,               KC_5,               KC_6,               KC_EQL,             XXXXXXX,            KC_LSFT,            KC_LCTL,            KC_LALT,            KC_LGUI,
+    KC_GRV,             KC_1,               KC_2,               KC_3,               KC_BSLS,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+                                            KC_DOT,             KC_0,               KC_MINS,            XXXXXXX,            _______,            XXXXXXX
+  ),
+  [FUN] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // |  F12  |  F 7  |  F 8  |  F 9  | PrScr |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  F11  |  F 4  |  F 5  |  F 6  | pause |                    |       |  sht  |  ctl  |  alt  |  gui  |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |  F10  |  F 1  |  F 2  |  F 3  | scrlk |                    |       |       |       |       |       |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |  app  |  spc  |  tab  |                    |       |       |  ___  |
+  //                 --------+-------+--------                    --------+-------+--------
+    KC_F12,             KC_F7,              KC_F8,              KC_F9,              KC_PSCR,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+    KC_F11,             KC_F4,              KC_F5,              KC_F6,              KC_PAUS,            XXXXXXX,            KC_LSFT,            KC_LCTL,            KC_LALT,            KC_LGUI,
+    KC_F10,             KC_F1,              KC_F2,              KC_F3,              KC_SCRL,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+                                            KC_APP,             KC_SPC,             KC_TAB,             XXXXXXX,            XXXXXXX,            _______
+  ),
+  [SYS] = LAYOUT_split_3x5_3(
+  // -----------------------------------------                    -----------------------------------------
+  // | BOOT  |       | GAME  | QWERT | COLMK |                    | COLMK | QWERT | GAME  |       | BOOT  |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |       |       |       |       |       |                    |       |       |       |       |       |
+  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  // |       |       |       |       |       |                    |       |       |       |       |       |
+  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
+  //                 |       |       |       |                    |       |       |       |
+  //                 --------+-------+--------                    --------+-------+--------
+    QK_BOOT,            XXXXXXX,            DF(GAM),            DF(QWE),            DF(COL),            DF(COL),            DF(QWE),            DF(GAM),            XXXXXXX,            QK_BOOT,
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
+                                            _______,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            _______
+  )
+};
+
+const uint16_t PROGMEM combo_sys[] = {LT(MED, KC_ESC), LT(FUN, KC_DEL), COMBO_END};
+const uint16_t PROGMEM combo_sys_gam[] = {KC_LALT, LT(FUN, KC_ESC), COMBO_END};
+
+combo_t key_combos[] = {
+  COMBO(combo_sys, MO(SYS)),
+  COMBO(combo_sys_gam, MO(SYS))
+};
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/readme.md b/keyboards/etiennecollin/wave/keymaps/feature/readme.md
new file mode 100644
index 000000000000..d9971b352b14
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/readme.md
@@ -0,0 +1,11 @@
+# Feature keymap
+
+This keymap is heavily inspired by the [miryoku](https://github.com/manna-harbour/miryoku) layout.
+
+It defaults to a [COLEMAK mod dh](https://colemakmods.github.io/mod-dh/) layer, but a QWERTY and a gaming layer are available from the `sys` layer.
+
+It uses the following features:
+
+-   Home row modifiers
+-   Usual special layers (`media`, `navigation`, `mouse`, `symbols`, `numbers`, `functions`, `system`)
+-   Combos (to access the `sys` layer by pressing both external thumb keys)
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/rules.mk b/keyboards/etiennecollin/wave/keymaps/feature/rules.mk
new file mode 100644
index 000000000000..96093b82013e
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/rules.mk
@@ -0,0 +1,2 @@
+CAPS_WORD_ENABLE = yes
+COMBO_ENABLE = yes
diff --git a/keyboards/etiennecollin/wave/keymaps/test/keymap.json b/keyboards/etiennecollin/wave/keymaps/test/keymap.json
new file mode 100644
index 000000000000..e73c86727309
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/test/keymap.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "author": "etiennecollin",
+    "keyboard": "etiennecollin/wave",
+    "notes": "This is a keymap file for etiennecollin/wave",
+    "keymap": "test",
+    "layout": "LAYOUT_split_3x5_3",
+    "config": {
+        "features": {
+            "console": true,
+            "debug": true
+        }
+    },
+    "layers": [
+        [
+            "KC_Q", "KC_W", "KC_E",     "KC_R",     "KC_T",         "KC_Y",     "KC_U",     "KC_I",     "KC_O",     "KC_P",
+            "KC_A", "KC_S", "KC_D",     "KC_F",     "KC_G",         "KC_H",     "KC_J",     "KC_K",     "KC_L",     "KC_SCLN",
+            "KC_Z", "KC_X", "KC_C",     "KC_V",     "KC_B",         "KC_N",     "KC_M",     "KC_COMM",  "KC_DOT",   "KC_SLSH",
+                            "KC_ESC",   "KC_SPC",   "KC_TAB",       "KC_ENT",   "KC_BSPC",  "KC_DEL"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/etiennecollin/wave/keymaps/test/readme.md b/keyboards/etiennecollin/wave/keymaps/test/readme.md
new file mode 100644
index 000000000000..3d3400b8f68e
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/test/readme.md
@@ -0,0 +1,4 @@
+# Test keymap
+
+Inspired by the [ferris sweep test keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/test).
+A simple QWERTY keymap used to test the keyboard. As such, it should not be used for other purposes than testing.
diff --git a/keyboards/etiennecollin/wave/readme.md b/keyboards/etiennecollin/wave/readme.md
new file mode 100644
index 000000000000..a66c6f71d3c2
--- /dev/null
+++ b/keyboards/etiennecollin/wave/readme.md
@@ -0,0 +1,37 @@
+# Wave
+
+![Wave pcb](https://i.imgur.com/oWF1Fnr.png)
+
+_The Wave is a small, reversible keyboard inspired by the [Ferris](https://github.com/pierrechevalier83/ferris), the [Ferris Sweep](https://github.com/davidphilipbarr/Sweep), the [Swoop](https://github.com/jimmerricks/swoop) and the [Sweep36](https://github.com/sadekbaroudi/sweep36). It aims to solve a few issues I found with the keyboards._
+
+-   Keyboard Maintainer: [Etienne Collin](https://github.com/etiennecollin)
+-   Hardware Supported: [Wave](https://github.com/etiennecollin/wave)
+-   Hardware Availability: Print the PCB with gerber files from [latest release in the repository](https://github.com/etiennecollin/wave/releases/latest)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make etiennecollin/wave:default
+
+Flashing example for this keyboard:
+
+    make etiennecollin/wave: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).
+
+## Recommended Keymap
+
+For an everyday keyboard, it is recommended to use the `feature` keymap, as the default keymap is extremely barebone. Here is a make example:
+
+    make etiennecollin/wave:feature
+
+Flashing example:
+
+    make etiennecollin/wave:feature:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the top left key of the left half of the keyboard and plug in the keyboard
+-   **Physical reset button**: Briefly press the reset button on the front of the PCB or short the GND and RST pins on the controller
+-   **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/etiennecollin/wave/rules.mk b/keyboards/etiennecollin/wave/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/etiennecollin/wave/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/info.json
new file mode 100644
index 000000000000..6804ce003bea
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/info.json
@@ -0,0 +1,106 @@
+{
+    "manufacturer": "gregandcin",
+    "keyboard_name": "gregandcin/teaqueen",
+    "maintainer": "gregandcin",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "NO_PIN"],
+        "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
+    },
+    "processor": "RP2040",
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "GP21"],
+                "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
+            }
+        },
+        "soft_serial_pin": "GP3"
+    },
+    "url": "https://github.com/gregandcin/teaqueen",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x4743"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 1},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [0, 2], "x": 4, "y": 0.9},
+                {"matrix": [0, 3], "x": 5, "y": 0, "r": 12},
+                {"matrix": [0, 4], "x": 6, "y": 0, "r": 12},
+                {"matrix": [0, 5], "x": 7, "y": 0, "r": 12},
+                {"matrix": [0, 6], "x": 8, "y": 0, "r": 12},
+                {"matrix": [5, 0], "x": 11.5, "y": 0.75, "r": -12},
+                {"matrix": [5, 1], "x": 12.5, "y": 0.75, "r": -12},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.75, "r": -12},
+                {"matrix": [5, 3], "x": 14.5, "y": 0.75, "r": -12},
+                {"matrix": [5, 4], "x": 13.4, "y": 0.9},
+                {"matrix": [5, 5], "x": 14.4, "y": 1},
+                {"matrix": [5, 6], "x": 15.4, "y": 1, "w": 2},
+                {"matrix": [1, 0], "x": 1.75, "y": 2, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 2},
+                {"matrix": [1, 3], "x": 4.5, "y": 1, "r": 12},
+                {"matrix": [1, 4], "x": 5.5, "y": 1, "r": 12},
+                {"matrix": [1, 5], "x": 6.5, "y": 1, "r": 12},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "r": 12},
+                {"matrix": [6, 0], "x": 11, "y": 1.75, "r": -12},
+                {"matrix": [6, 1], "x": 12, "y": 1.75, "r": -12},
+                {"matrix": [6, 2], "x": 13, "y": 1.75, "r": -12},
+                {"matrix": [6, 3], "x": 14, "y": 1.75, "r": -12},
+                {"matrix": [6, 4], "x": 13.13, "y": 1.95},
+                {"matrix": [6, 5], "x": 14.15, "y": 2},
+                {"matrix": [6, 6], "x": 15.15, "y": 2},
+                {"matrix": [6, 7], "x": 16.15, "y": 2, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.6, "y": 3, "w": 1.76},
+                {"matrix": [2, 2], "x": 3.35, "y": 3},
+                {"matrix": [2, 3], "x": 4.75, "y": 2, "r": 12},
+                {"matrix": [2, 4], "x": 5.75, "y": 2, "r": 12},
+                {"matrix": [2, 5], "x": 6.75, "y": 2, "r": 12},
+                {"matrix": [2, 6], "x": 7.75, "y": 2, "r": 12},
+                {"matrix": [7, 0], "x": 11.25, "y": 2.75, "r": -12},
+                {"matrix": [7, 1], "x": 12.25, "y": 2.75, "r": -12},
+                {"matrix": [7, 2], "x": 13.25, "y": 2.75, "r": -12},
+                {"matrix": [7, 3], "x": 14.25, "y": 2.75, "r": -12},
+                {"matrix": [7, 4], "x": 13.6, "y": 3},
+                {"matrix": [7, 5], "x": 14.6, "y": 3},
+                {"matrix": [7, 7], "x": 15.6, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 1.4, "y": 4, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.65, "y": 4},
+                {"matrix": [3, 3], "x": 5.25, "y": 3, "r": 12},
+                {"matrix": [3, 4], "x": 6.25, "y": 3, "r": 12},
+                {"matrix": [3, 5], "x": 7.25, "y": 3, "r": 12},
+                {"matrix": [3, 6], "x": 8.25, "y": 3, "r": 12},
+                {"matrix": [8, 0], "x": 10.75, "y": 3.75, "r": -12},
+                {"matrix": [8, 1], "x": 11.75, "y": 3.75, "r": -12},
+                {"matrix": [8, 2], "x": 12.75, "y": 3.75, "r": -12},
+                {"matrix": [8, 3], "x": 13.75, "y": 3.75, "r": -12},
+                {"matrix": [8, 4], "x": 13.3, "y": 4},
+                {"matrix": [8, 5], "x": 14.3, "y": 4},
+                {"matrix": [8, 6], "x": 15.3, "y": 4, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.05, "y": 4},
+                {"matrix": [4, 0], "x": 1.6, "y": 5, "w": 1.5},
+                {"matrix": [4, 1], "x": 3.1, "y": 5},
+                {"matrix": [4, 3], "x": 5.4, "y": 4.3, "w": 1.5, "r": 12},
+                {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 2, "r": 12},
+                {"matrix": [4, 6], "x": 8.75, "y": 4, "r": 12},
+                {"matrix": [9, 1], "x": 10.75, "y": 4.75, "w": 2.75, "r": -12},
+                {"matrix": [9, 3], "x": 13.6, "y": 4.8, "w": 1.5, "r": -12},
+                {"matrix": [9, 6], "x": 15.35, "y": 5},
+                {"matrix": [9, 7], "x": 16.35, "y": 5, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gregandcin/teaqueen/keymaps/default/config.h b/keyboards/gregandcin/teaqueen/keymaps/default/config.h
new file mode 100644
index 000000000000..3a125fdf63b5
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/default/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 gregandcin (@gregandcin)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Select hand configuration */
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
diff --git a/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
new file mode 100644
index 000000000000..abc6086270b6
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum custom_layer {
+    _QWERTY,
+    _SYMB,
+    _NAV
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_QWERTY] = LAYOUT(
+		KC_ESC,  KC_1,    KC_2,  KC_3,    KC_4,  KC_5,   KC_6,                    KC_7,  KC_8,   KC_9,  KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,           KC_Q,  KC_W,    KC_E,  KC_R,   KC_T,                    KC_Y,  KC_U,   KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS,          KC_A,  KC_S,    KC_D,  KC_F,   KC_G,                    KC_H,  KC_J,   KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT,          KC_Z,  KC_X,    KC_C,  KC_V,   KC_B,                    MO(1), KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+		KC_LCTL, KC_LGUI,        KC_LALT,        KC_SPC, MO(1),                          KC_SPC,        KC_RALT,                   KC_RGUI, KC_RCTL),
+
+	[_SYMB] = LAYOUT(
+		KC_GRV,  KC_F1,  KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,              KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,
+		KC_TRNS,         KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,         KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
+		KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		QK_BOOT,  KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                      KC_TRNS,          KC_TRNS,                    KC_TRNS, QK_BOOT),
+
+	 [_NAV] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_BTN2, KC_MS_U,  KC_BTN1, KC_WH_U, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,          KC_MS_L, KC_MS_D,  KC_MS_R, KC_WH_D, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/gregandcin/teaqueen/keymaps/via/config.h b/keyboards/gregandcin/teaqueen/keymaps/via/config.h
new file mode 100644
index 000000000000..3a125fdf63b5
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/via/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 gregandcin (@gregandcin)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Select hand configuration */
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
diff --git a/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c
new file mode 100644
index 000000000000..abc6086270b6
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum custom_layer {
+    _QWERTY,
+    _SYMB,
+    _NAV
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_QWERTY] = LAYOUT(
+		KC_ESC,  KC_1,    KC_2,  KC_3,    KC_4,  KC_5,   KC_6,                    KC_7,  KC_8,   KC_9,  KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,           KC_Q,  KC_W,    KC_E,  KC_R,   KC_T,                    KC_Y,  KC_U,   KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS,          KC_A,  KC_S,    KC_D,  KC_F,   KC_G,                    KC_H,  KC_J,   KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT,          KC_Z,  KC_X,    KC_C,  KC_V,   KC_B,                    MO(1), KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+		KC_LCTL, KC_LGUI,        KC_LALT,        KC_SPC, MO(1),                          KC_SPC,        KC_RALT,                   KC_RGUI, KC_RCTL),
+
+	[_SYMB] = LAYOUT(
+		KC_GRV,  KC_F1,  KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,              KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,
+		KC_TRNS,         KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,         KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
+		KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		QK_BOOT,  KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                      KC_TRNS,          KC_TRNS,                    KC_TRNS, QK_BOOT),
+
+	 [_NAV] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_BTN2, KC_MS_U,  KC_BTN1, KC_WH_U, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,          KC_MS_L, KC_MS_D,  KC_MS_R, KC_WH_D, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/gregandcin/teaqueen/keymaps/via/rules.mk b/keyboards/gregandcin/teaqueen/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gregandcin/teaqueen/readme.md b/keyboards/gregandcin/teaqueen/readme.md
new file mode 100644
index 000000000000..2d259e644d2d
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/readme.md
@@ -0,0 +1,26 @@
+# gregandcin/teaqueen
+
+![gregandcin/teaqueen](https://i.imgur.com/Wf1EIqwh.png)
+
+An Alice inspired, split layout keyboar featuring Kailh hotswap sockets.
+
+* Keyboard Maintainer: [gregandcin](https://github.com/gregandcin)
+* Hardware Supported: Elite-Pi, other RP2040 Community Edition Boards
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gregandcin/teaqueen:default
+
+Flashing example for this keyboard:
+
+    make gregandcin/teaqueen: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 `QK_BOOT` if it is available
diff --git a/keyboards/gregandcin/teaqueen/rules.mk b/keyboards/gregandcin/teaqueen/rules.mk
new file mode 100644
index 000000000000..161ec22b16e2
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/handwired/3dp660_oled/3dp660_oled.c b/keyboards/handwired/3dp660_oled/3dp660_oled.c
new file mode 100644
index 000000000000..cc98d235f45a
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/3dp660_oled.c
@@ -0,0 +1,121 @@
+// Copyright 2023 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined (OLED_ENABLE)
+
+
+// WPM responsiveness
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 20  // Speed at which animation goes into idle
+#define TAP_FRAMES 2
+#define TAP_SPEED 40  // WPM to trigger Bongo
+#define ANIM_FRAME_DURATION 200  // Frame MS
+#define ANIM_SIZE 636  // Number of bytes in array, max 1024
+
+
+
+static void render_animation(void) {
+
+    static uint32_t anim_timer         = 0;
+    static uint32_t anim_sleep         = 0;
+    static uint8_t  current_idle_frame = 0;
+    static uint8_t current_tap_frame = 0;
+
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    };
+
+    void animation_phase(void) {
+        if (get_current_wpm() <= IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+            oled_write_raw_P(prep[0], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() >= TAP_SPEED) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+        }
+    }
+    if (get_current_wpm() != 000) {
+        oled_on();  // Enables OLED on any alpha keypress
+
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    // Render Bongo Cat
+    render_animation();
+
+    // WPM text
+    oled_set_cursor(0, 0);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+
+    // Caps lock text
+    led_t led_state = host_keyboard_led_state();
+    oled_set_cursor(0, 3);
+    if (led_state.caps_lock) {
+        oled_write_P(PSTR("CAPS"), false);
+    }
+
+    return true;
+}
+
+#endif
diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/info.json
new file mode 100644
index 000000000000..a43aca34643c
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/info.json
@@ -0,0 +1,251 @@
+{
+    "manufacturer": "xia0",
+    "keyboard_name": "handwired/3dp660_oled",
+    "maintainer": "xia0",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "oled": true,
+        "nkro": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D5", "B0", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3661",
+        "vid": "0x6662"
+    },
+    "layouts": {
+        "LAYOUT_66_ansi": {
+          "layout": [
+            { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+            { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+            { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+            { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+            { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+            { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+            { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+            { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+            { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
+            { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
+            { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
+            { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
+            { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
+            { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
+            { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
+            { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
+            { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
+            { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
+            { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
+            { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
+            { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
+            { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
+            { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
+            { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+            { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+            { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+            { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
+            { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
+            { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
+            { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+            { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
+            { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
+            { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+          ]
+        },
+        "LAYOUT_66_iso": {
+          "layout": [
+            { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+            { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+            { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+            { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+            { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+            { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+            { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+            { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+            { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
+            { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
+            { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
+            { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
+            { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
+            { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
+            { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
+            { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
+            { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
+            { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+            { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
+            { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+            { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
+            { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
+            { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
+            { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
+            { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+            { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+            { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+            { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
+            { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
+            { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
+            { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+            { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
+            { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
+            { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+          ]
+        },
+        "LAYOUT_all": {
+          "layout": [
+            { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+            { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+            { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+            { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+            { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+            { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+            { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+            { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+            { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
+            { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
+            { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
+            { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
+            { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
+            { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
+            { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
+            { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
+            { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
+            { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
+            { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
+            { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+            { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
+            { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+            { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
+            { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
+            { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
+            { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+            { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
+            { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+            { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+            { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
+            { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
+            { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
+            { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
+            { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
+            { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
+            { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+            { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+            { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
+            { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
+            { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+          ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/3dp660_oled/keymaps/default/keymap.c b/keyboards/handwired/3dp660_oled/keymaps/default/keymap.c
new file mode 100644
index 000000000000..79e23eaabcaa
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(   KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_GRV , KC_BSPC, KC_INS,
+                        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,
+                        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+                        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_INT1, KC_RSFT, KC_UP,
+                        KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,                   KC_SPC , KC_SPC ,          KC_INT4, KC_RALT, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_all(   KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5,   KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_DEL , KC_VOLU,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_MUTE,          KC_VOLD,
+                        _______, _______, MO(2)  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+                        _______, _______, _______, _______,                   _______, _______,          _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
+
+	[2] = LAYOUT_all(   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______,                   _______, _______,          _______, _______, _______, _______, _______, _______, _______)
+};
diff --git a/keyboards/handwired/3dp660_oled/keymaps/via/keymap.c b/keyboards/handwired/3dp660_oled/keymaps/via/keymap.c
new file mode 100644
index 000000000000..74d17bf0edbf
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keymaps/via/keymap.c
@@ -0,0 +1,15 @@
+// Copyright 2023 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(   KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_INS,
+                        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+                        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+                        KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_SPC, KC_INT4, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+	[1] = LAYOUT_all(   KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD,
+                        KC_TRNS, KC_TRNS, _______, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, _______, KC_TRNS, KC_HOME, KC_PGDN, KC_END),
+};
diff --git a/keyboards/handwired/3dp660_oled/keymaps/via/rules.mk b/keyboards/handwired/3dp660_oled/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/3dp660_oled/readme.md b/keyboards/handwired/3dp660_oled/readme.md
new file mode 100644
index 000000000000..408fa4770a5b
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/readme.md
@@ -0,0 +1,28 @@
+# handwired/3dp660_oled
+
+![handwired/3dp660_oled](https://i.imgur.com/AQ6VQfgh.jpg)
+
+*A handwired FC660 layout with OLED display support.*
+
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported: ATmega32U4 e.g. Arduino Pro Micro or Teensy 2.0
+  * Note: If using a Pro Micro, pins B0 and D5 are required. [Click for details](https://golem.hu/guide/pro-micro-upgrade/).
+* Hardware Availability: [Printables](https://www.printables.com/model/464322-3dp-fc660-v3-oled-hand-wired-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/3dp660_oled:default
+
+Flashing example for this keyboard:
+
+    make handwired/3dp660_oled: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 MCU or short RST to GND.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/3dp660_oled/rules.mk b/keyboards/handwired/3dp660_oled/rules.mk
new file mode 100644
index 000000000000..c80812f6e0a4
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally blank
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json
new file mode 100644
index 000000000000..60830dbf80af
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "Dactyl-Manuform (4x6 + 4 and 3 for thumbs)",
+    "manufacturer": "joshreve",
+    "url": "https://github.com/joshreve/dactyl-keyboard",
+    "maintainer": "rek",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "development_board": "promicro",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [10, 2], "x": 11, "y": 4},
+                {"matrix": [10, 3], "x": 12, "y": 4},
+                {"matrix": [10, 4], "x": 13, "y": 4},
+                {"matrix": [10, 5], "x": 14, "y": 4},
+
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+                {"matrix": [5, 5], "x": 5, "y": 5},
+
+                {"matrix": [11, 0], "x": 14, "y": 5},
+                {"matrix": [11, 1], "x": 15, "y": 5},
+                {"matrix": [11, 2], "x": 16, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
new file mode 100644
index 000000000000..4d83c191f3c1
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define MASTER_LEFT
+//#define MASTER_RIGHT
+
+//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d8fe94a59bfd
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2023 Adam Tombleson (@rekarnar)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+enum layer_names {
+    _BASE,
+    _RAISE,
+    _LOWER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC  , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                    KC_6   , KC_7    , KC_8    , KC_9    , KC_0    , KC_BSPC,
+        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                    KC_Y   , KC_U    , KC_I    , KC_O    , KC_P    , KC_MINS,
+        KC_CAPS , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                    KC_H   , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT,
+        KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,                    KC_N   , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_BSLS,
+        KC_LCTL , KC_TAB , KC_LSFT, KC_LALT,                                      KC_COMMA,KC_DOT  , KC_LBRC , KC_RBRC ,
+                                      LOWER, KC_SPC , KC_BSPC,                    RAISE  , KC_ENT  , KC_DEL
+    ),
+ 
+    [_LOWER] = LAYOUT(
+        _______ , KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                    KC_CIRC, KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL,
+        QK_BOOT , _______, _______, _______, _______, _______,                    _______, _______ , _______ , _______ , KC_TILD , KC_PLUS,
+        _______ , KC_HOME, KC_PGUP, KC_PGDN, KC_END , _______,                    _______, KC_LEFT , KC_UP   , KC_DOWN , KC_RGHT , KC_PIPE,
+        _______ , _______, _______, _______, _______, _______,                    _______, _______ , _______ , _______ , KC_EQL  , KC_UNDS,
+        _______ , _______, _______, _______,                                      KC_TILD, _______ , KC_LPRN , KC_RPRN ,
+                              _______, KC_LGUI, LALT(KC_PSCR),                    C(S(KC_LEFT)), KC_GRAVE, C(S(KC_RIGHT))
+
+    ),
+
+    [_RAISE] = LAYOUT(
+        KC_F12  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                    KC_F6  , KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11 ,
+        _______ , _______,_______ , _______, _______, _______,                    _______, _______ , _______ , _______ , _______ , _______,
+        _______ , _______,_______ , _______, _______, _______,                    _______, KC_HOME , KC_PGUP , KC_PGDN , KC_END  , _______,
+        _______ , _______,_______ , _______, _______, _______,                    _______, _______ , _______ , _______ , _______ , _______,
+        _______ , _______,_______ , _______,                                      _______, _______ , _______ , LALT(KC_TAB),
+                                    KC_VOLD, KC_MUTE, KC_VOLU,                    _______, _______ , _______
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md b/keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md
new file mode 100644
index 000000000000..c3574c52bb8f
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md
@@ -0,0 +1,9 @@
+# Dactyl-Manuform (4x6 + 4 and 3 for thumbs)
+
+This is a 4x6 manuform with a 4 key bottom row and 3 key thumb clusters.
+
+The result is a 62 key layout.
+
+## Description
+
+* Keyboard Maintainer: https://github.com/joshreve/dactyl-keyboard
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
new file mode 100644
index 000000000000..3bbd2614291a
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
@@ -0,0 +1 @@
+# File intentionally blank
diff --git a/keyboards/handwired/split_cloud/config.h b/keyboards/handwired/split_cloud/config.h
new file mode 100644
index 000000000000..faa2750cafeb
--- /dev/null
+++ b/keyboards/handwired/split_cloud/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2023 Cloud Chagnon <cloud.chagnon@ucalgary.ca>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* left/right via compilation flag */
+#define EE_HANDS
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronztize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+// #define NO_ACTION_LAYER
+// #define NO_ACTION_TAPPING
+// #define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/split_cloud/info.json b/keyboards/handwired/split_cloud/info.json
new file mode 100644
index 000000000000..6d28728f69a5
--- /dev/null
+++ b/keyboards/handwired/split_cloud/info.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Split-Cloud",
+    "manufacturer": "coolsa",
+    "maintainer": "Cloud Chagnon",
+    "url": "https://github.com/coolsa/cloud_keyboard",
+    "usb": {
+        "vid": "0xCC43",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "bootmagic": {
+        "enabled": true
+    },
+    "features": {
+        "extrakey": true,
+        "nkro": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+                "rows": ["F7", "B1", "B3", "B2", "B6"]
+            }
+        },
+        "bootmagic": {
+            "matrix": [5, 5]
+        }
+    },
+    "stenography": {
+        "enabled": true,
+        "protocol": "all"
+    }
+    "development_board": "promicro",
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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": [5, 5], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [6, 5], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [7, 5], "x": 7, "y": 2},
+                {"matrix": [7, 4], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [8, 5], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [9, 5], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4},
+                {"matrix": [9, 1], "x": 11, "y": 4},
+                {"matrix": [9, 0], "x": 12, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/split_cloud/keymaps/default/config.h b/keyboards/handwired/split_cloud/keymaps/default/config.h
new file mode 100644
index 000000000000..7a6ba5e65657
--- /dev/null
+++ b/keyboards/handwired/split_cloud/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2023 Cloud Chagnon <cloud.chagnon@ucalgary.ca>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* The defaults are different for the Tri Layers */
+#define TRI_LAYER_LOWER_LAYER 3
+#define TRI_LAYER_UPPER_LAYER 4
+#define TRI_LAYER_ADJUST_LAYER 6
+
diff --git a/keyboards/handwired/split_cloud/keymaps/default/keymap.c b/keyboards/handwired/split_cloud/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f94a112c07d2
--- /dev/null
+++ b/keyboards/handwired/split_cloud/keymaps/default/keymap.c
@@ -0,0 +1,226 @@
+/* Copyright 2023 Cloud Chagnon
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_steno.h"
+
+// clang-format off
+
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _PLOVER,
+    _ADJUST
+};
+
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    COLEMAK,
+    DVORAK,
+    PLOVER,
+    EXT_PLV
+};
+
+#define ST_BOLT QK_STENO_BOLT
+#define ST_GEM QK_STENO_GEMINI
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Qwerty
+     * ,-----------------------------------------------------------------------------------.
+     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  |RCtrl |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_QWERTY] = LAYOUT_ortho_5x12(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL ,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_RCTL, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Colemak
+     * ,-----------------------------------------------------------------------------------.
+     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  |RCtrl |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_COLEMAK] = LAYOUT_ortho_5x12(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL ,
+        KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_K,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_RCTL, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Dvorak
+     * ,-----------------------------------------------------------------------------------.
+     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  |RCtrl |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_DVORAK] = LAYOUT_ortho_5x12(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_BSPC,
+        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,  KC_F,    KC_G,    KC_C,    KC_R,    KC_L,  KC_DEL,
+        KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,  KC_D,    KC_H,    KC_T,    KC_N,    KC_S,  KC_SLSH,
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,  KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,  KC_ENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_RCTL, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    ),
+
+    /* Lower
+     * ,-----------------------------------------------------------------------------------.
+     * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_LOWER] = LAYOUT_ortho_5x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_DEL ,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+
+    /* Raise
+     * ,-----------------------------------------------------------------------------------.
+     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | Pg Up| Pg Dn|      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_RAISE] = LAYOUT_ortho_5x12(
+        KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL ,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,  KC_F4,    KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+        _______, KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+
+    /* Plover layer (http://opensteno.org)
+     * ,-----------------------------------------------------------------------------------.
+     * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |  PWR | RES1 | RES2 |
+     * `-----------------------------------------------------------------------------------'
+     */
+
+    [_PLOVER] = LAYOUT_ortho_5x12(
+        STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
+        STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
+        XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        EXT_PLV, XXXXXXX, XXXXXXX, XXXXXXX, STN_A,   STN_O,   STN_E,   STN_U,   XXXXXXX, STN_PWR, STN_RE1, STN_RE2
+    ),
+
+    /* Adjust (Lower + Raise)
+     * ,-----------------------------------------------------------------------------------.
+     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * |      |      |Aud cy|Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |TXBOLT|GEM RP|
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |             |      |      |      |      |      |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_ADJUST] = LAYOUT_ortho_5x12(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12 ,
+        _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+        _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ST_BOLT, ST_GEM ,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+
+};
+
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QWERTY:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWERTY);
+            }
+            return false;
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_COLEMAK);
+            }
+            return false;
+        case DVORAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_DVORAK);
+            }
+            return false;
+        case PLOVER:
+            if (!record->event.pressed) {
+                layer_on(_PLOVER);
+            }
+            return false;
+        case EXT_PLV:
+            if (record->event.pressed) {
+                layer_off(_PLOVER);
+            }
+            return false;
+    }
+    return true;
+};
diff --git a/keyboards/handwired/split_cloud/keymaps/default/rules.mk b/keyboards/handwired/split_cloud/keymaps/default/rules.mk
new file mode 100644
index 000000000000..7c9bf212a6f5
--- /dev/null
+++ b/keyboards/handwired/split_cloud/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/handwired/split_cloud/readme.md b/keyboards/handwired/split_cloud/readme.md
new file mode 100644
index 000000000000..1d2731727508
--- /dev/null
+++ b/keyboards/handwired/split_cloud/readme.md
@@ -0,0 +1,22 @@
+# Split-Cloud handwired keyboard
+
+The Split-Cloud is a split ortholinear 5x12 layout, forked from the Preonic and Nyquist keyboard models. The default layout adds extra options for some added game compatibility, two control keys for QEmu, and adds a steno layer based on the Planck example.
+
+![Split-Cloud](https://i.imgur.com/QoHAFeXh.jpg)
+
+* Keyboard Maintainer: [Cloud Chagnon](https://github.com/coolsa)
+* Hardware Supported: Pro Micro
+* Hardware Availability: [Repository](https://github.com/coolsa/split-cloud)
+
+Make example for this keyboard:
+
+    make handwired/split_cloud:default
+
+This keyboard uses [Handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default, and must be configured once on each side. The make commands are:
+
+    make handwired/split_cloud:default:avrdude-split-left
+    make handwired/split_cloud:default:avrdude-split-right
+
+[QMK Toolbox](http://qmk.fm/toolbox) can also be used to set EEPROM handedness. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/split_cloud/rules.mk b/keyboards/handwired/split_cloud/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/ziyoulang_k3_mod/info.json b/keyboards/handwired/ziyoulang_k3_mod/info.json
new file mode 100644
index 000000000000..127cc51299c9
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/info.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "ziyoulang k3 mod",
+    "development_board": "bluepill",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xE002",
+        "vid": "0x5006"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
+    },
+    "community_layouts": ["96_ansi"],
+    "layouts": {
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"F1", "x":1, "y":0, "matrix": [0, 2]},
+                {"label":"F2", "x":2, "y":0, "matrix": [0, 3]},
+                {"label":"F3", "x":3, "y":0, "matrix": [0, 4]},
+                {"label":"F4", "x":4, "y":0, "matrix": [0, 5]},
+                {"label":"F5", "x":5, "y":0, "matrix": [0, 6]},
+                {"label":"F6", "x":6, "y":0, "matrix": [0, 7]},
+                {"label":"F7", "x":7, "y":0, "matrix": [0, 8]},
+                {"label":"F8", "x":8, "y":0, "matrix": [0, 9]},
+                {"label":"F9", "x":9, "y":0, "matrix": [0, 10]},
+                {"label":"F10", "x":10, "y":0, "matrix": [0, 11]},
+                {"label":"F11", "x":11, "y":0, "matrix": [0, 12]},
+                {"label":"F12", "x":12, "y":0, "matrix": [0, 13]},
+                {"label":"PrtSc", "x":13, "y":0, "matrix": [0, 14]},
+                {"label":"Delete", "x":14, "y":0, "matrix": [0, 15]},
+                {"label":"Home", "x":15.5, "y":0, "matrix": [0, 16]},
+                {"label":"Insert", "x":16.5, "y":0, "matrix": [0, 17]},
+                {"label":"PgUp", "x":17.5, "y":0, "matrix": [0, 18]},
+                {"label":"PgDn", "x":18.5, "y":0, "matrix": [0, 19]},
+
+                {"label":"~", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"!", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"@", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"#", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"$", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"%", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"^", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"&", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"*", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"(", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":")", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"_", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"+", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+                {"label":"Num Lock", "x":15.5, "y":1.25, "matrix": [1, 17]},
+                {"label":"/", "x":16.5, "y":1.25, "matrix": [1, 18]},
+                {"label":"*", "x":17.5, "y":1.25, "matrix": [1, 19]},
+                {"label":"-", "x":18.5, "y":1.25, "matrix": [1, 20]},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"Q", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"W", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"E", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"R", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"T", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"Y", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"U", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"I", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"O", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"P", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"{", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"}", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label":"7", "x":15.5, "y":2.25, "matrix": [2, 17]},
+                {"label":"8", "x":16.5, "y":2.25, "matrix": [2, 18]},
+                {"label":"9", "x":17.5, "y":2.25, "matrix": [2, 19]},
+                {"label":"+", "x":18.5, "y":2.25, "h":2, "matrix": [2, 20]},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"A", "x":1.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"S", "x":2.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"D", "x":3.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"F", "x":4.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"G", "x":5.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"H", "x":6.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"J", "x":7.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K", "x":8.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"L", "x":9.75, "y":3.25, "matrix": [3, 10]},
+                {"label":":", "x":10.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"\"", "x":11.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25, "matrix": [3, 13]},
+                {"label":"4", "x":15.5, "y":3.25, "matrix": [3, 17]},
+                {"label":"5", "x":16.5, "y":3.25, "matrix": [3, 18]},
+                {"label":"6", "x":17.5, "y":3.25, "matrix": [3, 19]},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25, "matrix": [4, 0]},
+                {"label":"Z", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"X", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"C", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"V", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"B", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"N", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"M", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"<", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":">", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"?", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 13]},
+                {"label":"1", "x":15.5, "y":4.25, "matrix": [4, 17]},
+                {"label":"2", "x":16.5, "y":4.25, "matrix": [4, 18]},
+                {"label":"3", "x":17.5, "y":4.25, "matrix": [4, 19]},
+                {"label":"Enter", "x":18.5, "y":4.25, "h":2, "matrix": [4, 20]},
+
+                {"label":"\u2191", "x":14.25, "y":4.5, "matrix": [4, 15]},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 3]},
+                {"x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"Alt", "x":10, "y":5.25, "matrix": [5, 10]},
+                {"label":"Fn", "x":11, "y":5.25, "matrix": [5, 11]},
+                {"label":"Ctrl", "x":12, "y":5.25, "matrix": [5, 13]},
+                {"label":"0", "x":16.5, "y":5.25, "matrix": [5, 17]},
+                {"label":".", "x":17.5, "y":5.25, "matrix": [5, 19]},
+
+                {"label":"\u2190", "x":13.25, "y":5.5, "matrix": [5, 14]},
+                {"label":"\u2193", "x":14.25, "y":5.5, "matrix": [5, 15]},
+                {"label":"\u2192", "x":15.25, "y":5.5, "matrix": [5, 16]}
+            ]
+        }
+    },
+    "manufacturer": "Coom",
+    "maintainer": "coomstoolbox",
+    "url": ""
+}
\ No newline at end of file
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/default/keymap.c b/keyboards/handwired/ziyoulang_k3_mod/keymaps/default/keymap.c
new file mode 100644
index 000000000000..6cd7d8640368
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Del│ │Hom│Ins│PgU│PgD│
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │ │ 4 │ 5 │ 6 │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬┬──┴┐├───┼───┼───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift││ ↑ ││ 1 │ 2 │ 3 │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬┬──┴┼───┼┴──┬┼───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │Alt│ Fn│Ctr││ ← │ ↓ │ → ││ 0 │ . │   │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+     */
+    [0] = LAYOUT_96_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_PSCR,  KC_DEL,  KC_HOME, KC_INS,  KC_PGUP, KC_PGDN,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                             KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+                                                                                                                                               KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_RCTL,                            KC_P0,            KC_PDOT,
+                                                                                                                                      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_96_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  _______, KC_SCRL, KC_PAUS,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______, _______,
+                                                                                                                                               _______,
+        _______,          _______, _______,                   _______,                            _______, _______,            _______,                            _______,          _______,
+                                                                                                                                      _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/keymap.c b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/keymap.c
new file mode 100644
index 000000000000..08825dacce08
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Del│ │Hom│Ins│PgU│PgD│
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │ │ 4 │ 5 │ 6 │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬┬──┴┐├───┼───┼───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift││ ↑ ││ 1 │ 2 │ 3 │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬┬──┴┼───┼┴──┬┼───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │Alt│ Fn│Ctr││ ← │ ↓ │ → ││ 0 │ . │   │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+     */
+    [0] = LAYOUT_96_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_DEL,  KC_HOME, KC_INS,  KC_PGUP, KC_PGDN,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                            KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                             KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+                                                                                                                                               KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_RCTL,                            KC_P0,            KC_PDOT,
+                                                                                                                                      KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
new file mode 100644
index 000000000000..ea877d67869c
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/ziyoulang_k3_mod/readme.md b/keyboards/handwired/ziyoulang_k3_mod/readme.md
new file mode 100644
index 000000000000..7e247fde198b
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/readme.md
@@ -0,0 +1,33 @@
+# ziyoulang_k3_mod
+
+![ziyoulang_k3_mod](https://i.imgur.com/z9mUvIoh.jpg)
+
+
+This base keyboard has  SX83099 IC causes some problems. I needed QMK as an alternative, especially since the controller freezes when the backlight is off.
+
+* Keyboard Maintainer: [Coom](https://github.com/coomstoolbox)
+* Hardware Supported: Ziyoulang K3,Blue Pill
+* Hardware Availability: [Base Keyboard](https://www.aliexpress.com/item/1005005458088199.html), [Blue Pill Board](https://www.aliexpress.com/item/32812837487.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/ziyoulang_k3_mod:default
+
+Flashing example for this keyboard:
+
+    make handwired/ziyoulang_k3_mod: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).
+
+## Requires hand wired
+
+[KiCAD wiring diagram](https://github.com/coomstoolbox/ZK3-BP-MOD-wiring-diagram)
+
+![explanation](https://i.imgur.com/yvhvhoBh.png)
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/ziyoulang_k3_mod/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/hineybush/h101/info.json b/keyboards/hineybush/h101/info.json
new file mode 100644
index 000000000000..d1f8fa32a084
--- /dev/null
+++ b/keyboards/hineybush/h101/info.json
@@ -0,0 +1,381 @@
+{
+    "manufacturer": "hiney",
+    "keyboard_name": "h101",
+    "maintainer": "hineybush",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "A8", "A9", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B9", "A3", "F0", "F1", "A7", "A5", "A4"],
+        "rows": ["C13", "C14", "C15", "A0", "A1", "A2"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "vid": "0x4069",
+        "pid": "0x0002"
+    },
+    "indicators": {
+        "num_lock": "A6",
+        "caps_lock": "B14",
+        "scroll_lock": "B8",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT_f13_tsangan": {
+            "layout": [
+                {"matrix": [0,0], "label":"Esc", "x":0, "y":0},
+                {"matrix": [0,1], "label":"F1", "x":1.25, "y":0},
+                {"matrix": [0,2], "label":"F2", "x":2.25, "y":0},
+                {"matrix": [0,3], "label":"F3", "x":3.25, "y":0},
+                {"matrix": [0,4], "label":"F4", "x":4.25, "y":0},
+                {"matrix": [0,5], "label":"F5", "x":5.5, "y":0},
+                {"matrix": [0,6], "label":"F6", "x":6.5, "y":0},
+                {"matrix": [0,7], "label":"F7", "x":7.5, "y":0},
+                {"matrix": [0,8], "label":"F8", "x":8.5, "y":0},
+                {"matrix": [0,9], "label":"F9", "x":9.75, "y":0},
+                {"matrix": [0,11], "label":"F10", "x":10.75, "y":0},
+                {"matrix": [0,12], "label":"F11", "x":11.75, "y":0},
+                {"matrix": [0,13], "label":"F12", "x":12.75, "y":0},
+                {"matrix": [0,14], "label":"F13", "x":14, "y":0},
+                {"matrix": [0,15], "label":"PrtSc", "x":15.25, "y":0},
+                {"matrix": [0,16], "label":"Scroll Lock", "x":16.25, "y":0},
+                {"matrix": [0,17], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0,18], "label":"KP 1", "x":18.5, "y":0},
+                {"matrix": [0,19], "label":"KP 2", "x":19.5, "y":0},
+                {"matrix": [0,20], "label":"KP 3", "x":20.5, "y":0},
+                {"matrix": [0,21], "label":"KP 4", "x":21.5, "y":0},
+                {"matrix": [1,0], "label":"~", "x":0, "y":1.25},
+                {"matrix": [1,1], "label":"!", "x":1, "y":1.25},
+                {"matrix": [1,2], "label":"@", "x":2, "y":1.25},
+                {"matrix": [1,3], "label":"#", "x":3, "y":1.25},
+                {"matrix": [1,4], "label":"$", "x":4, "y":1.25},
+                {"matrix": [1,5], "label":"%", "x":5, "y":1.25},
+                {"matrix": [1,6], "label":"^", "x":6, "y":1.25},
+                {"matrix": [1,7], "label":"&", "x":7, "y":1.25},
+                {"matrix": [1,8], "label":"*", "x":8, "y":1.25},
+                {"matrix": [1,9], "label":"(", "x":9, "y":1.25},
+                {"matrix": [1,10], "label":")", "x":10, "y":1.25},
+                {"matrix": [1,11], "label":"_", "x":11, "y":1.25},
+                {"matrix": [1,12], "label":"+", "x":12, "y":1.25},
+                {"matrix": [1,14], "label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"matrix": [1,15], "label":"Insert", "x":15.25, "y":1.25},
+                {"matrix": [1,16], "label":"Home", "x":16.25, "y":1.25},
+                {"matrix": [1,17], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1,18], "label":"Num Lock", "x":18.5, "y":1.25},
+                {"matrix": [1,19], "label":"/", "x":19.5, "y":1.25},
+                {"matrix": [1,20], "label":"*", "x":20.5, "y":1.25},
+                {"matrix": [1,21], "label":"-", "x":21.5, "y":1.25},
+                {"matrix": [2,0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"matrix": [2,1], "label":"Q", "x":1.5, "y":2.25},
+                {"matrix": [2,2], "label":"W", "x":2.5, "y":2.25},
+                {"matrix": [2,3], "label":"E", "x":3.5, "y":2.25},
+                {"matrix": [2,4], "label":"R", "x":4.5, "y":2.25},
+                {"matrix": [2,5], "label":"T", "x":5.5, "y":2.25},
+                {"matrix": [2,6], "label":"Y", "x":6.5, "y":2.25},
+                {"matrix": [2,7], "label":"U", "x":7.5, "y":2.25},
+                {"matrix": [2,8], "label":"I", "x":8.5, "y":2.25},
+                {"matrix": [2,9], "label":"O", "x":9.5, "y":2.25},
+                {"matrix": [2,10], "label":"P", "x":10.5, "y":2.25},
+                {"matrix": [2,11], "label":"{", "x":11.5, "y":2.25},
+                {"matrix": [2,12], "label":"}", "x":12.5, "y":2.25},
+                {"matrix": [2,13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2,15], "label":"Delete", "x":15.25, "y":2.25},
+                {"matrix": [2,16], "label":"End", "x":16.25, "y":2.25},
+                {"matrix": [2,17], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2,18], "label":"7", "x":18.5, "y":2.25},
+                {"matrix": [2,19], "label":"8", "x":19.5, "y":2.25},
+                {"matrix": [2,20], "label":"9", "x":20.5, "y":2.25},
+                {"matrix": [2,21], "label":"+", "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3,0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"matrix": [3,1], "label":"A", "x":1.75, "y":3.25},
+                {"matrix": [3,2], "label":"S", "x":2.75, "y":3.25},
+                {"matrix": [3,3], "label":"D", "x":3.75, "y":3.25},
+                {"matrix": [3,4], "label":"F", "x":4.75, "y":3.25},
+                {"matrix": [3,5], "label":"G", "x":5.75, "y":3.25},
+                {"matrix": [3,6], "label":"H", "x":6.75, "y":3.25},
+                {"matrix": [3,7], "label":"J", "x":7.75, "y":3.25},
+                {"matrix": [3,8], "label":"K", "x":8.75, "y":3.25},
+                {"matrix": [3,9], "label":"L", "x":9.75, "y":3.25},
+                {"matrix": [3,10], "label":":", "x":10.75, "y":3.25},
+                {"matrix": [3,11], "label":"\"", "x":11.75, "y":3.25},
+                {"matrix": [3,13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3,18], "label":"4", "x":18.5, "y":3.25},
+                {"matrix": [3,19], "label":"5", "x":19.5, "y":3.25},
+                {"matrix": [3,20], "label":"6", "x":20.5, "y":3.25},
+                {"matrix": [4,0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4,2], "label":"Z", "x":2.25, "y":4.25},
+                {"matrix": [4,3], "label":"X", "x":3.25, "y":4.25},
+                {"matrix": [4,4], "label":"C", "x":4.25, "y":4.25},
+                {"matrix": [4,5], "label":"V", "x":5.25, "y":4.25},
+                {"matrix": [4,6], "label":"B", "x":6.25, "y":4.25},
+                {"matrix": [4,7], "label":"N", "x":7.25, "y":4.25},
+                {"matrix": [4,8], "label":"M", "x":8.25, "y":4.25},
+                {"matrix": [4,9], "label":"<", "x":9.25, "y":4.25},
+                {"matrix": [4,10], "label":">", "x":10.25, "y":4.25},
+                {"matrix": [4,11], "label":"?", "x":11.25, "y":4.25},
+                {"matrix": [4,12], "label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"matrix": [4,16], "label":"Up Arrow", "x":16.25, "y":4.25},
+                {"matrix": [4,18], "label":"1", "x":18.5, "y":4.25},
+                {"matrix": [4,19], "label":"2", "x":19.5, "y":4.25},
+                {"matrix": [4,20], "label":"3", "x":20.5, "y":4.25},
+                {"matrix": [4,21], "label":"Enter", "x":21.5, "y":4.25, "h":2},
+                {"matrix": [5,0], "label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"matrix": [5,1], "label":"Win", "x":1.5, "y":5.25},
+                {"matrix": [5,2], "label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"matrix": [5,7], "label":"Space", "x":4, "y":5.25, "w":7},
+                {"matrix": [5,11], "label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"matrix": [5,12], "label":"Win", "x":12.5, "y":5.25},
+                {"matrix": [5,13], "label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"matrix": [5,15], "label":"Left Arrow", "x":15.25, "y":5.25},
+                {"matrix": [5,16], "label":"Down Arrow", "x":16.25, "y":5.25},
+                {"matrix": [5,17], "label":"Right Arrow", "x":17.25, "y":5.25},
+                {"matrix": [5,19], "label":"0", "x":18.5, "y":5.25, "w":2},
+                {"matrix": [5,20], "label":".", "x":20.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0,0], "label":"Esc", "x":0, "y":0},
+                {"matrix": [0,1], "label":"F1", "x":1.25, "y":0},
+                {"matrix": [0,2], "label":"F2", "x":2.25, "y":0},
+                {"matrix": [0,3], "label":"F3", "x":3.25, "y":0},
+                {"matrix": [0,4], "label":"F4", "x":4.25, "y":0},
+                {"matrix": [0,5], "label":"F5", "x":5.5, "y":0},
+                {"matrix": [0,6], "label":"F6", "x":6.5, "y":0},
+                {"matrix": [0,7], "label":"F7", "x":7.5, "y":0},
+                {"matrix": [0,8], "label":"F8", "x":8.5, "y":0},
+                {"matrix": [0,9], "label":"F9", "x":9.75, "y":0},
+                {"matrix": [0,11], "label":"F10", "x":10.75, "y":0},
+                {"matrix": [0,12], "label":"F11", "x":11.75, "y":0},
+                {"matrix": [0,13], "label":"F12", "x":12.75, "y":0},
+                {"matrix": [0,14], "label":"F13", "x":14, "y":0},
+                {"matrix": [0,15], "label":"PrtSc", "x":15.25, "y":0},
+                {"matrix": [0,16], "label":"Scroll Lock", "x":16.25, "y":0},
+                {"matrix": [0,17], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0,18], "label":"KP 1", "x":18.5, "y":0},
+                {"matrix": [0,19], "label":"KP 2", "x":19.5, "y":0},
+                {"matrix": [0,20], "label":"KP 3", "x":20.5, "y":0},
+                {"matrix": [0,21], "label":"KP 4", "x":21.5, "y":0},
+                {"matrix": [1,0], "label":"~", "x":0, "y":1.25},
+                {"matrix": [1,1], "label":"!", "x":1, "y":1.25},
+                {"matrix": [1,2], "label":"@", "x":2, "y":1.25},
+                {"matrix": [1,3], "label":"#", "x":3, "y":1.25},
+                {"matrix": [1,4], "label":"$", "x":4, "y":1.25},
+                {"matrix": [1,5], "label":"%", "x":5, "y":1.25},
+                {"matrix": [1,6], "label":"^", "x":6, "y":1.25},
+                {"matrix": [1,7], "label":"&", "x":7, "y":1.25},
+                {"matrix": [1,8], "label":"*", "x":8, "y":1.25},
+                {"matrix": [1,9], "label":"(", "x":9, "y":1.25},
+                {"matrix": [1,10], "label":")", "x":10, "y":1.25},
+                {"matrix": [1,11], "label":"_", "x":11, "y":1.25},
+                {"matrix": [1,12], "label":"+", "x":12, "y":1.25},
+                {"matrix": [1,13], "label":"1U Split Bksp", "x":13, "y":1.25},
+                {"matrix": [1,14], "label":"Backspace", "x":14, "y":1.25},
+                {"matrix": [1,15], "label":"Insert", "x":15.25, "y":1.25},
+                {"matrix": [1,16], "label":"Home", "x":16.25, "y":1.25},
+                {"matrix": [1,17], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1,18], "label":"Num Lock", "x":18.5, "y":1.25},
+                {"matrix": [1,19], "label":"/", "x":19.5, "y":1.25},
+                {"matrix": [1,20], "label":"*", "x":20.5, "y":1.25},
+                {"matrix": [1,21], "label":"-", "x":21.5, "y":1.25},
+                {"matrix": [2,0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"matrix": [2,1], "label":"Q", "x":1.5, "y":2.25},
+                {"matrix": [2,2], "label":"W", "x":2.5, "y":2.25},
+                {"matrix": [2,3], "label":"E", "x":3.5, "y":2.25},
+                {"matrix": [2,4], "label":"R", "x":4.5, "y":2.25},
+                {"matrix": [2,5], "label":"T", "x":5.5, "y":2.25},
+                {"matrix": [2,6], "label":"Y", "x":6.5, "y":2.25},
+                {"matrix": [2,7], "label":"U", "x":7.5, "y":2.25},
+                {"matrix": [2,8], "label":"I", "x":8.5, "y":2.25},
+                {"matrix": [2,9], "label":"O", "x":9.5, "y":2.25},
+                {"matrix": [2,10], "label":"P", "x":10.5, "y":2.25},
+                {"matrix": [2,11], "label":"{", "x":11.5, "y":2.25},
+                {"matrix": [2,12], "label":"}", "x":12.5, "y":2.25},
+                {"matrix": [2,13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2,15], "label":"Delete", "x":15.25, "y":2.25},
+                {"matrix": [2,16], "label":"End", "x":16.25, "y":2.25},
+                {"matrix": [2,17], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2,18], "label":"7", "x":18.5, "y":2.25},
+                {"matrix": [2,19], "label":"8", "x":19.5, "y":2.25},
+                {"matrix": [2,20], "label":"9", "x":20.5, "y":2.25},
+                {"matrix": [2,21], "label":"+", "x":21.5, "y":2.25},
+                {"matrix": [3,0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"matrix": [3,1], "label":"A", "x":1.75, "y":3.25},
+                {"matrix": [3,2], "label":"S", "x":2.75, "y":3.25},
+                {"matrix": [3,3], "label":"D", "x":3.75, "y":3.25},
+                {"matrix": [3,4], "label":"F", "x":4.75, "y":3.25},
+                {"matrix": [3,5], "label":"G", "x":5.75, "y":3.25},
+                {"matrix": [3,6], "label":"H", "x":6.75, "y":3.25},
+                {"matrix": [3,7], "label":"J", "x":7.75, "y":3.25},
+                {"matrix": [3,8], "label":"K", "x":8.75, "y":3.25},
+                {"matrix": [3,9], "label":"L", "x":9.75, "y":3.25},
+                {"matrix": [3,10], "label":":", "x":10.75, "y":3.25},
+                {"matrix": [3,11], "label":"\"", "x":11.75, "y":3.25},
+                {"matrix": [3,13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3,18], "label":"4", "x":18.5, "y":3.25},
+                {"matrix": [3,19], "label":"5", "x":19.5, "y":3.25},
+                {"matrix": [3,20], "label":"6", "x":20.5, "y":3.25},
+                {"matrix": [3,21], "label":"+", "x":21.5, "y":3.25},
+                {"matrix": [4,0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4,2], "label":"Z", "x":2.25, "y":4.25},
+                {"matrix": [4,3], "label":"X", "x":3.25, "y":4.25},
+                {"matrix": [4,4], "label":"C", "x":4.25, "y":4.25},
+                {"matrix": [4,5], "label":"V", "x":5.25, "y":4.25},
+                {"matrix": [4,6], "label":"B", "x":6.25, "y":4.25},
+                {"matrix": [4,7], "label":"N", "x":7.25, "y":4.25},
+                {"matrix": [4,8], "label":"M", "x":8.25, "y":4.25},
+                {"matrix": [4,9], "label":"<", "x":9.25, "y":4.25},
+                {"matrix": [4,10], "label":">", "x":10.25, "y":4.25},
+                {"matrix": [4,11], "label":"?", "x":11.25, "y":4.25},
+                {"matrix": [4,12], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4,13], "label":"Fn", "x":14, "y":4.25},
+                {"matrix": [4,16], "label":"Up Arrow", "x":16.25, "y":4.25},
+                {"matrix": [4,18], "label":"1", "x":18.5, "y":4.25},
+                {"matrix": [4,19], "label":"2", "x":19.5, "y":4.25},
+                {"matrix": [4,20], "label":"3", "x":20.5, "y":4.25},
+                {"matrix": [4,21], "label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [5,0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"matrix": [5,1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"matrix": [5,2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"matrix": [5,7], "label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"matrix": [5,10], "label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"matrix": [5,11], "label":"Alt", "x":11.25, "y":5.25, "w":1.25},
+                {"matrix": [5,12], "label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"matrix": [5,13], "label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"matrix": [5,15], "label":"Left Arrow", "x":15.25, "y":5.25},
+                {"matrix": [5,16], "label":"Down Arrow", "x":16.25, "y":5.25},
+                {"matrix": [5,17], "label":"Right Arrow", "x":17.25, "y":5.25},
+                {"matrix": [5,18], "label":"0", "x":18.5, "y":5.25},
+                {"matrix": [5,19], "label":"0", "x":19.5, "y":5.25},
+                {"matrix": [5,20], "label":".", "x":20.5, "y":5.25},
+                {"matrix": [5,21], "label":"Enter", "x":21.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_f12_all": {
+            "layout": [
+                {"matrix": [0,0], "label":"Esc", "x":0, "y":0},
+                {"matrix": [0,1], "label":"F1", "x":1.25, "y":0},
+                {"matrix": [0,2], "label":"F2", "x":2.25, "y":0},
+                {"matrix": [0,3], "label":"F3", "x":3.25, "y":0},
+                {"matrix": [0,4], "label":"F4", "x":4.25, "y":0},
+                {"matrix": [0,5], "label":"F5", "x":5.5, "y":0},
+                {"matrix": [0,6], "label":"F6", "x":6.5, "y":0},
+                {"matrix": [0,7], "label":"F7", "x":7.5, "y":0},
+                {"matrix": [0,8], "label":"F8", "x":8.5, "y":0},
+                {"matrix": [0,9], "label":"F9", "x":9.75, "y":0},
+                {"matrix": [0,11], "label":"F10", "x":10.75, "y":0},
+                {"matrix": [0,12], "label":"F11", "x":11.75, "y":0},
+                {"matrix": [0,13], "label":"F12", "x":12.75, "y":0},
+                {"matrix": [0,15], "label":"PrtSc", "x":15.25, "y":0},
+                {"matrix": [0,16], "label":"Scroll Lock", "x":16.25, "y":0},
+                {"matrix": [0,17], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0,18], "label":"KP 1", "x":18.5, "y":0},
+                {"matrix": [0,19], "label":"KP 2", "x":19.5, "y":0},
+                {"matrix": [0,20], "label":"KP 3", "x":20.5, "y":0},
+                {"matrix": [0,21], "label":"KP 4", "x":21.5, "y":0},
+                {"matrix": [1,0], "label":"~", "x":0, "y":1.25},
+                {"matrix": [1,1], "label":"!", "x":1, "y":1.25},
+                {"matrix": [1,2], "label":"@", "x":2, "y":1.25},
+                {"matrix": [1,3], "label":"#", "x":3, "y":1.25},
+                {"matrix": [1,4], "label":"$", "x":4, "y":1.25},
+                {"matrix": [1,5], "label":"%", "x":5, "y":1.25},
+                {"matrix": [1,6], "label":"^", "x":6, "y":1.25},
+                {"matrix": [1,7], "label":"&", "x":7, "y":1.25},
+                {"matrix": [1,8], "label":"*", "x":8, "y":1.25},
+                {"matrix": [1,9], "label":"(", "x":9, "y":1.25},
+                {"matrix": [1,10], "label":")", "x":10, "y":1.25},
+                {"matrix": [1,11], "label":"_", "x":11, "y":1.25},
+                {"matrix": [1,12], "label":"+", "x":12, "y":1.25},
+                {"matrix": [1,13], "label":"1U Split Bksp", "x":13, "y":1.25},
+                {"matrix": [1,14], "label":"Backspace", "x":14, "y":1.25},
+                {"matrix": [1,15], "label":"Insert", "x":15.25, "y":1.25},
+                {"matrix": [1,16], "label":"Home", "x":16.25, "y":1.25},
+                {"matrix": [1,17], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1,18], "label":"Num Lock", "x":18.5, "y":1.25},
+                {"matrix": [1,19], "label":"/", "x":19.5, "y":1.25},
+                {"matrix": [1,20], "label":"*", "x":20.5, "y":1.25},
+                {"matrix": [1,21], "label":"-", "x":21.5, "y":1.25},
+                {"matrix": [2,0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"matrix": [2,1], "label":"Q", "x":1.5, "y":2.25},
+                {"matrix": [2,2], "label":"W", "x":2.5, "y":2.25},
+                {"matrix": [2,3], "label":"E", "x":3.5, "y":2.25},
+                {"matrix": [2,4], "label":"R", "x":4.5, "y":2.25},
+                {"matrix": [2,5], "label":"T", "x":5.5, "y":2.25},
+                {"matrix": [2,6], "label":"Y", "x":6.5, "y":2.25},
+                {"matrix": [2,7], "label":"U", "x":7.5, "y":2.25},
+                {"matrix": [2,8], "label":"I", "x":8.5, "y":2.25},
+                {"matrix": [2,9], "label":"O", "x":9.5, "y":2.25},
+                {"matrix": [2,10], "label":"P", "x":10.5, "y":2.25},
+                {"matrix": [2,11], "label":"{", "x":11.5, "y":2.25},
+                {"matrix": [2,12], "label":"}", "x":12.5, "y":2.25},
+                {"matrix": [2,13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2,15], "label":"Delete", "x":15.25, "y":2.25},
+                {"matrix": [2,16], "label":"End", "x":16.25, "y":2.25},
+                {"matrix": [2,17], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2,18], "label":"7", "x":18.5, "y":2.25},
+                {"matrix": [2,19], "label":"8", "x":19.5, "y":2.25},
+                {"matrix": [2,20], "label":"9", "x":20.5, "y":2.25},
+                {"matrix": [2,21], "label":"+", "x":21.5, "y":2.25},
+                {"matrix": [3,0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"matrix": [3,1], "label":"A", "x":1.75, "y":3.25},
+                {"matrix": [3,2], "label":"S", "x":2.75, "y":3.25},
+                {"matrix": [3,3], "label":"D", "x":3.75, "y":3.25},
+                {"matrix": [3,4], "label":"F", "x":4.75, "y":3.25},
+                {"matrix": [3,5], "label":"G", "x":5.75, "y":3.25},
+                {"matrix": [3,6], "label":"H", "x":6.75, "y":3.25},
+                {"matrix": [3,7], "label":"J", "x":7.75, "y":3.25},
+                {"matrix": [3,8], "label":"K", "x":8.75, "y":3.25},
+                {"matrix": [3,9], "label":"L", "x":9.75, "y":3.25},
+                {"matrix": [3,10], "label":":", "x":10.75, "y":3.25},
+                {"matrix": [3,11], "label":"\"", "x":11.75, "y":3.25},
+                {"matrix": [3,13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3,18], "label":"4", "x":18.5, "y":3.25},
+                {"matrix": [3,19], "label":"5", "x":19.5, "y":3.25},
+                {"matrix": [3,20], "label":"6", "x":20.5, "y":3.25},
+                {"matrix": [3,21], "label":"+", "x":21.5, "y":3.25},
+                {"matrix": [4,0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4,2], "label":"Z", "x":2.25, "y":4.25},
+                {"matrix": [4,3], "label":"X", "x":3.25, "y":4.25},
+                {"matrix": [4,4], "label":"C", "x":4.25, "y":4.25},
+                {"matrix": [4,5], "label":"V", "x":5.25, "y":4.25},
+                {"matrix": [4,6], "label":"B", "x":6.25, "y":4.25},
+                {"matrix": [4,7], "label":"N", "x":7.25, "y":4.25},
+                {"matrix": [4,8], "label":"M", "x":8.25, "y":4.25},
+                {"matrix": [4,9], "label":"<", "x":9.25, "y":4.25},
+                {"matrix": [4,10], "label":">", "x":10.25, "y":4.25},
+                {"matrix": [4,11], "label":"?", "x":11.25, "y":4.25},
+                {"matrix": [4,12], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4,13], "label":"Fn", "x":14, "y":4.25},
+                {"matrix": [4,16], "label":"Up Arrow", "x":16.25, "y":4.25},
+                {"matrix": [4,18], "label":"1", "x":18.5, "y":4.25},
+                {"matrix": [4,19], "label":"2", "x":19.5, "y":4.25},
+                {"matrix": [4,20], "label":"3", "x":20.5, "y":4.25},
+                {"matrix": [4,21], "label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [5,0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"matrix": [5,1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"matrix": [5,2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"matrix": [5,7], "label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"matrix": [5,10], "label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"matrix": [5,11], "label":"Alt", "x":11.25, "y":5.25, "w":1.25},
+                {"matrix": [5,12], "label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"matrix": [5,13], "label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"matrix": [5,15], "label":"Left Arrow", "x":15.25, "y":5.25},
+                {"matrix": [5,16], "label":"Down Arrow", "x":16.25, "y":5.25},
+                {"matrix": [5,17], "label":"Right Arrow", "x":17.25, "y":5.25},
+                {"matrix": [5,18], "label":"0", "x":18.5, "y":5.25},
+                {"matrix": [5,19], "label":"0", "x":19.5, "y":5.25},
+                {"matrix": [5,20], "label":".", "x":20.5, "y":5.25},
+                {"matrix": [5,21], "label":"Enter", "x":21.5, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hineybush/h101/keymaps/default/keymap.c b/keyboards/hineybush/h101/keymaps/default/keymap.c
new file mode 100644
index 000000000000..bc0352003644
--- /dev/null
+++ b/keyboards/hineybush/h101/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_f13_tsangan(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_0,                    KC_PSCR, KC_SCRL, KC_PAUS,            KC_MPLY, KC_MNXT, KC_VOLU, KC_VOLD,
+    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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,                                                                    KC_P4,   KC_P5,   KC_P6,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,                                                  KC_UP,                       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_RCTL,                                                                                       KC_LEFT, KC_DOWN, KC_RGHT,            KC_P0,   KC_PDOT                   ),
+
+  [1] = LAYOUT_f13_tsangan(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                                       KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                                                       KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS                   ),
+
+};
diff --git a/keyboards/hineybush/h101/keymaps/via/keymap.c b/keyboards/hineybush/h101/keymaps/via/keymap.c
new file mode 100644
index 000000000000..020042b13a66
--- /dev/null
+++ b/keyboards/hineybush/h101/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+// Copyright 2023 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0B │0C │0D ││0E │ │0F │0G │0H │ │0I │0J │0K │0L │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ └───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐   ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │1G │1H │ │1I │1J │1K │1L │   │1E     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤   └───────┘                ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2F │2G │2H │ │2I │2J │2K │2L │                            │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┼───┤                            │2L │ Numpad "+"
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │               │3I │3J │3K │3L │                            │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐     ├───┼───┼───┼───┤                            ├───┤
+│40      │42 │43 │44 │45 │46 │47 │48 │49 │3A │3B │4C    │4D │     │4G │     │4I │4J │4K │4L │                            │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ ├───┼───┼───┼───┤                ┌───────┐   │4L │ Numpad Enter
+│50  │51  │52  │57                      │5A  │5B  │5C  │5D  │ │5F │5G │5H │ │5I │5J │5K │5L │       Numpad 0 │5J     │   │   │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───┴───┴───┴───┘                └───────┘   └───┘
+                                                 ┌──────────┐
+                                    2.75u RShift │4C        │
+                                                 └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │57                         │5B   │5C │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,     KC_0,                             KC_PSCR, KC_SCRL, KC_PAUS,            KC_MPLY, KC_MNXT, KC_VOLU, KC_VOLD,
+    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_TRNS, KC_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,            KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                          KC_DEL,  KC_END,  KC_PGDN,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,                                                                             KC_P4,   KC_P5,   KC_P6,   KC_TRNS,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),                                                 KC_UP,                       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_LGUI, MO(1),   KC_RCTL,                                                                                       KC_LEFT, KC_DOWN, KC_RGHT,            KC_TRNS, KC_P0,   KC_PDOT, KC_TRNS),
+
+  [1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                                                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                                                       KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
diff --git a/keyboards/hineybush/h101/keymaps/via/rules.mk b/keyboards/hineybush/h101/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/hineybush/h101/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h101/readme.md b/keyboards/hineybush/h101/readme.md
new file mode 100644
index 000000000000..d28ce3507477
--- /dev/null
+++ b/keyboards/hineybush/h101/readme.md
@@ -0,0 +1,27 @@
+# h101
+
+![h101](https://i.imgur.com/LqmvjS1h.png)
+
+F13 full-size PCB with 1.25u function row Spacing.
+
+* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
+* Hardware Supported: h101 using STM32F072
+* Hardware Availability: Fossil by Carolina Mech
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hineybush/h101:default
+
+Flashing example for this keyboard:
+
+    make hineybush/h101: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 `QK_BOOT` if it is available
diff --git a/keyboards/hineybush/h101/rules.mk b/keyboards/hineybush/h101/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/hineybush/h101/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/horrortroll/nyx/rev1/config.h b/keyboards/horrortroll/nyx/rev1/config.h
new file mode 100644
index 000000000000..9d891b2ff429
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix config */
+#define RGB_MATRIX_LED_COUNT 67
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/info.json
new file mode 100644
index 000000000000..f3b859de0a9c
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/info.json
@@ -0,0 +1,222 @@
+{
+    "keyboard_name": "Nyx",
+    "manufacturer": "HorrorTroll",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x5005",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP3", "GP23", "GP2", "GP1", "GP0", "GP4", "GP17", "GP11", "GP10", "GP19", "GP9", "GP8", "GP13", "GP15", "GP14"],
+        "rows": ["GP24", "GP25", "GP18", "GP12", "GP16"]
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP22"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 75,
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 202, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
+
+            {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 205, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 200, "y": 32, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+            {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [3, 13], "x": 209, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 189, "y": 48, "flags": 1},
+            {"matrix": [3, 11], "x": 168, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 138, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 123, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 108, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 93, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 78, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 63, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 49, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
+            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 95, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 151, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 170, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 194, "y": 64, "flags": 4},
+            {"matrix": [4, 13], "x": 209, "y": 64, "flags": 4},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
+                {"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c b/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d678f19b46ec
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
@@ -0,0 +1,85 @@
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Ins│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │Del│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │ Fn │RCrl│ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_BASE] = LAYOUT_65_ansi_blocker(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │Tog│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │Reset│   │MsU│   │   │   │   │   │   │Sad│Sai│Spd│Spi│     │Mod│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │MsL│MsD│MsR│   │   │   │   │   │   │   │   │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │Cal│   │   │NKO│   │VoD│VoU│Mut│      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │Hud│Vad│Hui│
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_FN]   = LAYOUT_65_ansi_blocker(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_TOG,
+                QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, _______, RGB_MOD,
+                _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RGB_VAI, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          RGB_HUD, RGB_VAD, RGB_HUI
+            )
+};
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/via/keymap.c b/keyboards/horrortroll/nyx/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..d678f19b46ec
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/via/keymap.c
@@ -0,0 +1,85 @@
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Ins│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │Del│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │ Fn │RCrl│ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_BASE] = LAYOUT_65_ansi_blocker(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │Tog│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │Reset│   │MsU│   │   │   │   │   │   │Sad│Sai│Spd│Spi│     │Mod│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │MsL│MsD│MsR│   │   │   │   │   │   │   │   │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │Cal│   │   │NKO│   │VoD│VoU│Mut│      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │Hud│Vad│Hui│
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_FN]   = LAYOUT_65_ansi_blocker(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_TOG,
+                QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, _______, RGB_MOD,
+                _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RGB_VAI, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          RGB_HUD, RGB_VAD, RGB_HUI
+            )
+};
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/via/rules.mk b/keyboards/horrortroll/nyx/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h b/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
new file mode 100644
index 000000000000..0cd0a54a8b5d
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
@@ -0,0 +1,133 @@
+/* Copyright 2022 Jpe230 <https://github.com/Jpe230>
+ * Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <math.h>
+#include <lib/lib8tion/lib8tion.h>
+
+#define LED_TRAIL 10
+
+static int8_t top = 0;
+static int8_t bottom = MATRIX_ROWS - 1;
+static int8_t left = 0;
+static int8_t right = MATRIX_COLS - 1;
+static int8_t dir = 1;
+
+static int8_t i = 0;
+static int8_t j = 0;
+
+static bool traverse = true;
+
+static uint8_t v_values[RGB_MATRIX_LED_COUNT] = {0};
+
+static void traverse_matrix(void) {
+    if (dir == 1) {
+        // moving left->right
+        i++;
+        // Since we have traversed the whole first
+        // row, move down to the next row.
+        if (i > right) {
+            ++top;
+            dir = 2;
+            j = top;
+            i -= 1;
+        }
+    } else if (dir == 2) {
+        // moving top->bottom
+        j++;
+        // Since we have traversed the whole last
+        // column, move left to the previous column.
+        if (j > bottom) {
+            --right;
+            dir = 3;
+            i = right;
+            j -= 1;
+        }
+    } else if (dir == 3) {
+        // moving right->left
+        i--;
+        // Since we have traversed the whole last
+        // row, move up to the previous row.
+        if (i < left) {
+            --bottom;
+            dir = 4;
+            j = bottom;
+            i += 1;
+        }
+    } else if (dir == 4) {
+        // moving bottom->up
+        j--;
+        // Since we have traversed the whole first
+        // col, move right to the next column.
+        if (j < top) {
+            ++left;
+            dir = 1;
+            i = left;
+            j += 1;
+        }
+    }
+}
+
+static void swirl_set_color(HSV hsv) {
+    uint8_t index = g_led_config.matrix_co[j][i];
+
+    if(index != NO_LED){
+        v_values[index] = 75;
+    }
+
+    for(uint8_t v = 0; v < RGB_MATRIX_LED_COUNT; v++)
+    {
+        if(index != v) {
+            if(v_values[v] >= 20)
+                v_values[v] -= 20;
+            else
+                v_values[v] = 0;
+        }
+        hsv.v =  v_values[v];
+        RGB rgb = hsv_to_rgb(hsv);
+        rgb_matrix_set_color(v, rgb.r, rgb.g, rgb.b);
+    }
+
+    traverse_matrix();
+
+    if (!(top <= bottom && left <= right)) {
+        eeprom_read_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config));
+        rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
+        return;
+    }
+}
+
+static bool STARTUP_SWIRL_ANIM(effect_params_t* params) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(24, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if (traverse) {
+        swirl_set_color(hsv);
+    }
+    traverse = !traverse;
+    return false;
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    for (int i = led_min; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); // Clear matrix just in case
+    }
+
+    return rgb_matrix_check_finished_leds(led_max);
+}
diff --git a/keyboards/horrortroll/nyx/rev1/nyx.c b/keyboards/horrortroll/nyx/rev1/nyx.c
new file mode 100644
index 000000000000..fb4ce3183b06
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/nyx.c
@@ -0,0 +1,89 @@
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                    }
+                    break;
+                }
+            }
+            return false;
+        case RGB_MOD:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_SOLID_MULTISPLASH:
+                        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
+                        return false;
+                    default:
+                        rgb_matrix_step();
+                        return false;
+                }
+            }
+            return false;
+        case RGB_RMOD:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_SOLID_COLOR:
+                        rgb_matrix_mode(RGB_MATRIX_SOLID_MULTISPLASH);
+                        return false;
+                    default:
+                        rgb_matrix_step_reverse();
+                        return false;
+                }
+            }
+            return false;
+    }
+
+    return process_record_user(keycode, record);
+}
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(30, 0, 75, 75);
+    } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+        rgb_matrix_set_color(30, RGB_OFF);
+    }
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+    if (!(rgb_matrix_get_flags() & LED_FLAG_ALL)) {
+        rgb_matrix_set_color_all(0, 0, 0);
+    } else {
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_CUSTOM_STARTUP_SWIRL_ANIM);
+    }
+
+    keyboard_post_init_user();
+}
+#endif
diff --git a/keyboards/horrortroll/nyx/rev1/readme.md b/keyboards/horrortroll/nyx/rev1/readme.md
new file mode 100644
index 000000000000..7fdbd0ed8f3b
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/readme.md
@@ -0,0 +1,27 @@
+# Nyx
+
+![Nyx](https://i.imgur.com/I202xevh.png)
+
+A 65% keyboard, which controlled by an RP2040 chipset. The keyboard feature RGB Matrix.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: RP2040
+* Hardware Availability: Private prototype (only 5 PCB available)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/nyx/rev1:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/nyx/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/nyx/rev1/rgb_matrix_kb.inc b/keyboards/horrortroll/nyx/rev1/rgb_matrix_kb.inc
new file mode 100644
index 000000000000..0912e3d956ae
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/rgb_matrix_kb.inc
@@ -0,0 +1,7 @@
+RGB_MATRIX_EFFECT(STARTUP_SWIRL_ANIM)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "lib/startup_swirl_anim.h"
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/horrortroll/nyx/rev1/rules.mk b/keyboards/horrortroll/nyx/rev1/rules.mk
new file mode 100644
index 000000000000..942ef4c5dbde
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/horrortroll/readme.md b/keyboards/horrortroll/readme.md
index 67347a3c1623..64bcdf0c654e 100644
--- a/keyboards/horrortroll/readme.md
+++ b/keyboards/horrortroll/readme.md
@@ -1,17 +1,18 @@
 # Welcome to my Keyboard Firmwares
 
 ## Keyboards Released by me:
-  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
-  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- |
-  | Handwired K552   | STM32F103RCT6 | TKL          | 0x7516    | 0x5000     | Hotswap, RGB Underglow, OLED 128x32          |
-  | Paws 60          | ATMEGA32U4    | 60%          | 0x7516    | 0x5001     | Hotswap                                      |
+  | Keyboard name  | MCU           | Layout | Vendor ID | Product ID | Features                            |
+  | -------------- | ------------- | ------ | --------- | ---------- | ----------------------------------- |
+  | Handwired K552 | STM32F103RCT6 | TKL    | 0x7516    | 0x5000     | Hotswap, RGB Underglow, OLED 128x32 |
+  | Paws 60        | ATMEGA32U4    | 60%    | 0x7516    | 0x5001     | Hotswap                             |
+  | Nyx            | RP2040        | 65%    | 0x7516    | 0x5005     | Hotswap, RGB Matrix                 |
 
 ## Keyboards Completed has Collaboration with me:
-  | Keyboard name      | MCU           | Layout       | Vendor ID | Product ID | Features                           |
-  | ------------------ | ------------- | ------------ | --------- | ---------- | ---------------------------------- |
-  | Lemon40            | ATMEGA32U4    | 40% Alice    | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32 |
-  | Caticorn (Solder)  | RP2040        | TKL          | 0x7516    | 0x6001     | Solder                             |
-  | Caticorn (Hotswap) | RP2040        | TKL          | 0x7516    | 0x6002     | Hotswap                            |
+  | Keyboard name      | MCU        | Layout    | Vendor ID | Product ID | Features                           |
+  | ------------------ | ---------- | --------- | --------- | ---------- | ---------------------------------- |
+  | Lemon40            | ATMEGA32U4 | 40% Alice | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32 |
+  | Caticorn (Solder)  | RP2040     | TKL       | 0x7516    | 0x6001     | Solder                             |
+  | Caticorn (Hotswap) | RP2040     | TKL       | 0x7516    | 0x6002     | Hotswap                            |
 
 ## Keyboard Rewrited by me:
   | Keyboard name                                                                               | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
rename to keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md
rename to keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
rename to keyboards/ibm/model_m/yugo_m/keymaps/via/keymap.c
diff --git a/keyboards/ibm/model_m/yugo_m/keymaps/via/rules.mk b/keyboards/ibm/model_m/yugo_m/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/ibm/model_m/yugo_m/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yugo_m/model_m_101/matrix_diagram.md b/keyboards/ibm/model_m/yugo_m/matrix_diagram.md
similarity index 100%
rename from keyboards/yugo_m/model_m_101/matrix_diagram.md
rename to keyboards/ibm/model_m/yugo_m/matrix_diagram.md
diff --git a/keyboards/inland/v83p/config.h b/keyboards/inland/v83p/config.h
new file mode 100644
index 000000000000..c433b568dda5
--- /dev/null
+++ b/keyboards/inland/v83p/config.h
@@ -0,0 +1,36 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3
+
+/* DIP switch */
+#define DIP_SWITCH_PINS \
+    { C11 }
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000
+
+#define RGB_MATRIX_LED_COUNT 92
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/inland/v83p/halconf.h b/keyboards/inland/v83p/halconf.h
new file mode 100644
index 000000000000..fcd8b7216a67
--- /dev/null
+++ b/keyboards/inland/v83p/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/inland/v83p/info.json b/keyboards/inland/v83p/info.json
new file mode 100644
index 000000000000..d7a418bccfbe
--- /dev/null
+++ b/keyboards/inland/v83p/info.json
@@ -0,0 +1,253 @@
+{
+    "manufacturer": "Inland",
+    "keyboard_name": "V83P",
+    "maintainer": "jonylee@hfd",
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x001B",
+        "device_version": "1.0.3",
+        "force_nkro": true,
+        "suspend_wakeup_delay": 1000
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch":true
+    },
+    "matrix_pins": {
+        "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "B14"]
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "A8", "pin_b": "B13" }
+        ]
+    },
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "max_brightness": 180,
+        "animations": {
+            "solid_color": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "layout": [
+            { "flags": 4, "matrix": [0,0],  "x":   0, "y": 0 },
+            { "flags": 4, "matrix": [0,1],  "x":  14, "y": 0 },
+            { "flags": 4, "matrix": [0,2],  "x":  29, "y": 0 },
+            { "flags": 4, "matrix": [0,3],  "x":  44, "y": 0 },
+            { "flags": 4, "matrix": [0,4],  "x":  59, "y": 0 },
+            { "flags": 4, "matrix": [0,5],  "x":  74, "y": 0 },
+            { "flags": 4, "matrix": [0,6],  "x":  89, "y": 0 },
+            { "flags": 4, "matrix": [0,7],  "x": 104, "y": 0 },
+            { "flags": 4, "matrix": [0,8],  "x": 119, "y": 0 },
+            { "flags": 4, "matrix": [0,9],  "x": 134, "y": 0 },
+            { "flags": 4, "matrix": [0,10], "x": 149, "y": 0 },
+            { "flags": 4, "matrix": [0,11], "x": 164, "y": 0 },
+            { "flags": 4, "matrix": [0,12], "x": 179, "y": 0 },
+            { "flags": 4, "matrix": [0,13], "x": 194, "y": 0 },
+
+            { "flags": 4, "matrix": [1,0],  "x":   0, "y": 13},
+            { "flags": 4, "matrix": [1,1],  "x":  14, "y": 13},
+            { "flags": 4, "matrix": [1,2],  "x":  28, "y": 13},
+            { "flags": 4, "matrix": [1,3],  "x":  42, "y": 13},
+            { "flags": 4, "matrix": [1,4],  "x":  56, "y": 13},
+            { "flags": 4, "matrix": [1,5],  "x":  70, "y": 13},
+            { "flags": 4, "matrix": [1,6],  "x":  84, "y": 13},
+            { "flags": 4, "matrix": [1,7],  "x":  98, "y": 13},
+            { "flags": 4, "matrix": [1,8],  "x": 112, "y": 13},
+            { "flags": 4, "matrix": [1,9],  "x": 126, "y": 13},
+            { "flags": 4, "matrix": [1,10], "x": 140, "y": 13},
+            { "flags": 4, "matrix": [1,11], "x": 154, "y": 13},
+            { "flags": 4, "matrix": [1,12], "x": 168, "y": 13},
+            { "flags": 4, "matrix": [1,13], "x": 182, "y": 13},
+            { "flags": 4, "matrix": [1,15], "x": 224, "y": 13},
+
+            { "flags": 4, "matrix": [2,0],  "x":   0, "y": 26},
+            { "flags": 4, "matrix": [2,1],  "x":  14, "y": 26},
+            { "flags": 4, "matrix": [2,2],  "x":  28, "y": 26},
+            { "flags": 4, "matrix": [2,3],  "x":  42, "y": 26},
+            { "flags": 4, "matrix": [2,4],  "x":  56, "y": 26},
+            { "flags": 4, "matrix": [2,5],  "x":  70, "y": 26},
+            { "flags": 4, "matrix": [2,6],  "x":  84, "y": 26},
+            { "flags": 4, "matrix": [2,7],  "x":  98, "y": 26},
+            { "flags": 4, "matrix": [2,8],  "x": 112, "y": 26},
+            { "flags": 4, "matrix": [2,9],  "x": 126, "y": 26},
+            { "flags": 4, "matrix": [2,10], "x": 140, "y": 26},
+            { "flags": 4, "matrix": [2,11], "x": 154, "y": 26},
+            { "flags": 4, "matrix": [2,12], "x": 168, "y": 26},
+            { "flags": 4, "matrix": [2,13], "x": 182, "y": 26},
+            { "flags": 4, "matrix": [2,15], "x": 224, "y": 26},
+
+            { "flags": 1, "matrix": [3,0],  "x":   0, "y": 38},
+            { "flags": 4, "matrix": [3,1],  "x":  28, "y": 38},
+            { "flags": 4, "matrix": [3,2],  "x":  42, "y": 38},
+            { "flags": 4, "matrix": [3,3],  "x":  56, "y": 38},
+            { "flags": 4, "matrix": [3,4],  "x":  70, "y": 38},
+            { "flags": 4, "matrix": [3,5],  "x":  84, "y": 38},
+            { "flags": 4, "matrix": [3,6],  "x":  98, "y": 38},
+            { "flags": 4, "matrix": [3,7],  "x": 112, "y": 38},
+            { "flags": 4, "matrix": [3,8],  "x": 126, "y": 38},
+            { "flags": 4, "matrix": [3,9],  "x": 140, "y": 38},
+            { "flags": 4, "matrix": [3,10], "x": 154, "y": 38},
+            { "flags": 4, "matrix": [3,11], "x": 168, "y": 38},
+            { "flags": 1, "matrix": [3,13], "x": 182, "y": 38},
+            { "flags": 4, "matrix": [3,15], "x": 224, "y": 38},
+
+            { "flags": 1, "matrix": [4,0],  "x":   0, "y": 51},
+            { "flags": 4, "matrix": [4,1],  "x":  18, "y": 51},
+            { "flags": 4, "matrix": [4,2],  "x":  37, "y": 51},
+            { "flags": 4, "matrix": [4,3],  "x":  56, "y": 51},
+            { "flags": 4, "matrix": [4,4],  "x":  74, "y": 51},
+            { "flags": 4, "matrix": [4,5],  "x":  93, "y": 51},
+            { "flags": 4, "matrix": [4,6],  "x": 112, "y": 51},
+            { "flags": 4, "matrix": [4,7],  "x": 130, "y": 51},
+            { "flags": 4, "matrix": [4,8],  "x": 149, "y": 51},
+            { "flags": 4, "matrix": [4,9],  "x": 168, "y": 51},
+            { "flags": 4, "matrix": [4,10], "x": 186, "y": 51},
+            { "flags": 1, "matrix": [4,13], "x": 200, "y": 51},
+            { "flags": 1, "matrix": [4,14], "x": 214, "y": 51},
+            { "flags": 1, "matrix": [4,15], "x": 224, "y": 51},
+
+            { "flags": 1, "matrix": [5,0],  "x":   0, "y": 64},
+            { "flags": 1, "matrix": [5,1],  "x":  18, "y": 64},
+            { "flags": 1, "matrix": [5,2],  "x":  37, "y": 64},
+            { "flags": 4, "matrix": [5,5],  "x":  92, "y": 64},
+            { "flags": 1, "matrix": [5,9],  "x": 140, "y": 64},
+            { "flags": 1, "matrix": [5,10], "x": 154, "y": 64},
+            { "flags": 1, "matrix": [5,11], "x": 168, "y": 64},
+            { "flags": 1, "matrix": [5,13], "x": 196, "y": 64},
+            { "flags": 1, "matrix": [5,14], "x": 210, "y": 64},
+            { "flags": 1, "matrix": [5,15], "x": 224, "y": 64},
+
+            { "flags": 2, "x":   0, "y": 0 },
+            { "flags": 2, "x":   0, "y": 16},
+            { "flags": 2, "x":   0, "y": 32},
+            { "flags": 2, "x":   0, "y": 48},
+            { "flags": 2, "x":   0, "y": 64},
+
+            { "flags": 2, "x": 224, "y": 0 },
+            { "flags": 2, "x": 224, "y": 16},
+            { "flags": 2, "x": 224, "y": 32},
+            { "flags": 2, "x": 224, "y": 48},
+            { "flags": 2, "x": 224, "y": 64}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                { "matrix": [0,0], "x": 0, "y": 0 },
+                { "matrix": [0,1], "x": 1.25, "y": 0 },
+                { "matrix": [0,2], "x": 2.25, "y": 0 },
+                { "matrix": [0,3], "x": 3.25, "y": 0 },
+                { "matrix": [0,4], "x": 4.25, "y": 0 },
+                { "matrix": [0,5], "x": 5.5, "y": 0 },
+                { "matrix": [0,6], "x": 6.5, "y": 0 },
+                { "matrix": [0,7], "x": 7.5, "y": 0 },
+                { "matrix": [0,8], "x": 8.5, "y": 0 },
+                { "matrix": [0,9], "x": 9.75, "y": 0 },
+                { "matrix": [0,10], "x": 10.75, "y": 0 },
+                { "matrix": [0,11], "x": 11.75, "y": 0 },
+                { "matrix": [0,12], "x": 12.75, "y": 0 },
+                { "matrix": [0,13], "x": 14, "y": 0 },
+                { "matrix": [0,15], "x": 15.5, "y": 0 },
+
+                { "matrix": [1,0], "x": 0, "y": 1 },
+                { "matrix": [1,1], "x": 1, "y": 1 },
+                { "matrix": [1,2], "x": 2, "y": 1 },
+                { "matrix": [1,3], "x": 3, "y": 1 },
+                { "matrix": [1,4], "x": 4, "y": 1 },
+                { "matrix": [1,5], "x": 5, "y": 1 },
+                { "matrix": [1,6], "x": 6, "y": 1 },
+                { "matrix": [1,7], "x": 7, "y": 1 },
+                { "matrix": [1,8], "x": 8, "y": 1 },
+                { "matrix": [1,9], "x": 9, "y": 1 },
+                { "matrix": [1,10], "x": 10, "y": 1 },
+                { "matrix": [1,11], "x": 11, "y": 1 },
+                { "matrix": [1,12], "x": 12, "y": 1 },
+                { "matrix": [1,13], "w": 2, "x": 13, "y": 1 },
+                { "matrix": [1,15], "x": 15.5, "y": 1 },
+
+                { "matrix": [2,0], "w": 1.5, "x": 0, "y": 2 },
+                { "matrix": [2,1], "x": 1.5, "y": 2 },
+                { "matrix": [2,2], "x": 2.5, "y": 2 },
+                { "matrix": [2,3], "x": 3.5, "y": 2 },
+                { "matrix": [2,4], "x": 4.5, "y": 2 },
+                { "matrix": [2,5], "x": 5.5, "y": 2 },
+                { "matrix": [2,6], "x": 6.5, "y": 2 },
+                { "matrix": [2,7], "x": 7.5, "y": 2 },
+                { "matrix": [2,8], "x": 8.5, "y": 2 },
+                { "matrix": [2,9], "x": 9.5, "y": 2 },
+                { "matrix": [2,10], "x": 10.5, "y": 2 },
+                { "matrix": [2,11], "x": 11.5, "y": 2 },
+                { "matrix": [2,12], "x": 12.5, "y": 2 },
+                { "matrix": [2,13], "w": 1.5, "x": 13.5, "y": 2 },
+                { "matrix": [2,15], "x": 15.5, "y": 2 },
+
+                { "matrix": [3,0], "w": 1.75, "x": 0, "y": 3 },
+                { "matrix": [3,1], "x": 1.75, "y": 3 },
+                { "matrix": [3,2], "x": 2.75, "y": 3 },
+                { "matrix": [3,3], "x": 3.75, "y": 3 },
+                { "matrix": [3,4], "x": 4.75, "y": 3 },
+                { "matrix": [3,5], "x": 5.75, "y": 3 },
+                { "matrix": [3,6], "x": 6.75, "y": 3 },
+                { "matrix": [3,7], "x": 7.75, "y": 3 },
+                { "matrix": [3,8], "x": 8.75, "y": 3 },
+                { "matrix": [3,9],  "x": 9.75, "y": 3 },
+                { "matrix": [3,10], "x": 10.75, "y": 3 },
+                { "matrix": [3,11], "x": 11.75, "y": 3 },
+                { "matrix": [3,13], "w": 2.25, "x": 12.75, "y": 3 },
+                { "matrix": [3,15], "x": 15.5, "y": 3 },
+
+                { "matrix": [4,0], "w": 2.25, "x": 0, "y": 4 },
+                { "matrix": [4,1], "x": 2.25, "y": 4 },
+                { "matrix": [4,2], "x": 3.25, "y": 4 },
+                { "matrix": [4,3], "x": 4.25, "y": 4 },
+                { "matrix": [4,4], "x": 5.25, "y": 4 },
+                { "matrix": [4,5], "x": 6.25, "y": 4 },
+                { "matrix": [4,6], "x": 7.25, "y": 4 },
+                { "matrix": [4,7], "x": 8.25, "y": 4 },
+                { "matrix": [4,8], "x": 9.25, "y": 4 },
+                { "matrix": [4,9],  "x": 10.25, "y": 4 },
+                { "matrix": [4,10], "x": 11.25, "y": 4 },
+                { "matrix": [4,13], "w": 1.75, "x": 12.25, "y": 4 },
+                { "matrix": [4,14], "x": 14.25, "y": 4.25 },
+                { "matrix": [4,15], "x": 15.5, "y": 4 },
+
+                { "matrix": [5,0], "w": 1.25, "x": 0, "y": 5 },
+                { "matrix": [5,1], "w": 1.25, "x": 1.25, "y": 5 },
+                { "matrix": [5,2], "w": 1.25, "x": 2.5, "y": 5 },
+                { "matrix": [5,5], "w": 6.25, "x": 3.75, "y": 5 },
+                { "matrix": [5,9], "x": 10, "y": 5 },
+                { "matrix": [5,10], "x": 11, "y": 5 },
+                { "matrix": [5,11], "x": 12, "y": 5 },
+                { "matrix": [5,13], "x": 13.25, "y": 5.25 },
+                { "matrix": [5,14], "x": 14.25, "y": 5.25 },
+                { "matrix": [5,15], "x": 15.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/inland/v83p/keymaps/default/keymap.c b/keyboards/inland/v83p/keymaps/default/keymap.c
new file mode 100644
index 000000000000..359939a01597
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// clang-format off
+enum __layers {
+    WIN_B,
+    WIN_FN,
+    MAC_B,
+    MAC_FN
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_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_DEL,       KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                 KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(WIN_FN),KC_RCTL,    KC_LEFT,  KC_DOWN, KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,       RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,               RGB_VAI,  RGB_HUD,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,      RGB_SPD, RGB_VAD, RGB_SPI),
+
+    [MAC_B] = LAYOUT_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,        KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(MAC_FN),KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,       RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                RGB_VAI, RGB_HUD,
+        _______, _______, _______,                   _______,                            _______, _______, _______,       RGB_SPD, RGB_VAD, RGB_SPI)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [MAC_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+};
+#endif
+
diff --git a/keyboards/inland/v83p/keymaps/default/rules.mk b/keyboards/inland/v83p/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/inland/v83p/keymaps/via/keymap.c b/keyboards/inland/v83p/keymaps/via/keymap.c
new file mode 100644
index 000000000000..56b44997d031
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/via/keymap.c
@@ -0,0 +1,76 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// clang-format off
+enum __layers {
+    WIN_B,
+    WIN_FN,
+    MAC_B,
+    MAC_FN
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_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_DEL,       KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                 KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(WIN_FN),KC_RCTL,    KC_LEFT,  KC_DOWN, KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,       RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,               RGB_VAI,  RGB_HUD,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,      RGB_SPD, RGB_VAD, RGB_SPI),
+
+    [MAC_B] = LAYOUT_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,        KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(MAC_FN),KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,       RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                RGB_VAI, RGB_HUD,
+        _______, _______, _______,                   _______,                            _______, _______, _______,       RGB_SPD, RGB_VAD, RGB_SPI)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [MAC_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+};
+#endif
+// clang-format on
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    if (active) {
+        keymap_config.no_gui = 0;
+    }
+    return true;
+}
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // caps lock red
+    if ((host_keyboard_led_state().caps_lock)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(44, 128, 0, 0);
+    }
+    // GUI lock red
+    if (keymap_config.no_gui) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(73, 128, 0, 0);
+    }
+    return true;
+}
diff --git a/keyboards/inland/v83p/keymaps/via/rules.mk b/keyboards/inland/v83p/keymaps/via/rules.mk
new file mode 100644
index 000000000000..4253f570f0bb
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/inland/v83p/mcuconf.h b/keyboards/inland/v83p/mcuconf.h
new file mode 100644
index 000000000000..aa272655630f
--- /dev/null
+++ b/keyboards/inland/v83p/mcuconf.h
@@ -0,0 +1,12 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/inland/v83p/readme.md b/keyboards/inland/v83p/readme.md
new file mode 100644
index 000000000000..000e960d634d
--- /dev/null
+++ b/keyboards/inland/v83p/readme.md
@@ -0,0 +1,26 @@
+# v83p
+
+A customizable 75% encoder keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: v83p
+* Hardware Availability: [inland](https://www.microcenter.com/search/search_results.aspx?N=4294961018+4294822437)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make inland/v83p:default
+
+Flashing example for this keyboard:
+
+    make inland/v83p: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:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical BOOT contact**: Short circuit the BOOT contact located below the spacebar of the PCB and plug in the keyboard
diff --git a/keyboards/inland/v83p/rules.mk b/keyboards/inland/v83p/rules.mk
new file mode 100644
index 000000000000..24d5f6f52ecc
--- /dev/null
+++ b/keyboards/inland/v83p/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/inland/v83p/v83p.c b/keyboards/inland/v83p/v83p.c
new file mode 100644
index 000000000000..26ab62784aab
--- /dev/null
+++ b/keyboards/inland/v83p/v83p.c
@@ -0,0 +1,119 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// clang-format off
+
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |   R location
+ *   |   |     G location
+ *   |   |     |     B location
+ *   |   |     |     | */
+    {1, A_1,   B_1,   C_1},
+    {1, A_2,   B_2,   C_2},
+    {1, A_3,   B_3,   C_3},
+    {1, A_4,   B_4,   C_4},
+    {1, A_5,   B_5,   C_5},
+    {1, A_6,   B_6,   C_6},
+    {1, A_7,   B_7,   C_7},
+    {1, A_8,   B_8,   C_8},
+    {1, A_9,   B_9,   C_9},
+    {1, A_10,  B_10,  C_10},
+    {1, A_11,  B_11,  C_11},
+    {1, A_12,  B_12,  C_12},
+    {1, A_13,  B_13,  C_13},
+    {1, A_14,  B_14,  C_14},
+
+    {0, A_1,   B_1,   C_1},
+    {0, A_2,   B_2,   C_2},
+    {0, A_3,   B_3,   C_3},
+    {0, A_4,   B_4,   C_4},
+    {0, A_5,   B_5,   C_5},
+    {0, A_6,   B_6,   C_6},
+    {0, A_7,   B_7,   C_7},
+    {0, A_8,   B_8,   C_8},
+    {0, A_9,   B_9,   C_9},
+    {0, A_10,  B_10,  C_10},
+    {0, A_11,  B_11,  C_11},
+    {0, A_12,  B_12,  C_12},
+    {0, A_13,  B_13,  C_13},
+    {0, A_14,  B_14,  C_14},
+    {1, D_1,   E_1,   F_1},
+
+    {0, D_1,   E_1,   F_1},
+    {0, D_2,   E_2,   F_2},
+    {0, D_3,   E_3,   F_3},
+    {0, D_4,   E_4,   F_4},
+    {0, D_5,   E_5,   F_5},
+    {0, D_6,   E_6,   F_6},
+    {0, D_7,   E_7,   F_7},
+    {0, D_8,   E_8,   F_8},
+    {0, D_9,   E_9,   F_9},
+    {0, D_10,  E_10,  F_10},
+    {0, D_11,  E_11,  F_11},
+    {0, D_12,  E_12,  F_12},
+    {0, D_13,  E_13,  F_13},
+    {0, D_14,  E_14,  F_14},
+    {1, D_2,   E_2,   F_2},
+
+    {0, G_1,   H_1,   I_1},
+    {0, G_2,   H_2,   I_2},
+    {0, G_3,   H_3,   I_3},
+    {0, G_4,   H_4,   I_4},
+    {0, G_5,   H_5,   I_5},
+    {0, G_6,   H_6,   I_6},
+    {0, G_7,   H_7,   I_7},
+    {0, G_8,   H_8,   I_8},
+    {0, G_9,   H_9,   I_9},
+    {0, G_10,  H_10,  I_10},
+    {0, G_11,  H_11,  I_11},
+    {0, G_12,  H_12,  I_12},
+    {0, G_13,  H_13,  I_13},
+    {1, D_3,   E_3,   F_3},
+
+    {0, J_1,   K_1,   L_1},
+    {0, J_2,   K_2,   L_2},
+    {0, J_3,   K_3,   L_3},
+    {0, J_4,   K_4,   L_4},
+    {0, J_5,   K_5,   L_5},
+    {0, J_6,   K_6,   L_6},
+    {0, J_7,   K_7,   L_7},
+    {0, J_8,   K_8,   L_8},
+    {0, J_9,   K_9,   L_9},
+    {0, J_10,  K_10,  L_10},
+    {0, J_11,  K_11,  L_11},
+    {0, J_12,  K_12,  L_12},
+    {1, D_7,   E_7,   F_7},
+    {1, D_4,   E_4,   F_4},
+
+    {0, J_13,  K_13,  L_13},
+    {0, J_14,  K_14,  L_14},
+    {0, J_15,  K_15,  L_15},
+    {0, J_16,  K_16,  L_16},
+
+    {0, G_14,  H_14,  I_14},
+    {0, G_15,  H_15,  I_15},
+    {0, G_16,  H_16,  I_16},
+
+    {0, D_15,  E_15,  F_15},
+    {1, D_6,   E_6,   F_6},
+    {1, D_5,   E_5,   F_5},
+
+    {1, G_1,   H_1,   I_1},
+    {1, G_2,   H_2,   I_2},
+    {1, G_3,   H_3,   I_3},
+    {1, G_4,   H_4,   I_4},
+    {1, G_5,   H_5,   I_5},
+
+    {1, J_1,   K_1,   L_1},
+    {1, J_2,   K_2,   L_2},
+    {1, J_3,   K_3,   L_3},
+    {1, J_4,   K_4,   L_4},
+    {1, J_5,   K_5,   L_5},
+};
+#endif
+
+
diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h
new file mode 100644
index 000000000000..8a7ea71db4e8
--- /dev/null
+++ b/keyboards/jukaie/jk01/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#define SPI_MOSI_PIN A7
+#define SPI_MISO_PIN A6
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B15
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 19
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/jukaie/jk01/halconf.h b/keyboards/jukaie/jk01/halconf.h
new file mode 100644
index 000000000000..64a184eb924e
--- /dev/null
+++ b/keyboards/jukaie/jk01/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/jukaie/jk01/info.json b/keyboards/jukaie/jk01/info.json
new file mode 100644
index 000000000000..87c787158c7f
--- /dev/null
+++ b/keyboards/jukaie/jk01/info.json
@@ -0,0 +1,270 @@
+{
+    "manufacturer": "Jukaie",
+    "keyboard_name": "JK01",
+    "maintainer": "Jukaie",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C2", "pin_b": "C3"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B12"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [76, 25],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 30, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 50, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 60, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 70, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 80, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 90, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 100, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 110, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 120, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 130, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 150, "y": 0 },
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 10 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 10 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 10 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 10 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 10 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 10 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 10 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 10 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 10 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 10 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 10 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 10 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 10 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 10 },
+            { "flags": 4, "matrix": [11, 6], "x": 150, "y": 10 },
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 20 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 20 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 20 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 20 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 20 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 20 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 20 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 20 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 20 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 20 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 20 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 20 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 20 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 20 },
+            { "flags": 4, "matrix": [6, 5], "x": 150, "y": 20 },
+            { "flags": 4, "matrix": [2, 1], "x": 0, "y": 30 },
+            { "flags": 4, "matrix": [1, 2], "x": 17, "y": 30 },
+            { "flags": 8, "matrix": [2, 2], "x": 27, "y": 30 },
+            { "flags": 4, "matrix": [3, 2], "x": 37, "y": 30 },
+            { "flags": 4, "matrix": [4, 2], "x": 47, "y": 30 },
+            { "flags": 4, "matrix": [4, 3], "x": 57, "y": 30 },
+            { "flags": 4, "matrix": [5, 3], "x": 67, "y": 30 },
+            { "flags": 4, "matrix": [5, 2], "x": 77, "y": 30 },
+            { "flags": 4, "matrix": [6, 2], "x": 87, "y": 30 },
+            { "flags": 4, "matrix": [7, 2], "x": 97, "y": 30 },
+            { "flags": 4, "matrix": [8, 2], "x": 107, "y": 30 },
+            { "flags": 4, "matrix": [8, 3], "x": 117, "y": 30 },
+            { "flags": 4, "matrix": [10, 4], "x": 127, "y": 30 },
+            { "flags": 4, "matrix": [1, 5], "x": 150, "y": 30 },
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 40 },
+            { "flags": 4, "matrix": [1, 4], "x": 22, "y": 40 },
+            { "flags": 4, "matrix": [2, 4], "x": 32, "y": 40 },
+            { "flags": 4, "matrix": [3, 4], "x": 42, "y": 40 },
+            { "flags": 4, "matrix": [4, 4], "x": 52, "y": 40 },
+            { "flags": 4, "matrix": [4, 5], "x": 62, "y": 40 },
+            { "flags": 4, "matrix": [5, 5], "x": 72, "y": 40 },
+            { "flags": 4, "matrix": [5, 4], "x": 82, "y": 40 },
+            { "flags": 4, "matrix": [6, 4], "x": 92, "y": 40 },
+            { "flags": 4, "matrix": [7, 4], "x": 102, "y": 40 },
+            { "flags": 4, "matrix": [8, 5], "x": 112, "y": 40 },
+            { "flags": 4, "matrix": [9, 1], "x": 122, "y": 40 },
+            { "flags": 4, "matrix": [3, 5], "x": 140, "y": 40 },
+            { "flags": 4, "matrix": [2, 5], "x": 150, "y": 40 },
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 50 },
+            { "flags": 4, "matrix": [9, 0], "x": 12, "y": 50 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 50 },
+            { "flags": 4, "matrix": [9, 4], "x": 37, "y": 50 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 50 },
+            { "flags": 4, "matrix": [9, 2], "x": 110, "y": 50 },
+            { "flags": 4, "matrix": [0, 4], "x": 120, "y": 50 },
+            { "flags": 4, "matrix": [0, 3], "x": 130, "y": 50 },
+            { "flags": 4, "matrix": [7, 3], "x": 140, "y": 50 },
+            { "flags": 4, "matrix": [0, 5], "x": 150, "y": 50 },
+            { "flags": 4, "matrix": [11, 0], "x": 0, "y": 1 },
+            { "flags": 4, "matrix": [11, 1], "x": 0, "y": 2 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x0002",
+        "vid": "0x4141"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "ESC", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 6, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 7, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 8, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 9, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 10, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 11, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 12, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 13, "y": 0 },
+                { "label": "Printscreen", "matrix": [9, 7], "x": 14, "y": 0 },
+                { "label": "Del", "matrix": [0, 2], "x": 15, "y": 0 },
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 },
+                { "label": "Home", "matrix": [11, 6], "x": 15, "y": 1 },
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2 },
+                { "label": "End", "matrix": [6, 5], "x": 15, "y": 2 },
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3 },
+                { "label": "PgUp", "matrix": [1, 5], "x": 15, "y": 3 },
+                { "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4 },
+                { "label": "Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4 },
+                { "label": "Up", "matrix": [3, 5], "x": 14, "y": 4 },
+                { "label": "PgDn", "matrix": [2, 5], "x": 15, "y": 4 },
+                { "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5 },
+                { "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5 },
+                { "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5 },
+                { "label": "Alt", "matrix": [9, 5], "x": 10, "y": 5 },
+                { "label": "FN", "matrix": [9, 2], "x": 11, "y": 5 },
+                { "label": "Ctrl", "matrix": [0, 4], "x": 12, "y": 5 },
+                { "label": "Left", "matrix": [0, 3], "x": 13, "y": 5 },
+                { "label": "Down", "matrix": [7, 3], "x": 14, "y": 5 },
+                { "label": "Right", "matrix": [0, 5], "x": 15, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c
new file mode 100644
index 000000000000..8f6941947609
--- /dev/null
+++ b/keyboards/jukaie/jk01/jk01.c
@@ -0,0 +1,173 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "jk01.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
+
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   1, k13, Esc
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   2, k26, F1
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   3, k36, F2
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   4, k31, F3
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   5, k33, F4
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   6, k07, F5
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   7, k63, F6
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   8, k71, F7
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   9, k76, F8
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  10, ka6, F9
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  11, ka7, F10
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  12, ka3, F11
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  13, ka5, F12
+    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  14, k97, Printscreen
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  15, k02, Del
+
+    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  16, k16, `
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  17, k17, 1
+    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  18, k27, 2
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  19, k37, 3
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  20, k47, 4
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  21, k46, 5
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  22, k56, 6
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  23, k57, 7
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  24, k67, 8
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  25, k77, 9
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  26, k87, 0
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  27, k86, -
+    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  28, k66, =
+    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  29, ka1, Backspace
+    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  30, kc6, Home
+
+    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  31, k11, Tab
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  32, k10, Q
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  33, k20, W
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  34, k30, E
+    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  35, k40, R
+    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  36, k41, T
+    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  37, k51, Y
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  38, k50, U
+    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  39, k60, I
+    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  40, k70, O
+    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  41, k80, P
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  42, k81, [
+    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  43, k61, ]
+    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  44, ka2, "\\"
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  45, k65, End
+
+    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  46, k21, Caps Lock
+    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  47, k12, A
+    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  48, k22, S
+    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  49, k32, D
+    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  50, k42, F
+    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  51, k43, G
+    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  52, k53, H
+    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  53, k52, J
+    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  54, k62, K
+    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  55, k72, L
+    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  56, k82, ;
+    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  57, k83, '
+    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  58, ka4, Enter
+    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  59, k15, PgUp
+
+    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  60, k00, Shift_L
+    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  61, k14, Z
+    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  62, k24, X
+    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  63, k34, C
+    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  64, k44, V
+    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  65, k45, B
+    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  66, k55, N
+    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  67, k54, M
+    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  68, k64, ,
+    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  69, k74, .
+    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  70, k85, /
+    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  71, k91, Shift_R
+    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  72, k35, Up
+    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  73, k25, PgDn
+
+    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  74, k06, Ctrl_L
+    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  75, k90, Win_L
+    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  76, k93, Alt_L
+    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  77, k94, Space
+    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  78, k95, Alt_R
+    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  79, k92, FN
+    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  80, k04, Ctrl_R
+    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  81, k03, Left
+    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  82, k73, Down
+    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  83, k05, Right
+
+    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
+    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C0);
+    setPinOutput(C15);
+    keyboard_pre_init_user();
+};
+void housekeeping_task_kb(void) {
+    writePin(C15, keymap_config.no_gui);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        case KC_SIRI:
+            if (record->event.pressed) {
+                host_consumer_send(0xCF);
+            } else {
+                host_consumer_send(0);
+            }
+            return false; /* Skip all further processing of this key */
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
\ No newline at end of file
diff --git a/keyboards/jukaie/jk01/jk01.h b/keyboards/jukaie/jk01/jk01.h
new file mode 100644
index 000000000000..d4bf805c12d5
--- /dev/null
+++ b/keyboards/jukaie/jk01/jk01.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+enum keyboard_keycodes {
+    KC_SIRI = QK_KB
+};
diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c
new file mode 100644
index 000000000000..bdf509a8e899
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+enum custom_layers {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = LAYOUT(
+  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_END,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGUP,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_PGDN,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(Winfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  KC_DEL,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_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_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/jukaie/jk01/keymaps/default/rules.mk b/keyboards/jukaie/jk01/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c
new file mode 100644
index 000000000000..bdf509a8e899
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+enum custom_layers {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = LAYOUT(
+  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_END,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGUP,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_PGDN,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(Winfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  KC_DEL,
+  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_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_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/jukaie/jk01/keymaps/via/rules.mk b/keyboards/jukaie/jk01/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jukaie/jk01/mcuconf.h b/keyboards/jukaie/jk01/mcuconf.h
new file mode 100644
index 000000000000..e4b8d1f97328
--- /dev/null
+++ b/keyboards/jukaie/jk01/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/jukaie/jk01/readme.md b/keyboards/jukaie/jk01/readme.md
new file mode 100644
index 000000000000..a9dbac18acd3
--- /dev/null
+++ b/keyboards/jukaie/jk01/readme.md
@@ -0,0 +1,23 @@
+# jk01 
+
+An 83 keys keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [JUKAIE](https://github.com/jukaie)
+* Hardware Supported: JK01
+* Hardware Availability: [JUKAIE](https://github.com/jukaie/keyboard1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jukaie/jk01:default
+
+Flashing example for this keyboard:
+
+    make jukaie/jk01:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB back side after the USB cable is connected
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+ESC will reset the board to bootloader mode
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/jukaie/jk01/rules.mk b/keyboards/jukaie/jk01/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/jukaie/jk01/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/kaly/kaly42/config.h b/keyboards/kaly/kaly42/config.h
new file mode 100644
index 000000000000..e97f0a8aa45b
--- /dev/null
+++ b/keyboards/kaly/kaly42/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
+
+#define SERIAL_USART_TX_PIN B6     // USART TX pin
+#define SERIAL_USART_RX_PIN B7     // USART RX pin
diff --git a/keyboards/kaly/kaly42/halconf.h b/keyboards/kaly/kaly42/halconf.h
new file mode 100644
index 000000000000..7cbbf5961036
--- /dev/null
+++ b/keyboards/kaly/kaly42/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+#include_next <halconf.h>
diff --git a/keyboards/kaly/kaly42/info.json b/keyboards/kaly/kaly42/info.json
new file mode 100644
index 000000000000..38de4ccea50d
--- /dev/null
+++ b/keyboards/kaly/kaly42/info.json
@@ -0,0 +1,93 @@
+{
+    "manufacturer": "Dwctor",
+    "keyboard_name": "kaly/kaly42",
+    "maintainer": "Dwctor",
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B1", "B10", "A8", "B15", "B14", "B13"],
+            ["B9", "B8", "B5", "B4", "B3", "A15"],
+            ["A4", "A3", "A5", "A6", "A7", "B0"],
+            ["A2", "A1", "A0", "NO_PIN", "NO_PIN", "NO_PIN"]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["B13", "B14", "B15", "A8", "B10", "B1"],
+                    ["A15", "B3", "B4", "B5", "B8", "B9"],
+                    ["B0", "A7", "A6", "A5", "A3", "A4"],
+                    ["A0", "A1", "A2", "NO_PIN", "NO_PIN", "NO_PIN"]
+                ]
+            }
+        }
+    },
+    "url": "https://github.com/Dwctor/Kaly",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "community_layouts": ["split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 5.5, "y": 3.75},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kaly/kaly42/keymaps/default/keymap.c b/keyboards/kaly/kaly42/keymaps/default/keymap.c
new file mode 100644
index 000000000000..54d46c54dbb7
--- /dev/null
+++ b/keyboards/kaly/kaly42/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┐
+      * │Tab│ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │Bsp│
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Ctl│ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │ ' │
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │Sft│
+      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
+      *               ┌───┐                   ┌───┐
+      *               │GUI├───┐           ┌───┤Alt│
+      *               └───┤Bsp├───┐   ┌───┤Ent├───┘
+      *                   └───┤   │   │   ├───┘
+      *                       └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x6_3(
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                                            KC_LGUI, KC_BSPC, KC_SPC,           KC_SPC,  KC_ENT,  KC_RALT
+    )
+};
diff --git a/keyboards/kaly/kaly42/mcuconf.h b/keyboards/kaly/kaly42/mcuconf.h
new file mode 100644
index 000000000000..6db1e6072a67
--- /dev/null
+++ b/keyboards/kaly/kaly42/mcuconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/kaly/kaly42/readme.md b/keyboards/kaly/kaly42/readme.md
new file mode 100644
index 000000000000..d3b0ff7a3d56
--- /dev/null
+++ b/keyboards/kaly/kaly42/readme.md
@@ -0,0 +1,27 @@
+# kaly/kaly42
+
+![kaly/kaly42](https://i.imgur.com/wSmUjFUh.jpeg)
+
+The Kaly is a split, ergonomic keyboard inspired by the [Ferris](https://github.com/pierrechevalier83/ferris) and the [Cantor](https://github.com/diepala/cantor) with the main goals of comfort, affordability and cuteness! The stand-out features of the Kaly is the ease-to-solder and the natural thumb cluster that allow users to confortably reach all keys of the keyboard! To see more of the Kaly, visit [this video](https://www.youtube.com/watch?v=PhxM8o__9Xo) outlining the journey of making this keybord.
+
+* Keyboard Maintainer: [Kael Soares Augusto](https://github.com/Dwctor)
+* Hardware Supported: Blackpill STM32F401
+* Hardware Availability: [https://github.com/Dwctor/Kaly](https://github.com/Dwctor/Kaly)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kaly/kaly42:default
+
+Flashing example for this keyboard:
+
+    make kaly/kaly42: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 `QK_BOOT` if it is available
diff --git a/keyboards/kaly/kaly42/rules.mk b/keyboards/kaly/kaly42/rules.mk
new file mode 100644
index 000000000000..c6e298832137
--- /dev/null
+++ b/keyboards/kaly/kaly42/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart
diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index 34246609e53b..ebcb70015009 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -25,8 +25,85 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [8, 1], "x": 0.4, "y": 0},
+                {"matrix": [3, 6], "x": 1.55, "y": 0.1},
+                {"matrix": [3, 7], "x": 2.55, "y": 0.1},
+                {"matrix": [4, 6], "x": 3.55, "y": 0},
+                {"matrix": [4, 7], "x": 4.55, "y": 0.1},
+                {"matrix": [5, 6], "x": 5.55, "y": 0.1},
+                {"matrix": [5, 7], "x": 6.55, "y": 0.1},
+                {"matrix": [6, 6], "x": 7.55, "y": 0.1},
+
+                {"matrix": [6, 7], "x": 9.75, "y": 0.1},
+                {"matrix": [7, 6], "x": 10.75, "y": 0.1},
+                {"matrix": [7, 7], "x": 11.75, "y": 0.1},
+                {"matrix": [0, 6], "x": 12.75, "y": 0.1},
+                {"matrix": [0, 7], "x": 13.75, "y": 0},
+                {"matrix": [1, 7], "x": 14.75, "y": 0.1},
+                {"matrix": [2, 7], "x": 15.75, "y": 0.1, "w": 2},
+
+                {"matrix": [8, 0], "x": 0.2, "y": 1},
+                {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5},
+                {"matrix": [3, 5], "x": 2.85, "y": 1.1},
+                {"matrix": [4, 4], "x": 3.85, "y": 1.1},
+                {"matrix": [4, 5], "x": 4.85, "y": 1.1},
+                {"matrix": [5, 4], "x": 5.85, "y": 1.1},
+                {"matrix": [5, 5], "x": 6.85, "y": 1.1},
+
+                {"matrix": [6, 4], "x": 9.45, "y": 1.1},
+                {"matrix": [6, 5], "x": 10.45, "y": 1.1},
+                {"matrix": [7, 5], "x": 11.45, "y": 1.1},
+                {"matrix": [0, 5], "x": 12.45, "y": 1.1},
+                {"matrix": [1, 5], "x": 13.45, "y": 1.1},
+                {"matrix": [1, 6], "x": 14.45, "y": 1.1},
+                {"matrix": [2, 5], "x": 15.45, "y": 1.1},
+                {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2},
+                {"matrix": [3, 2], "x": 1.15, "y": 2.1, "w": 1.75},
+                {"matrix": [3, 3], "x": 2.9, "y": 2.1},
+                {"matrix": [4, 3], "x": 3.9, "y": 2.1},
+                {"matrix": [5, 2], "x": 4.9, "y": 2.1},
+                {"matrix": [5, 3], "x": 5.9, "y": 2.1},
+                {"matrix": [6, 3], "x": 6.9, "y": 2.1},
+
+                {"matrix": [7, 3], "x": 9.9, "y": 2.1},
+                {"matrix": [7, 4], "x": 10.9, "y": 2.1},
+                {"matrix": [0, 3], "x": 11.9, "y": 2.1},
+                {"matrix": [0, 4], "x": 12.9, "y": 2.1},
+                {"matrix": [1, 3], "x": 13.9, "y": 2.1},
+                {"matrix": [1, 4], "x": 14.9, "y": 2.1},
+                {"matrix": [2, 3], "x": 15.9, "y": 2.1, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0.95, "y": 3.1, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.2, "y": 3.1},
+                {"matrix": [4, 2], "x": 4.2, "y": 3.1},
+                {"matrix": [5, 1], "x": 5.2, "y": 3.1},
+                {"matrix": [6, 1], "x": 6.2, "y": 3.1},
+                {"matrix": [6, 2], "x": 7.2, "y": 3.1},
+
+                {"matrix": [7, 1], "x": 9.6, "y": 3.1},
+                {"matrix": [7, 2], "x": 10.6, "y": 3.1},
+                {"matrix": [0, 1], "x": 11.6, "y": 3.1},
+                {"matrix": [0, 2], "x": 12.6, "y": 3.1},
+                {"matrix": [1, 1], "x": 13.6, "y": 3.1},
+                {"matrix": [1, 2], "x": 14.6, "y": 3.1},
+                {"matrix": [2, 1], "x": 15.6, "y": 3.1, "w": 1.75},
+                {"matrix": [2, 2], "x": 17.35, "y": 3.1},
+
+                {"matrix": [3, 0], "x": 0.95, "y": 4.1, "w": 1.5},
+                {"matrix": [4, 0], "x": 3.85, "y": 4.1, "w": 1.5},
+                {"matrix": [5, 0], "x": 5.35, "y": 4.1, "w": 2},
+                {"matrix": [6, 0], "x": 7.35, "y": 4.1, "w": 1.25},
+                {"matrix": [0, 0], "x": 9.6, "y": 4.1, "w": 2.75},
+                {"matrix": [1, 0], "x": 12.35, "y": 4.1, "w": 1.5},
+                {"matrix": [2, 0], "x": 16.65, "y": 4.1, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [8, 1], "x": 0.4, "y": 0},
diff --git a/keyboards/kapcave/arya/matrix_diagram.md b/keyboards/kapcave/arya/matrix_diagram.md
new file mode 100644
index 000000000000..245cb9a079cf
--- /dev/null
+++ b/keyboards/kapcave/arya/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Kapcave Arya
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │27     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │81 │  │36 │37 │46 │47 │56 │57 │66 │         │67 │76 │77 │06 │07 │17 │26 │27 │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │80 │  │34   │35 │44 │45 │54 │55 │          │64 │65 │75 │05 │15 │16 │25 │24    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│82 │  │32    │33 │43 │52 │53 │63 │           │73 │74 │03 │04 │13 │14 │23        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │41 │42 │51 │61 │62 │        │71 │72 │01 │02 │11 │12 │21       │22 │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │30   │     │40   │50     │60   │     │00        │10   │             │20   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │21          │
+                                                                     └────────────┘
+                        ┌─────────┬───┐
+                        │50       │60 │ 2.25u-1u Left Space
+                        └─────────┴───┘
+```
diff --git a/keyboards/keychron/q1v2/ansi/ansi.c b/keyboards/keychron/q1v2/ansi/ansi.c
new file mode 100644
index 000000000000..ea6c6278d1cf
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/ansi.c
@@ -0,0 +1,117 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_16,   G_16,   H_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_3,    D_3,    E_3},
+    {1, F_4,    D_4,    E_4},
+    {1, F_5,    D_5,    E_5},
+    {1, F_6,    D_6,    E_6},
+    {1, F_7,    D_7,    E_7},
+    {1, F_8,    D_8,    E_8},
+    {1, F_9,    D_9,    E_9},
+    {1, F_10,   D_10,   E_10},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_7,    A_7,    B_7},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_13,   A_13,   B_13},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/ansi/config.h b/keyboards/keychron/q1v2/ansi/config.h
new file mode 100644
index 000000000000..05ace3177834
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 45
+#define DRIVER_2_LED_TOTAL 37
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/ansi/info.json b/keyboards/keychron/q1v2/ansi/info.json
new file mode 100644
index 000000000000..a72d202d816d
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/info.json
@@ -0,0 +1,190 @@
+{
+   "usb": {
+        "pid": "0x0106",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1.25, "y":0},
+                {"matrix":[0,2], "x":2.25, "y":0},
+                {"matrix":[0,3], "x":3.25, "y":0},
+                {"matrix":[0,4], "x":4.25, "y":0},
+                {"matrix":[0,5], "x":5.5, "y":0},
+                {"matrix":[0,6], "x":6.5, "y":0},
+                {"matrix":[0,7], "x":7.5, "y":0},
+                {"matrix":[0,8], "x":8.5, "y":0},
+                {"matrix":[0,9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.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,15], "x":15.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":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,15], "x":15.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":[3,15], "x":15.25, "y":3.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,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"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},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 13], "flags":4, "x":202, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":196, "y":38},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/default/keymap.c b/keyboards/keychron/q1v2/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..383a43cdb2a5
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN,
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/ansi/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..3a6676196f8a
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/keychron/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/ansi/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..495e8907b48c
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/via/keymap.c b/keyboards/keychron/q1v2/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..ad35cfb78e3f
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/via/rules.mk b/keyboards/keychron/q1v2/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/ansi/rules.mk b/keyboards/keychron/q1v2/ansi/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
new file mode 100644
index 000000000000..ea6c6278d1cf
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,117 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_16,   G_16,   H_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_3,    D_3,    E_3},
+    {1, F_4,    D_4,    E_4},
+    {1, F_5,    D_5,    E_5},
+    {1, F_6,    D_6,    E_6},
+    {1, F_7,    D_7,    E_7},
+    {1, F_8,    D_8,    E_8},
+    {1, F_9,    D_9,    E_9},
+    {1, F_10,   D_10,   E_10},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_7,    A_7,    B_7},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_13,   A_13,   B_13},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/ansi_encoder/config.h b/keyboards/keychron/q1v2/ansi_encoder/config.h
new file mode 100644
index 000000000000..0dce301c3cef
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 45
+#define DRIVER_2_LED_TOTAL 37
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/ansi_encoder/info.json b/keyboards/keychron/q1v2/ansi_encoder/info.json
new file mode 100644
index 000000000000..616c44489131
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/info.json
@@ -0,0 +1,199 @@
+{
+    "usb": {
+        "pid": "0x0107",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8", "resolution": 4}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1.25, "y":0},
+                {"matrix":[0,2], "x":2.25, "y":0},
+                {"matrix":[0,3], "x":3.25, "y":0},
+                {"matrix":[0,4], "x":4.25, "y":0},
+                {"matrix":[0,5], "x":5.5, "y":0},
+                {"matrix":[0,6], "x":6.5, "y":0},
+                {"matrix":[0,7], "x":7.5, "y":0},
+                {"matrix":[0,8], "x":8.5, "y":0},
+                {"matrix":[0,9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.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,15], "x":15.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":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,15], "x":15.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":[3,15], "x":15.25, "y":3.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,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"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},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 13], "flags":4, "x":202, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":196, "y":38},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d4424125249e
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LCMD,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..9de2b88de986
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e299e1c96bee
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LCMD,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/ansi_encoder/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/config.h b/keyboards/keychron/q1v2/config.h
new file mode 100644
index 000000000000..e2d331c1ac19
--- /dev/null
+++ b/keyboards/keychron/q1v2/config.h
@@ -0,0 +1,59 @@
+/* Copyright 2023 @ Keychron(https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+/* Increase I2C speed to 1000 KHz */
+#define I2C1_TIMINGR_PRESC 0U
+#define I2C1_TIMINGR_SCLDEL 3U
+#define I2C1_TIMINGR_SDADEL 0U
+#define I2C1_TIMINGR_SCLH 15U
+#define I2C1_TIMINGR_SCLL 51U
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID \
+    {                          \
+        { 5, 4 }               \
+    }
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* Disable RGB lighting when PC is in suspend */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+/* Set LED driver current */
+#define CKLED2001_CURRENT_TUNE \
+    { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+
+#define HOLD_ON_OTHER_KEY_PRESS // Old default behavior of mod-taps
diff --git a/keyboards/keychron/q1v2/halconf.h b/keyboards/keychron/q1v2/halconf.h
new file mode 100644
index 000000000000..41bddcb2799b
--- /dev/null
+++ b/keyboards/keychron/q1v2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q1v2/info.json b/keyboards/keychron/q1v2/info.json
new file mode 100644
index 000000000000..c4a75f0283ab
--- /dev/null
+++ b/keyboards/keychron/q1v2/info.json
@@ -0,0 +1,58 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q1",
+    "url": "https://github.com/Keychron",
+    "maintainer": "keychron-contrib",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+        "vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", null, null, null, null, null, null, null, null],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "custom": true,
+        "custom_lite": true
+    },
+    "matrix_size": {
+        "cols": 16,
+        "rows": 6
+    },
+    "diode_direction": "ROW2COL",
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        }
+    }
+}
diff --git a/keyboards/keychron/q1v2/iso/config.h b/keyboards/keychron/q1v2/iso/config.h
new file mode 100644
index 000000000000..d9e596e2c571
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 45
+#define DRIVER_2_LED_TOTAL 38
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1v2/iso/info.json b/keyboards/keychron/q1v2/iso/info.json
new file mode 100644
index 000000000000..ed16a3a8208f
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/info.json
@@ -0,0 +1,192 @@
+{
+    "usb": {
+        "pid": "0x0108",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.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,15], "x":15.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":[2,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"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},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":187, "y":38},
+            {"matrix":[2, 13], "flags":4, "x":203, "y":32},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":2,   "y":49},
+            {"matrix":[4, 1],  "flags":4, "x":18,  "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/iso/iso.c b/keyboards/keychron/q1v2/iso/iso.c
new file mode 100644
index 000000000000..eae39c8d61d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/iso.c
@@ -0,0 +1,118 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_16,   G_16,   H_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_16,   D_16,   E_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, F_14,   D_14,   E_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_4,    D_4,    E_4},
+    {1, F_5,    D_5,    E_5},
+    {1, F_6,    D_6,    E_6},
+    {1, F_7,    D_7,    E_7},
+    {1, F_8,    D_8,    E_8},
+    {1, F_9,    D_9,    E_9},
+    {1, F_10,   D_10,   E_10},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_7,    A_7,    B_7},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_13,   A_13,   B_13},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/iso/keymaps/default/keymap.c b/keyboards/keychron/q1v2/iso/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f97a595ea62f
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/keychron/q1v2/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/iso/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..30e1ef18bb48
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/keychron/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/iso/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/iso/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..495e8907b48c
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/iso/keymaps/via/keymap.c b/keyboards/keychron/q1v2/iso/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f97a595ea62f
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/keychron/q1v2/iso/keymaps/via/rules.mk b/keyboards/keychron/q1v2/iso/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/iso/rules.mk b/keyboards/keychron/q1v2/iso/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/iso_encoder/config.h b/keyboards/keychron/q1v2/iso_encoder/config.h
new file mode 100644
index 000000000000..ab9be499d98a
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 45
+#define DRIVER_2_LED_TOTAL 38
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1v2/iso_encoder/info.json b/keyboards/keychron/q1v2/iso_encoder/info.json
new file mode 100644
index 000000000000..38e34176b89d
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/info.json
@@ -0,0 +1,201 @@
+{
+    "usb": {
+        "pid": "0x0109",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8", "resolution": 4}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.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,15], "x":15.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":[2,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"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},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":187, "y":38},
+            {"matrix":[2, 13], "flags":4, "x":203, "y":32},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":2,   "y":49},
+            {"matrix":[4, 1],  "flags":4, "x":18,  "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
new file mode 100644
index 000000000000..eae39c8d61d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
@@ -0,0 +1,118 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_16,   G_16,   H_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_16,   D_16,   E_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, F_14,   D_14,   E_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_4,    D_4,    E_4},
+    {1, F_5,    D_5,    E_5},
+    {1, F_6,    D_6,    E_6},
+    {1, F_7,    D_7,    E_7},
+    {1, F_8,    D_8,    E_8},
+    {1, F_9,    D_9,    E_9},
+    {1, F_10,   D_10,   E_10},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_7,    A_7,    B_7},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_13,   A_13,   B_13},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..74aa487f95ed
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..3b1e8b68ece1
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,85 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..74aa487f95ed
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_DEL,             KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/iso_encoder/rules.mk b/keyboards/keychron/q1v2/iso_encoder/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/jis/config.h b/keyboards/keychron/q1v2/jis/config.h
new file mode 100644
index 000000000000..2e3db213b0c5
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 46
+#define DRIVER_2_LED_TOTAL 40
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/jis/info.json b/keyboards/keychron/q1v2/jis/info.json
new file mode 100644
index 000000000000..e704624a6619
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/info.json
@@ -0,0 +1,198 @@
+{
+    "usb": {
+        "pid": "0x010A",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.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.251},
+                {"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},
+                {"matrix":[1,14], "x":14, "y":1.25},
+                {"matrix":[1,15], "x":15.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":[2,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "y":3.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},
+                {"matrix":[4,13], "x":13.25, "y":4.25},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25},
+                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25},
+                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25},
+                {"matrix":[5,12], "x":12.25, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.25},
+                {"matrix":[5,14], "x":14.25, "y":5.25},
+                {"matrix":[5,15], "x":15.25, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":205, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":117, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":161, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":4, "x":191, "y":15},
+            {"matrix":[1, 14], "flags":1, "x":205, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":28},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":28},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":28},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":28},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":28},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":28},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":28},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":28},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":28},
+            {"matrix":[2, 9],  "flags":4, "x":139, "y":28},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":28},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":28},
+            {"matrix":[2, 12], "flags":4, "x":183, "y":28},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":28},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":40},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":40},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":40},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":40},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":40},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":40},
+            {"matrix":[3, 8],  "flags":4, "x":128, "y":40},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":40},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":40},
+            {"matrix":[3, 11], "flags":4, "x":172, "y":40},
+            {"matrix":[3, 13], "flags":4, "x":187, "y":40},
+            {"matrix":[2, 13], "flags":1, "x":207, "y":36},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":40},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":52},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":52},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":52},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":52},
+            {"matrix":[4, 10], "flags":4, "x":150, "y":52},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":52},
+            {"matrix":[4, 12], "flags":4, "x":180, "y":52},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":52},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":35,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":51,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":92,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":134, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":150, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":180, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/jis/jis.c b/keyboards/keychron/q1v2/jis/jis.c
new file mode 100644
index 000000000000..6bfcbad3e4d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/jis.c
@@ -0,0 +1,121 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_16,   D_16,   E_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, F_14,   D_14,   E_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_3,    D_3,    E_3},
+    {1, F_4,    D_4,    E_4},
+    {1, F_5,    D_5,    E_5},
+    {1, F_6,    D_6,    E_6},
+    {1, F_7,    D_7,    E_7},
+    {1, F_8,    D_8,    E_8},
+    {1, F_9,    D_9,    E_9},
+    {1, F_10,   D_10,   E_10},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_7,    A_7,    B_7},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_13,   A_13,   B_13},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/jis/keymaps/default/keymap.c b/keyboards/keychron/q1v2/jis/keymaps/default/keymap.c
new file mode 100644
index 000000000000..14af11a77cb5
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/jis/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/jis/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..b783b9307809
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/keychron/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/jis/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/jis/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..495e8907b48c
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/jis/keymaps/via/keymap.c b/keyboards/keychron/q1v2/jis/keymaps/via/keymap.c
new file mode 100644
index 000000000000..14af11a77cb5
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/jis/keymaps/via/rules.mk b/keyboards/keychron/q1v2/jis/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/jis/rules.mk b/keyboards/keychron/q1v2/jis/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/jis_encoder/config.h b/keyboards/keychron/q1v2/jis_encoder/config.h
new file mode 100644
index 000000000000..c80c4238f57d
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 46
+#define DRIVER_2_LED_TOTAL 40
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/jis_encoder/info.json b/keyboards/keychron/q1v2/jis_encoder/info.json
new file mode 100644
index 000000000000..544958f24fd6
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/info.json
@@ -0,0 +1,207 @@
+{
+    "usb": {
+        "pid": "0x010B",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8", "resolution": 4}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.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.251},
+                {"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},
+                {"matrix":[1,14], "x":14, "y":1.25},
+                {"matrix":[1,15], "x":15.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":[2,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "y":3.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},
+                {"matrix":[4,13], "x":13.25, "y":4.25},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25},
+                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25},
+                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25},
+                {"matrix":[5,12], "x":12.25, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.25},
+                {"matrix":[5,14], "x":14.25, "y":5.25},
+                {"matrix":[5,15], "x":15.25, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":205, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":117, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":161, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":4, "x":191, "y":15},
+            {"matrix":[1, 14], "flags":1, "x":205, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":28},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":28},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":28},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":28},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":28},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":28},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":28},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":28},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":28},
+            {"matrix":[2, 9],  "flags":4, "x":139, "y":28},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":28},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":28},
+            {"matrix":[2, 12], "flags":4, "x":183, "y":28},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":28},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":40},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":40},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":40},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":40},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":40},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":40},
+            {"matrix":[3, 8],  "flags":4, "x":128, "y":40},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":40},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":40},
+            {"matrix":[3, 11], "flags":4, "x":172, "y":40},
+            {"matrix":[3, 13], "flags":4, "x":187, "y":40},
+            {"matrix":[2, 13], "flags":1, "x":207, "y":36},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":40},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":52},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":52},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":52},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":52},
+            {"matrix":[4, 10], "flags":4, "x":150, "y":52},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":52},
+            {"matrix":[4, 12], "flags":4, "x":180, "y":52},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":52},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":35,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":51,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":92,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":134, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":150, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":180, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
new file mode 100644
index 000000000000..6bfcbad3e4d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
@@ -0,0 +1,121 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_16,   D_16,   E_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, F_14,   D_14,   E_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_3,    D_3,    E_3},
+    {1, F_4,    D_4,    E_4},
+    {1, F_5,    D_5,    E_5},
+    {1, F_6,    D_6,    E_6},
+    {1, F_7,    D_7,    E_7},
+    {1, F_8,    D_8,    E_8},
+    {1, F_9,    D_9,    E_9},
+    {1, F_10,   D_10,   E_10},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_7,    A_7,    B_7},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_13,   A_13,   B_13},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..def0cba27f4e
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..5aa1ab9471f6
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..def0cba27f4e
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,     KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_INT3,  KC_BSPC,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,                      KC_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/jis_encoder/rules.mk b/keyboards/keychron/q1v2/jis_encoder/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/matrix.c b/keyboards/keychron/q1v2/matrix.c
new file mode 100644
index 000000000000..d008a7938414
--- /dev/null
+++ b/keyboards/keychron/q1v2/matrix.c
@@ -0,0 +1,205 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// Pin connected to DS of 74HC595
+#define DATA_PIN A7
+// Pin connected to SH_CP of 74HC595
+#define CLOCK_PIN B1
+// Pin connected to ST_CP of 74HC595
+#define LATCH_PIN B0
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
+}
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+    if (pin != NO_PIN) {
+        return readPin(pin);
+    } else {
+        return 1;
+    }
+}
+
+static void shiftOut(uint8_t dataOut) {
+    for (uint8_t i = 0; i < 8; i++) {
+        if (dataOut & 0x1) {
+            setPinOutput_writeHigh(DATA_PIN);
+        } else {
+            setPinOutput_writeLow(DATA_PIN);
+        }
+        dataOut = dataOut >> 1;
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+    }
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static void shiftout_single(uint8_t data) {
+    if (data & 0x1) {
+        setPinOutput_writeHigh(DATA_PIN);
+    } else {
+        setPinOutput_writeLow(DATA_PIN);
+    }
+
+    setPinOutput_writeHigh(CLOCK_PIN);
+    setPinOutput_writeLow(CLOCK_PIN);
+
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static bool select_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
+    } else {
+        if (col == 8) {
+            shiftout_single(0x00);
+        } else {
+            shiftout_single(0x01);
+        }
+        return true;
+    }
+    return false;
+}
+
+static void unselect_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#else
+        setPinInputHigh_atomic(pin);
+#endif
+    } else {
+        if (col == (MATRIX_COLS - 1)) shiftout_single(0x01);
+    }
+}
+
+static void unselect_cols(void) {
+    // unselect column pins
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+
+        if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+            setPinOutput_writeHigh(pin);
+#else
+            setPinInputHigh_atomic(pin);
+#endif
+        }
+        if (x == (MATRIX_COLS - 1))
+            // unselect Shift Register
+            shiftOut(0xFF);
+    }
+}
+
+static void matrix_init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        if (row_pins[x] != NO_PIN) {
+            setPinInputHigh_atomic(row_pins[x]);
+        }
+    }
+}
+
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+    bool key_pressed = false;
+
+    // Select col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
+    }
+
+    if (current_col < 8) {
+        matrix_output_select_delay();
+    } else {
+        for (int8_t cycle = 4; cycle > 0; cycle--) {
+            matrix_output_select_delay(); // 0.25us
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+        }
+    }
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+        // Check row pin state
+        if (readMatrixPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= row_shifter;
+            key_pressed = true;
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~row_shifter;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+    // Set col, read rows
+    matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+        matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
+    }
+
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+    return changed;
+}
diff --git a/keyboards/keychron/q1v2/mcuconf.h b/keyboards/keychron/q1v2/mcuconf.h
new file mode 100644
index 000000000000..0ca8c64850f4
--- /dev/null
+++ b/keyboards/keychron/q1v2/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q1v2/q1v2.c b/keyboards/keychron/q1v2/q1v2.c
new file mode 100644
index 000000000000..4f83a760d385
--- /dev/null
+++ b/keyboards/keychron/q1v2/q1v2.c
@@ -0,0 +1,86 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+const matrix_row_t matrix_mask[] = {
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111101111,
+};
+
+#ifdef DIP_SWITCH_ENABLE
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) {
+        return false;
+    }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    return true;
+}
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+#    ifdef RGB_MATRIX_ENABLE
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+#    endif
+    }
+    return true;
+}
+
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+    return true;
+}
+
+#endif
diff --git a/keyboards/keychron/q1v2/readme.md b/keyboards/keychron/q1v2/readme.md
new file mode 100644
index 000000000000..8efb51e60ff5
--- /dev/null
+++ b/keyboards/keychron/q1v2/readme.md
@@ -0,0 +1,31 @@
+# Keychron Q1 Version 2
+
+![Keychron Q1V2](https://i.imgur.com/BbJNGLYh.jpg)
+
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q1 Version 2
+* Hardware Availability: [Keychron Q1 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keychron/q1v2/ansi:default
+    make keychron/q1v2/ansi_encoder:default
+    make keychron/q1v2/iso:default
+    make keychron/q1v2/iso_encoder:default
+    make keychron/q1v2/jis:default
+    make keychron/q1v2/jis_encoder:default
+
+Flashing example for this keyboard:
+
+    make keychron/q1v2/ansi:default:flash
+    make keychron/q1v2/ansi_encoder:default:flash
+    make keychron/q1v2/iso:default:flash
+    make keychron/q1v2/iso_encoder:default:flash
+    make keychron/q1v2/jis:default:flash
+    make keychron/q1v2/jis_encoder:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk
index c09b2475769a..f1adcab005e8 100644
--- a/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-EMCODER_MAP_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c b/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c
index a3cf3191611b..4c0d09aa3a06 100644
--- a/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c
+++ b/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c
@@ -35,5 +35,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
+    )
 };
diff --git a/keyboards/kindakeyboards/conone65/keymaps/default/readme.md b/keyboards/kindakeyboards/conone65/keymaps/default/readme.md
deleted file mode 100644
index 2f1619634775..000000000000
--- a/keyboards/kindakeyboards/conone65/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Conone 65
diff --git a/keyboards/kindakeyboards/conone65/keymaps/via/keymap.c b/keyboards/kindakeyboards/conone65/keymaps/via/keymap.c
new file mode 100644
index 000000000000..a70f50418406
--- /dev/null
+++ b/keyboards/kindakeyboards/conone65/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Matt Chan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+        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_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,          KC_SPC,            KC_SPC,  KC_RALT, KC_APP,  MO(1),   KC_LEFT,          KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,          _______,          _______,          _______, _______, _______, _______, _______,          _______, _______
+    )
+};
diff --git a/keyboards/kindakeyboards/conone65/keymaps/via/rules.mk b/keyboards/kindakeyboards/conone65/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kindakeyboards/conone65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kindakeyboards/conone65/readme.md b/keyboards/kindakeyboards/conone65/readme.md
index f3429142dcab..d0694fcc03ba 100644
--- a/keyboards/kindakeyboards/conone65/readme.md
+++ b/keyboards/kindakeyboards/conone65/readme.md
@@ -1,10 +1,12 @@
 # Conone 65
 
+![Conone65 PCB](https://i.imgur.com/50dKAqh.jpeg)
+
 The Conone 65 is a custom keyboard designed and machined in Belgium.
 
-* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
-* Hardware Supported: Conone 65 PCB
-* Hardware Availability: [Group buy](https://forms.gle/nEFTxzBxy4KDm3nG8)
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13), [Matt Chan](https://github.com/mattchan)
+* Hardware Supported: Conone 65 PCB, ATMega32u4
+* Hardware Availability: https://www.kindakeyboards.be/conone65
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -15,3 +17,11 @@ Flashing example for this keyboard:
     make kindakeyboards/conone65: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h
new file mode 100644
index 000000000000..7660e3d7e98e
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2023 kisakeyluxury
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json
new file mode 100644
index 000000000000..ba79fc31a22b
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/info.json
@@ -0,0 +1,69 @@
+{
+  "keyboard_name": "fraserqaz",
+  "manufacturer": "iceage",
+  "maintainer": "kisakey-luxury",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+      "bootmagic": true,
+      "mousekey": true,
+      "extrakey": true,
+      "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["D5", "D4", "D6", "C6"]
+  },
+  "diode_direction": "COL2ROW",
+    "development_board": "promicro",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0, "w": 1.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 5], "x": 4, "y": 3, "w": 2.25},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+      ]
+    }
+  }
+}
diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h
new file mode 100644
index 000000000000..7d03c4ddb8e5
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 kisakeyluxury
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define COMBO_TERM 200
diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d5b0a8d2affb
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2023 kisakeyluxury
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+  _BASE
+};
+
+enum combo_events {
+	COMBO_ESC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+    KC_A,  KC_S,  KC_D,  KC_F,   KC_G,   KC_H,  KC_J,   KC_K,  KC_L, KC_ENT,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM, KC_DOT,
+    KC_1, KC_2, KC_3, KC_4, KC_SPACE, KC_4, KC_3, KC_2, QK_BOOT
+  )
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+
+combo_t key_combos[] = {
+	[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+};
+#endif
diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk b/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ab1e438182a3
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/kisakeyluxury/qtz/readme.md b/keyboards/kisakeyluxury/qtz/readme.md
new file mode 100644
index 000000000000..813bf10a32d1
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/readme.md
@@ -0,0 +1,24 @@
+# qtz
+
+35% keyboard designed by Iceage
+
+![pcb image](https://i.imgur.com/D2OmIkUh.png)
+
+* Keyboard Maintainer: [kisakey-luxury](https://github.com/kisakey-luxury)
+* Hardware Supported: *not released yet*
+* Hardware Availability: *not released yet*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kisakeyluxury/qtz:default
+
+Flashing example for this keyboard:
+
+    make kisakeyluxury/qtz:default:flash
+    
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB under the "Z" key
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (default is bottom-right most key)
\ No newline at end of file
diff --git a/keyboards/kisakeyluxury/qtz/rules.mk b/keyboards/kisakeyluxury/qtz/rules.mk
new file mode 100644
index 000000000000..0d24fc285796
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/rules.mk
@@ -0,0 +1 @@
+# intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/config.h b/keyboards/kprepublic/cstc40/config.h
new file mode 100644
index 000000000000..c43098689529
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/config.h
@@ -0,0 +1,59 @@
+// Copyright 2022 Var (@itsvar8)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C1_SDA_PIN B9
+#define I2C1_SCL_PIN B8
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_COUNT 1
+#define RGB_MATRIX_LED_COUNT 47
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
new file mode 100644
index 000000000000..39d3d7ff5284
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
@@ -0,0 +1,71 @@
+/* Copyright 2022 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+    { 0, L_1,  K_1,  J_1 },
+    { 0, L_2,  K_2,  J_2 },
+    { 0, L_3,  K_3,  J_3 },
+    { 0, L_4,  K_4,  J_4 },
+    { 0, L_5,  K_5,  J_5 },
+    { 0, L_6,  K_6,  J_6 },
+    { 0, L_7,  K_7,  J_7 },
+    { 0, L_8,  K_8,  J_8 },
+    { 0, L_9,  K_9,  J_9 },
+    { 0, L_10, K_10, J_10 },
+    { 0, L_11, K_11, J_11 },
+    { 0, L_12, K_12, J_12 },
+
+    { 0, I_1,  H_1,  G_1 },
+    { 0, I_2,  H_2,  G_2 },
+    { 0, I_3,  H_3,  G_3 },
+    { 0, I_4,  H_4,  G_4 },
+    { 0, I_5,  H_5,  G_5 },
+    { 0, I_6,  H_6,  G_6 },
+    { 0, I_7,  H_7,  G_7 },
+    { 0, I_8,  H_8,  G_8 },
+    { 0, I_9,  H_9,  G_9 },
+    { 0, I_10, H_10, G_10 },
+    { 0, I_11, H_11, G_11 },
+    { 0, I_12, H_12, G_12 },
+
+    { 0, F_1,  E_1,  D_1 },
+    { 0, F_2,  E_2,  D_2 },
+    { 0, F_3,  E_3,  D_3 },
+    { 0, F_4,  E_4,  D_4 },
+    { 0, F_5,  E_5,  D_5 },
+    { 0, F_6,  E_6,  D_6 },
+    { 0, F_7,  E_7,  D_7 },
+    { 0, F_8,  E_8,  D_8 },
+    { 0, F_9,  E_9,  D_9 },
+    { 0, F_10, E_10, D_10 },
+    { 0, F_11, E_11, D_11 },
+    { 0, F_12, E_12, D_12 },
+
+    { 0, C_1, B_1, A_1 },
+    { 0, C_2, B_2, A_2 },
+    { 0, C_3, B_3, A_3 },
+    { 0, C_4, B_4, A_4 },
+    { 0, C_5, B_5, A_5 },
+    { 0, C_6, B_6, A_6 },
+    { 0, C_8, B_8, A_8 },
+    { 0, C_9, B_9, A_9 },
+    { 0, C_10, B_10, A_10 },
+    { 0, C_11, B_11, A_11 },
+    { 0, C_12, B_12, A_12 }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/daughterboard/info.json b/keyboards/kprepublic/cstc40/daughterboard/info.json
new file mode 100644
index 000000000000..cdba7942df84
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/daughterboard/info.json
@@ -0,0 +1,6 @@
+{
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B10", "B12", "A5", "C4", "A7", "A15", "C10", "C11", "C0"],
+        "rows": ["B1", "B0", "C5", "A6"]
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/daughterboard/rules.mk b/keyboards/kprepublic/cstc40/daughterboard/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/daughterboard/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/halconf.h b/keyboards/kprepublic/cstc40/halconf.h
new file mode 100644
index 000000000000..0f279040aae1
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/info.json b/keyboards/kprepublic/cstc40/info.json
new file mode 100644
index 000000000000..4ccd8389e882
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/info.json
@@ -0,0 +1,130 @@
+{
+    "manufacturer": "kprepublic",
+    "keyboard_name": "cstc40",
+    "maintainer": "itsvar8",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+        "debounce": 2,
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "processor": "STM32F401",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0040",
+        "vid": "0x586A"
+    },
+    "layouts": {
+        "LAYOUT_planck_mit": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+                { "matrix": [1, 11], "x": 11, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+                { "matrix": [2, 11], "x": 11, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "w": 2, "x": 5, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+                { "matrix": [3, 11], "x": 11, "y": 3 }
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3733",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 101, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 203, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+            {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 101, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 162, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 203, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
+            {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 42, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
+            {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
+            {"matrix": [2, 5], "x": 101, "y": 42, "flags": 4},
+            {"matrix": [2, 6], "x": 122, "y": 42, "flags": 4},
+            {"matrix": [2, 7], "x": 142, "y": 42, "flags": 4},
+            {"matrix": [2, 8], "x": 162, "y": 42, "flags": 4},
+            {"matrix": [2, 9], "x": 183, "y": 42, "flags": 4},
+            {"matrix": [2, 10], "x": 203, "y": 42, "flags": 4},
+            {"matrix": [2, 11], "x": 224, "y": 42, "flags": 1},
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 40, "y": 64, "flags": 1},
+            {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1},
+            {"matrix": [3, 4], "x": 81, "y": 64, "flags": 1},
+            {"matrix": [3, 5], "x": 111, "y": 64, "flags": 1},
+            {"matrix": [3, 7], "x": 142, "y": 64, "flags": 1},
+            {"matrix": [3, 8], "x": 162, "y": 64, "flags": 1},
+            {"matrix": [3, 9], "x": 183, "y": 64, "flags": 1},
+            {"matrix": [3, 10], "x": 203, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1}
+        ],
+        "max_brightness": 200
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/keymaps/default/keymap.c b/keyboards/kprepublic/cstc40/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e47ff226a935
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2023
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | BLTog| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[0] = LAYOUT_planck_mit(
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,    KC_Y,     KC_U,     KC_I,     KC_O,    KC_P,     KC_BSPC,
+    KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,    KC_H,     KC_J,     KC_K,     KC_L,    KC_SCLN,  KC_QUOT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,    KC_N,     KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,  KC_ENT ,
+    RGB_TOG,  KC_LCTL,  KC_LALT,  KC_LGUI,  TL_LOWR,  KC_SPC,  TL_UPPR,  KC_LEFT,  KC_DOWN,  KC_UP,   KC_RGHT   
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[1] = LAYOUT_planck_mit(
+    KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,     KC_ASTR,     KC_LPRN,  KC_RPRN,  KC_BSPC,
+    KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_UNDS,     KC_PLUS,     KC_LCBR,  KC_RCBR,  KC_PIPE,
+    _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   S(KC_NUHS),  S(KC_NUBS),  KC_HOME,  KC_END,   _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,     KC_VOLD,     KC_VOLU,  KC_MPLY   
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[2] = LAYOUT_planck_mit(
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+    KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
+    _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NUHS,  KC_NUBS,  KC_PGUP,  KC_PGDN,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY   
+),
+
+/* Adjust (Lower + Raise)
+ *                      v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[3] = LAYOUT_planck_mit(
+    _______,  QK_BOOT,  DB_TOGG,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_DEL,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______   
+)
+
+};
diff --git a/keyboards/kprepublic/cstc40/keymaps/default/rules.mk b/keyboards/kprepublic/cstc40/keymaps/default/rules.mk
new file mode 100644
index 000000000000..7c9bf212a6f5
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/kprepublic/cstc40/keymaps/via/keymap.c b/keyboards/kprepublic/cstc40/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e47ff226a935
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/via/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2023
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | BLTog| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[0] = LAYOUT_planck_mit(
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,    KC_Y,     KC_U,     KC_I,     KC_O,    KC_P,     KC_BSPC,
+    KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,    KC_H,     KC_J,     KC_K,     KC_L,    KC_SCLN,  KC_QUOT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,    KC_N,     KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,  KC_ENT ,
+    RGB_TOG,  KC_LCTL,  KC_LALT,  KC_LGUI,  TL_LOWR,  KC_SPC,  TL_UPPR,  KC_LEFT,  KC_DOWN,  KC_UP,   KC_RGHT   
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[1] = LAYOUT_planck_mit(
+    KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,     KC_ASTR,     KC_LPRN,  KC_RPRN,  KC_BSPC,
+    KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_UNDS,     KC_PLUS,     KC_LCBR,  KC_RCBR,  KC_PIPE,
+    _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   S(KC_NUHS),  S(KC_NUBS),  KC_HOME,  KC_END,   _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,     KC_VOLD,     KC_VOLU,  KC_MPLY   
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[2] = LAYOUT_planck_mit(
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+    KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
+    _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NUHS,  KC_NUBS,  KC_PGUP,  KC_PGDN,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY   
+),
+
+/* Adjust (Lower + Raise)
+ *                      v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[3] = LAYOUT_planck_mit(
+    _______,  QK_BOOT,  DB_TOGG,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_DEL,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______   
+)
+
+};
diff --git a/keyboards/kprepublic/cstc40/keymaps/via/rules.mk b/keyboards/kprepublic/cstc40/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kprepublic/cstc40/mcuconf.h b/keyboards/kprepublic/cstc40/mcuconf.h
new file mode 100644
index 000000000000..a56e52fb8dae
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/readme.md b/keyboards/kprepublic/cstc40/readme.md
new file mode 100644
index 000000000000..211c078cc2ec
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/readme.md
@@ -0,0 +1,26 @@
+# cstc40
+
+A 40% hotswap ortholinear RGB keyboard from KP Republic.
+
+* Keyboard Maintainer: [Var](https://github.com/itsvar8)
+* Hardware Supported: CSTC40
+* Hardware Availability: kprepublic.com
+
+The differences between the two versions are just the rows and columns pins and the additional small pcb for the daughterboard version.
+
+Make example for this keyboard (after setting up your build environment):
+
+    for daughterboard version: make kprepublic/cstc40/daughterboard:default
+    for single pcb version: make kprepublic/cstc40/single_pcb:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+The single_pcb uses pin A10, which apparently is a design flaw that prevent the bootloader to start every time - https://docs.qmk.fm/#/platformdev_blackpill_f4x1?id=pins-to-be-avoided. There is a simple workaround that works most of the time - press the pin key (generally the letter R) during the boot.
diff --git a/keyboards/kprepublic/cstc40/single_pcb/info.json b/keyboards/kprepublic/cstc40/single_pcb/info.json
new file mode 100644
index 000000000000..330ada7bac5b
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/single_pcb/info.json
@@ -0,0 +1,6 @@
+{
+    "matrix_pins": {
+        "cols": ["C7", "C8", "C9", "A8", "A10", "B10", "A15", "C13", "B6", "B5", "B4", "B3"],
+        "rows": ["C12", "C10", "C11", "B0"]
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/rules.mk b/keyboards/kprepublic/cstc40/single_pcb/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/single_pcb/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
new file mode 100644
index 000000000000..39d3d7ff5284
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
@@ -0,0 +1,71 @@
+/* Copyright 2022 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+    { 0, L_1,  K_1,  J_1 },
+    { 0, L_2,  K_2,  J_2 },
+    { 0, L_3,  K_3,  J_3 },
+    { 0, L_4,  K_4,  J_4 },
+    { 0, L_5,  K_5,  J_5 },
+    { 0, L_6,  K_6,  J_6 },
+    { 0, L_7,  K_7,  J_7 },
+    { 0, L_8,  K_8,  J_8 },
+    { 0, L_9,  K_9,  J_9 },
+    { 0, L_10, K_10, J_10 },
+    { 0, L_11, K_11, J_11 },
+    { 0, L_12, K_12, J_12 },
+
+    { 0, I_1,  H_1,  G_1 },
+    { 0, I_2,  H_2,  G_2 },
+    { 0, I_3,  H_3,  G_3 },
+    { 0, I_4,  H_4,  G_4 },
+    { 0, I_5,  H_5,  G_5 },
+    { 0, I_6,  H_6,  G_6 },
+    { 0, I_7,  H_7,  G_7 },
+    { 0, I_8,  H_8,  G_8 },
+    { 0, I_9,  H_9,  G_9 },
+    { 0, I_10, H_10, G_10 },
+    { 0, I_11, H_11, G_11 },
+    { 0, I_12, H_12, G_12 },
+
+    { 0, F_1,  E_1,  D_1 },
+    { 0, F_2,  E_2,  D_2 },
+    { 0, F_3,  E_3,  D_3 },
+    { 0, F_4,  E_4,  D_4 },
+    { 0, F_5,  E_5,  D_5 },
+    { 0, F_6,  E_6,  D_6 },
+    { 0, F_7,  E_7,  D_7 },
+    { 0, F_8,  E_8,  D_8 },
+    { 0, F_9,  E_9,  D_9 },
+    { 0, F_10, E_10, D_10 },
+    { 0, F_11, E_11, D_11 },
+    { 0, F_12, E_12, D_12 },
+
+    { 0, C_1, B_1, A_1 },
+    { 0, C_2, B_2, A_2 },
+    { 0, C_3, B_3, A_3 },
+    { 0, C_4, B_4, A_4 },
+    { 0, C_5, B_5, A_5 },
+    { 0, C_6, B_6, A_6 },
+    { 0, C_8, B_8, A_8 },
+    { 0, C_9, B_9, A_9 },
+    { 0, C_10, B_10, A_10 },
+    { 0, C_11, B_11, A_11 },
+    { 0, C_12, B_12, A_12 }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/kwstudio/pisces/info.json b/keyboards/kwstudio/pisces/info.json
new file mode 100644
index 000000000000..48f4e6a4f66f
--- /dev/null
+++ b/keyboards/kwstudio/pisces/info.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Pisces",
+    "manufacturer": "kws",
+    "maintainer": "kws",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B2", "B3", "B1"],
+        "rows": ["B7", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4B53"
+    },
+    "community_layouts": ["tkl_f13_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0}, 
+                {"matrix":[0,1], "x":1.25, "y":0}, 
+                {"matrix":[0,2], "x":2.25, "y":0}, 
+                {"matrix":[0,3], "x":3.25, "y":0}, 
+                {"matrix":[0,4], "x":4.25, "y":0}, 
+                {"matrix":[0,6], "x":5.5, "y":0}, 
+                {"matrix":[0,7], "x":6.5, "y":0}, 
+                {"matrix":[0,8], "x":7.5, "y":0}, 
+                {"matrix":[0,9], "x":8.5, "y":0}, 
+                {"matrix":[0,10], "x":9.75, "y":0}, 
+                {"matrix":[0,11], "x":10.75, "y":0}, 
+                {"matrix":[0,12], "x":11.75, "y":0}, 
+                {"matrix":[0,13], "x":12.75, "y":0}, 
+                {"matrix":[0,14], "x":14, "y":0}, 
+                {"matrix":[0,15], "x":15.25, "y":0}, 
+                {"matrix":[0,16], "x":16.25, "y":0}, 
+                {"matrix":[0,17], "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,14], "x":13, "y":1.25, "w":2}, 
+                {"matrix":[1,15], "x":15.25, "y":1.25}, 
+                {"matrix":[1,16], "x":16.25, "y":1.25}, 
+                {"matrix":[1,17], "x":17.25, "y":1.25},
+ 
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, 
+                {"matrix":[2,2], "x":1.5, "y":2.25}, 
+                {"matrix":[2,3], "x":2.5, "y":2.25}, 
+                {"matrix":[2,4], "x":3.5, "y":2.25}, 
+                {"matrix":[2,5], "x":4.5, "y":2.25}, 
+                {"matrix":[2,6], "x":5.5, "y":2.25}, 
+                {"matrix":[2,7], "x":6.5, "y":2.25}, 
+                {"matrix":[2,8], "x":7.5, "y":2.25}, 
+                {"matrix":[2,9], "x":8.5, "y":2.25}, 
+                {"matrix":[2,10], "x":9.5, "y":2.25}, 
+                {"matrix":[2,11], "x":10.5, "y":2.25}, 
+                {"matrix":[2,12], "x":11.5, "y":2.25}, 
+                {"matrix":[2,13], "x":12.5, "y":2.25}, 
+                {"matrix":[2,14], "x":13.5, "y":2.25, "w":1.5}, 
+                {"matrix":[2,15], "x":15.25, "y":2.25}, 
+                {"matrix":[2,16], "x":16.25, "y":2.25}, 
+                {"matrix":[2,17], "x":17.25, "y":2.25}, 
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, 
+                {"matrix":[3,2], "x":1.75, "y":3.25}, 
+                {"matrix":[3,3], "x":2.75, "y":3.25}, 
+                {"matrix":[3,4], "x":3.75, "y":3.25}, 
+                {"matrix":[3,5], "x":4.75, "y":3.25}, 
+                {"matrix":[3,6], "x":5.75, "y":3.25}, 
+                {"matrix":[3,7], "x":6.75, "y":3.25}, 
+                {"matrix":[3,8], "x":7.75, "y":3.25}, 
+                {"matrix":[3,9], "x":8.75, "y":3.25}, 
+                {"matrix":[3,10], "x":9.75, "y":3.25}, 
+                {"matrix":[3,11], "x":10.75, "y":3.25}, 
+                {"matrix":[3,12], "x":11.75, "y":3.25}, 
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[4,1], "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,13], "x":12.25, "y":4.25, "w":2.75}, 
+                {"matrix":[4,16], "x":16.25, "y":4.25},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.5}, 
+                {"matrix":[5,2], "x":1.5, "y":5.25}, 
+                {"matrix":[5,3], "x":2.5, "y":5.25, "w":1.5}, 
+                {"matrix":[5,7], "x":4, "y":5.25, "w":7}, 
+                {"matrix":[5,11], "x":11, "y":5.25, "w":1.5}, 
+                {"matrix":[5,13], "x":12.5, "y":5.25}, 
+                {"matrix":[5,14], "x":13.5, "y":5.25, "w":1.5}, 
+                {"matrix":[5,15], "x":15.25, "y":5.25}, 
+                {"matrix":[5,16], "x":16.25, "y":5.25}, 
+                {"matrix":[5,17], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kwstudio/pisces/keymaps/default/keymap.c b/keyboards/kwstudio/pisces/keymaps/default/keymap.c
new file mode 100644
index 000000000000..6b20a3aa9001
--- /dev/null
+++ b/keyboards/kwstudio/pisces/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 kwstudio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_f13_ansi_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,      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,  MO(1), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,          _______,              _______,         
+        _______, _______, _______,                            _______,                                     _______, _______, _______,     _______, _______, _______
+    )
+};
diff --git a/keyboards/kwstudio/pisces/keymaps/via/keymap.c b/keyboards/kwstudio/pisces/keymaps/via/keymap.c
new file mode 100644
index 000000000000..6b20a3aa9001
--- /dev/null
+++ b/keyboards/kwstudio/pisces/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 kwstudio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_f13_ansi_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,      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,  MO(1), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,          _______,              _______,         
+        _______, _______, _______,                            _______,                                     _______, _______, _______,     _______, _______, _______
+    )
+};
diff --git a/keyboards/kwstudio/pisces/keymaps/via/rules.mk b/keyboards/kwstudio/pisces/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kwstudio/pisces/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kwstudio/pisces/readme.md b/keyboards/kwstudio/pisces/readme.md
new file mode 100644
index 000000000000..29cf8ebf5c48
--- /dev/null
+++ b/keyboards/kwstudio/pisces/readme.md
@@ -0,0 +1,25 @@
+# Pisces
+
+![Pisces](https://i.imgur.com/fqEBVD8h.jpeg)
+
+* Keyboard Maintainer: [khchen](https://github.com/khchen2004)
+* Hardware Supported: Pisces PCB
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kwstudio/pisces:default
+
+Flashing example for this keyboard:
+
+    make kwstudio/pisces: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 `QK_BOOT` if it is available
diff --git a/keyboards/kwstudio/pisces/rules.mk b/keyboards/kwstudio/pisces/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/kwstudio/pisces/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/lendunistus/rpneko65/rev1/config.h b/keyboards/lendunistus/rpneko65/rev1/config.h
new file mode 100644
index 000000000000..6786155fbf62
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 lendunistus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CAPS_LOCK_ENABLE true
diff --git a/keyboards/lendunistus/rpneko65/rev1/info.json b/keyboards/lendunistus/rpneko65/rev1/info.json
new file mode 100644
index 000000000000..29682cf2a779
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/info.json
@@ -0,0 +1,766 @@
+{
+    "manufacturer": "lendunistus",
+    "keyboard_name": "RPNeko65",
+    "maintainer": "lendunistus",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP2", "GP0", "GP1"],
+        "rows": ["GP28", "GP27", "GP26", "GP25", "GP24"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "led_count": 1
+    },
+    "url": "https://github.com/lendunistus/rpneko65",
+    "usb": {
+        "device_version": "1.0.0",
+        "force_nkro": true,
+        "pid": "0x0001",
+        "vid": "0x6C75"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP18"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "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": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lendunistus/rpneko65/rev1/keymaps/default/keymap.c b/keyboards/lendunistus/rpneko65/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..5b52fa20387d
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 lendunistus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // Main layer
+  [0] = LAYOUT_all(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_NUHS,          KC_PGUP,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT,          MO(1),            KC_LEFT, KC_DOWN,          KC_RGHT
+  ),
+  // Function layer
+  [1] = LAYOUT_all(
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+      _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,          _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,          _______,
+      _______, _______, _______,                   _______, _______, _______, _______,          _______,          _______, _______,          _______
+  )
+};
diff --git a/keyboards/lendunistus/rpneko65/rev1/keymaps/via/keymap.c b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..5b52fa20387d
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 lendunistus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // Main layer
+  [0] = LAYOUT_all(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_NUHS,          KC_PGUP,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT,          MO(1),            KC_LEFT, KC_DOWN,          KC_RGHT
+  ),
+  // Function layer
+  [1] = LAYOUT_all(
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+      _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,          _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,          _______,
+      _______, _______, _______,                   _______, _______, _______, _______,          _______,          _______, _______,          _______
+  )
+};
diff --git a/keyboards/lendunistus/rpneko65/rev1/keymaps/via/rules.mk b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/lendunistus/rpneko65/rev1/readme.md b/keyboards/lendunistus/rpneko65/rev1/readme.md
new file mode 100644
index 000000000000..d41fe19c8a4d
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/readme.md
@@ -0,0 +1,24 @@
+# rpneko65
+
+![rpneko65](https://i.imgur.com/QUIUSqJh.png)\
+*PCB rear side*
+
+A multi-layout PCB designed to fit the Bakeneko65 case by kkatano.
+
+* Keyboard Maintainer: [lendunistus](https://github.com/lendunistus)
+* Hardware Supported: RPNeko65 PCB; [Bakeneko65 V3 Case](https://github.com/kkatano/bakeneko-65)
+* Hardware Availability: [Open source on GitHub](https://github.com/lendunistus/rpneko65)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lendunistus/rpneko65/rev1:default
+
+Flashing example for this keyboard:
+
+    make lendunistus/rpneko65/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Plug in the keyboard while holding down either the ESC key or the button on the back of the PCB labelled "USB Boot".
diff --git a/keyboards/lendunistus/rpneko65/rev1/rev1.c b/keyboards/lendunistus/rpneko65/rev1/rev1.c
new file mode 100644
index 000000000000..2cb9cf07f871
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/rev1.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (CAPS_LOCK_ENABLE && res) {
+        if(led_state.caps_lock) {
+            #ifdef CAPS_LOCK_COLOR
+                rgblight_sethsv_at(CAPS_LOCK_COLOR, 0);
+            #else
+                rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 0);
+            #endif
+        }
+        else{
+            rgblight_sethsv_at(HSV_BLACK, 0);
+        }
+    }
+    return res;
+}
diff --git a/keyboards/lendunistus/rpneko65/rev1/rules.mk b/keyboards/lendunistus/rpneko65/rev1/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/lgbtkl/info.json b/keyboards/lgbtkl/info.json
new file mode 100644
index 000000000000..a3f126e86200
--- /dev/null
+++ b/keyboards/lgbtkl/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "queertykeys",
+    "keyboard_name": "lgbtkl",
+    "maintainer": "ojthetiny",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "usb": {
+        "vid": "0x6F6A",
+        "pid": "0x4C54",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["C10", "A15", "A5", "C1", "C2"],
+        "cols": ["C8", "C7", "C6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "C3", "C14", "C13"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "matrix": [0, 5], "x": 5.25, "y": 0 },
+                { "matrix": [0, 6], "x": 6.25, "y": 0 },
+                { "matrix": [0, 7], "x": 7.25, "y": 0 },
+                { "matrix": [0, 8], "x": 8.25, "y": 0 },
+                { "matrix": [0, 9], "x": 9.25, "y": 0 },
+                { "matrix": [0, 10], "x": 10.25, "y": 0 },
+                { "matrix": [0, 11], "x": 11.25, "y": 0 },
+                { "matrix": [0, 12], "x": 12.25, "y": 0 },
+                { "matrix": [0, 13], "x": 13.25, "y": 0 },
+                { "matrix": [0, 14], "x": 14.25, "y": 0 },
+                { "matrix": [0, 15], "x": 15.25, "y": 0 },
+                { "matrix": [0, 16], "x": 16.5, "y": 0 },
+                { "matrix": [0, 17], "x": 17.5, "y": 0 },
+                { "matrix": [0, 18], "x": 18.5, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "w": 1.5, "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "x": 2.75, "y": 1 },
+                { "matrix": [1, 3], "x": 3.75, "y": 1 },
+                { "matrix": [1, 4], "x": 4.75, "y": 1 },
+                { "matrix": [1, 5], "x": 5.75, "y": 1 },
+                { "matrix": [1, 6], "x": 6.75, "y": 1 },
+                { "matrix": [1, 7], "x": 7.75, "y": 1 },
+                { "matrix": [1, 8], "x": 8.75, "y": 1 },
+                { "matrix": [1, 9], "x": 9.75, "y": 1 },
+                { "matrix": [1, 10], "x": 10.75, "y": 1 },
+                { "matrix": [1, 11], "x": 11.75, "y": 1 },
+                { "matrix": [1, 12], "x": 12.75, "y": 1 },
+                { "matrix": [1, 13], "x": 13.75, "y": 1 },
+                { "matrix": [1, 15], "w": 1.5, "x": 14.75, "y": 1 },
+                { "matrix": [1, 16], "x": 16.5, "y": 1 },
+                { "matrix": [1, 17], "x": 17.5, "y": 1 },
+                { "matrix": [1, 18], "x": 18.5, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2 },
+                { "matrix": [2, 2], "x": 3, "y": 2 },
+                { "matrix": [2, 3], "x": 4, "y": 2 },
+                { "matrix": [2, 4], "x": 5, "y": 2 },
+                { "matrix": [2, 5], "x": 6, "y": 2 },
+                { "matrix": [2, 6], "x": 7, "y": 2 },
+                { "matrix": [2, 7], "x": 8, "y": 2 },
+                { "matrix": [2, 8], "x": 9, "y": 2 },
+                { "matrix": [2, 9], "x": 10, "y": 2 },
+                { "matrix": [2, 10], "x": 11, "y": 2 },
+                { "matrix": [2, 11], "x": 12, "y": 2 },
+                { "matrix": [2, 12], "x": 13, "y": 2 },
+                { "matrix": [2, 14], "w": 2.25, "x": 14, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "w": 2.25, "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 3.5, "y": 3 },
+                { "matrix": [3, 3], "x": 4.5, "y": 3 },
+                { "matrix": [3, 4], "x": 5.5, "y": 3 },
+                { "matrix": [3, 5], "x": 6.5, "y": 3 },
+                { "matrix": [3, 6], "x": 7.5, "y": 3 },
+                { "matrix": [3, 7], "x": 8.5, "y": 3 },
+                { "matrix": [3, 8], "x": 9.5, "y": 3 },
+                { "matrix": [3, 9], "x": 10.5, "y": 3 },
+                { "matrix": [3, 10], "x": 11.5, "y": 3 },
+                { "matrix": [3, 11], "x": 12.5, "y": 3 },
+                { "matrix": [3, 13], "w": 1.75, "x": 13.5, "y": 3 },
+                { "matrix": [3, 14], "w": 2.75, "x": 13.5, "y": 3 },
+                { "matrix": [3, 15], "x": 15.25, "y": 3 },
+                { "matrix": [3, 17], "x": 17.5, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.5, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "x": 2.75, "y": 4 },
+                { "matrix": [4, 3], "w": 1.5, "x": 3.75, "y": 4 },
+                { "matrix": [4, 5], "w": 3, "x": 5.25, "y": 4 },
+                { "matrix": [4, 7], "x": 8.25, "y": 4 },
+                { "matrix": [4, 9], "w": 3, "x": 9.25, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 12.25, "y": 4 },
+                { "matrix": [4, 13], "x": 13.75, "y": 4 },
+                { "matrix": [4, 15], "w": 1.5, "x": 14.75, "y": 4 },
+                { "matrix": [4, 16], "x": 16.5, "y": 4 },
+                { "matrix": [4, 17], "x": 17.5, "y": 4 },
+                { "matrix": [4, 18], "x": 18.5, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/lgbtkl/keymaps/default/keymap.c b/keyboards/lgbtkl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..01dcedcc18de
--- /dev/null
+++ b/keyboards/lgbtkl/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 ojthetiny
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_F1,   	KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,	 KC_INS, KC_HOME, KC_PGUP,
+		KC_F2,   	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,	 KC_BSPC,		 KC_DEL, KC_END,  KC_PGDN,
+		KC_F3,   	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, 		KC_ENT,
+		KC_F4,   	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, 		XXXXXXX, MO(1),   			  KC_UP,
+		KC_F5,   	KC_LCTL, KC_LGUI, KC_LALT, 			KC_SPC, 		  KC_SPC,			KC_SPC,  				KC_RALT,      KC_RGUI, 		KC_RCTL,	 KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT(
+		XXXXXXX, 	XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,	 XXXXXXX, XXXXXXX, XXXXXXX,
+		XXXXXXX, 	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,		 XXXXXXX, XXXXXXX, XXXXXXX,
+		XXXXXXX, 	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, 		XXXXXXX,
+		XXXXXXX, 	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 		XXXXXXX, _______, 			  XXXXXXX,
+		QK_BOOT, 	XXXXXXX, XXXXXXX, XXXXXXX, 			XXXXXXX, 		  XXXXXXX, 			XXXXXXX,		  XXXXXXX, 		XXXXXXX, 			XXXXXXX, 	 XXXXXXX, XXXXXXX, XXXXXXX
+	),
+
+};
diff --git a/keyboards/lgbtkl/keymaps/via/keymap.c b/keyboards/lgbtkl/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2fc44ae8cc04
--- /dev/null
+++ b/keyboards/lgbtkl/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2023 ojthetiny
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_F1,   	KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,	 KC_INS, KC_HOME, KC_PGUP,
+		KC_F2,   	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,	 KC_BSPC,		 KC_DEL, KC_END,  KC_PGDN,
+		KC_F3,   	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, 		KC_ENT,
+		KC_F4,   	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, 		XXXXXXX, MO(1),   			  KC_UP,
+		KC_F5,   	KC_LCTL, KC_LGUI, KC_LALT, 			KC_SPC, 		  KC_SPC,			KC_SPC,  				KC_RALT,      KC_RGUI, 		KC_RCTL,	 KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT(
+		XXXXXXX, 	XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,	 XXXXXXX, XXXXXXX, XXXXXXX,
+		XXXXXXX, 	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,		 XXXXXXX, XXXXXXX, XXXXXXX,
+		XXXXXXX, 	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, 		XXXXXXX,
+		XXXXXXX, 	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 		XXXXXXX, _______, 			  XXXXXXX,
+		QK_BOOT, 	XXXXXXX, XXXXXXX, XXXXXXX, 			XXXXXXX, 		  XXXXXXX, 			XXXXXXX,		  XXXXXXX, 		XXXXXXX, 			XXXXXXX, 	 XXXXXXX, XXXXXXX, XXXXXXX
+	),
+
+
+};
diff --git a/keyboards/lgbtkl/keymaps/via/rules.mk b/keyboards/lgbtkl/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/lgbtkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lgbtkl/readme.md b/keyboards/lgbtkl/readme.md
new file mode 100644
index 000000000000..cd6f94b6e972
--- /dev/null
+++ b/keyboards/lgbtkl/readme.md
@@ -0,0 +1,26 @@
+# LGBTKL
+
+LGBTKL keyboard by Queertykeys
+
+* Keyboard Maintainer: [Liv](https://github.com/ojthetiny)
+* Hardware Supported: LGBTKL
+* Hardware Availability: Private GB
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lgbtkl:default
+
+Flashing example for this keyboard:
+
+    make lgbtkl: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 using one of the following methods:
+
+* **Bootmagic reset**: Hold the F1 key while connecting the USB cable
+* **Physical reset button**: Hold the button labeled 'B/R' for a while to enter bootloader.
+* **Keycode in layout**: In the case of the default keymap, use the key combination Fn + F5
\ No newline at end of file
diff --git a/keyboards/lgbtkl/rules.mk b/keyboards/lgbtkl/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/lgbtkl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
index 9b4af1230562..23fb708cf646 100644
--- a/keyboards/linworks/dolice/info.json
+++ b/keyboards/linworks/dolice/info.json
@@ -25,9 +25,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-        "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    "layout_aliases": {
+      "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
       "LAYOUT_alice": {
         "layout": [
diff --git a/keyboards/linworks/dolice/matrix_diagram.md b/keyboards/linworks/dolice/matrix_diagram.md
new file mode 100644
index 000000000000..c89f8f82225e
--- /dev/null
+++ b/keyboards/linworks/dolice/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Linworks Dolice
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │17     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │10 │01 │11 │02 │12 │03 │13 │         │14 │05 │15 │06 │16 │07 │17 │57 │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │20 │  │30   │21 │22 │32 │23 │33 │          │24 │34 │25 │35 │26 │36 │27 │37    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│40 │  │50    │41 │42 │52 │43 │53 │           │44 │54 │45 │55 │46 │56 │47        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │70      │61 │62 │72 │63 │73 │        │64 │74 │65 │75 │66 │76 │67       │77 │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │80   │     │81   │82     │83   │     │84        │85   │             │87   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │67          │
+                                                                     └────────────┘
+                        ┌─────────┬───┐
+                        │82       │83 │ 2.25u-1u Left Space
+                        └─────────┴───┘
+```
diff --git a/keyboards/lucid/velvet_hotswap/info.json b/keyboards/lucid/velvet_hotswap/info.json
index 2cbecb782d84..4fa4ad46987c 100644
--- a/keyboards/lucid/velvet_hotswap/info.json
+++ b/keyboards/lucid/velvet_hotswap/info.json
@@ -4,7 +4,7 @@
     "url": "http://www.makerkeyboards.com",
     "maintainer": "Maker Keyboards",
     "usb": {
-        "device_version": "1.0.0",
+        "device_version": "1.0.1",
         "pid": "0x0008",
         "vid": "0x7667"
     },
@@ -14,9 +14,6 @@
         "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
     },
     "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c b/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c
index 23e76c78544f..a8f6dae2ae0c 100644
--- a/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c
+++ b/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -28,14 +28,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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/lucid/velvet_hotswap/keymaps/via/keymap.c b/keyboards/lucid/velvet_hotswap/keymaps/via/keymap.c
index b7257c8274be..2a0247c71599 100644
--- a/keyboards/lucid/velvet_hotswap/keymaps/via/keymap.c
+++ b/keyboards/lucid/velvet_hotswap/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -30,32 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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_tkl_f13_ansi_split_bs_rshift(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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_tkl_f13_ansi_split_bs_rshift(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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/lucid/velvet_hotswap/readme.md b/keyboards/lucid/velvet_hotswap/readme.md
index 7c6c72ee3816..1262386236b8 100644
--- a/keyboards/lucid/velvet_hotswap/readme.md
+++ b/keyboards/lucid/velvet_hotswap/readme.md
@@ -1,4 +1,6 @@
-# Velvet Hotswap PCB by Lucid
+# Velvet Hotswap PCB by Maker Keyboards
+
+![Maker Keyboards Velvet Hotswap](https://imgur.com/KfTWnCgh.jpg)
 
 The following is the QMK Firmware for the Velvet Hotswap PCB by [Maker Keyboards](http://www.makerkeyboards.com).
 * Keyboard Maintainer: Maker Keyboards
diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json
index 1cc8e43cdbc3..b94b4160162b 100644
--- a/keyboards/lucid/velvet_solder/info.json
+++ b/keyboards/lucid/velvet_solder/info.json
@@ -4,7 +4,7 @@
     "url": "http://www.makerkeyboards.com",
     "maintainer": "Maker Keyboards",
     "usb": {
-        "device_version": "1.0.0",
+        "device_version": "1.0.1",
         "pid": "0x0007",
         "vid": "0x7667"
     },
@@ -14,9 +14,6 @@
         "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
     },
     "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/lucid/velvet_solder/keymaps/default/keymap.c b/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
index 57fa9bf2bc02..7c120c645332 100644
--- a/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -28,14 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_MENU, 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, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
+
 };
diff --git a/keyboards/lucid/velvet_solder/keymaps/via/keymap.c b/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
index 2c7cd72db8b4..6b7561754323 100644
--- a/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -30,32 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                      KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_MENU, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
+
 };
diff --git a/keyboards/lucid/velvet_solder/readme.md b/keyboards/lucid/velvet_solder/readme.md
index 83fd074047aa..120974634b74 100644
--- a/keyboards/lucid/velvet_solder/readme.md
+++ b/keyboards/lucid/velvet_solder/readme.md
@@ -1,4 +1,6 @@
-# Velvet Solder PCB by Lucid
+# Velvet Solder PCB by Maker Keyboards
+
+![Velvet Solder PCB](https://imgur.com/4lMWY6Dh.jpg)
 
 The following is the QMK Firmware for the Velvet Solder PCB by [Maker Keyboards](http://www.makerkeyboards.com).
 * Keyboard Maintainer: Maker Keyboards
diff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/blackio83.c
new file mode 100644
index 000000000000..0d8412624e2d
--- /dev/null
+++ b/keyboards/miiiw/blackio83/blackio83.c
@@ -0,0 +1,189 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "blackio83.h"
+#include "usb_main.h"
+#include "usb_util.h"
+
+#define LOOP_10HZ_PERIOD    100
+deferred_token loop10hz_token  = INVALID_DEFERRED_TOKEN;
+uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg);
+
+static const SerialConfig mwproto_uart_config = {
+    .speed = MWPROTO_BITRATE,
+};
+
+static void POWER_EnterSleep(void) {
+    /* Clear Wake-up flag */
+    PWR->CR |= PWR_CR_CWUF | PWR_CR_CSBF;
+    /* Select Sleep mode */
+    /* PWR->CR |= PWR_CR_PDDS | PWR_CR_LPDS; */
+    /* Set SLEEPDEEP bit of Cortex System Control Register */
+    SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;
+    /* Request Wait For Interrupt */
+    __WFI();
+    /* Reset SLEEPDEEP bit of Cortex System Control Register */
+    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk;
+    NVIC_SystemReset();
+}
+
+extern void ws2812_poweron(void);
+extern void ws2812_poweroff(void);
+
+static bool p_setup = false;
+static bool s_init = false;
+void ws2812_poweron(void) {
+    if(p_setup) return;
+    p_setup = true;
+    s_init = false;
+    setPinOutput(RGB_EN_PIN);
+    writePinHigh(RGB_EN_PIN);
+}
+
+void ws2812_poweroff(void) {
+    if(!p_setup) return;
+    p_setup = false;
+    setPinInputLow(WS2812_DI_PIN);
+    writePinLow(RGB_EN_PIN);
+}
+
+void keyboard_pre_init_kb() {
+	keyboard_pre_init_user();
+
+    setPinInputLow(MWPROTO_STATUS_PIN);
+    setPinOutput(MWPROTO_WAKEUP_PIN);
+    writePinLow(MWPROTO_WAKEUP_PIN);
+    wait_ms(2);
+    writePinHigh(MWPROTO_WAKEUP_PIN);
+
+	palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
+	sdStart(&MWPROTO_DRIVER, &mwproto_uart_config);
+}
+
+void keyboard_post_init_kb(void) {
+    keyboard_post_init_user();
+
+    print(/* clang-format off */
+        "\n<--QMK Keyboard-->\n"
+        "Vendor: " STR(MANUFACTURER) "(" STR(VENDOR_ID) ")\n"
+        "Product: " STR(PRODUCT) " (" STR(PRODUCT_ID) ")\n"
+        "Version: " STR(DEVICE_VER) "\n"
+        "BUILD: " __DATE__ "\n"
+    ); /* clang-format on */
+
+    writePinLow(MWPROTO_WAKEUP_PIN);
+    wait_ms(50);
+    sdPutI(&MWPROTO_DRIVER, 0xA5);
+    sdPutI(&MWPROTO_DRIVER, 0x12);
+    sdPutI(&MWPROTO_DRIVER, 0x01);
+    sdPutI(&MWPROTO_DRIVER, 0x02);
+    sdPutI(&MWPROTO_DRIVER, 0xB4);
+    writePinHigh(MWPROTO_WAKEUP_PIN);
+
+    ws2812_poweron();
+    loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL);
+}
+
+__attribute__((weak)) void shutdown_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_suspend_state(true);
+#endif  // RGB_MATRIX_ENABLE
+    wait_ms(10);
+    ws2812_poweroff();
+}
+
+#ifdef DIP_SWITCH_ENABLE
+bool dip_switch_update_mask_kb(uint32_t state) {
+    if (!dip_switch_update_mask_user(state)) { return false; }
+    
+    if(state & 0x01) {
+        led_suspend();
+        usbDisconnectBus(&USB_DRIVER);
+        usbStop(&USB_DRIVER);
+        shutdown_user();
+        setPinInputHigh(POWER_SWITCH_PIN);
+        palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE);
+        POWER_EnterSleep();
+    }
+    
+    return true;
+}
+#endif
+
+uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) {
+    
+    if(last_input_activity_elapsed() > 1000) {
+        static uint32_t pmu_timer = 0;
+        if(timer_elapsed32(pmu_timer) > 3000) {
+            pmu_timer = timer_read32();
+            writePinLow(MWPROTO_WAKEUP_PIN);
+            if(readPin(MWPROTO_STATUS_PIN))
+                wait_us(500);
+            else
+                wait_us(1500);
+            sdPutI(&MWPROTO_DRIVER, 0xA5);
+            sdPutI(&MWPROTO_DRIVER, 0x28);
+            sdPutI(&MWPROTO_DRIVER, 0x00);
+            sdPutI(&MWPROTO_DRIVER, 0x8D);
+            writePinHigh(MWPROTO_WAKEUP_PIN);
+        }
+    }
+
+    extern matrix_row_t matrix[MATRIX_ROWS];
+    static uint32_t restore_tick = 0;
+    if(matrix[0] == 0x4000 && matrix[1] == 0 && 
+       matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) {
+        if(restore_tick++ > 50) {
+            restore_tick = 0;
+            writePinLow(MWPROTO_WAKEUP_PIN);
+            if(readPin(MWPROTO_STATUS_PIN))
+                wait_us(500);
+            else
+                wait_us(1500);
+            sdPutI(&MWPROTO_DRIVER, 0xA5);
+            sdPutI(&MWPROTO_DRIVER, 0x1F);
+            sdPutI(&MWPROTO_DRIVER, 0x01);
+            sdPutI(&MWPROTO_DRIVER, 0x0F);
+            sdPutI(&MWPROTO_DRIVER, 0xB4);
+            writePinHigh(MWPROTO_WAKEUP_PIN);
+            wait_ms(50);
+            eeconfig_init();
+    #ifdef RGB_MATRIX_ENABLE
+            extern void rgb_matrix_update_pwm_buffers(void);
+            for(int i = 0; i < 5; i++) {
+                rgb_matrix_set_color_all(RGB_WHITE);
+                rgb_matrix_update_pwm_buffers();
+                wait_ms(500);
+                rgb_matrix_set_color_all(RGB_OFF);
+                rgb_matrix_update_pwm_buffers();
+                wait_ms(500);
+            }
+    #endif
+            wait_ms(500);
+            soft_reset_keyboard();
+        }
+    } else {
+        restore_tick = 0;
+    }
+
+    static uint32_t debug_tick = 0;
+	if (debug_tick++ > 9 ) {
+        dprintf("trigger %d\n", trigger_time);
+		debug_tick = 0;
+	}
+
+    return LOOP_10HZ_PERIOD;
+}
diff --git a/keyboards/miiiw/blackio83/blackio83.h b/keyboards/miiiw/blackio83/blackio83.h
new file mode 100644
index 000000000000..ea371443e30e
--- /dev/null
+++ b/keyboards/miiiw/blackio83/blackio83.h
@@ -0,0 +1,30 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+enum custom_keycodes {
+    DEV_BT1 = QK_KB,
+    DEV_BT2,
+    DEV_BT3,
+    DEV_RF24,
+    ALT_TAB,
+    RGB_RST,
+};
\ No newline at end of file
diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h
new file mode 100644
index 000000000000..73c98722e9d4
--- /dev/null
+++ b/keyboards/miiiw/blackio83/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// EEPROM i2c chip
+#define EEPROM_I2C_24LC256
+
+/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
+ * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/miiiw/blackio83/halconf.h b/keyboards/miiiw/blackio83/halconf.h
new file mode 100644
index 000000000000..037108a3923b
--- /dev/null
+++ b/keyboards/miiiw/blackio83/halconf.h
@@ -0,0 +1,32 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#define HAL_USE_I2C TRUE
+
+// This enables interrupt-driven mode
+#define PAL_USE_WAIT TRUE
+#define USB_USE_WAIT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json
new file mode 100644
index 000000000000..40fc6b7d8937
--- /dev/null
+++ b/keyboards/miiiw/blackio83/info.json
@@ -0,0 +1,216 @@
+{
+    "manufacturer": "MIIIW",
+    "keyboard_name": "MIIIW BlackIO 83",
+    "maintainer": "ArthurCyy",
+    "bootloader": "stm32-dfu",
+    "debounce": 3,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "deferred_exec": true,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B14"
+    },
+    "matrix_pins": {
+        "cols": ["H0", "H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"],
+        "rows": ["A7", "A6", "A5", "A4", "A3", "A2"]
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 10, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 18, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 68, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 78, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 86, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 124, "y": 20, "flags": 4},
+            {"matrix": [1, 1], "x": 108, "y": 20, "flags": 4},
+            {"matrix": [1, 2], "x": 96, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 88, "y": 20, "flags": 4},
+            {"matrix": [1, 4], "x": 80, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 72, "y": 20, "flags": 4},
+            {"matrix": [1, 6], "x": 64, "y": 20, "flags": 4},
+            {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4},
+            {"matrix": [1, 8], "x": 48, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 40, "y": 20, "flags": 4},
+            {"matrix": [1, 10], "x": 32, "y": 20, "flags": 4},
+            {"matrix": [1, 11], "x": 24, "y": 20, "flags": 4},
+            {"matrix": [1, 12], "x": 16, "y": 20, "flags": 4},
+            {"matrix": [1, 13], "x": 8, "y": 20, "flags": 4},
+            {"matrix": [1, 15], "x": 0, "y": 20, "flags": 4},
+            {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4},
+            {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4},
+            {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4},
+            {"matrix": [2, 3], "x": 28, "y": 36, "flags": 4},
+            {"matrix": [2, 4], "x": 36, "y": 36, "flags": 4},
+            {"matrix": [2, 5], "x": 44, "y": 36, "flags": 4},
+            {"matrix": [2, 6], "x": 52, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 60, "y": 36, "flags": 4},
+            {"matrix": [2, 8], "x": 68, "y": 36, "flags": 4},
+            {"matrix": [2, 9], "x": 76, "y": 36, "flags": 4},
+            {"matrix": [2, 10], "x": 84, "y": 36, "flags": 4},
+            {"matrix": [2, 11], "x": 92, "y": 36, "flags": 4},
+            {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4},
+            {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4},
+            {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4},
+            {"matrix": [3, 0], "x": 124, "y": 52, "flags": 4},
+            {"matrix": [3, 1], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [3, 2], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [3, 3], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [3, 4], "x": 78, "y": 52, "flags": 4},
+            {"matrix": [3, 5], "x": 70, "y": 52, "flags": 4},
+            {"matrix": [3, 6], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [3, 7], "x": 54, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 46, "y": 52, "flags": 4},
+            {"matrix": [3, 9], "x": 38, "y": 52, "flags": 4},
+            {"matrix": [3, 10], "x": 30, "y": 52, "flags": 4},
+            {"matrix": [3, 11], "x": 22, "y": 52, "flags": 4},
+            {"matrix": [3, 12], "x": 14, "y": 52, "flags": 4},
+            {"matrix": [3, 15], "x": 3, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4},
+            {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4},
+            {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 68, "flags": 4},
+            {"matrix": [4, 4], "x": 42, "y": 68, "flags": 4},
+            {"matrix": [4, 5], "x": 50, "y": 68, "flags": 4},
+            {"matrix": [4, 6], "x": 58, "y": 68, "flags": 4},
+            {"matrix": [4, 7], "x": 66, "y": 68, "flags": 4},
+            {"matrix": [4, 8], "x": 74, "y": 68, "flags": 4},
+            {"matrix": [4, 9], "x": 82, "y": 68, "flags": 4},
+            {"matrix": [4, 10], "x": 90, "y": 68, "flags": 4},
+            {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4},
+            {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4},
+            {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4},
+            {"matrix": [5, 0], "x": 122, "y": 84, "flags": 4},
+            {"matrix": [5, 1], "x": 114, "y": 84, "flags": 4},
+            {"matrix": [5, 2], "x": 106, "y": 84, "flags": 4},
+            {"matrix": [5, 5], "x": 96, "y": 84, "flags": 4},
+            {"matrix": [5, 8], "x": 88, "y": 84, "flags": 4},
+            {"matrix": [5, 9], "x": 80, "y": 84, "flags": 4},
+            {"matrix": [5, 10], "x": 50, "y": 84, "flags": 4},
+            {"matrix": [5, 12], "x": 20, "y": 88, "flags": 4},
+            {"matrix": [5, 13], "x": 10, "y": 88, "flags": 4},
+            {"matrix": [5, 14], "x": 1, "y": 88, "flags": 4}
+        ]
+    },
+    "url": "https://github.com/ArthurCyy",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x83A1",
+        "vid": "0x3044"
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/miiiw/blackio83/keymaps/default/keymap.c b/keyboards/miiiw/blackio83/keymaps/default/keymap.c
new file mode 100644
index 000000000000..dc906f7e2c85
--- /dev/null
+++ b/keyboards/miiiw/blackio83/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum keymap_layers {
+    WIN_BL,
+    WIN_FL,
+    MAC_BL,
+    MAC_FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap WIN_BL: Win Base Layer (Default Layer)
+   */
+    [WIN_BL] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,            KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, MO(WIN_FL), KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap WIN_FL: Win Function Layer
+   */
+	[WIN_FL] = LAYOUT(
+        RGB_RST,          KC_BRID, KC_BRIU, ALT_TAB, G(KC_D), KC_WBAK, KC_WSCH, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+
+  /* Keymap MAC_BL: Mac Base Layer
+   */
+    [MAC_BL] = LAYOUT(
+        KC_ESC,           KC_BRID, KC_BRIU,C(KC_UP),C(KC_DOWN),KC_F11,G(KC_SPC),KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_PSCR,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_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_LALT, KC_LGUI,                   KC_SPC,                    KC_RGUI, MO(MAC_FL), KC_RALT,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap MAC_FL: Mac Function Layer
+   */
+	[MAC_FL] = LAYOUT(
+        RGB_RST,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+};
diff --git a/keyboards/miiiw/blackio83/keymaps/via/keymap.c b/keyboards/miiiw/blackio83/keymaps/via/keymap.c
new file mode 100644
index 000000000000..dc906f7e2c85
--- /dev/null
+++ b/keyboards/miiiw/blackio83/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum keymap_layers {
+    WIN_BL,
+    WIN_FL,
+    MAC_BL,
+    MAC_FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap WIN_BL: Win Base Layer (Default Layer)
+   */
+    [WIN_BL] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,            KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, MO(WIN_FL), KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap WIN_FL: Win Function Layer
+   */
+	[WIN_FL] = LAYOUT(
+        RGB_RST,          KC_BRID, KC_BRIU, ALT_TAB, G(KC_D), KC_WBAK, KC_WSCH, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+
+  /* Keymap MAC_BL: Mac Base Layer
+   */
+    [MAC_BL] = LAYOUT(
+        KC_ESC,           KC_BRID, KC_BRIU,C(KC_UP),C(KC_DOWN),KC_F11,G(KC_SPC),KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_PSCR,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_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_LALT, KC_LGUI,                   KC_SPC,                    KC_RGUI, MO(MAC_FL), KC_RALT,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap MAC_FL: Mac Function Layer
+   */
+	[MAC_FL] = LAYOUT(
+        RGB_RST,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+};
diff --git a/keyboards/miiiw/blackio83/keymaps/via/rules.mk b/keyboards/miiiw/blackio83/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/miiiw/blackio83/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/matrix.c
new file mode 100644
index 000000000000..841ff3c16e69
--- /dev/null
+++ b/keyboards/miiiw/blackio83/matrix.c
@@ -0,0 +1,139 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+#include "matrix.h"
+#include "common/shift_register.h"
+
+static uint8_t read_rows(void);
+static void    init_cols(void);
+static void    select_col(uint8_t col);
+static void    unselect_col(uint8_t col);
+static void    unselect_cols(void);
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+#ifdef DIP_SWITCH_PINS
+#    define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
+static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
+#endif
+
+void matrix_init_custom(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        setPinInputLow(row_pins[row]);
+    }
+    
+    shift_init();
+    init_cols();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+        select_col(col);
+        waitInputPinDelay();
+        uint8_t rows = read_rows();
+        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+            bool prev_bit = ((uint32_t)(current_matrix[row]) & (matrix_row_t)(1UL << col)) ? 1 : 0;
+            bool curr_bit = ((uint32_t)rows & (uint32_t)(1UL << row)) ? 1 : 0;
+            if (prev_bit != curr_bit) {
+                current_matrix[row] = (uint32_t)(current_matrix[row]) ^ (uint32_t)(1UL << col);
+                changed = true;
+            }
+        }
+        unselect_col(col);
+    }
+
+    return changed;
+}
+
+void matrix_power_up(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        palDisableLineEvent(row_pins[row]);
+        setPinInputLow(row_pins[row]);
+    }
+    init_cols();
+#ifdef DIP_SWITCH_PINS
+    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputHigh(dip_switch_pad[i]);
+    }
+#endif
+}
+
+void matrix_power_down(void) {
+    unselect_cols();
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        setPinInputLow(row_pins[row]);
+        palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE);
+    }
+#ifdef DIP_SWITCH_PINS
+    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputLow(dip_switch_pad[i]);
+    }
+#endif
+}
+
+static uint8_t read_rows(void) {
+    uint8_t row_value = 0;
+    for(uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        row_value |= (readPin(row_pins[row]) << row);
+    }
+    return row_value;
+}
+
+static void init_cols(void) {
+    shift_writeAll(0);
+    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
+        if(col_pins[col] < H0) {
+            setPinOutput(col_pins[col]);
+            writePinLow(col_pins[col]);
+        }
+    }
+}
+
+static void select_col(uint8_t col) {
+    if(col_pins[col] < H0){
+        writePinHigh(col_pins[col]);
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+    }else{
+        shift_writePin(col_pins[col], 1);
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    if(col_pins[col] < H0){
+        writePinLow(col_pins[col]);
+    }else{
+        shift_writePin(col_pins[col], 0);
+    }
+}
+
+static void unselect_cols(void) {
+    shift_writeAll(1);
+    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
+        if(col_pins[col] < H0) {
+            setPinOutput(col_pins[col]);
+            writePinHigh(col_pins[col]);
+        }
+    }
+}
diff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/mcuconf.h
new file mode 100644
index 000000000000..89038eba8251
--- /dev/null
+++ b/keyboards/miiiw/blackio83/mcuconf.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_USE_DMA
+#define STM32_I2C_USE_DMA FALSE
diff --git a/keyboards/miiiw/blackio83/readme.md b/keyboards/miiiw/blackio83/readme.md
new file mode 100644
index 000000000000..ecb42fac261b
--- /dev/null
+++ b/keyboards/miiiw/blackio83/readme.md
@@ -0,0 +1,30 @@
+# MIIIW BlackIO83
+
+![BlackIO83](https://i.imgur.com/jZ7HrTCh.jpg)
+![BlackIO83](https://i.imgur.com/AnlUIfph.jpg)
+
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [ArthurCyy](https://github.com/ArthurCyy)
+* Hardware Supported: BlackIO83 rev_0100
+* Hardware Availability: [MIIIW](https://www.miiiw.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make miiiw/blackio83/rev_0100:default
+
+Flashing example for this keyboard:
+
+    make miiiw/blackio83/rev_0100: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**: With the power switch off, hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard.
+* **Physical button**: With the power switch off, hold the small metal button on the right side under the spacebar keycap and plug in the keyboard.
+* **Keycode in layout**:
+  * (Official firmware only) With the power switch on, press and hold the left Shift+ Fn+ upper right DEL.
+  * (Unofficial firmware) With the power switch on, press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h
new file mode 100644
index 000000000000..803c8a8a3b2d
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+/* Dip Switch */
+#define POWER_SWITCH_PIN B0
+#define DIP_SWITCH_PINS { B0, B1, B8, B12 }
+
+/* 16 with dummy columns for shift registers */
+#define SHR_SERIES_NUM 2
+#define SHR_CLOCK_PIN A0
+#define SHR_DATA_PIN A1
+#define SHR_LATCH_PIN C15
+
+/* MIIIW Protocol Driver */
+#define MWPROTO_BITRATE 256000
+#define MWPROTO_DRIVER SD1
+#define MWPROTO_TX_PIN A9
+#define MWPROTO_TX_PAL_MODE 1
+#define MWPROTO_RX_PIN A10
+#define MWPROTO_RX_PAL_MODE 1
+#define MWPROTO_WAKEUP_PIN A15
+#define MWPROTO_STATUS_PIN C13
+
+/* RGB Matrix config */
+#define RGB_EN_PIN A8
+#define RGBLED_NUM 83
+#define RGB_MATRIX_LED_COUNT 83
+#define RGB_MATRIX_CENTER { 62, 42 }
+
+// PWM RGB Underglow Defines
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_GRB
+#define WS2812_TRST_US 200
+
+// I2C config
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_PIN B6
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+#define I2C1_TIMINGR_PRESC 0x00U
+#define I2C1_TIMINGR_SCLDEL 0x03U
+#define I2C1_TIMINGR_SDADEL 0x01U
+#define I2C1_TIMINGR_SCLH 0x03U
+#define I2C1_TIMINGR_SCLL 0x09U
diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
new file mode 100644
index 000000000000..b28ac84acb41
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
@@ -0,0 +1,17 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "blackio83.h"
diff --git a/keyboards/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk
new file mode 100644
index 000000000000..5558efa95d72
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/rules.mk
@@ -0,0 +1,7 @@
+CUSTOM_MATRIX = lite
+
+WS2812_DRIVER_REQUIRED := yes
+
+# Project specific files
+SRC += matrix.c \
+	   common/shift_register.c
diff --git a/keyboards/miiiw/common/shift_register.c b/keyboards/miiiw/common/shift_register.c
new file mode 100644
index 000000000000..1f21c1246836
--- /dev/null
+++ b/keyboards/miiiw/common/shift_register.c
@@ -0,0 +1,90 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+#include "shift_register.h"
+
+static void shift_out(void);
+
+static uint8_t shift_values[SHR_SERIES_NUM] = {0};
+
+void shift_init(void) {
+#ifdef SHR_OE_PIN
+    setPinOutput(SHR_OE_PIN);
+    writePinHigh(SHR_OE_PIN);
+#endif
+    setPinOutput(SHR_DATA_PIN);
+    setPinOutput(SHR_LATCH_PIN);
+    setPinOutput(SHR_CLOCK_PIN);
+}
+
+void shift_enable(void) {
+#ifdef SHR_OE_PIN
+    writePinLow(SHR_OE_PIN);
+#endif
+    writePinLow(SHR_DATA_PIN);
+    writePinLow(SHR_LATCH_PIN);
+    writePinLow(SHR_CLOCK_PIN);
+}
+
+void shift_disable(void) {
+#ifdef SHR_OE_PIN
+    writePinHigh(SHR_OE_PIN);
+#endif
+    writePinLow(SHR_DATA_PIN);
+    writePinLow(SHR_LATCH_PIN);
+    writePinLow(SHR_CLOCK_PIN);
+}
+
+void shift_writePin(pin_t pin, int level) {
+	uint8_t group = (pin - H0) >> 3;
+	uint8_t	bit = 0x01 << ((pin - H0)&0x07);
+
+    if(group >= SHR_SERIES_NUM) 
+        return;
+
+    if(level)
+        shift_values[group] |= bit;
+    else
+        shift_values[group] &= ~bit;
+    shift_out();
+}
+
+void shift_writeGroup(int group, uint8_t value) {
+    if(group >= SHR_SERIES_NUM) 
+        return;
+
+    shift_values[group] = value;
+    shift_out();
+}
+
+void shift_writeAll(int level) {
+    memset(shift_values, level ? 0xFF : 0, sizeof(shift_values));
+    shift_out();
+}
+
+static void shift_out(void) {
+    uint8_t n = SHR_SERIES_NUM;
+    writePinLow(SHR_LATCH_PIN);
+    while(n--){
+        for (uint8_t i = 0; i < 8; i++) {
+            writePinLow(SHR_CLOCK_PIN);
+            writePin(SHR_DATA_PIN, shift_values[n] & (0x80 >> i));
+            writePinHigh(SHR_CLOCK_PIN);
+	    }
+    }
+    writePinHigh(SHR_LATCH_PIN);
+}
diff --git a/keyboards/miiiw/common/shift_register.h b/keyboards/miiiw/common/shift_register.h
new file mode 100644
index 000000000000..f9895e63f827
--- /dev/null
+++ b/keyboards/miiiw/common/shift_register.h
@@ -0,0 +1,34 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "gpio.h"
+
+#ifndef GPIOH_BASE
+#   define GPIOH_BASE  (0xFF595A00U)
+#endif
+
+#ifndef SHR_SERIES_NUM
+#   define SHR_SERIES_NUM 1
+#endif
+
+extern void shift_init(void);
+extern void shift_enable(void);
+extern void shift_disable(void);
+extern void shift_writePin(pin_t pin, int level);
+extern void shift_writeGroup(int group, uint8_t value);
+extern void shift_writeAll(int level);
diff --git a/keyboards/millet/doksin/info.json b/keyboards/millet/doksin/info.json
new file mode 100644
index 000000000000..7a848662cd4f
--- /dev/null
+++ b/keyboards/millet/doksin/info.json
@@ -0,0 +1,31 @@
+{
+    "manufacturer": "millet",
+    "keyboard_name": "doksin",
+    "maintainer": "millet",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D4"]
+        ]
+    },
+    "processor": "atmega32u2",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1919",
+        "vid": "0xBDD1"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/millet/doksin/keymaps/default/keymap.c b/keyboards/millet/doksin/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2d9e565f3a4e
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+/* Copyright 2019 Biacco42
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_1x1(
+    KC_1
+  ),
+};
diff --git a/keyboards/millet/doksin/keymaps/default/readme.md b/keyboards/millet/doksin/keymaps/default/readme.md
new file mode 100644
index 000000000000..5ddd4572c40e
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/default/readme.md
@@ -0,0 +1 @@
+# default keymap for DOKSIN
\ No newline at end of file
diff --git a/keyboards/millet/doksin/keymaps/via/keymap.c b/keyboards/millet/doksin/keymaps/via/keymap.c
new file mode 100644
index 000000000000..56d8f970841f
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+/* Copyright 2019 Biacco42
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_1x1( /* Base */
+    KC_1
+  ),
+
+};
diff --git a/keyboards/millet/doksin/keymaps/via/rules.mk b/keyboards/millet/doksin/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/millet/doksin/readme.md b/keyboards/millet/doksin/readme.md
new file mode 100644
index 000000000000..175416eb8b69
--- /dev/null
+++ b/keyboards/millet/doksin/readme.md
@@ -0,0 +1,19 @@
+# DOKСИН
+
+![DOKСИН](https://i.imgur.com/OaDlfwrh.jpg)
+
+Can be used as a keyboard...
+
+* Keyboard Maintainer: [millet](https://github.com/milletmilletmilletmilletmilletmilletmil)
+* Hardware Supported: The DOKСИН PCB
+* Hardware Availability: None
+
+Make example for this keyboard (after setting up your build environment):
+
+    make millet/doksin:default
+
+Flashing example for this keyboard:
+
+    make millet/doksin:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/millet/doksin/rules.mk b/keyboards/millet/doksin/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/monsgeek/m3/config.h b/keyboards/monsgeek/m3/config.h
new file mode 100644
index 000000000000..85eb5b8e99e7
--- /dev/null
+++ b/keyboards/monsgeek/m3/config.h
@@ -0,0 +1,50 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* LED Indicators */
+#define LED_MAC_OS_PIN C10
+#define LED_WIN_LOCK_PIN C11
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000 /* 400000 */
+
+#define RGB_MATRIX_LED_COUNT   87
+
+#define RGB_TRIGGER_ON_KEYDOWN
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/monsgeek/m3/halconf.h b/keyboards/monsgeek/m3/halconf.h
new file mode 100644
index 000000000000..55bfe5c97794
--- /dev/null
+++ b/keyboards/monsgeek/m3/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/monsgeek/m3/info.json b/keyboards/monsgeek/m3/info.json
new file mode 100644
index 000000000000..db646103f12c
--- /dev/null
+++ b/keyboards/monsgeek/m3/info.json
@@ -0,0 +1,249 @@
+{
+    "keyboard_name": "M3",
+    "manufacturer": "MonsGeek",
+    "maintainer": "jonylee@hfd",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x0009",
+        "device_version": "1.0.5",
+        "suspend_wakeup_delay": 400,
+        "force_nkro": true
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "indicators": {
+        "caps_lock": "A15"
+    }, 
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "max_brightness": 160,
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "multisplash": true
+        },
+        "layout":[
+            { "flags": 4, "matrix": [0, 0],  "x":  0, "y": 0},
+            { "flags": 4, "matrix": [0, 1],  "x": 24, "y": 0},
+            { "flags": 4, "matrix": [0, 2],  "x": 38, "y": 0},
+            { "flags": 4, "matrix": [0, 3],  "x": 52, "y": 0},
+            { "flags": 4, "matrix": [0, 4],  "x": 66, "y": 0},
+            { "flags": 4, "matrix": [0, 5],  "x": 82, "y": 0},
+            { "flags": 4, "matrix": [0, 6],  "x": 96, "y": 0},
+            { "flags": 4, "matrix": [0, 7],  "x":110, "y": 0},
+            { "flags": 4, "matrix": [0, 8],  "x":124, "y": 0},
+            { "flags": 4, "matrix": [0, 9],  "x":140, "y": 0},
+            { "flags": 4, "matrix": [0, 10], "x":154, "y": 0},
+            { "flags": 4, "matrix": [0, 11], "x":168, "y": 0},
+            { "flags": 4, "matrix": [0, 12], "x":182, "y": 0},
+            { "flags": 4, "matrix": [0, 14], "x":196, "y": 0},
+            { "flags": 4, "matrix": [0, 15], "x":210, "y": 0},
+            { "flags": 4, "matrix": [0, 16], "x":224, "y": 0},
+
+            { "flags": 4, "matrix": [1, 0],  "x":  0, "y": 12},
+            { "flags": 4, "matrix": [1, 1],  "x": 13, "y": 12},
+            { "flags": 4, "matrix": [1, 2],  "x": 26, "y": 12},
+            { "flags": 4, "matrix": [1, 3],  "x": 39, "y": 12},
+            { "flags": 4, "matrix": [1, 4],  "x": 52, "y": 12},
+            { "flags": 4, "matrix": [1, 5],  "x": 65, "y": 12},
+            { "flags": 4, "matrix": [1, 6],  "x": 79, "y": 12},
+            { "flags": 4, "matrix": [1, 7],  "x": 92, "y": 12},
+            { "flags": 4, "matrix": [1, 8],  "x":105, "y": 12},
+            { "flags": 4, "matrix": [1, 9],  "x":118, "y": 12},
+            { "flags": 4, "matrix": [1, 10], "x":131, "y": 12},
+            { "flags": 4, "matrix": [1, 11], "x":144, "y": 12},
+            { "flags": 4, "matrix": [1, 12], "x":158, "y": 12},
+            { "flags": 4, "matrix": [1, 13], "x":171, "y": 12},
+            { "flags": 4, "matrix": [1, 14], "x":184, "y": 12},
+            { "flags": 4, "matrix": [1, 15], "x":197, "y": 12},
+            { "flags": 4, "matrix": [1, 16], "x":210, "y": 12},
+
+            { "flags": 4, "matrix": [2, 0],  "x":  0, "y": 26},
+            { "flags": 4, "matrix": [2, 1],  "x": 14, "y": 26},
+            { "flags": 4, "matrix": [2, 2],  "x": 28, "y": 26},
+            { "flags": 4, "matrix": [2, 3],  "x": 42, "y": 26},
+            { "flags": 4, "matrix": [2, 4],  "x": 56, "y": 26},
+            { "flags": 4, "matrix": [2, 5],  "x": 70, "y": 26},
+            { "flags": 4, "matrix": [2, 6],  "x": 84, "y": 26},
+            { "flags": 4, "matrix": [2, 7],  "x": 98, "y": 26},
+            { "flags": 4, "matrix": [2, 8],  "x":112, "y": 26},
+            { "flags": 4, "matrix": [2, 9],  "x":126, "y": 26},
+            { "flags": 4, "matrix": [2, 10], "x":140, "y": 26},
+            { "flags": 4, "matrix": [2, 11], "x":154, "y": 26},
+            { "flags": 4, "matrix": [2, 12], "x":168, "y": 26},
+            { "flags": 4, "matrix": [2, 13], "x":182, "y": 26},
+            { "flags": 4, "matrix": [2, 14], "x":196, "y": 26},
+            { "flags": 4, "matrix": [2, 15], "x":210, "y": 26},
+            { "flags": 4, "matrix": [2, 16], "x":224, "y": 26},
+
+            { "flags": 4, "matrix": [3, 0],  "x":  0, "y": 38},
+            { "flags": 4, "matrix": [3, 1],  "x": 14, "y": 38},
+            { "flags": 4, "matrix": [3, 2],  "x": 28, "y": 38},
+            { "flags": 4, "matrix": [3, 3],  "x": 42, "y": 38},
+            { "flags": 4, "matrix": [3, 4],  "x": 56, "y": 38},
+            { "flags": 4, "matrix": [3, 5],  "x": 70, "y": 38},
+            { "flags": 4, "matrix": [3, 6],  "x": 84, "y": 38},
+            { "flags": 4, "matrix": [3, 7],  "x": 98, "y": 38},
+            { "flags": 4, "matrix": [3, 8],  "x":112, "y": 38},
+            { "flags": 4, "matrix": [3, 9],  "x":126, "y": 38},
+            { "flags": 4, "matrix": [3, 10], "x":140, "y": 38},
+            { "flags": 4, "matrix": [3, 11], "x":154, "y": 38},
+            { "flags": 4, "matrix": [3, 13], "x":182, "y": 38},
+
+            { "flags": 4, "matrix": [4, 0],  "x":  0, "y": 51},
+            { "flags": 4, "matrix": [4, 1],  "x": 14, "y": 51},
+            { "flags": 4, "matrix": [4, 2],  "x": 28, "y": 51},
+            { "flags": 4, "matrix": [4, 3],  "x": 42, "y": 51},
+            { "flags": 4, "matrix": [4, 4],  "x": 56, "y": 51},
+            { "flags": 4, "matrix": [4, 5],  "x": 70, "y": 51},
+            { "flags": 4, "matrix": [4, 6],  "x": 84, "y": 51},
+            { "flags": 4, "matrix": [4, 7],  "x": 98, "y": 51},
+            { "flags": 4, "matrix": [4, 8],  "x":112, "y": 51},
+            { "flags": 4, "matrix": [4, 9],  "x":126, "y": 51},
+            { "flags": 4, "matrix": [4, 10], "x":140, "y": 51},
+            { "flags": 4, "matrix": [4, 13], "x":154, "y": 51},
+            { "flags": 4, "matrix": [4, 15], "x":182, "y": 51},
+
+            { "flags": 4, "matrix": [5, 0],  "x":  0, "y": 64},
+            { "flags": 4, "matrix": [5, 1],  "x": 14, "y": 64},
+            { "flags": 4, "matrix": [5, 2],  "x": 28, "y": 64},
+            { "flags": 4, "matrix": [5, 5],  "x": 70, "y": 64},
+            { "flags": 4, "matrix": [5, 9],  "x":126, "y": 64},
+            { "flags": 4, "matrix": [5, 10], "x":140, "y": 64},
+            { "flags": 4, "matrix": [5, 11], "x":154, "y": 64},
+            { "flags": 4, "matrix": [5, 13], "x":182, "y": 64},
+            { "flags": 4, "matrix": [5, 14], "x":196, "y": 64},
+            { "flags": 4, "matrix": [5, 15], "x":210, "y": 64},
+            { "flags": 4, "matrix": [5, 16], "x":224, "y": 64}
+        ]
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "F9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "F10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "F11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "F12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "ScrLk", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 },
+
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2 },
+                { "label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+                { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.25 },
+
+                { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+                { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.25 },
+
+                { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 },
+
+                { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75 },
+                { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.25 },
+
+                { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "Left", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+                { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/monsgeek/m3/keymaps/default/keymap.c b/keyboards/monsgeek/m3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d075b6067f34
--- /dev/null
+++ b/keyboards/monsgeek/m3/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    WIN_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = 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(WIN_FN),       KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(WIN_FN),       _______, KC_A,    KC_S,    KC_D),
+
+
+    [WIN_FN] = LAYOUT_tkl_ansi( /* FN */
+	    _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT_tkl_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,          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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(MAC_FN),       KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT),
+
+    [MAC_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D),
+    [MAC_FN] = LAYOUT_tkl_ansi( /* FN */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/monsgeek/m3/keymaps/via/keymap.c b/keyboards/monsgeek/m3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..d075b6067f34
--- /dev/null
+++ b/keyboards/monsgeek/m3/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    WIN_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = 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(WIN_FN),       KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(WIN_FN),       _______, KC_A,    KC_S,    KC_D),
+
+
+    [WIN_FN] = LAYOUT_tkl_ansi( /* FN */
+	    _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT_tkl_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,          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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(MAC_FN),       KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT),
+
+    [MAC_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D),
+    [MAC_FN] = LAYOUT_tkl_ansi( /* FN */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/monsgeek/m3/keymaps/via/rules.mk b/keyboards/monsgeek/m3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/monsgeek/m3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
new file mode 100644
index 000000000000..95bfb34789b5
--- /dev/null
+++ b/keyboards/monsgeek/m3/m3.c
@@ -0,0 +1,192 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    /*row0*/
+    {1, A_1,   B_1,   C_1},
+    {1, A_2,   B_2,   C_2},
+    {1, A_3,   B_3,   C_3},
+    {1, A_4,   B_4,   C_4},
+    {1, A_5,   B_5,   C_5},
+    {1, A_6,   B_6,   C_6},
+    {1, A_7,   B_7,   C_7},
+    {1, A_8,   B_8,   C_8},
+    {1, A_9,   B_9,   C_9},
+    {1, A_10,  B_10,  C_10},
+    {1, A_11,  B_11,  C_11},
+    {1, A_12,  B_12,  C_12},
+    {1, A_13,  B_13,  C_13},
+    {1, A_14,  B_14,  C_14},
+    {1, A_15,  B_15,  C_15},
+    {1, A_16,  B_16,  C_16},
+
+    /*row1*/
+    {0, A_1,   B_1,   C_1},
+    {0, A_2,   B_2,   C_2},
+    {0, A_3,   B_3,   C_3},
+    {0, A_4,   B_4,   C_4},
+    {0, A_5,   B_5,   C_5},
+    {0, A_6,   B_6,   C_6},
+    {0, A_7,   B_7,   C_7},
+    {0, A_8,   B_8,   C_8},
+    {0, A_9,   B_9,   C_9},
+    {0, A_10,  B_10,  C_10},
+    {0, A_11,  B_11,  C_11},
+    {0, A_12,  B_12,  C_12},
+    {0, A_13,  B_13,  C_13},
+    {0, A_14,  B_14,  C_14},
+    {1, D_1,    E_1,   F_1},
+    {1, D_2,    E_2,   F_2},
+    {1, D_3,    E_3,   F_3},
+
+    /*row2*/
+    {0, D_1,   E_1,   F_1},
+    {0, D_2,   E_2,   F_2},
+    {0, D_3,   E_3,   F_3},
+    {0, D_4,   E_4,   F_4},
+    {0, D_5,   E_5,   F_5},
+    {0, D_6,   E_6,   F_6},
+    {0, D_7,   E_7,   F_7},
+    {0, D_8,   E_8,   F_8},
+    {0, D_9,   E_9,   F_9},
+    {0, D_10,  E_10,  F_10},
+    {0, D_11,  E_11,  F_11},
+    {0, D_12,  E_12,  F_12},
+    {0, D_13,  E_13,  F_13},
+    {0, D_14,  E_14,  F_14},
+    {1, G_1,   H_1,   I_1},
+    {1, G_2,   H_2,   I_2},
+    {1, G_3,   H_3,   I_3},
+
+    /*row3*/
+    {0, G_1,   H_1,   I_1},
+    {0, G_2,   H_2,   I_2},
+    {0, G_3,   H_3,   I_3},
+    {0, G_4,   H_4,   I_4},
+    {0, G_5,   H_5,   I_5},
+    {0, G_6,   H_6,   I_6},
+    {0, G_7,   H_7,   I_7},
+    {0, G_8,   H_8,   I_8},
+    {0, G_9,   H_9,   I_9},
+    {0, G_10,  H_10,  I_10},
+    {0, G_11,  H_11,  I_11},
+    {0, G_12,  H_12,  I_12},
+    {0, G_13,  H_13,  I_13},
+
+    /*row4*/
+    {0, J_1,   K_1,   L_1},
+    {0, J_2,   K_2,   L_2},
+    {0, J_3,   K_3,   L_3},
+    {0, J_4,   K_4,   L_4},
+    {0, J_5,   K_5,   L_5},
+    {0, J_6,   K_6,   L_6},
+    {0, J_7,   K_7,   L_7},
+    {0, J_8,   K_8,   L_8},
+    {0, J_9,   K_9,   L_9},
+    {0, J_10,  K_10,  L_10},
+    {0, J_11,  K_11,  L_11},
+    {0, J_12,  K_12,  L_12},
+    {1,  J_4,   K_4,  L_4},
+
+    /*row5*/
+    {0, J_13,  K_13,  L_13},
+    {0, J_14,  K_14,  L_14},
+    {0, J_15,  K_15,  L_15},
+    {0, J_16,  K_16,  L_16},
+    {0, G_14,  H_14,  I_14},
+    {0, G_15,  H_15,  I_15},
+    {0, G_16,  H_16,  I_16},
+    {0, D_15,  E_15,  F_15},
+    {1,  J_1,   K_1,  L_1},
+    {1,  J_2,   K_2,  L_2},
+    {1,  J_3,   K_3,  L_3},
+};
+#endif // RGB_MATRIX_ENABLE
+
+// clang-format on
+enum __layers {
+    WIN_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN,
+};
+
+void matrix_init_kb(void) {
+    setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN
+    writePinLow(LED_MAC_OS_PIN);
+    setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock
+    writePinLow(LED_WIN_LOCK_PIN);
+}
+
+void housekeeping_task_kb(void){
+    writePin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3));
+    writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case DF(WIN_B):
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(WIN_B);
+            }
+            return false;
+        case DF(MAC_B):
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(MAC_B);
+                keymap_config.no_gui = 0;
+                eeconfig_update_keymap(keymap_config.raw);
+            }
+            return false;
+        case GU_TOGG:
+            if (record->event.pressed) {
+                writePin(LED_WIN_LOCK_PIN, !keymap_config.no_gui);
+            }
+            return true;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+        default:
+            return true;
+    }
+}
diff --git a/keyboards/monsgeek/m3/mcuconf.h b/keyboards/monsgeek/m3/mcuconf.h
new file mode 100644
index 000000000000..e2884f3828f6
--- /dev/null
+++ b/keyboards/monsgeek/m3/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/monsgeek/m3/readme.md b/keyboards/monsgeek/m3/readme.md
new file mode 100644
index 000000000000..32e9112276b3
--- /dev/null
+++ b/keyboards/monsgeek/m3/readme.md
@@ -0,0 +1,24 @@
+# MonsGeek M3
+
+A customizable 80% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: MonsGeek M3 PCB
+* Hardware Availability: [monsgeek](https://www.monsgeek.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make monsgeek/m3:default
+
+Flashing example for this keyboard:
+
+    make monsgeek/m3:default:flash
+    
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/monsgeek/m3/rules.mk b/keyboards/monsgeek/m3/rules.mk
new file mode 100644
index 000000000000..24d5f6f52ecc
--- /dev/null
+++ b/keyboards/monsgeek/m3/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index 7013ce903db6..4c569a89dfdb 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -346,9 +346,9 @@
                 {"label": "\u2191", "matrix": [4, 14], "x": 16.25, "y": 4.25},
 
                 {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
                 {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 7},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
                 {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
                 {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
                 {"label": "Ctrl", "matrix": [4, 15], "x": 13.5, "y": 5.25, "w": 1.5},
diff --git a/keyboards/printedpad/config.h b/keyboards/printedpad/config.h
new file mode 100644
index 000000000000..58bf9c6ffe1c
--- /dev/null
+++ b/keyboards/printedpad/config.h
@@ -0,0 +1,15 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+#define I2C1_TIMINGR_PRESC 0x00U
+#define I2C1_TIMINGR_SCLDEL 0x03U
+#define I2C1_TIMINGR_SDADEL 0x01U
+#define I2C1_TIMINGR_SCLH 0x03U
+#define I2C1_TIMINGR_SCLL 0x09U
+
+#define OLED_TIMEOUT 300000
diff --git a/keyboards/printedpad/halconf.h b/keyboards/printedpad/halconf.h
new file mode 100644
index 000000000000..0534f72da252
--- /dev/null
+++ b/keyboards/printedpad/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/printedpad/info.json b/keyboards/printedpad/info.json
new file mode 100644
index 000000000000..90a42c73137a
--- /dev/null
+++ b/keyboards/printedpad/info.json
@@ -0,0 +1,46 @@
+{
+    "manufacturer": "Prota Designs",
+    "keyboard_name": "Printed Pad",
+    "maintainer": "noahbei",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0"],
+        "rows": ["A10", "C9", "A8", "A9"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x5064"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/printedpad/keymaps/default/keymap.c b/keyboards/printedpad/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2126dc593fdd
--- /dev/null
+++ b/keyboards/printedpad/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐
+     * │Tog│ 
+     * ├───┼───┬───┐ 
+     * │ 7 │ 8 │ 9 │
+     * ├───┼───┼───┤
+     * │ 4 │ 5 │ 6 │
+     * ├───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ 
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        LT(0, KC_NO),
+        KC_7,   KC_8,   KC_9,
+        KC_4,   KC_5,   KC_6,
+        KC_1,   KC_2,   KC_3
+    ),
+
+    [1] = LAYOUT(
+        LT(0, KC_NO),
+        KC_A,   KC_B,   KC_C,
+        KC_D,   KC_E,   KC_F,
+        KC_G,   KC_H,   KC_I
+    ),
+
+    [2] = LAYOUT(
+        LT(0, KC_NO),
+        KC_J,   KC_K,   KC_L,
+        KC_M,   KC_N,   KC_O,
+        KC_P,   KC_Q,   KC_R
+    ),
+
+    [3] = LAYOUT(
+        LT(0, KC_NO),
+        KC_S,   KC_T,   KC_U,
+        KC_V,   KC_W,   KC_X,
+        KC_Y,   KC_Z,   KC_ENT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/printedpad/keymaps/via/keymap.c b/keyboards/printedpad/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2126dc593fdd
--- /dev/null
+++ b/keyboards/printedpad/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐
+     * │Tog│ 
+     * ├───┼───┬───┐ 
+     * │ 7 │ 8 │ 9 │
+     * ├───┼───┼───┤
+     * │ 4 │ 5 │ 6 │
+     * ├───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ 
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        LT(0, KC_NO),
+        KC_7,   KC_8,   KC_9,
+        KC_4,   KC_5,   KC_6,
+        KC_1,   KC_2,   KC_3
+    ),
+
+    [1] = LAYOUT(
+        LT(0, KC_NO),
+        KC_A,   KC_B,   KC_C,
+        KC_D,   KC_E,   KC_F,
+        KC_G,   KC_H,   KC_I
+    ),
+
+    [2] = LAYOUT(
+        LT(0, KC_NO),
+        KC_J,   KC_K,   KC_L,
+        KC_M,   KC_N,   KC_O,
+        KC_P,   KC_Q,   KC_R
+    ),
+
+    [3] = LAYOUT(
+        LT(0, KC_NO),
+        KC_S,   KC_T,   KC_U,
+        KC_V,   KC_W,   KC_X,
+        KC_Y,   KC_Z,   KC_ENT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/printedpad/keymaps/via/rules.mk b/keyboards/printedpad/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/printedpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/printedpad/mcuconf.h b/keyboards/printedpad/mcuconf.h
new file mode 100644
index 000000000000..af97c1c992a3
--- /dev/null
+++ b/keyboards/printedpad/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/printedpad/oled.c b/keyboards/printedpad/oled.c
new file mode 100644
index 000000000000..a41fad77673e
--- /dev/null
+++ b/keyboards/printedpad/oled.c
@@ -0,0 +1,1420 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "printedpad.h"
+
+#ifdef OLED_ENABLE
+static void flash_current_layer(void);
+
+#define FRAME_DURATION 200
+
+uint32_t animation_timer = 0;
+uint8_t current_frame = 0;
+
+static void render_animation(void) {
+    // 'monkeylong26', 128x32px
+    static const char epd_bitmap_monkeylong26[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 
+        0x90, 0x90, 0x63, 0xc4, 0x3f, 0x1f, 0x3b, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xa0, 0xa1, 
+        0x72, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 
+        0x02, 0x04, 0x74, 0xf4, 0xe5, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0x10, 0x70, 0xe8, 0xef, 0xd0, 
+        0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong25', 128x32px
+    static const char epd_bitmap_monkeylong25[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 
+        0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0xc3, 0xc4, 
+        0x3f, 0x1f, 0x3b, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xa0, 0xa1, 0x72, 0x0c, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x05, 0x05, 0x74, 0xf4, 
+        0xe5, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0xf0, 0xf0, 0xe8, 0xaf, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong24', 128x32px
+    static const char epd_bitmap_monkeylong24[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x83, 0x04, 0x9f, 0x7f, 0x3b, 0x70, 
+        0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xe0, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x0a, 0x0a, 0x09, 0x74, 0xf5, 0xee, 0xae, 0xde, 
+        0x11, 0x10, 0xf0, 0xf0, 0xf0, 0xa8, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong23', 128x32px
+    static const char epd_bitmap_monkeylong23[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x03, 0x04, 0x1f, 0x3f, 0xfb, 0xf0, 0x60, 0x28, 0x53, 0xd0, 
+        0x50, 0xc3, 0x20, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x06, 0x09, 0x10, 0x14, 0x14, 0x13, 0x08, 0x04, 0xef, 0xef, 0xff, 0xf2, 0xf2, 0xf2, 0xb1, 
+        0xd0, 0x08, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong22', 128x32px
+    static const char epd_bitmap_monkeylong22[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 
+        0x40, 0x40, 0x83, 0x04, 0x1f, 0xff, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x30, 0x43, 0xe0, 0x21, 
+        0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 
+        0x0a, 0x0a, 0x09, 0x04, 0xe4, 0xef, 0xef, 0xbf, 0xd1, 0x10, 0xf1, 0xf2, 0xf2, 0xaa, 0xcf, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong21', 128x32px
+    static const char epd_bitmap_monkeylong21[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 
+        0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0xc3, 0x04, 
+        0xdf, 0x3f, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0xd0, 0x43, 0x20, 0x61, 0xf2, 0x0c, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04, 0x74, 
+        0xf4, 0xef, 0xaf, 0xdf, 0x11, 0x10, 0x10, 0xf0, 0xf1, 0xea, 0xae, 0xc2, 0x01, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong20', 128x32px
+    static const char epd_bitmap_monkeylong20[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x90, 0x90, 0x63, 0x64, 0x9f, 0xbf, 0xfb, 0xf0, 
+        0xe0, 0xca, 0xd2, 0x50, 0x52, 0xc2, 0x20, 0x11, 0x32, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x04, 0x74, 0xf4, 0xe4, 0xaf, 0xcf, 0x1f, 
+        0x11, 0x10, 0x10, 0xf0, 0xf0, 0xe8, 0xaf, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong19', 128x32px
+    static const char epd_bitmap_monkeylong19[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xc0, 0x20, 0x10, 0x90, 0x90, 0x63, 0x64, 0x9f, 0xbf, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 
+        0x50, 0xc3, 0x20, 0x11, 0x32, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x01, 0x02, 0x02, 0x04, 0x74, 0xf4, 0xe4, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0x10, 
+        0x70, 0xe8, 0xef, 0xd1, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong18', 128x32px
+    static const char epd_bitmap_monkeylong18[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 
+        0x20, 0x20, 0xc3, 0x64, 0x9f, 0xbf, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0x20, 0x11, 
+        0x32, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 
+        0x05, 0x05, 0x74, 0xf4, 0xe4, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0x10, 0x70, 0xe8, 0xef, 0xd1, 
+        0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong17', 128x32px
+    static const char epd_bitmap_monkeylong17[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 
+        0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x83, 0x04, 
+        0xdf, 0x3f, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0xd0, 0x43, 0x20, 0x61, 0xf2, 0x0c, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x0a, 0x0a, 0x09, 0x74, 
+        0xf4, 0xef, 0xaf, 0xdf, 0x11, 0x10, 0x10, 0xf0, 0xf1, 0xea, 0xae, 0xc2, 0x01, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong16', 128x32px
+    static const char epd_bitmap_monkeylong16[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x03, 0x04, 0x1f, 0xff, 0xfb, 0xf0, 
+        0xe0, 0xc8, 0xd3, 0x50, 0x30, 0x43, 0xe0, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x10, 0x14, 0x14, 0x13, 0x08, 0x04, 0xef, 0xef, 0xff, 
+        0xb1, 0xd0, 0xf1, 0xf2, 0xf2, 0xaa, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong15', 128x32px
+    static const char epd_bitmap_monkeylong15[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x38, 0x18, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x83, 0x04, 0x1f, 0x3f, 0xfb, 0xf0, 0x60, 0x28, 0x53, 0xd0, 
+        0x50, 0xc3, 0x20, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x03, 0x04, 0x08, 0x0a, 0x0a, 0x09, 0x04, 0x04, 0x0f, 0x0f, 0xff, 0xf2, 0xf2, 0xb2, 0xf1, 
+        0xb0, 0xc8, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong14', 128x32px
+    static const char epd_bitmap_monkeylong14[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xc0, 0x20, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 0xe0, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 
+        0x20, 0x20, 0xc3, 0x04, 0x9f, 0x7f, 0x3b, 0x70, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xe0, 0x21, 
+        0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 
+        0x05, 0x05, 0x04, 0x04, 0xe5, 0xee, 0xee, 0xbe, 0xd1, 0x10, 0xf0, 0xf0, 0xf0, 0xa8, 0xcf, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    // 'monkeylong13', 128x32px
+    static const char epd_bitmap_monkeylong13[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x72, 
+        0xa1, 0xa0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0x3b, 0x1f, 0x3f, 0xc4, 0x63, 0x90, 0x90, 
+        0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 
+        0xd0, 0xef, 0xe8, 0x70, 0x10, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe5, 0xf4, 0x74, 0x04, 0x02, 
+        0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong12', 128x32px
+    static const char epd_bitmap_monkeylong12[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 
+        0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x0c, 0x72, 0xa1, 0xa0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0x3b, 0x1f, 0x3f, 
+        0xc4, 0xc3, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xc0, 0xaf, 0xe8, 0xf0, 0xf0, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe5, 
+        0xf4, 0x74, 0x05, 0x05, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong11', 128x32px
+    static const char epd_bitmap_monkeylong11[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x32, 0x21, 0xe0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 
+        0x70, 0x3b, 0x7f, 0x9f, 0x04, 0x83, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xa8, 0xf0, 0xf0, 0xf0, 0x10, 0x11, 
+        0xde, 0xae, 0xee, 0xf5, 0x74, 0x09, 0x0a, 0x0a, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong9', 128x32px
+    static const char epd_bitmap_monkeylong9[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x32, 
+        0x21, 0xe0, 0x43, 0x30, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0xff, 0x1f, 0x04, 0x83, 0x40, 0x40, 
+        0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xcf, 0xaa, 0xf2, 0xf2, 0xf1, 0x10, 0xd1, 0xbf, 0xef, 0xef, 0xe4, 0x04, 0x09, 0x0a, 0x0a, 
+        0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong10', 128x32px
+    static const char epd_bitmap_monkeylong10[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x32, 0x21, 0x20, 0xc3, 0x50, 
+        0xd0, 0x53, 0x28, 0x60, 0xf0, 0xfb, 0x3f, 0x1f, 0x04, 0x03, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x08, 0xd0, 
+        0xb1, 0xf2, 0xf2, 0xf2, 0xff, 0xef, 0xef, 0x04, 0x08, 0x13, 0x14, 0x14, 0x10, 0x09, 0x06, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong8', 128x32px
+    static const char epd_bitmap_monkeylong8[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 
+        0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x0c, 0xf2, 0x61, 0x20, 0x43, 0xd0, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0x3f, 0xdf, 
+        0x04, 0xc3, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0xc2, 0xae, 0xea, 0xf1, 0xf0, 0x10, 0x10, 0x11, 0xdf, 0xaf, 0xef, 0xf4, 
+        0x74, 0x04, 0x05, 0x05, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong7', 128x32px
+    static const char epd_bitmap_monkeylong7[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x32, 0x11, 0x20, 0xc2, 0x52, 0x50, 0xd2, 0xca, 0xe0, 
+        0xf0, 0xfb, 0xbf, 0x9f, 0x64, 0x63, 0x90, 0x90, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc1, 0xaf, 0xe8, 0xf0, 0xf0, 0x10, 0x10, 0x11, 
+        0x1f, 0xcf, 0xaf, 0xe4, 0xf4, 0x74, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong6', 128x32px
+    static const char epd_bitmap_monkeylong6[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x32, 0x11, 0x20, 0xc3, 0x50, 
+        0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0xbf, 0x9f, 0x64, 0x63, 0x90, 0x90, 0x10, 0x20, 0xc0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0xd1, 0xef, 0xe8, 0x70, 
+        0x10, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe4, 0xf4, 0x74, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong5', 128x32px
+    static const char epd_bitmap_monkeylong5[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x32, 
+        0x11, 0x20, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0xbf, 0x9f, 0x64, 0xc3, 0x20, 0x20, 
+        0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 
+        0xd1, 0xef, 0xe8, 0x70, 0x10, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe4, 0xf4, 0x74, 0x05, 0x05, 
+        0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong4', 128x32px
+    static const char epd_bitmap_monkeylong4[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 
+        0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x0c, 0xf2, 0x61, 0x20, 0x43, 0xd0, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0x3f, 0xdf, 
+        0x04, 0x83, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0xc2, 0xae, 0xea, 0xf1, 0xf0, 0x10, 0x10, 0x11, 0xdf, 0xaf, 0xef, 0xf4, 
+        0x74, 0x09, 0x0a, 0x0a, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong3', 128x32px
+    static const char epd_bitmap_monkeylong3[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x32, 0x21, 0xe0, 0x43, 0x30, 0x50, 0xd3, 0xc8, 0xe0, 
+        0xf0, 0xfb, 0xff, 0x1f, 0x04, 0x03, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xaa, 0xf2, 0xf2, 0xf1, 0xd0, 0xb1, 
+        0xff, 0xef, 0xef, 0x04, 0x08, 0x13, 0x14, 0x14, 0x10, 0x09, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong2', 128x32px
+    static const char epd_bitmap_monkeylong2[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x18, 0x38, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x32, 0x21, 0x20, 0xc3, 0x50, 
+        0xd0, 0x53, 0x28, 0x60, 0xf0, 0xfb, 0x3f, 0x1f, 0x04, 0x83, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc8, 0xb0, 
+        0xf1, 0xb2, 0xf2, 0xf2, 0xff, 0x0f, 0x0f, 0x04, 0x04, 0x09, 0x0a, 0x0a, 0x08, 0x04, 0x03, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong1', 128x32px
+    static const char epd_bitmap_monkeylong1[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xe0, 0x10, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 0x20, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x32, 
+        0x21, 0xe0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0x70, 0x3b, 0x7f, 0x9f, 0x04, 0xc3, 0x20, 0x20, 
+        0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xcf, 0xa8, 0xf0, 0xf0, 0xf0, 0x10, 0xd1, 0xbe, 0xee, 0xee, 0xe5, 0x04, 0x04, 0x05, 0x05, 
+        0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    // Array of all bitmaps for convenience. (Total bytes used to store images = 13728)
+    static const char* const epd_bitmap_allArray[26] = {
+        epd_bitmap_monkeylong1,
+        epd_bitmap_monkeylong2,
+        epd_bitmap_monkeylong3,
+        epd_bitmap_monkeylong4,
+        epd_bitmap_monkeylong5,
+        epd_bitmap_monkeylong6,
+        epd_bitmap_monkeylong7,
+        epd_bitmap_monkeylong8,
+        epd_bitmap_monkeylong9,
+        epd_bitmap_monkeylong10,
+        epd_bitmap_monkeylong11,
+        epd_bitmap_monkeylong12,
+        epd_bitmap_monkeylong13,
+        epd_bitmap_monkeylong14,
+        epd_bitmap_monkeylong15,
+        epd_bitmap_monkeylong16,
+        epd_bitmap_monkeylong17,
+        epd_bitmap_monkeylong18,
+        epd_bitmap_monkeylong19,
+        epd_bitmap_monkeylong20,
+        epd_bitmap_monkeylong21,
+        epd_bitmap_monkeylong22,
+        epd_bitmap_monkeylong23,
+        epd_bitmap_monkeylong24,
+        epd_bitmap_monkeylong25,
+        epd_bitmap_monkeylong26
+    };
+
+    uint16_t frame_size = sizeof(epd_bitmap_monkeylong1);
+    
+    if (layer_changed) // flash_current_layer will change layer_changed to flase after a short time, resuming the animation
+        flash_current_layer();
+
+    else if (timer_elapsed(animation_timer) > FRAME_DURATION) {
+        // Set animation_timer to updated time
+        animation_timer = timer_read();
+        
+        // Increment frame
+        current_frame = (current_frame + 1) % (sizeof(epd_bitmap_allArray) / sizeof(epd_bitmap_allArray[0]));
+
+        // Draw frame to OLED
+        oled_write_raw_P(epd_bitmap_allArray[current_frame], frame_size); 
+    }
+}
+
+static void render_layers(void) {
+    static const char pop[][525] = {
+        {
+        // 'Pop1', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 
+        0x01, 0x03, 0x07, 0xff, 0xff, 0xc7, 0xc3, 0xe1, 0xf0, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 
+        0x80, 0xc0, 0xe0, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0xff, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00
+        },
+        {
+        // 'Pop2', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 
+        0x03, 0x07, 0xff, 0xff, 0xe3, 0xe1, 0xf0, 0xf8, 0xf8, 0x78, 0x30, 0x01, 0x03, 0x87, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 
+        0xc0, 0xe0, 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x21, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00
+        },
+        {
+        // 'Pop3', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 0x07, 
+        0xff, 0xff, 0xf3, 0xf1, 0xf0, 0x78, 0x78, 0x78, 0x38, 0x00, 0x01, 0x83, 0xff, 0xff, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 0xe0, 
+        0xff, 0xff, 0xcf, 0x8f, 0x0f, 0x1e, 0x3e, 0x3e, 0x3e, 0x1c, 0x00, 0x80, 0xc3, 0xff, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00
+        },
+        {
+        // 'Pop4', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 0x07, 0xff, 
+        0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x83, 0xc1, 0xe0, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 0xe0, 0xff, 
+        0xe3, 0xe0, 0xe0, 0xe0, 0xe2, 0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00
+        }
+    };
+    
+    oled_write_raw_P(pop[get_highest_layer(layer_state)], sizeof(pop[0]));
+}
+
+static void render_button_pressed(void) {
+    static const char pressed[] = {
+        // 'pressed', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x08, 0x08, 0x08, 0x90, 0x00, 0xf8, 
+        0x00, 0x00, 0x00, 0x00, 0x08, 0xf8, 0x08, 0x00, 0xf0, 0x08, 0x08, 0x08, 0x90, 0x00, 0xf8, 0x20, 
+        0xd0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x38, 0x08, 0x0c, 0x0c, 0x1e, 0x1e, 
+        0x1e, 0x1e, 0x0e, 0x0e, 0x0e, 0x0e, 0x1e, 0x3c, 0xf8, 0xf8, 0xd8, 0x10, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 
+        0x01, 0x01, 0xc1, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0xc0, 0x01, 0x00, 
+        0x00, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x3c, 0x42, 0x81, 0x00, 0x02, 0x01, 0x21, 0x41, 0x42, 
+        0x40, 0x42, 0x41, 0x21, 0x01, 0x02, 0x00, 0x00, 0x01, 0x8f, 0xff, 0x3e, 0x07, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x22, 0x10, 0x10, 0x10, 0x10, 0x10, 
+        0x10, 0x10, 0x11, 0x12, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x12, 0x11, 0x10, 0x10, 
+        0x10, 0x18, 0x2a, 0x45, 0xc4, 0x42, 0x42, 0x22, 0x21, 0x11, 0x12, 0xfe, 0x02, 0x02, 0x02, 0x02, 
+        0x7a, 0x84, 0x84, 0x4c, 0x3c, 0xfc, 0xfe, 0x87, 0x83, 0x99, 0xa4, 0xa2, 0x92, 0x44, 0x38, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x43, 0x42, 0x44, 0x3c, 0x04, 
+        0x0c, 0x08, 0x08, 0x08, 0x3c, 0x46, 0x43, 0x43, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    static const char not_pressed[] = {
+        // 'not_pressed', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x38, 0x08, 0x0c, 0x0c, 0x1e, 0x1e, 
+        0x1e, 0x1e, 0x0e, 0x0e, 0x0e, 0x0e, 0x1e, 0x3c, 0xf8, 0xf8, 0xd8, 0x10, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0x10, 0x3c, 0x42, 0x81, 0x00, 0x02, 0x01, 0x21, 0x41, 0x42, 
+        0x40, 0x42, 0x41, 0x21, 0x01, 0x02, 0x00, 0x00, 0x01, 0x8f, 0xff, 0x3e, 0x07, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x48, 0xc4, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0xc4, 0x48, 0x71, 0x02, 0x04, 0x04, 0x08, 0x09, 0x12, 0xfe, 0x02, 0x02, 0x02, 0x02, 
+        0x7a, 0x84, 0x84, 0x4c, 0x3c, 0xfc, 0xfe, 0x87, 0x83, 0x99, 0xa4, 0xa2, 0x92, 0x44, 0x38, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x43, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x43, 0x42, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x43, 0x42, 0x44, 0x3c, 0x04, 
+        0x0c, 0x08, 0x08, 0x08, 0x3c, 0x46, 0x43, 0x43, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    if (layer_changed)
+        flash_current_layer();
+    
+    else if (key_pressed)
+        oled_write_raw_P(pressed, sizeof(pressed));
+    else
+        oled_write_raw_P(not_pressed, sizeof(not_pressed));
+}
+
+static void flash_current_layer(void) {
+    // will flash for 500 ms
+    if (timer_elapsed(flash_timer) > 500)
+        layer_changed = false;
+    
+    static const char flash[][525] = {
+        {
+        // 'flash1', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xc7, 0xc3, 0xe1, 0xf0, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        // 'flash2', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xe3, 0xe1, 0xf0, 0xf8, 0xf8, 0x78, 0x30, 0x01, 0x03, 0x87, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x21, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        // 'flash3', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xf3, 0xf1, 0xf0, 0x78, 0x78, 0x78, 0x38, 0x00, 0x01, 0x83, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0xff, 0xcf, 0x8f, 0x0f, 0x1e, 0x3e, 0x3e, 0x3e, 0x1c, 0x00, 0x80, 0xc3, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        // 'flash4', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x83, 0xe1, 0xf0, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0xe3, 0xe0, 0xe0, 0xe0, 0xe2, 0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0xe3, 0xff, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+
+    oled_write_raw_P(flash[get_highest_layer(layer_state)], sizeof(flash[0]));
+}
+
+static void render_logo(void) {
+    static const char prota[] = {
+        // 'Prota_flash', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 
+        0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0xc3, 0xff, 0xff, 0xff, 0x7f, 0x3e, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0xc3, 0xff, 
+        0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0xf8, 0xfe, 0xff, 0xff, 0x1f, 0x07, 0x03, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x1f, 0xff, 0xff, 0xfe, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xe0, 0xf8, 0xfe, 0xff, 0x3f, 0x07, 0x07, 0x3f, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0xff, 
+        0xff, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x1f, 0x7f, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xff, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 
+        0xff, 0xff, 0xff, 0x3f, 0x1d, 0x1c, 0x1c, 0x1c, 0x1c, 0x1d, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x80, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+        0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+        0x07, 0x07, 0x07, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x06, 
+        0x06, 0x06, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x07, 
+        0x07, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x07, 0x07, 
+        0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    oled_write_raw_P(prota, sizeof(prota));
+}
+
+bool logo_rendered = false;
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (!logo_rendered) {
+        render_logo();
+        if (timer_read() > 2500)
+            logo_rendered = true;
+    }
+    else {
+        switch(current_display_mode) {
+            case 0:
+                render_layers();
+                break;
+            case 1:
+                render_animation();
+                break;
+            case 2:
+                render_button_pressed();
+                break;
+        }
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/printedpad/printedpad.c b/keyboards/printedpad/printedpad.c
new file mode 100644
index 000000000000..4e3354c0284b
--- /dev/null
+++ b/keyboards/printedpad/printedpad.c
@@ -0,0 +1,57 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "printedpad.h"
+
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+}
+
+const uint8_t max_layer = 3;
+uint8_t current_display_mode = 0;
+
+bool key_pressed = false;
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+#ifdef OLED_ENABLE
+    key_pressed = record->event.pressed;
+#endif
+    switch(keycode) {
+        case LT(0, KC_NO):
+            if (record->event.pressed) {
+                // on tap
+                if (record->tap.count) {
+                    if (get_highest_layer(layer_state) >= max_layer) {
+                        layer_clear(); 
+                    } else { 
+                        layer_move(get_highest_layer(layer_state) + 1);
+                    }
+                }
+#ifdef OLED_ENABLE
+                // on hold
+                else {
+                    current_display_mode = (current_display_mode + 1) % 3;
+                }
+#endif
+            }
+            return false;
+    }
+    return true;
+}
+
+#ifdef OLED_ENABLE
+uint32_t flash_timer = 0;
+bool layer_changed = false;
+
+// when the layer is changed, flash the layer number on the screen
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    flash_timer = timer_read();
+    layer_changed = true;
+    
+    return layer_state_set_user(state);
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/printedpad/printedpad.h b/keyboards/printedpad/printedpad.h
new file mode 100644
index 000000000000..17c23be69bcf
--- /dev/null
+++ b/keyboards/printedpad/printedpad.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+//for oled key press
+extern bool key_pressed;
+
+// for changing oled display mode
+extern uint8_t current_display_mode;
+
+//for determining when the layer is changed and having a timer for how long we flash the layer
+extern uint32_t flash_timer;
+extern bool layer_changed;
diff --git a/keyboards/printedpad/readme.md b/keyboards/printedpad/readme.md
new file mode 100644
index 000000000000..bbddd29116f1
--- /dev/null
+++ b/keyboards/printedpad/readme.md
@@ -0,0 +1,25 @@
+# Printed Pad
+
+![magtray4x3](https://i.imgur.com/TBpZzIoh.jpeg)
+
+* Keyboard Maintainer: [noahbei](https://github.com/noahbei)
+* Hardware Supported: STM32F072RBT6
+* Hardware Availability: https://protadesigns.com/products/printed-pad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make printedpad:default
+
+Flashing example for this keyboard:
+
+    make printedpad: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 `QK_BOOT` if it is available
diff --git a/keyboards/printedpad/rules.mk b/keyboards/printedpad/rules.mk
new file mode 100644
index 000000000000..5ab52a55a0f8
--- /dev/null
+++ b/keyboards/printedpad/rules.mk
@@ -0,0 +1 @@
+SRC += oled.c
\ No newline at end of file
diff --git a/keyboards/projectd/75/ansi/ansi.c b/keyboards/projectd/75/ansi/ansi.c
new file mode 100644
index 000000000000..1df76250022d
--- /dev/null
+++ b/keyboards/projectd/75/ansi/ansi.c
@@ -0,0 +1,205 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
+
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  Esc
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  F1
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //  F2
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //  F3
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  F4
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //  F5
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  F6
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  F7
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  F8
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  F9
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  F10
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  F11
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  F12
+    {1, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  Printscreen
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  Delete
+
+    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  `
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  1
+    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  2
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  3
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  4
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  5
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  6
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  7
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  8
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  9
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  0
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  -
+    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  =
+    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  Backspace
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  Home
+
+    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  Tab
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  Q
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  W
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  E
+    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  R
+    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  T
+    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  Y
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  U
+    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  I
+    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  O
+    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  P
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  [
+    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  ]
+    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  "\\"
+    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  PGUP
+
+    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  Caps Lock
+    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  A
+    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  S
+    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  D
+    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  F
+    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  G
+    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  H
+    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  J
+    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  K
+    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  L
+    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  ;
+    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  '
+    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  Enter
+    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  PGDN
+
+    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  L Shift
+    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  Z
+    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  X
+    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  C
+    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  V
+    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  B
+    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  N
+    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  M
+    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  ,
+    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  .
+    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  "/""
+    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  R Shift
+    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  Up
+    {1, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  END
+
+    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  L Ctrl
+    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  L Win
+    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  L Alt
+    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},  //  LED1
+    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},  //  LED2
+    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  Space
+    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},  //  LED3
+    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},  //  LED4
+    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  R Alt
+    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  FN
+    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  R Ctrl
+
+    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  Left
+    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  Down
+    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  Right
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(45, 255, 255, 255);
+    }
+
+    return false;
+
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        case RGB_R:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(0, 255, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case RGB_G:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(85, 255, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case RGB_B:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(170, 255, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case RGB_W:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(0, 0, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case SW_cy:
+            rgb_matrix_sethsv(0, 255, 255);
+            rgb_matrix_mode(13);
+            return false; /* Skip all further processing of this key */
+
+        
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
diff --git a/keyboards/projectd/75/ansi/ansi.h b/keyboards/projectd/75/ansi/ansi.h
new file mode 100644
index 000000000000..4e65d84ba74c
--- /dev/null
+++ b/keyboards/projectd/75/ansi/ansi.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+enum my_keycodes {
+    RGB_R = QK_KB,
+    RGB_G,
+    RGB_B,
+    RGB_W,
+    SW_cy,
+};
diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h
new file mode 100644
index 000000000000..5fcad72e7111
--- /dev/null
+++ b/keyboards/projectd/75/ansi/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#define SPI_MOSI_PIN A7
+#define SPI_MISO_PIN A6
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B15
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 70
+#define DRIVER_2_LED_TOTAL 17
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/projectd/75/ansi/halconf.h b/keyboards/projectd/75/ansi/halconf.h
new file mode 100644
index 000000000000..64a184eb924e
--- /dev/null
+++ b/keyboards/projectd/75/ansi/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/projectd/75/ansi/info.json b/keyboards/projectd/75/ansi/info.json
new file mode 100644
index 000000000000..daf94202e06b
--- /dev/null
+++ b/keyboards/projectd/75/ansi/info.json
@@ -0,0 +1,276 @@
+{
+    "manufacturer": "ProjectD",
+    "keyboard_name": "ProjectD 75% ANSI",
+    "maintainer": "Gsky",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [78, 20],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 12.5, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 22.5, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 32.5, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 42.5, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 55, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 65, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 75, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 85, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 97.5, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 107.5, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 117.5, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 127.5, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [6, 5], "x": 155, "y": 0 },
+
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 12.5 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 12.5 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 12.5 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 12.5 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 12.5 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 12.5 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 12.5 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 12.5 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 12.5 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 12.5 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 12.5 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 12.5 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 12.5 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 12.5 },
+            { "flags": 4, "matrix": [0, 2], "x": 155, "y": 12.5 },
+
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 22.5 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 22.5 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 22.5 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 22.5 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 22.5 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 22.5 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 22.5 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 22.5 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 22.5 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 22.5 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 22.5 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 22.5 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 22.5 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 22.5 },
+            { "flags": 4, "matrix": [1, 5], "x": 155, "y": 22.5 },
+
+            { "flags": 8, "matrix": [2, 1], "x": 0, "y": 32.5 },
+            { "flags": 4, "matrix": [1, 2], "x": 17.5, "y": 32.5 },
+            { "flags": 4, "matrix": [2, 2], "x": 27.5, "y": 32.5 },
+            { "flags": 4, "matrix": [3, 2], "x": 37.5, "y": 32.5 },
+            { "flags": 4, "matrix": [4, 2], "x": 47.5, "y": 32.5 },
+            { "flags": 4, "matrix": [4, 3], "x": 57.5, "y": 32.5 },
+            { "flags": 4, "matrix": [5, 3], "x": 67.5, "y": 32.5 },
+            { "flags": 4, "matrix": [5, 2], "x": 77.5, "y": 32.5 },
+            { "flags": 4, "matrix": [6, 2], "x": 87.5, "y": 32.5 },
+            { "flags": 4, "matrix": [7, 2], "x": 97.5, "y": 32.5 },
+            { "flags": 4, "matrix": [8, 2], "x": 107.5, "y": 32.5 },
+            { "flags": 4, "matrix": [8, 3], "x": 117.5, "y": 32.5 },
+            { "flags": 4, "matrix": [10, 4], "x": 127.5, "y": 32.5 },
+            { "flags": 4, "matrix": [2, 5], "x": 155, "y": 32.5 },
+
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 42.5 },
+            { "flags": 4, "matrix": [1, 4], "x": 22.5, "y": 42.5 },
+            { "flags": 4, "matrix": [2, 4], "x": 32.5, "y": 42.5 },
+            { "flags": 4, "matrix": [3, 4], "x": 42.5, "y": 42.5 },
+            { "flags": 4, "matrix": [4, 4], "x": 52.5, "y": 42.5 },
+            { "flags": 4, "matrix": [4, 5], "x": 62.5, "y": 42.5 },
+            { "flags": 4, "matrix": [5, 5], "x": 72.5, "y": 42.5 },
+            { "flags": 4, "matrix": [5, 4], "x": 82.5, "y": 42.5 },
+            { "flags": 4, "matrix": [6, 4], "x": 92.5, "y": 42.5 },
+            { "flags": 4, "matrix": [7, 4], "x": 102.5, "y": 42.5 },
+            { "flags": 4, "matrix": [8, 5], "x": 112.5, "y": 42.5 },
+            { "flags": 4, "matrix": [9, 1], "x": 122.5, "y": 42.5 },
+            { "flags": 4, "matrix": [3, 5], "x": 142.5, "y": 45 },
+            { "flags": 4, "matrix": [7, 5], "x": 155, "y": 42.5 },
+
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 0], "x": 12.5, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 52.5 },
+            { "flags": 4, "x": 61.5, "y": 52.5 },
+            { "flags": 4, "x": 62.5, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 4], "x": 65, "y": 52.5 },
+            { "flags": 4, "x": 67.5, "y": 52.5 },
+            { "flags": 4, "x": 68.5, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 2], "x": 110, "y": 52.5 },
+            { "flags": 4, "matrix": [0, 4], "x": 120, "y": 52.5 },
+            { "flags": 4, "matrix": [0, 3], "x": 132.5, "y": 52.5 },
+            { "flags": 4, "matrix": [7, 3], "x": 142.5, "y": 52.5 },
+            { "flags": 4, "matrix": [0, 5], "x": 152.5, "y": 52.5 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x000F",
+        "vid": "0x3233"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Esc", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 3.25, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 4.25, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 5.5, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 6.5, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 7.5, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 8.5, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 9.75, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 10.75, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 11.75, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 12.75, "y": 0 },
+                { "label": "PrintScreen", "matrix": [9, 7], "x": 14, "y": 0 },
+                { "label": "Delete", "matrix": [6, 5], "x": 15.5, "y": 0 },
+
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1.25 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1.25 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1.25 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1.25 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1.25 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1.25 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1.25 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1.25 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1.25 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1.25 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1.25 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1.25 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1.25 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1.25 },
+                { "label": "Home", "matrix": [0, 2], "x": 15.5, "y": 1.25 },
+
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2.25 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2.25 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2.25 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2.25 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2.25 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2.25 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2.25 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "PGUP", "matrix": [1, 5], "x": 15.5, "y": 2.25 },
+
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3.25 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3.25 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3.25 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3.25 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3.25 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "label": "PGDN", "matrix": [2, 5], "x": 15.5, "y": 3.25 },
+
+                { "label": "L Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4.25 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4.25 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4.25 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4.25 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.25 },
+                { "label": "R Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4.25 },
+                { "label": "Up", "matrix": [3, 5], "x": 14.25, "y": 4.5 },
+                { "label": "End", "matrix": [7, 5], "x": 15.5, "y": 4.25 },
+
+                { "label": "L Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label": "L Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "L Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "label": "R Alt", "matrix": [9, 5], "x": 10, "y": 5.25 },
+                { "label": "FN", "matrix": [9, 2], "x": 11, "y": 5.25 },
+                { "label": "R Ctrl", "matrix": [0, 4], "x": 12, "y": 5.25 },
+                { "label": "Left", "matrix": [0, 3], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [7, 3], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [0, 5], "x": 15.25, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/projectd/75/ansi/keymaps/default/config.h b/keyboards/projectd/75/ansi/keymaps/default/config.h
new file mode 100644
index 000000000000..43e27f6356c3
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/default/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/projectd/75/ansi/keymaps/default/keymap.c b/keyboards/projectd/75/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..36e493748194
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[0] = LAYOUT(
+        QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGDN,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_END,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+[1] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  RGB_TOG,  RGB_MOD,  RGB_RMOD, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_VAI,  _______,
+        _______,  _______,  _______,                      _______,                                MO(2),    _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+[2] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  RGB_R,    RGB_G,    RGB_B,    RGB_W,    SW_cy,    _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/projectd/75/ansi/keymaps/via/keymap.c b/keyboards/projectd/75/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..36e493748194
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[0] = LAYOUT(
+        QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGDN,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_END,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+[1] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  RGB_TOG,  RGB_MOD,  RGB_RMOD, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_VAI,  _______,
+        _______,  _______,  _______,                      _______,                                MO(2),    _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+[2] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  RGB_R,    RGB_G,    RGB_B,    RGB_W,    SW_cy,    _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/projectd/75/ansi/keymaps/via/rules.mk b/keyboards/projectd/75/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/projectd/75/ansi/mcuconf.h b/keyboards/projectd/75/ansi/mcuconf.h
new file mode 100644
index 000000000000..e4b8d1f97328
--- /dev/null
+++ b/keyboards/projectd/75/ansi/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/projectd/75/ansi/readme.md b/keyboards/projectd/75/ansi/readme.md
new file mode 100644
index 000000000000..97b13a953bee
--- /dev/null
+++ b/keyboards/projectd/75/ansi/readme.md
@@ -0,0 +1,25 @@
+# ProjectD 75% ANSI 
+![ProjectD 75 ANSI](https://imgur.com/dtNDC8zh.png)
+
+A 75% keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [GSKY](https://github.com/gksygithub)
+* Hardware Supported: projectd_75_ansi
+* Hardware Availability: [GSKY](https://github.com/gskygithub/projectd_75_ansi)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make projectd/75/ansi:default
+
+Flashing example for this keyboard:
+
+    make projectd/75/ansi:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted under the space key after the USB cable is connected
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
+* Fn+Alt+Tab will reset the board to bootloader mode
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/projectd/75/ansi/rules.mk b/keyboards/projectd/75/ansi/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/projectd/75/ansi/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/purin/info.json b/keyboards/purin/info.json
new file mode 100644
index 000000000000..08a8b06e3423
--- /dev/null
+++ b/keyboards/purin/info.json
@@ -0,0 +1,108 @@
+{
+    "manufacturer": "oRE-o",
+    "keyboard_name": "purin",
+    "maintainer": "oRE-o",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D0", "D1", "D2", "B7", "B3", "F4", "F1", "F0"],
+        "rows": ["F6", "F7", "D4", "D5", "D3"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x6F52"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 6], "x": 9.5, "y": 3},
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/purin/keymaps/default/keymap.c b/keyboards/purin/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f5c2cd7bbfe1
--- /dev/null
+++ b/keyboards/purin/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT( // for windows
+        KC_ESC,     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_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_RALT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+                    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  MO(2),            KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+
+    [1] = LAYOUT(   // for mac
+        KC_ESC,     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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+                    KC_LCTL, KC_LALT, KC_LGUI,          KC_SPC,  MO(2),            KC_SPC,           KC_RGUI,                            KC_RALT
+    ),
+
+    [2] = LAYOUT(   // FN Layer 1
+        _______,    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_PGUP,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   DF(0),   DF(1),
+        KC_PGDN,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+                    _______, _______, _______,          _______, _______,          _______,          _______,                            _______
+    ),
+};
diff --git a/keyboards/purin/keymaps/via/keymap.c b/keyboards/purin/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e13eea3c7485
--- /dev/null
+++ b/keyboards/purin/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT( // for windows
+        KC_ESC,     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_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_RALT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+                    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  MO(2),            KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+
+    [1] = LAYOUT(   // for mac
+        KC_ESC,     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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+                    KC_LCTL, KC_LALT, KC_LGUI,          KC_SPC,  MO(2),            KC_SPC,           KC_RGUI,                            KC_RALT
+    ),
+
+    [2] = LAYOUT(   // FN Layer 1
+        _______,    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_PGUP,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   DF(0),   DF(1),
+        KC_PGDN,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+                    _______, _______, _______,          _______, _______,          _______,          _______,                            _______
+    ),
+};
diff --git a/keyboards/purin/keymaps/via/rules.mk b/keyboards/purin/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/purin/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/purin/readme.md b/keyboards/purin/readme.md
new file mode 100644
index 000000000000..4b4eb6a1b86d
--- /dev/null
+++ b/keyboards/purin/readme.md
@@ -0,0 +1,28 @@
+# purin
+
+![purin](https://i.imgur.com/ig8DWEFh.jpg)
+
+Keyboard developed by oREo!
+Project for learning about qmk, Atmega32u4.
+
+* Keyboard Maintainer: [oRE-o](https://github.com/oRE-o)
+* Hardware Supported: Purin PCB by oREo
+* Hardware Availability: Not yet
+
+Make example for this keyboard (after setting up your build environment):
+
+    make purin:default
+
+Flashing example for this keyboard:
+
+    make purin: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 `QK_BOOT` if it is available
diff --git a/keyboards/purin/rules.mk b/keyboards/purin/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/purin/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/ansi.c b/keyboards/qwertykeys/qk100/ansi/ansi.c
new file mode 100644
index 000000000000..87e1b99e1b7e
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/ansi.c
@@ -0,0 +1,197 @@
+/*
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+    {0, CS2_SW1, CS3_SW1, CS1_SW1},    /* RGB0-ESC ROW0*/
+    {0, CS5_SW1, CS6_SW1, CS4_SW1},    /* RGB1-F1 */
+    {0, CS8_SW1, CS9_SW1, CS7_SW1},    /* RGB2-F2 */
+    {0, CS11_SW1, CS12_SW1, CS10_SW1}, /* RGB3-F3 */
+    {0, CS14_SW1, CS15_SW1, CS13_SW1}, /* RGB4-F4 */
+    {0, CS17_SW1, CS18_SW1, CS16_SW1}, /* RGB5-F5 */
+    {0, CS20_SW1, CS21_SW1, CS19_SW1}, /* RGB6-F6 */
+    {0, CS23_SW1, CS24_SW1, CS22_SW1}, /* RGB7-F7 */
+    {0, CS26_SW1, CS27_SW1, CS25_SW1}, /* RGB8-F8 */
+    {0, CS29_SW1, CS30_SW1, CS28_SW1}, /* RGB9-F9 */
+    {0, CS32_SW1, CS33_SW1, CS31_SW1}, /* RGB10-F10 */
+    {0, CS35_SW1, CS36_SW1, CS34_SW1}, /* RGB11-F11 */
+    {0, CS38_SW1, CS39_SW1, CS37_SW1}, /* RGB12-F12 */
+    {0, CS29_SW7, CS30_SW7, CS28_SW7}, /* RGB13-Delete */
+    {0, CS32_SW7, CS33_SW7, CS31_SW7}, /* RGB14-End */
+    {0, CS35_SW7, CS36_SW7, CS34_SW7}, /* RGB15-Insert */
+    {0, CS38_SW7, CS39_SW7, CS37_SW7}, /* RGB16-Home */
+    {0, CS2_SW2, CS3_SW2, CS1_SW2},    /* RGB17-~ ----ROW1*/
+    {0, CS5_SW2, CS6_SW2, CS4_SW2},    /* RGB18-1 */
+    {0, CS8_SW2, CS9_SW2, CS7_SW2},    /* RGB19-2 */
+    {0, CS11_SW2, CS12_SW2, CS10_SW2}, /* RGB20-3 */
+    {0, CS14_SW2, CS15_SW2, CS13_SW2}, /* RGB21-4 */
+    {0, CS17_SW2, CS18_SW2, CS16_SW2}, /* RGB22-5 */
+    {0, CS20_SW2, CS21_SW2, CS19_SW2}, /* RGB23-6 */
+    {0, CS23_SW2, CS24_SW2, CS22_SW2}, /* RGB24-7 */
+    {0, CS26_SW2, CS27_SW2, CS25_SW2}, /* RGB25-8 */
+    {0, CS29_SW2, CS30_SW2, CS28_SW2}, /* RGB26-9 */
+    {0, CS32_SW2, CS33_SW2, CS31_SW2}, /* RGB27-0 */
+    {0, CS35_SW2, CS36_SW2, CS34_SW2}, /* RGB28--- */
+    {0, CS38_SW2, CS39_SW2, CS37_SW2}, /* RGB29-+= */
+    {0, CS26_SW7, CS27_SW7, CS25_SW7}, /* RGB30-BS */
+    {0, CS29_SW8, CS30_SW8, CS28_SW8}, /* RGB31-Num Lock */
+    {0, CS32_SW8, CS33_SW8, CS31_SW8}, /* RGB32- / */
+    {0, CS35_SW8, CS36_SW8, CS34_SW8}, /* RGB33- * */
+    {0, CS38_SW8, CS39_SW8, CS37_SW8}, /* RGB34- - */
+    {0, CS2_SW3, CS3_SW3, CS1_SW3},    /* RGB35-TAB ----ROW2*/
+    {0, CS5_SW3, CS6_SW3, CS4_SW3},    /* RGB36-Q */
+    {0, CS8_SW3, CS9_SW3, CS7_SW3},    /* RGB37-W */
+    {0, CS11_SW3, CS12_SW3, CS10_SW3}, /* RGB38-E */
+    {0, CS14_SW3, CS15_SW3, CS13_SW3}, /* RGB39-R */
+    {0, CS17_SW3, CS18_SW3, CS16_SW3}, /* RGB40-T */
+    {0, CS20_SW3, CS21_SW3, CS19_SW3}, /* RGB41-Y */
+    {0, CS23_SW3, CS24_SW3, CS22_SW3}, /* RGB42-U */
+    {0, CS26_SW3, CS27_SW3, CS25_SW3}, /* RGB43-I */
+    {0, CS29_SW3, CS30_SW3, CS28_SW3}, /* RGB44-O */
+    {0, CS32_SW3, CS33_SW3, CS31_SW3}, /* RGB45-P */
+    {0, CS35_SW3, CS36_SW3, CS34_SW3}, /* RGB46-[ */
+    {0, CS38_SW3, CS39_SW3, CS37_SW3}, /* RGB47-] */
+    {0, CS26_SW9, CS27_SW9, CS25_SW9}, /* RGB48-\ */
+    {0, CS29_SW9, CS30_SW9, CS28_SW9}, /* RGB49-page up */
+    {0, CS32_SW9, CS33_SW9, CS31_SW9}, /* RGB50-7 */
+    {0, CS35_SW9, CS36_SW9, CS34_SW9}, /* RGB51-8 */
+    {0, CS38_SW9, CS39_SW9, CS37_SW9}, /* RGB52-9 */
+    {0, CS2_SW4, CS3_SW4, CS1_SW4},    /* RGB53-CAPS---ROW3*/
+    {0, CS5_SW4, CS6_SW4, CS4_SW4},    /* RGB54-A-- */
+    {0, CS8_SW4, CS9_SW4, CS7_SW4},    /* RGB55-S-- */
+    {0, CS11_SW4, CS12_SW4, CS10_SW4}, /* RGB56-D */
+    {0, CS14_SW4, CS15_SW4, CS13_SW4}, /* RGB57-F */
+    {0, CS17_SW4, CS18_SW4, CS16_SW4}, /* RGB58-G */
+    {0, CS20_SW4, CS21_SW4, CS19_SW4}, /* RGB59-H */
+    {0, CS23_SW4, CS24_SW4, CS22_SW4}, /* RGB60-J */
+    {0, CS26_SW4, CS27_SW4, CS25_SW4}, /* RGB61-K */
+    {0, CS29_SW4, CS30_SW4, CS28_SW4}, /* RGB62-L */
+    {0, CS32_SW4, CS33_SW4, CS31_SW4}, /* RGB63-;: */
+    {0, CS35_SW4, CS36_SW4, CS34_SW4}, /* RGB64-'" */
+    {0, CS38_SW4, CS39_SW4, CS37_SW4}, /* RGB65-ENTER */
+    {0, CS11_SW7, CS12_SW7, CS10_SW7}, /* RGB66-Page Down */
+    {0, CS14_SW7, CS15_SW7, CS13_SW7}, /* RGB67-4 */
+    {0, CS17_SW7, CS18_SW7, CS16_SW7}, /* RGB68-5 */
+    {0, CS20_SW7, CS21_SW7, CS19_SW7}, /* RGB69-6 */
+    {0, CS23_SW7, CS24_SW7, CS22_SW7}, /* RGB70-+ */
+    {0, CS2_SW5, CS3_SW5, CS1_SW5},    /* RGB71-LSF --ROW4*/
+    {0, CS5_SW5, CS6_SW5, CS4_SW5},    /* RGB72-Z */
+    {0, CS8_SW5, CS9_SW5, CS7_SW5},    /* RGB73-X */
+    {0, CS11_SW5, CS12_SW5, CS10_SW5}, /* RGB74-C */
+    {0, CS14_SW5, CS15_SW5, CS13_SW5}, /* RGB75-V */
+    {0, CS17_SW5, CS18_SW5, CS16_SW5}, /* RGB76-B */
+    {0, CS20_SW5, CS21_SW5, CS19_SW5}, /* RGB77-N */
+    {0, CS23_SW5, CS24_SW5, CS22_SW5}, /* RGB78-M */
+    {0, CS26_SW5, CS27_SW5, CS25_SW5}, /* RGB79-,< */
+    {0, CS29_SW5, CS30_SW5, CS28_SW5}, /* RGB80->. */
+    {0, CS32_SW5, CS33_SW5, CS31_SW5}, /* RGB81-?/ */
+    {0, CS35_SW5, CS36_SW5, CS34_SW5}, /* RGB82-RSF */
+    {0, CS38_SW5, CS39_SW5, CS37_SW5}, /* RGB83-UP */
+    {0, CS14_SW8, CS15_SW8, CS13_SW8}, /* RGB84-1*/
+    {0, CS17_SW8, CS18_SW8, CS16_SW8}, /* RGB85-2 */
+    {0, CS20_SW8, CS21_SW8, CS19_SW8}, /* RGB86-3 */
+    {0, CS23_SW8, CS24_SW8, CS22_SW8}, /* RGB87-Enter */
+    {0, CS2_SW6, CS3_SW6, CS1_SW6},    /* RGB88-lct-- ROW5*/
+    {0, CS5_SW6, CS6_SW6, CS4_SW6},    /* RGB89-lwin */
+    {0, CS8_SW6, CS9_SW6, CS7_SW6},    /* RGB90-lalt */
+    {0, CS11_SW6, CS12_SW6, CS10_SW6}, /* RGB91-sp0 */
+    {0, CS17_SW6, CS18_SW6, CS16_SW6}, /* RGB92-sp */
+    {0, CS26_SW6, CS27_SW6, CS25_SW6}, /* RGB93-sp2 */
+    {0, CS29_SW6, CS30_SW6, CS28_SW6}, /* RGB94-ralt */
+    {0, CS32_SW6, CS33_SW6, CS31_SW6}, /* RGB95- fn */
+    {0, CS35_SW6, CS36_SW6, CS34_SW6}, /* RGB96-left */
+    {0, CS38_SW6, CS39_SW6, CS37_SW6}, /* RGB97-down */
+    {0, CS11_SW9, CS12_SW9, CS10_SW9}, /* RGB98-right */
+    {0, CS14_SW9, CS15_SW9, CS13_SW9}, /* RGB99- 0 */
+    {0, CS20_SW9, CS21_SW9, CS19_SW9}  /* RGB100- . */
+};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case QK_KB_0:
+                rgb_matrix_toggle();
+                break;
+
+            case QK_KB_1:
+                rgb_matrix_step();
+                break;
+
+            case QK_KB_2:
+                rgb_matrix_step_reverse();
+                break;
+
+            case QK_KB_3:
+                rgb_matrix_increase_hue(); // Increase the hue for effect range LEDs
+                break;
+
+            case QK_KB_4:
+                rgb_matrix_decrease_hue(); // Decrease the hue for effect range LEDs
+                break;
+
+            case QK_KB_5:
+                rgb_matrix_increase_sat(); // Increase the saturation for effect range LEDs
+                break;
+
+            case QK_KB_6:
+                rgb_matrix_decrease_sat(); // Decrease the saturation for effect range LEDs
+                break;
+
+            case QK_KB_7:
+                rgb_matrix_increase_val(); // Increase the value for effect range LEDs
+                break;
+
+            case QK_KB_8:
+                rgb_matrix_decrease_val(); // Decrease the value for effect range LEDs
+                break;
+
+            case QK_KB_9:
+                rgb_matrix_increase_speed(); // Increase the speed of the animations
+                break;
+
+            case QK_KB_10:
+                rgb_matrix_decrease_speed(); // Decrease the speed of the animations
+                break;
+
+            default:
+                break;
+        }
+    }
+    return process_record_user(keycode, record);
+}
+#endif
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_WHITE});
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({3, 3, HSV_WHITE});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_capslock_layer, my_numlock_layer);
+
+void keyboard_post_init_kb(void) {
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+        rgblight_set_layer_state(1, !led_state.num_lock);
+    }
+    return res;
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/config.h b/keyboards/qwertykeys/qk100/ansi/config.h
new file mode 100644
index 000000000000..6d0401a3dc80
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/config.h
@@ -0,0 +1,43 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#    define RGBLIGHT_LAYERS                   
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF 
+#    define RGBLIGHT_LAYERS_RETAIN_VAL      
+#    define RGBLIGHT_DEFAULT_VAL 10
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+#    define RGBLIGHT_SLEEP
+/*== customize breathing effect ==*/
+#    define RGBLIGHT_BREATHE_TABLE_SIZE 128
+#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
+#    define RGBLIGHT_EFFECT_BREATHE_MAX    60
+
+/* RGB matrix */
+#define I2C1_CLOCK_SPEED 400000  
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2  
+#    define RGB_MATRIX_DISABLE_KEYCODES 
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_LED_PROCESS_LIMIT  4
+#    define RGB_MATRIX_LED_FLUSH_LIMIT    26
+#    define RGB_MATRIX_STARTUP_VAL        128
+#    define DRIVER_ADDR_1                 0b0110000
+#    define DRIVER_COUNT                  1
+#    define RGB_MATRIX_LED_COUNT          101 
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/halconf.h b/keyboards/qwertykeys/qk100/ansi/halconf.h
new file mode 100644
index 000000000000..0deaa06aa2e5
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Qwertykeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/info.json
new file mode 100644
index 000000000000..e9cd6ca3f204
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/info.json
@@ -0,0 +1,266 @@
+{
+    "keyboard_name": "QK100 ANSI",
+    "usb": {
+        "pid": "0x3030",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3741",
+        "max_brightness": 200,
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 54, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 72, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 96, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 108, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 126, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 138, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 150, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 162, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 188, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 200, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 212, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 84, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 96, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 108, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 120, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 132, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 144, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 156, "y": 13, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 13, "flags": 1},
+            {"matrix": [1, 16], "x": 200, "y": 13, "flags": 1},
+            {"matrix": [1, 17], "x": 212, "y": 13, "flags": 1},
+            {"matrix": [1, 18], "x": 224, "y": 13, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 90, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 102, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 114, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 126, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 138, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 150, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 176, "y": 26, "flags": 1},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 39, "flags": 1},
+            {"matrix": [3, 1], "x": 20, "y": 39, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 39, "flags": 4},
+            {"matrix": [3, 3], "x": 44, "y": 39, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 39, "flags": 4},
+            {"matrix": [3, 5], "x": 68, "y": 39, "flags": 4},
+            {"matrix": [3, 6], "x": 80, "y": 39, "flags": 4},
+            {"matrix": [3, 7], "x": 92, "y": 39, "flags": 4},
+            {"matrix": [3, 8], "x": 104, "y": 39, "flags": 4},
+            {"matrix": [3, 9], "x": 116, "y": 39, "flags": 4},
+            {"matrix": [3, 10], "x": 128, "y": 39, "flags": 4},
+            {"matrix": [3, 11], "x": 140, "y": 39, "flags": 4},
+            {"matrix": [3, 13], "x": 158, "y": 39, "flags": 1},
+            {"matrix": [3, 14], "x": 176, "y": 39, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 39, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 39, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 39, "flags": 4},
+            {"matrix": [3, 18], "x": 224, "y": 39, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 26, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 38, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 50, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 74, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 98, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 110, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 122, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 134, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 150, "y": 52, "flags": 1},
+            {"matrix": [4, 13], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 52, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 52, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 224, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [5, 1], "x": 14, "y": 52, "flags": 1},
+            {"matrix": [5, 2], "x": 28, "y": 52, "flags": 1},
+            {"matrix": [5, 5], "x": 74, "y": 52, "flags": 4},
+            {"matrix": [5, 9], "x": 122, "y": 52, "flags": 1},
+            {"matrix": [5, 10], "x": 148, "y": 52, "flags": 1},
+            {"matrix": [5, 12], "x": 158, "y": 52, "flags": 1},
+            {"matrix": [5, 13], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [5, 14], "x": 182, "y": 52, "flags": 1},
+            {"matrix": [5, 15], "x": 196, "y": 52, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 52, "flags": 4}
+        ],
+        "animations": {
+            "solid_color": true,
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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, 15], "x":16.5, "y":0},
+                {"matrix": [0, 16], "x":17.5, "y":0},
+                {"matrix": [0, 17], "x":18.5, "y":0},
+                {"matrix": [0, 18], "x":19.5, "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, 15], "x":16.5, "y":1.25},
+                {"matrix": [1, 16], "x":17.5, "y":1.25},
+                {"matrix": [1, 17], "x":18.5, "y":1.25},
+                {"matrix": [1, 18], "x":19.5, "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": [2, 13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 15], "x":16.5, "y":2.25},
+                {"matrix": [2, 16], "x":17.5, "y":2.25},
+                {"matrix": [2, 17], "x":18.5, "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": [3, 14], "x":15.25, "y":3.25},
+                {"matrix": [3, 15], "x":16.5, "y":3.25},
+                {"matrix": [3, 16], "x":17.5, "y":3.25},
+                {"matrix": [3, 17], "x":18.5, "y":3.25},
+                {"matrix": [3, 18], "x":19.5, "y":2.25, "h":2},
+                {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4, 1], "x":2.25, "y":4.25},
+                {"matrix": [4, 2], "x":3.25, "y":4.25},
+                {"matrix": [4, 3], "x":4.25, "y":4.25},
+                {"matrix": [4, 4], "x":5.25, "y":4.25},
+                {"matrix": [4, 5], "x":6.25, "y":4.25},
+                {"matrix": [4, 6], "x":7.25, "y":4.25},
+                {"matrix": [4, 7], "x":8.25, "y":4.25},
+                {"matrix": [4, 8], "x":9.25, "y":4.25},
+                {"matrix": [4, 9], "x":10.25, "y":4.25},
+                {"matrix": [4, 10], "x":11.25, "y":4.25},
+                {"matrix": [4, 11], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4, 13], "x":14.25, "y":4.5},
+                {"matrix": [4, 15], "x":16.5, "y":4.25},
+                {"matrix": [4, 16], "x":17.5, "y":4.25},
+                {"matrix": [4, 17], "x":18.5, "y":4.25},
+                {"matrix": [4, 18], "x":19.5, "y":4.25, "h":2},
+                {"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, 5], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix": [5, 9], "x":10, "y":5.25, "w":1.5},
+                {"matrix": [5, 10], "x":11.5, "y":5.25, "w":1.5},
+                {"matrix": [5, 12], "x":13.25, "y":5.5},
+                {"matrix": [5, 13], "x":14.25, "y":5.5},
+                {"matrix": [5, 14], "x":15.25, "y":5.5},
+                {"matrix": [5, 15], "x":16.5, "y":5.25, "w":2},
+                {"matrix": [5, 17], "x":18.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/default/keymap.c b/keyboards/qwertykeys/qk100/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f081299d50e7
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   [0] = LAYOUT(
+     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_DEL,  KC_END,  KC_INS, KC_HOME, 
+     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST,KC_PMNS,
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7,   KC_P8,   KC_P9,
+     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN, KC_P4,   KC_P5,   KC_P6,  KC_PPLS,
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,  KC_PENT,
+     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [1] = LAYOUT(
+     QK_KB_0, QK_KB_1, QK_KB_2, QK_KB_3, QK_KB_4, QK_KB_5, QK_KB_6, QK_KB_7, QK_KB_8, QK_KB_9, QK_KB_10,KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/via/keymap.c b/keyboards/qwertykeys/qk100/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f081299d50e7
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   [0] = LAYOUT(
+     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_DEL,  KC_END,  KC_INS, KC_HOME, 
+     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST,KC_PMNS,
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7,   KC_P8,   KC_P9,
+     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN, KC_P4,   KC_P5,   KC_P6,  KC_PPLS,
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,  KC_PENT,
+     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [1] = LAYOUT(
+     QK_KB_0, QK_KB_1, QK_KB_2, QK_KB_3, QK_KB_4, QK_KB_5, QK_KB_6, QK_KB_7, QK_KB_8, QK_KB_9, QK_KB_10,KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/mcuconf.h b/keyboards/qwertykeys/qk100/ansi/mcuconf.h
new file mode 100644
index 000000000000..a8228a149f1f
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 Qwertykeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+/*
+ * I2C driver system settings.
+ */
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1                  TRUE
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/readme.md b/keyboards/qwertykeys/qk100/ansi/readme.md
new file mode 100644
index 000000000000..d3360b0420b3
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/readme.md
@@ -0,0 +1,21 @@
+# qk100 - ANSI PCB
+
+![qk100](https://i.imgur.com/im0iArYh.jpg)
+
+A 100% made by Qwertykeys.
+
+* Keyboard Maintainer: [Qwertykeys](https://github.com/owlab-git)
+* Hardware Supported: qk100 ANSI PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/qRwKr7mW1oWy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertykeys/qk100/ansi:default
+
+Flashing example for this keyboard:
+
+    make qwertykeys/qk100/ansi:default:flash
+
+**Bootloader:** Press the button B on PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/rules.mk b/keyboards/qwertykeys/qk100/ansi/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json
new file mode 100644
index 000000000000..c8498f3eafc7
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/info.json
@@ -0,0 +1,43 @@
+{
+    "manufacturer": "Qwertykeys",
+    "url": "",
+    "maintainer": "Qwertykeys",
+    "usb": {
+        "vid": "0x4F53"
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B4", "B5", "B8", "B9", "C13" ],
+        "rows": ["A1", "A2", "A3", "A5", "A4", "A6" ]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true
+        },
+        "brightness_steps": 10,
+        "saturation_steps": 8,
+        "led_count": 6,
+        "max_brightness": 120
+        
+    },
+    "dynamic_keymap": {
+        "layer_count": 2
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/config.h b/keyboards/qwertykeys/qk100/solder/config.h
new file mode 100644
index 000000000000..714f01a1daae
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/config.h
@@ -0,0 +1,29 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#    define RGBLIGHT_LAYERS                   
+#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF 
+#    define RGBLIGHT_LAYERS_RETAIN_VAL      
+#    define RGBLIGHT_DEFAULT_VAL 10
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+#    define RGBLIGHT_SLEEP
+/*== customize breathing effect ==*/
+#    define RGBLIGHT_BREATHE_TABLE_SIZE 128
+#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
+#    define RGBLIGHT_EFFECT_BREATHE_MAX    60
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/info.json b/keyboards/qwertykeys/qk100/solder/info.json
new file mode 100644
index 000000000000..64f8945b7fd6
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/info.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "qk100 Solder",
+    "usb": {
+        "pid": "0x3053",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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, 15], "x":16.5, "y":0},
+                {"matrix": [0, 16], "x":17.5, "y":0},
+                {"matrix": [0, 17], "x":18.5, "y":0},
+                {"matrix": [0, 18], "x":19.5, "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": [2, 13], "x":13, "y":1.25},
+                {"matrix": [1, 13], "x":14, "y":1.25},
+                {"matrix": [1, 15], "x":16.5, "y":1.25},
+                {"matrix": [1, 16], "x":17.5, "y":1.25},
+                {"matrix": [1, 17], "x":18.5, "y":1.25},
+                {"matrix": [1, 18], "x":19.5, "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.5, "y":2.25},
+                {"matrix": [2, 16], "x":17.5, "y":2.25},
+                {"matrix": [2, 17], "x":18.5, "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": [3, 14], "x":15.25, "y":3.25},
+                {"matrix": [3, 15], "x":16.5, "y":3.25},
+                {"matrix": [3, 16], "x":17.5, "y":3.25},
+                {"matrix": [3, 17], "x":18.5, "y":3.25},
+                {"matrix": [3, 18], "x":19.5, "y":2.25, "h":2},
+                {"matrix": [4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix": [5, 3], "x":1.25, "y":4.25},
+                {"matrix": [4, 1], "x":2.25, "y":4.25},
+                {"matrix": [4, 2], "x":3.25, "y":4.25},
+                {"matrix": [4, 3], "x":4.25, "y":4.25},
+                {"matrix": [4, 4], "x":5.25, "y":4.25},
+                {"matrix": [4, 5], "x":6.25, "y":4.25},
+                {"matrix": [4, 6], "x":7.25, "y":4.25},
+                {"matrix": [4, 7], "x":8.25, "y":4.25},
+                {"matrix": [4, 8], "x":9.25, "y":4.25},
+                {"matrix": [4, 9], "x":10.25, "y":4.25},
+                {"matrix": [4, 10], "x":11.25, "y":4.25},
+                {"matrix": [4, 11], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4, 13], "x":14.25, "y":4.5},
+                {"matrix": [4, 15], "x":16.5, "y":4.25},
+                {"matrix": [4, 16], "x":17.5, "y":4.25},
+                {"matrix": [4, 17], "x":18.5, "y":4.25},
+                {"matrix": [4, 18], "x":19.5, "y":4.25, "h":2},
+                {"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, 5], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix": [5, 9], "x":10, "y":5.25, "w":1.5},
+                {"matrix": [5, 10], "x":11.5, "y":5.25, "w":1.5},
+                {"matrix": [5, 12], "x":13.25, "y":5.5},
+                {"matrix": [5, 13], "x":14.25, "y":5.5},
+                {"matrix": [5, 14], "x":15.25, "y":5.5},
+                {"matrix": [5, 15], "x":16.5, "y":5.25, "w":2},
+                {"matrix": [5, 17], "x":18.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/keymaps/default/keymap.c b/keyboards/qwertykeys/qk100/solder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..20d727431cbe
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   [0] = LAYOUT(
+     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_DEL,  KC_END,  KC_INS,  KC_HOME,  
+     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7,   KC_P8,   KC_P9,   
+     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [1] = LAYOUT(
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/keymaps/via/keymap.c b/keyboards/qwertykeys/qk100/solder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..20d727431cbe
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   [0] = LAYOUT(
+     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_DEL,  KC_END,  KC_INS,  KC_HOME,  
+     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7,   KC_P8,   KC_P9,   
+     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [1] = LAYOUT(
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/keymaps/via/rules.mk b/keyboards/qwertykeys/qk100/solder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/readme.md b/keyboards/qwertykeys/qk100/solder/readme.md
new file mode 100644
index 000000000000..f660fe0d42c8
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/readme.md
@@ -0,0 +1,21 @@
+# qk100 - Solder PCB
+
+![qk100](https://i.imgur.com/im0iArYh.jpg)
+
+A 100% made by Qwertykeys.
+
+* Keyboard Maintainer: [Qwertykeys](https://github.com/owlab-git)
+* Hardware Supported: qk100 Solder PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/qRwKr7mW1oWy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertykeys/qk100/solder:default
+
+Flashing example for this keyboard:
+
+    make qwertykeys/qk100/solder:default:flash
+
+**Bootloader:** Press the button B on PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/rules.mk b/keyboards/qwertykeys/qk100/solder/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/solder.c b/keyboards/qwertykeys/qk100/solder/solder.c
new file mode 100644
index 000000000000..8a3e46dab798
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/solder.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "quantum.h"
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_WHITE});
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({3, 3, HSV_WHITE});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_capslock_layer, my_numlock_layer);
+
+void keyboard_post_init_kb(void) {
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+        rgblight_set_layer_state(1, !led_state.num_lock);
+    }
+    return res;
+}
\ No newline at end of file
diff --git a/keyboards/rationalist/ratio60_hotswap/keymaps/default/keymap.c b/keyboards/rationalist/ratio60_hotswap/keymaps/default/keymap.c
new file mode 100644
index 000000000000..48d264064a18
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_ESC,   KC_1,    KC_2,   KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_BSPC,
+  KC_TAB,  	KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,    KC_S,   KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, 	KC_LGUI, KC_LALT,                          KC_SPC, 			         KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+  QK_BOOT, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12, _______, KC_DEL,
+  _______, _______, KC_UP,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/rationalist/ratio60_hotswap/keymaps/default/rules.mk b/keyboards/rationalist/ratio60_hotswap/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rationalist/ratio60_hotswap/keymaps/via/keymap.c b/keyboards/rationalist/ratio60_hotswap/keymaps/via/keymap.c
new file mode 100644
index 000000000000..9fd68711a3a6
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_ESC,   KC_1,    KC_2,   KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_BSPC,
+  KC_TAB,  	KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS,  KC_A,    KC_S,   KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, 	KC_LGUI, KC_LALT,                          KC_SPC, 			         KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+  QK_BOOT, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12, _______, KC_DEL,
+  _______, _______, KC_UP,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/rationalist/ratio60_hotswap/keymaps/via/rules.mk b/keyboards/rationalist/ratio60_hotswap/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rationalist/ratio60_hotswap/readme.md b/keyboards/rationalist/ratio60_hotswap/readme.md
new file mode 100644
index 000000000000..7085b8484371
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/readme.md
@@ -0,0 +1,24 @@
+# Rati(o)60
+
+A 60% hot swap PCB for both tray mount and o-ring mount
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: Rati(o)60 Rev A
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rationalist/ratio60_hotswap/rev_a:default
+
+Flashing example for this keyboard:
+
+    make rationalist/ratio60_hotswap/rev_a:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down Escape and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB or short the reset header for about 3 seconds then release the buttom/remove the short
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/config.h b/keyboards/rationalist/ratio60_hotswap/rev_a/config.h
new file mode 100644
index 000000000000..eb7d87e083a0
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/rev_a/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/info.json b/keyboards/rationalist/ratio60_hotswap/rev_a/info.json
new file mode 100644
index 000000000000..5d3763d52d92
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/rev_a/info.json
@@ -0,0 +1,377 @@
+{
+    "manufacturer": "Rationalist",
+    "keyboard_name": "Rati(o)60 Hotswap Rev A",
+    "maintainer": "4pplet",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A1", "pin_b": "A0", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 16
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0003",
+        "vid": "0x4446"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "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": [1, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_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": [1, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/rules.mk b/keyboards/rationalist/ratio60_hotswap/rev_a/rules.mk
new file mode 100644
index 000000000000..04fe1eba2acd
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/rev_a/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/sawnsprojects/okayu/halconf.h b/keyboards/sawnsprojects/okayu/halconf.h
new file mode 100644
index 000000000000..eb4e81c9ac84
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#include_next <halconf.h>
diff --git a/keyboards/sawnsprojects/okayu/info.json b/keyboards/sawnsprojects/okayu/info.json
new file mode 100644
index 000000000000..89743590368f
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/info.json
@@ -0,0 +1,766 @@
+{
+    "keyboard_name": "Okayu",
+    "manufacturer": "Salane",
+    "url": "",
+    "maintainer": "Mai The San",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x00A1",
+        "device_version": "1.0.0",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "matrix_pins": {
+        "cols": ["A9", "A0", "A8", "C13", "A1", "A2", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B3", "A15", "A3", "A10", "B14"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B12",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "rgblight": {
+        "led_count": 24,
+        "sleep": true,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+           ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+           ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+                
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4}
+           ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+           ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sawnsprojects/okayu/keymaps/default/keymap.c b/keyboards/sawnsprojects/okayu/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f5290a50064a
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2023 MaiTheSan (@maithesan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _BL,
+    _FL,
+    _AL,
+    _CL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BL] = LAYOUT_all(
+    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_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+    KC_LSFT, KC_NO,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(_AL),
+    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
+
+[_FL] = LAYOUT_all(
+    KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
+    VK_TOGG, _______,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
+
+[_AL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+    _______, _______, _______,       _______,                               _______, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+[_CL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______,       _______,                               _______, _______, _______, _______)
+
+ };
diff --git a/keyboards/sawnsprojects/okayu/keymaps/via/keymap.c b/keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f5290a50064a
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2023 MaiTheSan (@maithesan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _BL,
+    _FL,
+    _AL,
+    _CL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BL] = LAYOUT_all(
+    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_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+    KC_LSFT, KC_NO,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(_AL),
+    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
+
+[_FL] = LAYOUT_all(
+    KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
+    VK_TOGG, _______,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
+
+[_AL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+    _______, _______, _______,       _______,                               _______, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+[_CL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______,       _______,                               _______, _______, _______, _______)
+
+ };
diff --git a/keyboards/sawnsprojects/okayu/keymaps/via/rules.mk b/keyboards/sawnsprojects/okayu/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/readme.md b/keyboards/sawnsprojects/okayu/readme.md
new file mode 100644
index 000000000000..d49415865b90
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/readme.md
@@ -0,0 +1,27 @@
+# Okayu
+
+![Okayu](https://i.imgur.com/pRnRHl8h.png)
+
+A Wibu 60% keyboard PCB Design by inspire of Nekomata Okayu and can fit many keyboard case
+
+* Keyboard Maintainer: [Mai The San](https://github.com/maithesan)
+* Hardware Supported: Several 60% keyboard (RE60, Krush60, Unikorn, Tinyneko, Bakeneko60...)
+* Hardware Availability: NuxrosKB, Salane Discord
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sawnsprojects/okayu:default
+
+Flashing example for this keyboard:
+
+    make sawnsprojects/okayu: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 `QK_BOOT` if it is available
diff --git a/keyboards/sawnsprojects/okayu/rules.mk b/keyboards/sawnsprojects/okayu/rules.mk
new file mode 100644
index 000000000000..59655554eb2c
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = sawnsprojects/okayu/stm32f072
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/config.h b/keyboards/sawnsprojects/okayu/stm32f072/config.h
new file mode 100644
index 000000000000..c47f1928c848
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f072/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/info.json b/keyboards/sawnsprojects/okayu/stm32f072/info.json
new file mode 100644
index 000000000000..b5d728b1cdf1
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f072/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+}
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h b/keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
new file mode 100644
index 000000000000..7cd72d9a86b9
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/rules.mk b/keyboards/sawnsprojects/okayu/stm32f072/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/config.h b/keyboards/sawnsprojects/okayu/stm32f103/config.h
new file mode 100644
index 000000000000..eff3605470a9
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f103/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 5 
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/info.json b/keyboards/sawnsprojects/okayu/stm32f103/info.json
new file mode 100644
index 000000000000..31fd483f66be
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f103/info.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "bluepill"
+}
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h b/keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
new file mode 100644
index 000000000000..8ab476c663ec
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/rules.mk b/keyboards/sawnsprojects/okayu/stm32f103/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/config.h b/keyboards/sawnsprojects/okayu/stm32f303/config.h
new file mode 100644
index 000000000000..c47f1928c848
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f303/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/info.json b/keyboards/sawnsprojects/okayu/stm32f303/info.json
new file mode 100644
index 000000000000..84661311fd2b
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f303/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu"
+}
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h b/keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
new file mode 100644
index 000000000000..7cd72d9a86b9
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/rules.mk b/keyboards/sawnsprojects/okayu/stm32f303/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/split67/config.h b/keyboards/split67/config.h
new file mode 100644
index 000000000000..9d50d9bdd1c1
--- /dev/null
+++ b/keyboards/split67/config.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+
+
diff --git a/keyboards/split67/info.json b/keyboards/split67/info.json
new file mode 100644
index 000000000000..f24eea4ce074
--- /dev/null
+++ b/keyboards/split67/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "yuezp",
+    "keyboard_name": "split_67",
+    "maintainer": "qmk",
+    "build": {
+        "lto": true
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null, null],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+                "rows": ["D4", "C6", "D7", "E6", "B4"]
+            }
+        },
+        "soft_serial_pin": "D0"
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xBBBC",
+        "vid": "0xCCCD"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 5], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0, "w": 2},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [6, 0], "x": 8.5, "y": 1},
+                {"matrix": [6, 1], "x": 9.5, "y": 1},
+                {"matrix": [6, 2], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 4], "x": 12.5, "y": 1},
+                {"matrix": [6, 5], "x": 13.5, "y": 1},
+                {"matrix": [6, 6], "x": 14.5, "y": 1},
+                {"matrix": [6, 7], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [7, 0], "x": 8.75, "y": 2},
+                {"matrix": [7, 1], "x": 9.75, "y": 2},
+                {"matrix": [7, 2], "x": 10.75, "y": 2},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 4], "x": 12.75, "y": 2},
+                {"matrix": [7, 5], "x": 13.75, "y": 2},
+                {"matrix": [7, 6], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [8, 0], "x": 9.25, "y": 3},
+                {"matrix": [8, 1], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 4], "x": 13.25, "y": 3},
+                {"matrix": [8, 5], "x": 14.25, "y": 3, "w": 2},
+                {"matrix": [8, 6], "x": 16.25, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 4], "x": 16.25, "y": 4},
+                {"matrix": [9, 5], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/split67/keymaps/default/keymap.c b/keyboards/split67/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4e896f4aa59f
--- /dev/null
+++ b/keyboards/split67/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+[0] = LAYOUT(
+   KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,  KC_5,  KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,  KC_INS,
+   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,  KC_T,           KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,   KC_DEL,
+   KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,  KC_G,           KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+   KC_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, MO(1),                 KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT(
+   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC, KC_INS,
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+   KC_TRNS, KC_LGUI, KC_TRNS, KC_SPC,  KC_TRNS,                      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/split67/keymaps/via/keymap.c b/keyboards/split67/keymaps/via/keymap.c
new file mode 100644
index 000000000000..cb14ee19bf75
--- /dev/null
+++ b/keyboards/split67/keymaps/via/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Keymap (Base Layer) Default Layer
+* .-------------------------------------.     .---------------------------------------------------.
+* |Esc   |  1 |  2 |   3  | 4  | 5  | 6 |     |  7  |  8  |  9 |  0 |  - |   =   | Backsp| Insert |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Tab   |  Q |  W |   E  | R  | T  |   |     |  Y  |  U  |  I |  O |  P |   [   |   ]   |   \    |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Ctrl  |  A |  S |   D  | F  | G  |   |     |  H  |  J  |  K |  L |  ; |   '   | Return| Delete |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Shift |  Z |  X |   C  | V  | B  |   |     |  N  |  M  |  , |  . |  / | Shift |  Up   |        |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Ctrl  | Win| Alt| Space| Fn |    |   |     |Space| Ctrl| Alt| Lef| Dow|  Rig  |       |        |
+* .-------------------------------------.     .---------------------------------------------------.
+*/
+[0] = LAYOUT(
+   KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,  KC_5,  KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+   KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,  KC_T,          KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,
+   KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,  KC_G,          KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+   KC_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, MO(1),                KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+        
+
+/* Keymap Fn Layer
+* .----------------------------------------.   .---------------------------------------------------.
+* |   |  F1 |  F2 |   F3  | F4  | F5  | F6 |   |  F7  |  F8  | F9 |  F10 |  F11 |   F12   |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* .----------------------------------------.   .---------------------------------------------------.
+*/
+[1] = LAYOUT(
+   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC, KC_INS,
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+   KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/split67/keymaps/via/rules.mk b/keyboards/split67/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/split67/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/split67/readme.md b/keyboards/split67/readme.md
new file mode 100644
index 000000000000..e42fa9f9ff69
--- /dev/null
+++ b/keyboards/split67/readme.md
@@ -0,0 +1,26 @@
+# split67
+
+![split67](https://i.imgur.com/2eC03Smh.jpg)
+
+A 65% keys split keyboard.
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: Pro Micro, (ATmega32u4)
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make split67:default
+    
+Flashing example for this keyboard:
+
+    make split67: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/split67/rules.mk b/keyboards/split67/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/split67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/studiokestra/line_tkl/config.h b/keyboards/studiokestra/line_tkl/config.h
new file mode 100644
index 000000000000..c37d8a5ad28d
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/studiokestra/line_tkl/info.json b/keyboards/studiokestra/line_tkl/info.json
new file mode 100644
index 000000000000..312dd6e5cfd2
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/info.json
@@ -0,0 +1,219 @@
+{
+    "manufacturer": "Studio Kestra",
+    "keyboard_name": "Line TKL",
+    "maintainer": "studiokestra",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B5", "D5", "D3"],
+        "rows": ["D0", "D1", "B0", "B7", "B3", "E6", "C7", "C6", "B4", "D7", "D6", "D4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://minokeys.com/collections/line-friends",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x8704",
+        "vid": "0x7C10"
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "D2",
+        "on_state": 1
+    },
+    "community_layouts": [
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                { "matrix": [0,0], "x":0, "y":0}, 
+                { "matrix": [0,1], "x":2.25, "y":0}, 
+                { "matrix": [0,2], "x":3.25, "y":0}, 
+                { "matrix": [1,2], "x":4.25, "y":0}, 
+                { "matrix": [0,3], "x":5.5, "y":0}, 
+                { "matrix": [1,3], "x":6.5, "y":0}, 
+                { "matrix": [0,4], "x":7.5, "y":0}, 
+                { "matrix": [1,4], "x":8.5, "y":0}, 
+                { "matrix": [0,5], "x":9.75, "y":0}, 
+                { "matrix": [1,5], "x":10.75, "y":0}, 
+                { "matrix": [0,6], "x":11.75, "y":0}, 
+                { "matrix": [1,6], "x":12.75, "y":0}, 
+                { "matrix": [0,7], "x":14, "y":0}, 
+                { "matrix": [1,7], "x":15.25, "y":0}, 
+                { "matrix": [0,8], "x":16.25, "y":0}, 
+                { "matrix": [1,8], "x":17.25, "y":0}, 
+                { "matrix": [2,0], "x":0, "y":1.25}, 
+                { "matrix": [3,0], "x":1, "y":1.25}, 
+                { "matrix": [2,1], "x":2, "y":1.25}, 
+                { "matrix": [3,1], "x":3, "y":1.25}, 
+                { "matrix": [2,2], "x":4, "y":1.25}, 
+                { "matrix": [3,2], "x":5, "y":1.25}, 
+                { "matrix": [2,3], "x":6, "y":1.25}, 
+                { "matrix": [3,3], "x":7, "y":1.25}, 
+                { "matrix": [2,4], "x":8, "y":1.25}, 
+                { "matrix": [3,4], "x":9, "y":1.25}, 
+                { "matrix": [2,5], "x":10, "y":1.25}, 
+                { "matrix": [3,5], "x":11, "y":1.25}, 
+                { "matrix": [2,6], "x":12, "y":1.25}, 
+                { "matrix": [3,6], "x":13, "y":1.25}, 
+                { "matrix": [3,7], "x":15.25, "y":1.25}, 
+                { "matrix": [2,8], "x":16.25, "y":1.25}, 
+                { "matrix": [3,8], "x":17.25, "y":1.25}, 
+                { "matrix": [4,0], "x":0, "y":2.25, "w":1.5}, 
+                { "matrix": [5,0], "x":1.5, "y":2.25}, 
+                { "matrix": [4,1], "x":2.5, "y":2.25}, 
+                { "matrix": [5,1], "x":3.5, "y":2.25}, 
+                { "matrix": [4,2], "x":4.5, "y":2.25}, 
+                { "matrix": [5,2], "x":5.5, "y":2.25}, 
+                { "matrix": [4,3], "x":6.5, "y":2.25}, 
+                { "matrix": [5,3], "x":7.5, "y":2.25}, 
+                { "matrix": [4,4], "x":8.5, "y":2.25}, 
+                { "matrix": [5,4], "x":9.5, "y":2.25}, 
+                { "matrix": [4,5], "x":10.5, "y":2.25}, 
+                { "matrix": [5,5], "x":11.5, "y":2.25}, 
+                { "matrix": [4,6], "x":12.5, "y":2.25}, 
+                { "matrix": [4,7], "x":13.5, "y":2.25, "w":1.5}, 
+                { "matrix": [5,7], "x":15.25, "y":2.25}, 
+                { "matrix": [4,8], "x":16.25, "y":2.25}, 
+                { "matrix": [5,8], "x":17.25, "y":2.25}, 
+                { "matrix": [6,0], "x":0, "y":3.25, "w":1.75}, 
+                { "matrix": [7,0], "x":1.75, "y":3.25}, 
+                { "matrix": [6,1], "x":2.75, "y":3.25}, 
+                { "matrix": [7,1], "x":3.75, "y":3.25}, 
+                { "matrix": [6,2], "x":4.75, "y":3.25}, 
+                { "matrix": [7,2], "x":5.75, "y":3.25}, 
+                { "matrix": [6,3], "x":6.75, "y":3.25}, 
+                { "matrix": [7,3], "x":7.75, "y":3.25}, 
+                { "matrix": [6,4], "x":8.75, "y":3.25}, 
+                { "matrix": [7,4], "x":9.75, "y":3.25}, 
+                { "matrix": [6,5], "x":10.75, "y":3.25}, 
+                { "matrix": [7,5], "x":11.75, "y":3.25}, 
+                { "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
+                { "matrix": [8,0], "x":0, "y":4.25, "w":1.25}, 
+                { "matrix": [8,1], "x":2.25, "y":4.25}, 
+                { "matrix": [9,1], "x":3.25, "y":4.25}, 
+                { "matrix": [8,2], "x":4.25, "y":4.25},
+                { "matrix": [9,2], "x":5.25, "y":4.25}, 
+                { "matrix": [8,3], "x":6.25, "y":4.25}, 
+                { "matrix": [9,3], "x":7.25, "y":4.25}, 
+                { "matrix": [8,4], "x":8.25, "y":4.25}, 
+                { "matrix": [9,4], "x":9.25, "y":4.25}, 
+                { "matrix": [8,5], "x":10.25, "y":4.25}, 
+                { "matrix": [9,5], "x":11.25, "y":4.25}, 
+                { "matrix": [8,6], "x":12.25, "y":4.25, "w":1.75},
+                { "matrix": [9,8], "x":16.25, "y":4.25}, 
+                { "matrix": [10,0], "x":0, "y":5.25, "w":1.5}, 
+                { "matrix": [11,0], "x":1.5,"y":5.25}, 
+                { "matrix": [10,1], "x":2.5,"y":5.25,"w":1.5}, 
+                { "matrix": [10,3], "x":4,"y":5.25,"w":7},
+                { "matrix": [11,5], "x":11,"y":5.25,"w":1.5}, 
+                { "matrix": [10,6], "x":12.5,"y":5.25}, 
+                { "matrix": [10,7], "x":13.5,"y":5.25,"w":1.5},
+                { "matrix": [11,7], "x":15.25, "y":5.25}, 
+                { "matrix": [10,8], "x":16.25, "y":5.25}, 
+                { "matrix": [11,8], "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                { "matrix": [0,0], "x":0, "y":0}, 
+                { "matrix": [0,1], "x":2.25, "y":0}, 
+                { "matrix": [0,2], "x":3.25, "y":0}, 
+                { "matrix": [1,2], "x":4.25, "y":0}, 
+                { "matrix": [0,3], "x":5.5, "y":0}, 
+                { "matrix": [1,3], "x":6.5, "y":0}, 
+                { "matrix": [0,4], "x":7.5, "y":0}, 
+                { "matrix": [1,4], "x":8.5, "y":0}, 
+                { "matrix": [0,5], "x":9.75, "y":0}, 
+                { "matrix": [1,5], "x":10.75, "y":0}, 
+                { "matrix": [0,6], "x":11.75, "y":0}, 
+                { "matrix": [1,6], "x":12.75, "y":0}, 
+                { "matrix": [0,7], "x":14, "y":0}, 
+                { "matrix": [1,7], "x":15.25, "y":0}, 
+                { "matrix": [0,8], "x":16.25, "y":0}, 
+                { "matrix": [1,8], "x":17.25, "y":0}, 
+                { "matrix": [2,0], "x":0, "y":1.25}, 
+                { "matrix": [3,0], "x":1, "y":1.25}, 
+                { "matrix": [2,1], "x":2, "y":1.25}, 
+                { "matrix": [3,1], "x":3, "y":1.25}, 
+                { "matrix": [2,2], "x":4, "y":1.25}, 
+                { "matrix": [3,2], "x":5, "y":1.25}, 
+                { "matrix": [2,3], "x":6, "y":1.25}, 
+                { "matrix": [3,3], "x":7, "y":1.25}, 
+                { "matrix": [2,4], "x":8, "y":1.25}, 
+                { "matrix": [3,4], "x":9, "y":1.25}, 
+                { "matrix": [2,5], "x":10, "y":1.25}, 
+                { "matrix": [3,5], "x":11, "y":1.25}, 
+                { "matrix": [2,6], "x":12, "y":1.25}, 
+                { "matrix": [3,6], "x":13, "y":1.25}, 
+                { "matrix": [2,7], "x":14, "y":1.25}, 
+                { "matrix": [3,7], "x":15.25, "y":1.25}, 
+                { "matrix": [2,8], "x":16.25, "y":1.25}, 
+                { "matrix": [3,8], "x":17.25, "y":1.25}, 
+                { "matrix": [4,0], "x":0, "y":2.25, "w":1.5}, 
+                { "matrix": [5,0], "x":1.5, "y":2.25}, 
+                { "matrix": [4,1], "x":2.5, "y":2.25}, 
+                { "matrix": [5,1], "x":3.5, "y":2.25}, 
+                { "matrix": [4,2], "x":4.5, "y":2.25}, 
+                { "matrix": [5,2], "x":5.5, "y":2.25}, 
+                { "matrix": [4,3], "x":6.5, "y":2.25}, 
+                { "matrix": [5,3], "x":7.5, "y":2.25}, 
+                { "matrix": [4,4], "x":8.5, "y":2.25}, 
+                { "matrix": [5,4], "x":9.5, "y":2.25}, 
+                { "matrix": [4,5], "x":10.5, "y":2.25}, 
+                { "matrix": [5,5], "x":11.5, "y":2.25}, 
+                { "matrix": [4,6], "x":12.5, "y":2.25}, 
+                { "matrix": [4,7], "x":13.5, "y":2.25, "w":1.5}, 
+                { "matrix": [5,7], "x":15.25, "y":2.25}, 
+                { "matrix": [4,8], "x":16.25, "y":2.25}, 
+                { "matrix": [5,8], "x":17.25, "y":2.25}, 
+                { "matrix": [6,0], "x":0, "y":3.25, "w":1.75}, 
+                { "matrix": [7,0], "x":1.75, "y":3.25}, 
+                { "matrix": [6,1], "x":2.75, "y":3.25}, 
+                { "matrix": [7,1], "x":3.75, "y":3.25}, 
+                { "matrix": [6,2], "x":4.75, "y":3.25}, 
+                { "matrix": [7,2], "x":5.75, "y":3.25}, 
+                { "matrix": [6,3], "x":6.75, "y":3.25}, 
+                { "matrix": [7,3], "x":7.75, "y":3.25}, 
+                { "matrix": [6,4], "x":8.75, "y":3.25}, 
+                { "matrix": [7,4], "x":9.75, "y":3.25}, 
+                { "matrix": [6,5], "x":10.75, "y":3.25}, 
+                { "matrix": [7,5], "x":11.75, "y":3.25}, 
+                { "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
+                { "matrix": [8,0], "x":0, "y":4.25, "w":1.25}, 
+                { "matrix": [8,1], "x":2.25, "y":4.25}, 
+                { "matrix": [9,1], "x":3.25, "y":4.25}, 
+                { "matrix": [8,2], "x":4.25, "y":4.25},
+                { "matrix": [9,2], "x":5.25, "y":4.25}, 
+                { "matrix": [8,3], "x":6.25, "y":4.25}, 
+                { "matrix": [9,3], "x":7.25, "y":4.25}, 
+                { "matrix": [8,4], "x":8.25, "y":4.25}, 
+                { "matrix": [9,4], "x":9.25, "y":4.25}, 
+                { "matrix": [8,5], "x":10.25, "y":4.25}, 
+                { "matrix": [9,5], "x":11.25, "y":4.25}, 
+                { "matrix": [8,6], "x":12.25, "y":4.25, "w":1.75},
+                { "matrix": [9,6], "x":14, "y":4.25}, 
+                { "matrix": [9,8], "x":16.25, "y":4.25}, 
+                { "matrix": [10,0], "x":0, "y":5.25, "w":1.5}, 
+                { "matrix": [11,0], "x":1.5,"y":5.25}, 
+                { "matrix": [10,1], "x":2.5,"y":5.25,"w":1.5}, 
+                { "matrix": [10,3], "x":4,"y":5.25,"w":7},
+                { "matrix": [11,5], "x":11,"y":5.25,"w":1.5}, 
+                { "matrix": [10,6], "x":12.5,"y":5.25}, 
+                { "matrix": [10,7], "x":13.5,"y":5.25,"w":1.5},
+                { "matrix": [11,7], "x":15.25, "y":5.25}, 
+                { "matrix": [10,8], "x":16.25, "y":5.25}, 
+                { "matrix": [11,8], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a8dc54ee8706
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// SPDX-License-Identifier: GPL-2.0-or-later
+  
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bcksp │ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+     * │Ctrl │GUI│Alt  │                           │  Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+     */
+
+    [0] = LAYOUT_tkl_ansi_tsangan(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                         KC_PSCR, KC_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, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+    [1] = LAYOUT_tkl_ansi_tsangan(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                       
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..595ed5d03cc5
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// SPDX-License-Identifier: GPL-2.0-or-later
+  
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │LBk│RBk│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │GUI│Alt  │                           │  Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+     */
+
+    [0] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                         KC_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_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,     
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                                   KC_UP,          
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+    [1] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                       
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/studiokestra/line_tkl/keymaps/via/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c
new file mode 100644
index 000000000000..595ed5d03cc5
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// SPDX-License-Identifier: GPL-2.0-or-later
+  
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │LBk│RBk│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │GUI│Alt  │                           │  Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+     */
+
+    [0] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                         KC_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_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,     
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                                   KC_UP,          
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+    [1] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift(
+    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                       
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/studiokestra/line_tkl/keymaps/via/rules.mk b/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/studiokestra/line_tkl/readme.md b/keyboards/studiokestra/line_tkl/readme.md
new file mode 100644
index 000000000000..a5d7ae0c4143
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/readme.md
@@ -0,0 +1,27 @@
+# studiokestra/line_tkl
+
+![studiokestra/line_tkl](https://i.imgur.com/3MmRQkh.png)
+
+PCB developed for Mino Keys in collaboration with Line Friends (C).
+
+* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/)
+* Hardware Supported: Line TKL
+* Hardware Availability: https://minokeys.com/collections/line-friends
+
+Make example for this keyboard (after setting up your build environment):
+
+    make studiokestra/line_tkl:default
+
+Flashing example for this keyboard:
+
+    make studiokestra/line_tkl:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/studiokestra/line_tkl/rules.mk b/keyboards/studiokestra/line_tkl/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json
index 21932cebc63c..722de6251ab6 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -41,11 +41,90 @@
   },
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
-  "community_layouts": ["alice_split_bs"],
+  "community_layouts": ["alice", "alice_split_bs"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_alice_split_bs"
   },
   "layouts": {
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [5, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [5, 1], "x": 0, "y": 1},
+
+        {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 2.75, "y": 1},
+        {"matrix": [1, 2], "x": 3.75, "y": 1},
+        {"matrix": [1, 3], "x": 4.75, "y": 1},
+        {"matrix": [1, 4], "x": 5.75, "y": 1},
+        {"matrix": [1, 5], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 6], "x": 9.75, "y": 1},
+        {"matrix": [1, 7], "x": 10.75, "y": 1},
+        {"matrix": [1, 8], "x": 11.75, "y": 1},
+        {"matrix": [1, 9], "x": 12.75, "y": 1},
+        {"matrix": [1, 10], "x": 13.75, "y": 1},
+        {"matrix": [1, 11], "x": 14.75, "y": 1},
+        {"matrix": [1, 12], "x": 15.75, "y": 1},
+        {"matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 2], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [2, 3], "x": 5, "y": 2},
+        {"matrix": [2, 4], "x": 6, "y": 2},
+        {"matrix": [2, 5], "x": 7, "y": 2},
+
+        {"matrix": [2, 6], "x": 10, "y": 2},
+        {"matrix": [2, 7], "x": 11, "y": 2},
+        {"matrix": [2, 8], "x": 12, "y": 2},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+        {"matrix": [2, 11], "x": 15, "y": 2},
+        {"matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 3.5, "y": 3},
+        {"matrix": [3, 2], "x": 4.5, "y": 3},
+        {"matrix": [3, 3], "x": 5.5, "y": 3},
+        {"matrix": [3, 4], "x": 6.5, "y": 3},
+        {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 6], "x": 9.5, "y": 3},
+        {"matrix": [3, 7], "x": 10.5, "y": 3},
+        {"matrix": [3, 8], "x": 11.5, "y": 3},
+        {"matrix": [3, 9], "x": 12.5, "y": 3},
+        {"matrix": [3, 10], "x": 13.5, "y": 3},
+        {"matrix": [3, 11], "x": 14.5, "y": 3},
+        {"matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 3], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
     "LAYOUT_alice_split_bs": {
       "layout": [
         {"matrix": [5, 0], "x": 0, "y": 0},
diff --git a/keyboards/viktus/sp111_v2/info.json b/keyboards/viktus/sp111_v2/info.json
new file mode 100644
index 000000000000..63c531ee4488
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/info.json
@@ -0,0 +1,198 @@
+{
+    "manufacturer": "BlindAssassin111",
+    "keyboard_name": "viktus/sp111_v2",
+    "maintainer": "blindassassin111",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "F6", "F5", "F4", "F1", "F7", "B7", "D2", "D3", "D5", "D4"],
+        "rows": ["C7", "B6", "B5", "B4", "D7", "D6"]
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "layout": [
+            { "flags": 8, "x": 0, "y": 0 },
+            { "flags": 8, "x": 0, "y": 1 },
+            { "flags": 8, "x": 0, "y": 2 }
+        ],
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["C6", "F1", "B4", "B5", "D2", "D3", "D5", "D4", "D6", "D7"],
+                "rows": ["C7", "B6", "F4", "F5", "F6", "F7"]
+            }
+        },
+        "transport": {
+            "protocol": "i2c"
+        },
+        "usb_detect": {
+            "enabled": true
+        }
+    },
+    "url": "https://viktus.design/",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x5112",
+        "vid": "0x5644"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5.75, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6.75, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7.75, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8.75, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 10, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 11, "y": 0 },
+                { "label": "6,0", "matrix": [6, 0], "x": 13, "y": 0 },
+                { "label": "6,1", "matrix": [6, 1], "x": 14, "y": 0 },
+                { "label": "6,3", "matrix": [6, 3], "x": 15.25, "y": 0 },
+                { "label": "6,4", "matrix": [6, 4], "x": 16.25, "y": 0 },
+                { "label": "6,5", "matrix": [6, 5], "x": 17.25, "y": 0 },
+                { "label": "6,6", "matrix": [6, 6], "x": 18.25, "y": 0 },
+                { "label": "6,7", "matrix": [6, 7], "x": 19.5, "y": 0 },
+                { "label": "6,8", "matrix": [6, 8], "x": 20.75, "y": 0 },
+                { "label": "6,9", "matrix": [6, 9], "x": 21.75, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.5 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.5 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.5 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.5 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.5 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.5 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.5 },
+                { "label": "7,0", "matrix": [7, 0], "x": 12.5, "y": 1.5 },
+                { "label": "7,1", "matrix": [7, 1], "x": 13.5, "y": 1.5 },
+                { "label": "7,2", "matrix": [7, 2], "x": 14.5, "y": 1.5 },
+                { "label": "7,3", "matrix": [7, 3], "x": 15.5, "y": 1.5 },
+                { "label": "7,4", "matrix": [7, 4], "x": 16.5, "y": 1.5 },
+                { "label": "7,5", "matrix": [7, 5], "x": 17.5, "y": 1.5 },
+                { "label": "7,6", "matrix": [7, 6], "x": 18.5, "y": 1.5 },
+                { "label": "7,7", "matrix": [7, 7], "x": 19.5, "y": 1.5 },
+                { "label": "7,8", "matrix": [7, 8], "x": 20.75, "y": 1.5 },
+                { "label": "7,9", "matrix": [7, 9], "x": 21.75, "y": 1.5 },
+                { "label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1, "y": 2.5 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2, "y": 2.5 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3, "y": 2.5 },
+                { "label": "2,4", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.5 },
+                { "label": "2,5", "matrix": [2, 5], "x": 6, "y": 2.5 },
+                { "label": "2,6", "matrix": [2, 6], "x": 7, "y": 2.5 },
+                { "label": "2,7", "matrix": [2, 7], "x": 8, "y": 2.5 },
+                { "label": "2,8", "matrix": [2, 8], "x": 9, "y": 2.5 },
+                { "label": "2,9", "matrix": [2, 9], "x": 10, "y": 2.5 },
+                { "label": "8,0", "matrix": [8, 0], "x": 12, "y": 2.5 },
+                { "label": "8,1", "matrix": [8, 1], "x": 13, "y": 2.5 },
+                { "label": "8,2", "matrix": [8, 2], "x": 14, "y": 2.5 },
+                { "label": "8,3", "matrix": [8, 3], "x": 15, "y": 2.5 },
+                { "label": "8,4", "matrix": [8, 4], "x": 16, "y": 2.5 },
+                { "label": "8,5", "matrix": [8, 5], "x": 17, "y": 2.5 },
+                { "label": "8,6", "matrix": [8, 6], "x": 18, "y": 2.5 },
+                { "label": "8,7", "matrix": [8, 7], "w": 1.5, "x": 19, "y": 2.5 },
+                { "label": "8,8", "matrix": [8, 8], "x": 20.75, "y": 2.5 },
+                { "label": "8,9", "matrix": [8, 9], "x": 21.75, "y": 2.5 },
+                { "label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5 },
+                { "label": "3,1", "matrix": [3, 1], "x": 1, "y": 3.5 },
+                { "label": "3,2", "matrix": [3, 2], "x": 2, "y": 3.5 },
+                { "label": "3,3", "matrix": [3, 3], "x": 3, "y": 3.5 },
+                { "label": "3,4", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.5 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3.5 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3.5 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3.5 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3.5 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3.5 },
+                { "label": "9,0", "matrix": [9, 0], "x": 12.25, "y": 3.5 },
+                { "label": "9,1", "matrix": [9, 1], "x": 13.25, "y": 3.5 },
+                { "label": "9,2", "matrix": [9, 2], "x": 14.25, "y": 3.5 },
+                { "label": "9,3", "matrix": [9, 3], "x": 15.25, "y": 3.5 },
+                { "label": "9,4", "matrix": [9, 4], "x": 16.25, "y": 3.5 },
+                { "label": "9,5", "matrix": [9, 5], "x": 17.25, "y": 3.5 },
+                { "label": "9,6", "matrix": [9, 6], "x": 18.25, "y": 3.5 },
+                { "label": "9,7", "matrix": [9, 7], "w": 1.25, "x": 19.25, "y": 3.5 },
+                { "label": "9,8", "matrix": [9, 8], "x": 20.75, "y": 3.5 },
+                { "label": "9,9", "matrix": [9, 9], "x": 21.75, "y": 3.5 },
+                { "label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5 },
+                { "label": "4,1", "matrix": [4, 1], "x": 1, "y": 4.5 },
+                { "label": "4,2", "matrix": [4, 2], "x": 2, "y": 4.5 },
+                { "label": "4,3", "matrix": [4, 3], "x": 3, "y": 4.5 },
+                { "label": "4,4", "matrix": [4, 4], "w": 1.25, "x": 4.5, "y": 4.5 },
+                { "label": "4,5", "matrix": [4, 5], "x": 5.75, "y": 4.5 },
+                { "label": "4,6", "matrix": [4, 6], "x": 6.75, "y": 4.5 },
+                { "label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4.5 },
+                { "label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4.5 },
+                { "label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4.5 },
+                { "label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4.5 },
+                { "label": "10,1", "matrix": [10, 1], "x": 12.75, "y": 4.5 },
+                { "label": "10,1", "matrix": [10, 2], "x": 13.75, "y": 4.5 },
+                { "label": "10,2", "matrix": [10, 3], "x": 14.75, "y": 4.5 },
+                { "label": "10,3", "matrix": [10, 4], "x": 15.75, "y": 4.5 },
+                { "label": "10,4", "matrix": [10, 5], "x": 16.75, "y": 4.5 },
+                { "label": "10,6", "matrix": [10, 6], "w": 1.75, "x": 17.75, "y": 4.5 },
+                { "label": "10,7", "matrix": [10, 7], "x": 19.5, "y": 4.5 },
+                { "label": "10,8", "matrix": [10, 8], "x": 20.75, "y": 4.75 },
+                { "label": "5.0", "matrix": [5, 0], "x": 0, "y": 5.5 },
+                { "label": "5,1", "matrix": [5, 1], "x": 1, "y": 5.5 },
+                { "label": "5,2", "matrix": [5, 2], "x": 2, "y": 5.5 },
+                { "label": "5,3", "matrix": [5, 3], "x": 3, "y": 5.5 },
+                { "label": "5,4", "matrix": [5, 4], "w": 1.25, "x": 4.5, "y": 5.5 },
+                { "label": "5,5", "matrix": [5, 5], "w": 1.25, "x": 5.75, "y": 5.5 },
+                { "label": "5,7", "matrix": [5, 7], "w": 1.25, "x": 7, "y": 5.5 },
+                { "label": "5,8", "matrix": [5, 8], "x": 8.25, "y": 5.5 },
+                { "label": "5,9", "matrix": [5, 9], "w": 2.25, "x": 9.25, "y": 5.5 },
+                { "label": "11,2", "matrix": [11, 2], "w": 2.25, "x": 12.5, "y": 5.5 },
+                { "label": "11,3", "matrix": [11, 3], "x": 14.75, "y": 5.5 },
+                { "label": "11,4", "matrix": [11, 4], "w": 1.25, "x": 15.75, "y": 5.5 },
+                { "label": "11,5", "matrix": [11, 5], "w": 1.25, "x": 17, "y": 5.5 },
+                { "label": "11,6", "matrix": [11, 6], "w": 1.25, "x": 18.25, "y": 5.5 },
+                { "label": "11,7", "matrix": [11, 7], "x": 19.75, "y": 5.75 },
+                { "label": "11,8", "matrix": [11, 8], "x": 20.75, "y": 5.75 },
+                { "label": "11,9", "matrix": [11, 9], "x": 21.75, "y": 5.75 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/sp111_v2/keymaps/default/keymap.c b/keyboards/viktus/sp111_v2/keymaps/default/keymap.c
new file mode 100644
index 000000000000..ac1b84e19933
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+    * ┌──┐┌──┐┌──┐┌──┐  ┌──┐ ┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐    ┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐ ┌──┐ ┌──┐┌──┐
+    * │0A││0B││0C││0D│  │0E│ │0F││0G││0H││0I│ │0J││0K│    │6A││6B│ │6D││6E││6F││6G│ │6H│ │6I││6J│
+    * └──┘└──┘└──┘└──┘  └──┘ └──┘└──┘└──┘└──┘ └──┘└──┘    └──┘└──┘ └──┘└──┘└──┘└──┘ └──┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐
+    * │1A││1B││1C││1D│  │1E││1F││1G││1H││1I││1J││1K│    │7A││7B││7C││7D││7E││7F││7G││7H│ │7I││7J│
+    * └──┘└──┘└──┘└──┘  └──┘└──┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐
+    * │2A││2B││2C││2D│  │2E  ││2F││2G││2H││2I││2J│    │8A││8B││8C││8D││8E││8F││8G││8H  │ │8I││8J│
+    * └──┘└──┘└──┘└──┘  └────┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───┐ ┌──┐┌──┐
+    * │3A││3B││3C││3D│  │3E   ││3F││3G││3H││3I││3J│    │9A││9B││9C││9D││9E││9F││9G││9H │ │9I││9J│
+    * └──┘└──┘└──┘└──┘  └─────┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
+    * │4A││4B││4C││4D│  │4E ││4F││4G││4H││4I││4J││4K│    │AB││AC││AD││AE││AF││AG   ││AH│ ┌──┐
+    * └──┘└──┘└──┘└──┘  └───┘└──┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└─────┘└──┘ │AI│
+    * ┌──┐┌──┐┌──┐┌──┐  ┌───┐┌───┐┌───┐┌──┐┌───────┐    ┌───────┐┌──┐┌───┐┌───┐┌───┐     └──┘
+    * │5A││5B││5C││5D│  │5E ││5F ││5H ││5I││5J     │    │BC     ││BD││BE ││BF ││BG │ ┌──┐┌──┐┌──┐
+    * └──┘└──┘└──┘└──┘  └───┘└───┘└───┘└──┘└───────┘    └───────┘└──┘└───┘└───┘└───┘ │BH││BI││BJ│
+    *                                                                                └──┘└──┘└──┘
+    */
+    [_BASE] = LAYOUT(
+    KC_MUTE,KC_MPRV,KC_MPLY,KC_MNXT,    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_NUM, KC_PSLS,KC_PAST,KC_PMNS,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_INS,
+    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,  KC_DEL,
+    KC_P4,  KC_P5,  KC_P6,  KC_PEQL,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGUP, KC_PGDN,
+    KC_P1,  KC_P2,  KC_P3,  KC_PENT,    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),          KC_UP,
+    KC_P0,  KC_P0,  KC_P0,  KC_PDOT,    KC_LCTL, KC_LGUI, KC_LALT, KC_MUTE, KC_SPC,           KC_SPC,  KC_APP,  KC_RALT, KC_RGUI, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [_FN] = LAYOUT(
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, QK_BOOT,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,                            _______, _______, _______)
+};
diff --git a/keyboards/viktus/sp111_v2/keymaps/via/config.h b/keyboards/viktus/sp111_v2/keymaps/via/config.h
new file mode 100644
index 000000000000..917fe0c8bb86
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/viktus/sp111_v2/keymaps/via/keymap.c b/keyboards/viktus/sp111_v2/keymaps/via/keymap.c
new file mode 100644
index 000000000000..57e25720f9a5
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+    KC_MUTE,KC_MPRV,KC_MPLY,KC_MNXT,    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_NUM, KC_PSLS,KC_PAST,KC_PMNS,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME, KC_INS,
+    KC_P7,  KC_P8,  KC_P9,  KC_PMNS,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,  KC_DEL,
+    KC_P4,  KC_P5,  KC_P6,  KC_PPLS,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGUP, KC_PGDN,
+    KC_P1,  KC_P2,  KC_P3,  KC_PPLS,    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,
+    KC_P0,  KC_P0,  KC_PDOT,  KC_PENT,  KC_LCTL, KC_LGUI, KC_LALT, KC_MUTE, KC_SPC,           KC_SPC,  KC_APP,  KC_RALT, KC_RGUI, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT(
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, QK_BOOT,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,                            _______, _______, _______)
+};
diff --git a/keyboards/viktus/sp111_v2/keymaps/via/rules.mk b/keyboards/viktus/sp111_v2/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/viktus/sp111_v2/readme.md b/keyboards/viktus/sp111_v2/readme.md
new file mode 100644
index 000000000000..c3767ba02ba5
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/readme.md
@@ -0,0 +1,27 @@
+# Viktus Styrka v2
+
+![viktus/sp111_v2](https://i.imgur.com/ApgZRhgh.png)
+
+A split southpaw fullsize-esque layout. Round 2 of the board has RGB LED indicators.
+
+* Keyboard Maintainer: [BlindAssassin111](https://github.com/blindassassin111)
+* Hardware Supported: SP-111 round 2 PCBs only
+* Hardware Availability: Space Cables, Ashkeebs, protoTypist, mykeyboard, ilumkb, SwitchKeys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make viktus/sp111_v2:default
+
+Flashing example for this keyboard:
+
+    make viktus/sp111_v2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/viktus/sp111_v2/rules.mk b/keyboards/viktus/sp111_v2/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/viktus/sp111_v2/sp111_v2.c b/keyboards/viktus/sp111_v2/sp111_v2.c
new file mode 100644
index 000000000000..96a9aaa5fe40
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/sp111_v2.c
@@ -0,0 +1,12 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+void keyboard_pre_init_kb(void) {
+    // enable built in pullups to avoid timeouts when right hand not connected
+    setPinInputHigh(D0);
+    setPinInputHigh(D1);
+
+    keyboard_pre_init_user();
+}
diff --git a/keyboards/vinhcatba/uncertainty/bongo.c b/keyboards/vinhcatba/uncertainty/bongo.c
new file mode 100644
index 000000000000..707955ee8810
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/bongo.c
@@ -0,0 +1,506 @@
+// Copyright 2022 Parker Levin (@pedker)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#define ANIM_FRAME_DURATION 75 // how long each frame lasts in ms
+#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
+#define IDLE_FRAMES 5
+#define IDLE_TIMEOUT 750 // the amount of time it takes to return to idle
+#define TAP_FRAMES 2
+#define KEYS_SIZE 104 // the number of keys stored in the array that tracks keypresses; how many keys are on the board?
+
+enum anim_states
+{
+    Idle,
+    Prep,
+    Tap
+};
+uint8_t anim_state = Idle;
+uint32_t idle_timeout_timer = 0;
+uint32_t anim_timer = 0;
+uint8_t current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+struct pair_int_int
+{
+    uint8_t first;
+    uint8_t second;
+};
+struct pair_int_int pressed_keys[KEYS_SIZE];
+struct pair_int_int pressed_keys_prev[KEYS_SIZE];
+uint8_t pressed_keys_index = 0;
+
+bool key_down = 0;
+char wpm[42];
+
+static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] =
+{
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+};
+
+static const char PROGMEM idle_minimal[IDLE_FRAMES][ANIM_SIZE] =
+{
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02,
+        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04,
+        0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,
+        0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08,
+        0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40,
+        0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02,
+        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04,
+        0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20,
+        0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40,
+        0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04,
+        0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08,
+        0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20,
+        0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40,
+        0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04,
+        0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08,
+        0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,
+        0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08,
+        0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40,
+        0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02,
+        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04,
+        0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,
+        0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08,
+        0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40,
+        0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+};
+
+static const char PROGMEM prep[][ANIM_SIZE] =
+{
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+};
+
+static const char PROGMEM prep_minimal[][ANIM_SIZE] =
+{
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04,
+        0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44,
+        0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,
+        0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04,
+        0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02,
+        0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+};
+
+static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] =
+{
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+};
+
+static const char PROGMEM tap_minimal[TAP_FRAMES][ANIM_SIZE] =
+{
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04,
+        0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04,
+        0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,
+        0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04,
+        0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10,
+        0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e,
+        0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04,
+        0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44,
+        0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40,
+        0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08,
+        0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02,
+        0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40,
+        0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
+        0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02,
+        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8,
+        0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+};
+
+bool detect_key_down(void)
+{
+    // store the previous cycle's cache
+    for (uint8_t i = 0; i < KEYS_SIZE; ++i)
+    {
+        pressed_keys_prev[i].first = pressed_keys[i].first;
+        pressed_keys_prev[i].second = pressed_keys[i].second;
+    }
+
+    // fill cache with currently pressed keys
+    pressed_keys_index = 0;
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++)
+    {
+        for (uint8_t y = 0; y < MATRIX_COLS; y++)
+        {
+            // is this key is currently down?
+            if (((matrix_get_row(x) & (1 << y)) > 0))
+            {
+                pressed_keys[pressed_keys_index].first = x+1; // adding 1 to the row/col so that we can use 0 as a null-check
+                pressed_keys[pressed_keys_index].second = y+1;
+            }
+            else
+            {
+                pressed_keys[pressed_keys_index].first = 0;
+                pressed_keys[pressed_keys_index].second = 0;
+            }
+            pressed_keys_index++;
+        }
+    }
+
+    // check for a new key down compared to last cycle
+    for (uint8_t i = 0; i < KEYS_SIZE; ++i)
+    {
+        if (pressed_keys[i].first && pressed_keys[i].second && !pressed_keys_prev[i].first && !pressed_keys_prev[i].second)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void eval_anim_state(void)
+{
+    key_down = detect_key_down();
+
+    switch (anim_state)
+    {
+        case Idle:
+            if (key_down) // Idle to Tap
+            {
+                anim_state = Tap;
+            }
+            break;
+
+        case Prep:
+            if (key_down) // Prep to Tap
+            {
+                anim_state = Tap;
+            }
+            else if (timer_elapsed32(idle_timeout_timer) >= IDLE_TIMEOUT) // Prep to Idle
+            {
+                anim_state = Idle;
+                current_idle_frame = 0;
+            }
+            break;
+
+        case Tap:
+            if (!key_down) // Tap to Prep
+            {
+                anim_state = Prep;
+                idle_timeout_timer = timer_read32();
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+void draw_bongo(bool minimal)
+{
+    eval_anim_state();
+
+    oled_set_cursor(0, 0);
+
+    switch (anim_state)
+    {
+        case Idle:
+            if (minimal)
+                oled_write_raw_P(idle_minimal[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+            else
+                oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION)
+            {
+                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+                anim_timer = timer_read32();
+            }
+            break;
+
+        case Prep:
+            if (minimal)
+                oled_write_raw_P(prep_minimal[0], ANIM_SIZE);
+            else
+                oled_write_raw_P(prep[0], ANIM_SIZE);
+            break;
+
+        case Tap:
+            if (minimal)
+                oled_write_raw_P(tap_minimal[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+            else
+                oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            break;
+
+        default:
+            break;
+    }
+
+    if (!minimal)
+    {
+        // print wpm
+        oled_set_cursor(0, 0);
+        oled_write("WPM:", false);
+        oled_write(get_u8_str(get_current_wpm(),'0'), false);
+    }
+}
diff --git a/keyboards/vinhcatba/uncertainty/bongo.h b/keyboards/vinhcatba/uncertainty/bongo.h
new file mode 100644
index 000000000000..d1cecbc61972
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/bongo.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Parker Levin (@pedker)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+void draw_bongo(bool minimal);
diff --git a/keyboards/vinhcatba/uncertainty/config.h b/keyboards/vinhcatba/uncertainty/config.h
new file mode 100644
index 000000000000..288f1d81a947
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/config.h
@@ -0,0 +1,30 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* WS2812 driver config specifically for STM32F401 */
+// DI pin = PB1, which is AF02, TIM3_CH4 (table 9 in datasheet)
+#define RGBLIGHT_LED_MAP { 2, 3, 4, 5, 6, 0, 1, 7, 8, 9, 10, 11, 12, 13}    // index 5 = CAPS; index 6 = NUM
+
+#define WS2812_PWM_DRIVER PWMD3     // TIM3
+#define WS2812_PWM_CHANNEL 4        // CH4
+#define WS2812_PWM_PAL_MODE 2       // AF2
+
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2        // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual)
+#define WS2812_DMA_CHANNEL 5                        // DMA Channel 5 for TIM3_UP  (table 28 in reference manual)
+
+
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
+
+/* eeprom i2c driver config */
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100000
+#define EXTERNAL_EEPROM_BYTE_COUNT 4096
+#define EXTERNAL_EEPROM_PAGE_SIZE 32
+#define EXTERNAL_EEPROM_WRITE_TIME 10
+//#define EEPROM_I2C_24LC32
+
+/* OLED config */
+#define OLED_UPDATE_INTERVAL 100
+#define OLED_BRIGHTNESS 200
diff --git a/keyboards/vinhcatba/uncertainty/halconf.h b/keyboards/vinhcatba/uncertainty/halconf.h
new file mode 100644
index 000000000000..0b105e29b8a3
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
+
+#undef HAL_USE_I2C
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/info.json
new file mode 100644
index 000000000000..fc0e69ad19fb
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/info.json
@@ -0,0 +1,170 @@
+{
+    "manufacturer": "Vinh Le",
+    "keyboard_name": "Uncertainty",
+    "maintainer": "vinhcatba",
+    "development_board": "blackpill_f401",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A13", "pin_b": "A14"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "wpm": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B5", "B8", "B9", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14", "C13"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 10,
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        },
+        "led_count": 14,
+        "max_brightness": 255,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x564C"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 1.25, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2.25, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "0,16", "matrix": [0, 16], "x": 17.25, "y": 0},
+                {"label": "0,17", "matrix": [0, 17], "x": 18.25, "y": 0},
+                {"label": "1,17", "matrix": [1, 17], "x": 19.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 1.25, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 2.25, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 3.25, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 4.25, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 5.25, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 6.25, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 7.25, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 8.25, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 9.25, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 10.25, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 11.25, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 12.25, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 13.25, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 14.25, "y": 1, "w": 2},
+                {"label": "1,14", "matrix": [1, 14], "x": 16.25, "y": 1},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1},
+                {"label": "1,16", "matrix": [1, 16], "x": 18.25, "y": 1},
+                {"label": "3,17", "matrix": [3, 17], "x": 19.25, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 1.75},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 13.75, "y": 2},
+                {"label": "2,14", "matrix": [2, 14], "x": 14.75, "y": 2, "w": 1.5},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 2},
+                {"label": "2,16", "matrix": [2, 16], "x": 17.25, "y": 2},
+                {"label": "2,17", "matrix": [2, 17], "x": 18.25, "y": 2},
+                {"label": "4,17", "matrix": [4, 17], "x": 19.25, "y": 2, "h": 2},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.75},
+                {"label": "3,2", "matrix": [3, 2], "x": 3, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 4, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 5, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 6, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 7, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 8, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 9, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 10, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 11, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 12, "y": 3},
+                {"label": "3,12", "matrix": [3, 12], "x": 13, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14, "y": 3, "w": 2.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 3},
+                {"label": "3,16", "matrix": [3, 16], "x": 18.25, "y": 3},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 3.5, "y": 4},
+                {"label": "4,3", "matrix": [4, 3], "x": 4.5, "y": 4},
+                {"label": "4,4", "matrix": [4, 4], "x": 5.5, "y": 4},
+                {"label": "4,5", "matrix": [4, 5], "x": 6.5, "y": 4},
+                {"label": "4,6", "matrix": [4, 6], "x": 7.5, "y": 4},
+                {"label": "4,7", "matrix": [4, 7], "x": 8.5, "y": 4},
+                {"label": "4,8", "matrix": [4, 8], "x": 9.5, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "x": 10.5, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "4,12", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.75},
+                {"label": "4,13", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 4},
+                {"label": "4,16", "matrix": [4, 16], "x": 18.25, "y": 4},
+                {"label": "5,17", "matrix": [5, 17], "x": 19.25, "y": 4, "h": 2},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+                {"label": "5,6", "matrix": [5, 6], "x": 5, "y": 5, "w": 6.25},
+                {"label": "5,7", "matrix": [5, 7], "x": 11.25, "y": 5},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.25, "y": 5},
+                {"label": "5,11", "matrix": [5, 11], "x": 13.25, "y": 5},
+                {"label": "5,12", "matrix": [5, 12], "x": 14.25, "y": 5},
+                {"label": "5,13", "matrix": [5, 13], "x": 15.25, "y": 5},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 5},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5},
+                {"label": "5,16", "matrix": [5, 16], "x": 18.25, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/default/keymap.c b/keyboards/vinhcatba/uncertainty/keymaps/default/keymap.c
new file mode 100644
index 000000000000..910453e76d9d
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/default/keymap.c
@@ -0,0 +1,89 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =    {
+
+    /* 0
+    *        ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+    *        │ Esc  │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │PrtScn│  Del │ Home │  End │ PgUp │ PgDn │
+    *        ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┤
+    *        │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │  -   │  =   │    Bksp     │ # Lk │   /  │   *  │  -   │
+    * ┌──────┼──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬─────────┼──────┼──────┼──────┼──────┤
+    * │ Mute │   Tab    │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [   │  ]   │    \    │  7   │  8   │  9   │      │
+    * ├──────┼──────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─────────┼──────┼──────┼──────┤  +   |
+    * │ Null │   Caps     │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │   '  │    Enter     │  4   │  5   │  6   │      |
+    * ├──────┼────────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴───────┬──────┼──────┤──────┼──────┼──────┤
+    * │ Null │     Shft     │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │    Shft    │  Up  │  1   │  2   │  3   │      │
+    * ├──────┼───────┬──────┴┬─────┴─┬────┴──────┴──────┴──────┴──────┴──────┴─────┬┴─────┬┴─────┬┴─────┬──────┼──────┼──────┼──────┼──────┤ Entr |
+    * │ Null │ Ctrl  │ Gui   │ Alt   │                  Space                      │ Alt  │  Fn  │ Ctrl │ Left │ Down │ Right│  0   │   .  │      │
+    * └──────┴───────┴───────┴───────┴─────────────────────────────────────────────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
+    */
+    [0] = LAYOUT(
+                 KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+                 KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,            KC_BSPC, KC_NUM, KC_PSLS,  KC_PAST, KC_PMNS,
+        KC_MUTE, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CALC, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                    KC_ENT,  KC_P4,   KC_P5,   KC_P6,
+        C(KC_V), KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        C(KC_C), KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC                                    , KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT
+    ),
+    [1] = LAYOUT(
+                 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS , KC_SCRL, _______, _______, EE_CLR ,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        OLED_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, _______, _______, _______,                    _______                                   , _______, _______, _______,RGB_RMOD, RGB_VAD, RGB_MOD, _______, _______
+    )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif // endif ENCODER_MAP_ENABLE
+
+#ifdef RGBLIGHT_ENABLE
+#    define HSV_PASTEL_BLUE 150, 155, 51
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 0
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 1
+);
+
+const rgblight_segment_t PROGMEM indicators_off_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 2, HSV_OFF}       // Turn off 2 LEDs, starting with LED 0
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    indicators_off_layer,
+    my_capslock_layer,
+    my_numlock_layer
+);
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(1, led_state.caps_lock);
+    rgblight_set_layer_state(2, led_state.num_lock);
+    return true;
+}
+
+void keyboard_post_init_user(void) {
+    // debug_enable=true;
+    // debug_matrix=true;
+
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_set_layer_state(0, 1);
+    rgblight_set_effect_range(2, 12);
+    rgblight_enable();
+}
+#endif // endif RGBLIGHT_ENABLE
+
+
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/default/rules.mk b/keyboards/vinhcatba/uncertainty/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/via/keymap.c b/keyboards/vinhcatba/uncertainty/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2427393be72d
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/via/keymap.c
@@ -0,0 +1,88 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =    {
+
+    /* 0
+    *        ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+    *        │ Esc  │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │PrtScn│  Del │ Home │  End │ PgUp │ PgDn │
+    *        ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┤
+    *        │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │  -   │  =   │    Bksp     │ # Lk │   /  │   *  │  -   │
+    * ┌──────┼──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬─────────┼──────┼──────┼──────┼──────┤
+    * │ Mute │   Tab    │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [   │  ]   │    \    │  7   │  8   │  9   │      │
+    * ├──────┼──────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─────────┼──────┼──────┼──────┤  +   |
+    * │ Null │   Caps     │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │   '  │    Enter     │  4   │  5   │  6   │      |
+    * ├──────┼────────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴───────┬──────┼──────┤──────┼──────┼──────┤
+    * │ Null │     Shft     │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │    Shft    │  Up  │  1   │  2   │  3   │      │
+    * ├──────┼───────┬──────┴┬─────┴─┬────┴──────┴──────┴──────┴──────┴──────┴─────┬┴─────┬┴─────┬┴─────┬──────┼──────┼──────┼──────┼──────┤ Entr |
+    * │ Null │ Ctrl  │ Gui   │ Alt   │                  Space                      │ Alt  │  Fn  │ Ctrl │ Left │ Down │ Right│  0   │   .  │      │
+    * └──────┴───────┴───────┴───────┴─────────────────────────────────────────────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
+    */
+    [0] = LAYOUT(
+                 KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+                 KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,            KC_BSPC, KC_NUM, KC_PSLS,  KC_PAST, KC_PMNS,
+        KC_MUTE, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CALC, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                    KC_ENT,  KC_P4,   KC_P5,   KC_P6,
+        C(KC_V), KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        C(KC_C), KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC                                    , KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT
+    ),
+    [1] = LAYOUT(
+                 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS , KC_SCRL, _______, _______, EE_CLR ,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        OLED_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, _______, _______, _______,                    _______                                   , _______, _______, _______,RGB_RMOD, RGB_VAD, RGB_MOD, _______, _______
+    )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =   { ENCODER_CCW_CW(KC_BRID, KC_BRIU)  }
+};
+#endif // endif ENCODER_MAP_ENABLE
+
+#ifdef RGBLIGHT_ENABLE
+#define HSV_PASTEL_BLUE 150, 155, 51
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 0
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 1
+);
+
+const rgblight_segment_t PROGMEM indicators_off_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 2, HSV_OFF}       // Turn off 2 LEDs, starting with LED 0
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    indicators_off_layer,
+    my_capslock_layer,
+    my_numlock_layer
+);
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(1, led_state.caps_lock);
+    rgblight_set_layer_state(2, led_state.num_lock);
+    return true;
+}
+
+void keyboard_post_init_user(void) {
+    // debug_enable=true;
+    // debug_matrix=true;
+
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_set_layer_state(0, 1);
+    rgblight_set_effect_range(2, 12);
+    rgblight_enable();
+}
+#endif // endif RGBLIGHT_ENABLE
+
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/via/rules.mk b/keyboards/vinhcatba/uncertainty/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/vinhcatba/uncertainty/mcuconf.h b/keyboards/vinhcatba/uncertainty/mcuconf.h
new file mode 100644
index 000000000000..313f8dd06a69
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/mcuconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/vinhcatba/uncertainty/readme.md b/keyboards/vinhcatba/uncertainty/readme.md
new file mode 100644
index 000000000000..ead5d17c5403
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/readme.md
@@ -0,0 +1,26 @@
+# uncertainty
+
+![uncertainty](https://i.imgur.com/IKrn37Bh.jpeg)
+
+*This is an open source keyboard with exposed-component design. It has 96% (1800) layout with extra 3 keys on the left for custom macro (default are Copy, Paste and open Calculator). It features OLED screen, RGB Backlight, Encoder and VIA-supported. Powered by a STM32F401 Blackpill.*
+
+* Keyboard Maintainer: [Vinh Le](https://github.com/vinhcatba)
+* Hardware Supported: The PCB is [here](https://github.com/vinhcatba/uncertainty), controller supported: STM32F401 Blackpill, SSD1306 128x32 OLED, WS2812B RGB, External EEPROM, Rotary Encoder.
+* Hardware Availability: [Open-source hardware](https://github.com/vinhcatba/uncertainty)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make vinhcatba/uncertainty:default
+
+Flashing example for this keyboard:
+
+    make vinhcatba/uncertainty:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset button**: On Blackpill board: Hold `NRST` and `BOOT0` -> Release `NRST` first and **quickly** release `BOOT0` right after.
+* **Keycode in layout**: `QK_BOOT` is on the second layer, replacing Escape (top left key).
diff --git a/keyboards/vinhcatba/uncertainty/rules.mk b/keyboards/vinhcatba/uncertainty/rules.mk
new file mode 100644
index 000000000000..6255f6529472
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/rules.mk
@@ -0,0 +1,3 @@
+SRC += bongo.c
+# using external i2c eeprom
+EEPROM_DRIVER = i2c
diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.c b/keyboards/vinhcatba/uncertainty/uncertainty.c
new file mode 100644
index 000000000000..19e5a5cfd537
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/uncertainty.c
@@ -0,0 +1,32 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+#include "bongo.h"
+// Used to draw on to the oled screen
+bool oled_minimal = true;
+bool oled_task_kb(void) {
+    if(!oled_task_user()) { return false; }
+    draw_bongo(oled_minimal);
+    return false;
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+     if (!process_record_user(keycode, record)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case OLED_TOG:
+            if (record->event.pressed) {
+                oled_minimal = !oled_minimal;
+            }
+            return false;
+        default:
+            return true;
+    }
+}
+#endif // endif OLED_ENABLE
diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.h b/keyboards/vinhcatba/uncertainty/uncertainty.h
new file mode 100644
index 000000000000..91a3500b0889
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/uncertainty.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "quantum.h"
+
+enum my_keycodes {
+    OLED_TOG = QK_KB
+};
+
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index 6c2a87df222c..de733b988a8f 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -33,6 +33,7 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "community_layouts": ["alice"],
     "layouts": {
         "LAYOUT_alice": {
             "layout": [
diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json
index 324a57d180bd..a07e426978e7 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -34,11 +34,91 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/xelus/valor/rev1/matrix_diagram.md b/keyboards/xelus/valor/rev1/matrix_diagram.md
new file mode 100644
index 000000000000..2c4e53a40bf5
--- /dev/null
+++ b/keyboards/xelus/valor/rev1/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Xelus Valor Rev. 1
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │01 │02 │03 │04 │05 │06 │07 │         │08 │09 │0A │0B │0C │0D │0E │2E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │10 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│20 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2D        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45     │46   │     │48        │4A   │             │4D   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+                        ┌─────────┬───┐
+                        │45       │46 │ 2.25u-1u Left Space
+                        └─────────┴───┘
+```
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index a8068eff8974..cdb3bb994766 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -22,11 +22,90 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/xelus/valor/rev2/matrix_diagram.md b/keyboards/xelus/valor/rev2/matrix_diagram.md
new file mode 100644
index 000000000000..b8a071af530b
--- /dev/null
+++ b/keyboards/xelus/valor/rev2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Xelus Valor Rev. 2
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │01 │02 │03 │04 │05 │06 │07 │         │08 │09 │0A │0B │0C │0D │0E │2E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │10 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│20 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2D        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴──┬┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45       │46 │     │48        │4A   │             │4D   │
+      └─────┘     └─────┴─────────┴───┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+```
diff --git a/keyboards/yampad/keymaps/default/keymap.c b/keyboards/yampad/keymaps/default/keymap.c
index f54d4f33b07a..61e6d8ff7467 100644
--- a/keyboards/yampad/keymaps/default/keymap.c
+++ b/keyboards/yampad/keymaps/default/keymap.c
@@ -22,6 +22,7 @@ SOFTWARE.
 */
 
 #include QMK_KEYBOARD_H
+#include <stdio.h>
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/yampad/keymaps/via/keymap.c b/keyboards/yampad/keymaps/via/keymap.c
index f54d4f33b07a..61e6d8ff7467 100644
--- a/keyboards/yampad/keymaps/via/keymap.c
+++ b/keyboards/yampad/keymaps/via/keymap.c
@@ -22,6 +22,7 @@ SOFTWARE.
 */
 
 #include QMK_KEYBOARD_H
+#include <stdio.h>
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index 45b0c42484c3..94eac85089ea 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "quantum.h"
+#include <stdio.h>
 
 #if defined(OLED_ENABLE)
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
index 26ab6ab528aa..91a0529e88a9 100644
--- a/keyboards/yiancardesigns/seigaiha/info.json
+++ b/keyboards/yiancardesigns/seigaiha/info.json
@@ -14,8 +14,247 @@
     },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_rshift_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [1, 0], "x": 0, "y": 0},
diff --git a/keyboards/yiancardesigns/seigaiha/matrix_diagram.md b/keyboards/yiancardesigns/seigaiha/matrix_diagram.md
new file mode 100644
index 000000000000..7ab40f87f004
--- /dev/null
+++ b/keyboards/yiancardesigns/seigaiha/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Yiancar-Designs Seigaiha
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │10 │  │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │0E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │20 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│30 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2E        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45     │46   │     │48        │4A   │             │4E   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+```
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
index 790ac9dd838b..0f9065a63485 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
@@ -53,17 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code16(KC_WH_U);
-    } else {
-      tap_code16(KC_WH_D);
-    }
-  }
-  return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [_FN1] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+    [_FN2] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+    [_FN3] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+};
 #endif
 
 #ifdef RGBLIGHT_LAYERS
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
index 036bd6d1c3ec..715838ecc5d9 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/zeix/qwertyqop60hs/config.h b/keyboards/zeix/qwertyqop60hs/config.h
new file mode 100644
index 000000000000..77970ce4d344
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/zeix/qwertyqop60hs/info.json b/keyboards/zeix/qwertyqop60hs/info.json
new file mode 100644
index 000000000000..8a3e06f2eb47
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/info.json
@@ -0,0 +1,452 @@
+{
+    "keyboard_name": "QQ 60% Hotswap",
+    "maintainer": "itsme-zeix",
+    "manufacturer": "qwertyqop",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0x4C27",
+        "pid": "0x2900",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {    
+        "rows": ["GP6","GP5","GP4","GP0","GP12"],
+        "cols": ["GP28","GP27","GP26","GP25","GP24","GP23","GP22","GP3","GP2","GP1","GP8","GP9","GP10","GP11","GP7"]
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "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": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_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": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 14], "x": 13, "y": 0, "w": 2 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 14], "x": 13, "y": 0, "w": 2 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 }
+            ]
+        }       
+    }
+}
diff --git a/keyboards/zeix/qwertyqop60hs/keymaps/default/keymap.c b/keyboards/zeix/qwertyqop60hs/keymaps/default/keymap.c
new file mode 100644
index 000000000000..14d759965a65
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+  
+[1] = LAYOUT_all(
+  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/zeix/qwertyqop60hs/keymaps/via/keymap.c b/keyboards/zeix/qwertyqop60hs/keymaps/via/keymap.c
new file mode 100644
index 000000000000..14d759965a65
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+  
+[1] = LAYOUT_all(
+  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/zeix/qwertyqop60hs/keymaps/via/rules.mk b/keyboards/zeix/qwertyqop60hs/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/zeix/qwertyqop60hs/matrix_diagram.md b/keyboards/zeix/qwertyqop60hs/matrix_diagram.md
new file mode 100644
index 000000000000..37644edc7fc8
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Zeix Qwertyqop60hs
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ 
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/zeix/qwertyqop60hs/readme.md b/keyboards/zeix/qwertyqop60hs/readme.md
new file mode 100644
index 000000000000..1a36951fd16e
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/readme.md
@@ -0,0 +1,27 @@
+# qwertyqop hotswap 60% PCB
+
+![qwertyqop hotswap 60% PCB](https://i.imgur.com/OJXzZSEh.jpg)
+
+A generic hotswap 60% PCB with cutouts akin to h60 and 2 positions for JST port.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: Qwertyqop QQ60 Hotswap PCB Rev1
+* Hardware Availability: https://qwertyqop.com/products/60-pcb-1
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zeix/qwertyqop60hs:default
+
+Flashing example for this keyboard:
+
+    make zeix/qwertyqop60hs: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**: Press the 'USB_BOOT' button and plug in keyboard or briefly short the `RESET` and `GND` pads on the SWD header twice
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/zeix/qwertyqop60hs/rules.mk b/keyboards/zeix/qwertyqop60hs/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/layouts/default/60_ansi_wkl/default_60_ansi_wkl/keymap.c b/layouts/default/60_ansi_wkl/default_60_ansi_wkl/keymap.c
new file mode 100644
index 000000000000..1307ae1600da
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/default_60_ansi_wkl/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_ansi_wkl(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_ansi_wkl/info.json b/layouts/default/60_ansi_wkl/info.json
new file mode 100644
index 000000000000..9d502e41687c
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/info.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "60% ANSI Winkeyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_ansi_wkl/layout.json b/layouts/default/60_ansi_wkl/layout.json
new file mode 100644
index 000000000000..19f5466dde29
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:2.75},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_ansi_wkl/readme.md b/layouts/default/60_ansi_wkl/readme.md
new file mode 100644
index 000000000000..c4c7e5541f3e
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/readme.md
@@ -0,0 +1,3 @@
+# 60_ansi_wkl
+
+    LAYOUT_60_ansi_wkl
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/default_60_ansi_wkl_split_bs_rshift/keymap.c b/layouts/default/60_ansi_wkl_split_bs_rshift/default_60_ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..4fddeeb4c5df
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/default_60_ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/info.json b/layouts/default/60_ansi_wkl_split_bs_rshift/info.json
new file mode 100644
index 000000000000..8cc625781654
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/info.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "60% ANSI Winkeyless layout with split Backspace and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/layout.json b/layouts/default/60_ansi_wkl_split_bs_rshift/layout.json
new file mode 100644
index 000000000000..e333df5e0b37
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:1.75},"",""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/readme.md b/layouts/default/60_ansi_wkl_split_bs_rshift/readme.md
new file mode 100644
index 000000000000..c34c18a0ec0a
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# 60_ansi_wkl_split_bs_rshift
+
+    LAYOUT_60_ansi_wkl_split_bs_rshift
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/default_60_iso_tsangan_split_bs_rshift/keymap.c b/layouts/default/60_iso_tsangan_split_bs_rshift/default_60_iso_tsangan_split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..2f63749755bf
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/default_60_iso_tsangan_split_bs_rshift/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │GUI│ Alt │                           │ Alt │GUI│ Ctrl│
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+     */
+    [0] = LAYOUT_60_iso_tsangan_split_bs_rshift(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    )
+};
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/info.json b/layouts/default/60_iso_tsangan_split_bs_rshift/info.json
new file mode 100644
index 000000000000..277afd9d5c86
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "60% ISO layout with split Backspace, split Right Shift, and Tsangan Bottom Row",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/layout.json b/layouts/default/60_iso_tsangan_split_bs_rshift/layout.json
new file mode 100644
index 000000000000..99f729bda1a5
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"",""],
+[{w:1.5},"","",{w:1.5},"",{w:7},"",{w:1.5},"","",{w:1.5},""]
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/readme.md b/layouts/default/60_iso_tsangan_split_bs_rshift/readme.md
new file mode 100644
index 000000000000..4313926ca191
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# 60_iso_tsangan_split_bs_rshift
+
+    LAYOUT_60_iso_tsangan_split_bs_rshift
diff --git a/layouts/default/60_iso_wkl/default_60_iso_wkl/keymap.c b/layouts/default/60_iso_wkl/default_60_iso_wkl/keymap.c
new file mode 100644
index 000000000000..a46aaf226c72
--- /dev/null
+++ b/layouts/default/60_iso_wkl/default_60_iso_wkl/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_iso_wkl(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_iso_wkl/info.json b/layouts/default/60_iso_wkl/info.json
new file mode 100644
index 000000000000..2dab40bd818f
--- /dev/null
+++ b/layouts/default/60_iso_wkl/info.json
@@ -0,0 +1,74 @@
+{
+    "keyboard_name": "60% ISO Winkeyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_iso_wkl/layout.json b/layouts/default/60_iso_wkl/layout.json
new file mode 100644
index 000000000000..84e7431988e6
--- /dev/null
+++ b/layouts/default/60_iso_wkl/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:2.75},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_iso_wkl/readme.md b/layouts/default/60_iso_wkl/readme.md
new file mode 100644
index 000000000000..f109450c9bc4
--- /dev/null
+++ b/layouts/default/60_iso_wkl/readme.md
@@ -0,0 +1,3 @@
+# 60_iso_wkl
+
+    LAYOUT_60_iso_wkl
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..b07d56ea2062
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_iso_wkl_split_bs_rshift(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/info.json b/layouts/default/60_iso_wkl_split_bs_rshift/info.json
new file mode 100644
index 000000000000..b5a745dd4526
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/info.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "60% ISO Winkeyless with split Backspace and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/layout.json b/layouts/default/60_iso_wkl_split_bs_rshift/layout.json
new file mode 100644
index 000000000000..92837c330b72
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"",""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/readme.md b/layouts/default/60_iso_wkl_split_bs_rshift/readme.md
new file mode 100644
index 000000000000..c1f4df013bd1
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# 60_iso_wkl_split_bs_rshift
+
+    LAYOUT_60_iso_wkl_split_bs_rshift
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 439613911aca..361fa86792cb 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -94,6 +94,36 @@ LAYOUT_60_ansi_tsangan
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 ```
 
+```
+LAYOUT_60_ansi_wkl
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+│        │   │   │   │   │   │   │   │   │   │   │          │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
+```
+LAYOUT_60_ansi_wkl_split_bs_rshift
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│        │   │   │   │   │   │   │   │   │   │   │      │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
 ```
 LAYOUT_60_hhkb
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -154,6 +184,51 @@ LAYOUT_60_iso_tsangan
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 ```
 
+```
+LAYOUT_60_iso_tsangan_split_bs_rshift
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
+
+```
+LAYOUT_60_iso_wkl
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+│    │   │   │   │   │   │   │   │   │   │   │   │          │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
+```
+LAYOUT_60_iso_wkl_split_bs_rshift
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
 ```
 LAYOUT_60_jis
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 9c3decf4f76a..b8bc99aa0d35 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -31,6 +31,7 @@
 ]
 
 subcommands = [
+    'qmk.cli.ci.validate_aliases',
     'qmk.cli.bux',
     'qmk.cli.c2json',
     'qmk.cli.cd',
diff --git a/lib/python/qmk/cli/ci/__init__.py b/lib/python/qmk/cli/ci/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/lib/python/qmk/cli/ci/validate_aliases.py b/lib/python/qmk/cli/ci/validate_aliases.py
new file mode 100644
index 000000000000..a205d03cff90
--- /dev/null
+++ b/lib/python/qmk/cli/ci/validate_aliases.py
@@ -0,0 +1,46 @@
+"""Validates the list of keyboard aliases.
+"""
+from pathlib import Path
+
+from milc import cli
+
+from qmk.json_schema import json_load
+from qmk.keyboard import resolve_keyboard, keyboard_folder
+
+
+def _safe_keyboard_folder(target):
+    try:
+        return keyboard_folder(target)  # throws ValueError if it's invalid
+    except Exception:
+        return None
+
+
+def _target_keyboard_exists(target):
+    # If there's no target, then we can't build it.
+    if not target:
+        return False
+
+    # If the target directory existed but there was no rules.mk or rules.mk was incorrectly parsed, then we can't build it.
+    if not resolve_keyboard(target):
+        return False
+
+    # If the target directory exists but it itself has an invalid alias or invalid rules.mk, then we can't build it either.
+    if not _safe_keyboard_folder(target):
+        return False
+
+    # As far as we can tell, we can build it!
+    return True
+
+
+@cli.subcommand('Validates the list of keyboard aliases.', hidden=True)
+def ci_validate_aliases(cli):
+    aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
+
+    success = True
+    for alias in aliases.keys():
+        target = aliases[alias].get('target', None)
+        if not _target_keyboard_exists(target):
+            cli.log.error(f'Keyboard alias {alias} has a target that doesn\'t exist: {target}')
+            success = False
+
+    return success
diff --git a/lib/python/qmk/cli/find.py b/lib/python/qmk/cli/find.py
index 2836eb8a5421..f2135bbc16c8 100644
--- a/lib/python/qmk/cli/find.py
+++ b/lib/python/qmk/cli/find.py
@@ -23,7 +23,7 @@ def find(cli):
     if len(cli.args.filter) == 0 and len(cli.args.print) > 0:
         cli.log.warning('No filters supplied -- keymaps not parsed, unable to print requested values.')
 
-    targets = search_keymap_targets(cli.args.keymap, cli.args.filter, cli.args.print)
+    targets = search_keymap_targets([('all', cli.config.find.keymap)], cli.args.filter, cli.args.print)
     for keyboard, keymap, print_vals in targets:
         print(f'{keyboard}:{keymap}')
 
diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py
index 897a6c4c0d0d..a7c85b5643d9 100644
--- a/lib/python/qmk/cli/lint.py
+++ b/lib/python/qmk/cli/lint.py
@@ -20,6 +20,9 @@ def _list_defaultish_keymaps(kb):
     """
     defaultish = ['ansi', 'iso', 'via']
 
+    # This is only here to flag it as "testable", so it doesn't fly under the radar during PR
+    defaultish.append('vial')
+
     keymaps = set()
     for x in list_keymaps(kb):
         if x in defaultish or x.startswith('default'):
diff --git a/lib/python/qmk/cli/mass_compile.py b/lib/python/qmk/cli/mass_compile.py
index 1227f435e74e..06e6e411a72a 100755
--- a/lib/python/qmk/cli/mass_compile.py
+++ b/lib/python/qmk/cli/mass_compile.py
@@ -97,6 +97,6 @@ def mass_compile(cli):
     if len(cli.args.builds) > 0:
         targets = search_make_targets(cli.args.builds, cli.args.filter)
     else:
-        targets = search_keymap_targets(cli.args.keymap, cli.args.filter)
+        targets = search_keymap_targets([('all', cli.config.mass_compile.keymap)], cli.args.filter)
 
-    return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.args.no_temp, cli.args.parallel, cli.args.env)
+    return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.config.mass_compile.no_temp, cli.config.mass_compile.parallel, cli.args.env)
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 660b2ff72e60..34696e37930c 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -212,13 +212,16 @@ def parse_configurator_json(configurator_file):
         cli.log.error(f'Invalid JSON keymap: {configurator_file} : {e.message}')
         exit(1)
 
-    orig_keyboard = user_keymap['keyboard']
+    keyboard = user_keymap['keyboard']
     aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
 
-    if orig_keyboard in aliases:
-        if 'target' in aliases[orig_keyboard]:
-            user_keymap['keyboard'] = aliases[orig_keyboard]['target']
+    while keyboard in aliases:
+        last_keyboard = keyboard
+        keyboard = aliases[keyboard].get('target', keyboard)
+        if keyboard == last_keyboard:
+            break
 
+    user_keymap['keyboard'] = keyboard
     return user_keymap
 
 
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index 18ca5a95341f..9826f3f8876b 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -92,8 +92,11 @@ def keyboard_folder(keyboard):
     """
     aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
 
-    if keyboard in aliases:
+    while keyboard in aliases:
+        last_keyboard = keyboard
         keyboard = aliases[keyboard].get('target', keyboard)
+        if keyboard == last_keyboard:
+            break
 
     rules_mk_file = Path(base_path, keyboard, 'rules.mk')
 
diff --git a/lib/python/qmk/search.py b/lib/python/qmk/search.py
index 0b5d48921898..a74450ca87d9 100644
--- a/lib/python/qmk/search.py
+++ b/lib/python/qmk/search.py
@@ -4,12 +4,12 @@
 import functools
 import fnmatch
 import logging
-import multiprocessing
 import re
 from typing import List, Tuple
 from dotty_dict import dotty
 from milc import cli
 
+from qmk.util import parallel_map
 from qmk.info import keymap_json
 import qmk.keyboard
 import qmk.keymap
@@ -78,17 +78,16 @@ def _expand_keymap_target(keyboard: str, keymap: str, all_keyboards: List[str] =
         all_keyboards = qmk.keyboard.list_keyboards()
 
     if keyboard == 'all':
-        with multiprocessing.Pool() as pool:
-            if keymap == 'all':
-                cli.log.info('Retrieving list of all keyboards and keymaps...')
-                targets = []
-                for kb in pool.imap_unordered(_all_keymaps, all_keyboards):
-                    targets.extend(kb)
-                return targets
-            else:
-                cli.log.info(f'Retrieving list of keyboards with keymap "{keymap}"...')
-                keyboard_filter = functools.partial(_keymap_exists, keymap=keymap)
-                return [(kb, keymap) for kb in filter(lambda e: e is not None, pool.imap_unordered(keyboard_filter, all_keyboards))]
+        if keymap == 'all':
+            cli.log.info('Retrieving list of all keyboards and keymaps...')
+            targets = []
+            for kb in parallel_map(_all_keymaps, all_keyboards):
+                targets.extend(kb)
+            return targets
+        else:
+            cli.log.info(f'Retrieving list of keyboards with keymap "{keymap}"...')
+            keyboard_filter = functools.partial(_keymap_exists, keymap=keymap)
+            return [(kb, keymap) for kb in filter(lambda e: e is not None, parallel_map(keyboard_filter, all_keyboards))]
     else:
         if keymap == 'all':
             keyboard = qmk.keyboard.resolve_keyboard(keyboard)
@@ -117,8 +116,7 @@ def _filter_keymap_targets(target_list: List[Tuple[str, str]], filters: List[str
         targets = [(kb, km, {}) for kb, km in target_list]
     else:
         cli.log.info('Parsing data for all matching keyboard/keymap combinations...')
-        with multiprocessing.Pool() as pool:
-            valid_keymaps = [(e[0], e[1], dotty(e[2])) for e in pool.imap_unordered(_load_keymap_info, target_list)]
+        valid_keymaps = [(e[0], e[1], dotty(e[2])) for e in parallel_map(_load_keymap_info, target_list)]
 
         function_re = re.compile(r'^(?P<function>[a-zA-Z]+)\((?P<key>[a-zA-Z0-9_\.]+)(,\s*(?P<value>[^#]+))?\)$')
         equals_re = re.compile(r'^(?P<key>[a-zA-Z0-9_\.]+)\s*=\s*(?P<value>[^#]+)$')
@@ -179,10 +177,10 @@ def f(e):
     return targets
 
 
-def search_keymap_targets(keymap='default', filters: List[str] = [], print_vals: List[str] = []) -> List[Tuple[str, str, List[Tuple[str, str]]]]:
+def search_keymap_targets(targets: List[Tuple[str, str]] = [('all', 'default')], filters: List[str] = [], print_vals: List[str] = []) -> List[Tuple[str, str, List[Tuple[str, str]]]]:
     """Search for build targets matching the supplied criteria.
     """
-    return list(sorted(_filter_keymap_targets(expand_keymap_targets([('all', keymap)]), filters, print_vals), key=lambda e: (e[0], e[1])))
+    return list(sorted(_filter_keymap_targets(expand_keymap_targets(targets), filters, print_vals), key=lambda e: (e[0], e[1])))
 
 
 def search_make_targets(targets: List[str], filters: List[str] = [], print_vals: List[str] = []) -> List[Tuple[str, str, List[Tuple[str, str]]]]:
diff --git a/lib/python/qmk/util.py b/lib/python/qmk/util.py
new file mode 100644
index 000000000000..db7debd5788f
--- /dev/null
+++ b/lib/python/qmk/util.py
@@ -0,0 +1,56 @@
+"""Utility functions.
+"""
+import contextlib
+import multiprocessing
+
+from milc import cli
+
+
+@contextlib.contextmanager
+def parallelize():
+    """Returns a function that can be used in place of a map() call.
+
+    Attempts to use `mpire`, falling back to `multiprocessing` if it's not
+    available. If parallelization is not requested, returns the original map()
+    function.
+    """
+
+    # Work out if we've already got a config value for parallel searching
+    if cli.config.user.parallel_search is None:
+        parallel_search = True
+    else:
+        parallel_search = cli.config.user.parallel_search
+
+    # Non-parallel searches use `map()`
+    if not parallel_search:
+        yield map
+        return
+
+    # Prefer mpire's `WorkerPool` if it's available
+    with contextlib.suppress(ImportError):
+        from mpire import WorkerPool
+        from mpire.utils import make_single_arguments
+        with WorkerPool() as pool:
+
+            def _worker(func, *args):
+                # Ensure we don't unpack tuples -- mpire's `WorkerPool` tries to do so normally so we tell it not to.
+                for r in pool.imap_unordered(func, make_single_arguments(*args, generator=False), progress_bar=True):
+                    yield r
+
+            yield _worker
+        return
+
+    # Otherwise fall back to multiprocessing's `Pool`
+    with multiprocessing.Pool() as pool:
+        yield pool.imap_unordered
+
+
+def parallel_map(*args, **kwargs):
+    """Effectively runs `map()` but executes it in parallel if necessary.
+    """
+    with parallelize() as map_fn:
+        # This needs to be enclosed in a `list()` as some implementations return
+        # a generator function, which means the scope of the pool is closed off
+        # before the results are returned. Returning a list ensures results are
+        # materialised before any worker pool is shut down.
+        return list(map_fn(*args, **kwargs))
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 1676a60aa35d..2ec0ec4b19f1 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -389,7 +389,6 @@ void led_matrix_task(void) {
 
 void led_matrix_indicators(void) {
     led_matrix_indicators_kb();
-    led_matrix_indicators_user();
 }
 
 __attribute__((weak)) bool led_matrix_indicators_kb(void) {
@@ -415,7 +414,6 @@ void led_matrix_indicators_advanced(effect_params_t *params) {
     uint8_t max = LED_MATRIX_LED_COUNT;
 #endif
     led_matrix_indicators_advanced_kb(min, max);
-    led_matrix_indicators_advanced_user(min, max);
 }
 
 __attribute__((weak)) bool led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index abb3817b5f65..17dc701a4154 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -19,6 +19,8 @@
 #include "pointing_device.h"
 #include <string.h>
 #include "timer.h"
+#include "gpio.h"
+
 #ifdef MOUSEKEY_ENABLE
 #    include "mousekey.h"
 #endif
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
index fc3106e37e9a..3135b9e531bf 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.c
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -17,6 +17,7 @@
 
 #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
 
+#    include <string.h>
 #    include "pointing_device_auto_mouse.h"
 #    include "debug.h"
 #    include "action_util.h"
diff --git a/readme.md b/readme.md
index 5649ddfa097a..f0e49a08e956 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
 [![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
 
-This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co).
+This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the Clueboard product line.
 
 ## Documentation