Merge remote-tracking branch 'origin/master' into develop

20 files changed, 600 insertions, 503 deletions

diff --git a/keyboards/jacky_studio/piggy60/config.h b/keyboards/jacky_studio/piggy60/config.h
deleted file mode 100644
index ab0e4531a1..0000000000
--- a/keyboards/jacky_studio/piggy60/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 The QMK Community (@qmk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/jacky_studio/piggy60/hotswap/info.json b/keyboards/jacky_studio/piggy60/hotswap/info.json
index e3fa1b8b84..8b10920700 100644
--- a/keyboards/jacky_studio/piggy60/hotswap/info.json
+++ b/keyboards/jacky_studio/piggy60/hotswap/info.json
@@ -1,3 +1,4 @@
 {
-    "diode_direction": "ROW2COL"
+    "diode_direction": "ROW2COL",
+    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"]
 }
diff --git a/keyboards/jacky_studio/piggy60/info.json b/keyboards/jacky_studio/piggy60/info.json
index 46b274b211..2805209f47 100644
--- a/keyboards/jacky_studio/piggy60/info.json
+++ b/keyboards/jacky_studio/piggy60/info.json
@@ -29,7 +29,8 @@
         "pid": "0x1001"
     },
     "indicators": {
-        "caps_lock": "F4"
+        "caps_lock": "F4",
+        "on_state": 0
     },
     "rgblight": {
         "led_count": 14,
@@ -115,202 +116,6 @@
                 { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
             ]
         },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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], "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], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "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 },
-                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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], "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], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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], "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], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
-            ]
-        },
         "LAYOUT_60_hhkb": {
             "layout": [
                 { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
@@ -375,272 +180,6 @@
                 { "label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4 }
             ]
         },
-        "LAYOUT_60_iso": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "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 },
-                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_hhkb": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0)", "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 },
-                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
-            ]
-        },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
diff --git a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
index 8f14e6d0c0..b166c6771f 100644
--- a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
+++ b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
@@ -9,21 +9,21 @@
             "LT(1,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",  "LT(1,KC_MUTE)",
             "KC_LCTL",        "KC_LGUI",  "KC_LALT",                                      "KC_SPC",               "LT(1,KC_APP)",  "KC_RALT",              "KC_RGUI",  "KC_RCTL"
-        ]
+        ],
         [
             "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_PSCR",  "KC_DEL",
             "KC_TRNS",  "KC_TRNS",  "KC_UP",    "KC_TRNS",  "KC_PGUP",  "KC_HOME",  "KC_TRNS",  "KC_VOLU",  "KC_BRIU",  "KC_TRNS",  "KC_WH_U",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
             "KC_TRNS",  "KC_LEFT",  "KC_DOWN",  "KC_RGHT",  "KC_PGDN",  "KC_END",   "KC_TRNS",  "KC_VOLD",  "KC_BRID",  "KC_TRNS",  "KC_WH_D",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
             "RGB_TOG",  "KC_TRNS",  "RGB_MOD",  "RGB_HUI",  "RGB_SAI",  "RGB_VAI",  "RGB_SPI",  "KC_TRNS",  "KC_MUTE",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",              "KC_TRNS",  "KC_TRNS",
             "KC_TRNS",  "KC_TRNS",  "KC_TRNS",                                      "KC_TRNS",              "KC_TRNS",  "KC_TRNS",              "KC_TRNS",  "KC_TRNS"
-        ]
+        ],
         [
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",            "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS"
-        ]
+        ],
         [
             "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
             "KC_TRNS", "KC_TRNS", "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/jacky_studio/piggy60/rules.mk b/keyboards/jacky_studio/piggy60/rules.mk
index eebe701e8e..530e6598df 100644
--- a/keyboards/jacky_studio/piggy60/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rules.mk
@@ -1,2 +1 @@
 DEFAULT_FOLDER = jacky_studio/piggy60/solder
-LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_hhkb 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb
diff --git a/keyboards/jacky_studio/piggy60/solder/info.json b/keyboards/jacky_studio/piggy60/solder/info.json
index beded82262..6a4cacb0fc 100644
--- a/keyboards/jacky_studio/piggy60/solder/info.json
+++ b/keyboards/jacky_studio/piggy60/solder/info.json
@@ -1,3 +1,477 @@
 {
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "community_layouts": [
+       "60_ansi",
+       "60_ansi_split_bs_rshift",
+       "60_ansi_tsangan",
+       "60_hhkb",
+       "60_iso",
+       "60_iso_split_bs_rshift",
+       "60_iso_tsangan",
+       "60_tsangan_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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], "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], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "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 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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], "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], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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], "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], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "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 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "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, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_hhkb": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "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 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "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": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        }
+    }
 }
diff --git a/keyboards/xelus/kangaroo/info.json b/keyboards/xelus/kangaroo/info.json
index d70cb92e93..adb6450826 100644
--- a/keyboards/xelus/kangaroo/info.json
+++ b/keyboards/xelus/kangaroo/info.json
@@ -1,12 +1,10 @@
 {
-    "keyboard_name": "Kangaroo", 
     "manufacturer": "Xelus",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo", 
-    "maintainer": "qmk", 
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo",
+    "maintainer": "qmk",
     "usb": {
         "vid": "0x5845",
-        "pid": "0x524F",
-        "device_version": "0.0.1"
+        "pid": "0x524F"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/xelus/kangaroo/kangaroo.c b/keyboards/xelus/kangaroo/kangaroo.c
index a7a3d24800..585d33d498 100644
--- a/keyboards/xelus/kangaroo/kangaroo.c
+++ b/keyboards/xelus/kangaroo/kangaroo.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Harrison Chan (Xelus)
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * 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
@@ -16,9 +16,4 @@
 
 #include "kangaroo.h"
 
-void board_init(void) {
-  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
-  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
-}
-
 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/rev1/config.h
index a57d22a7f8..a57d22a7f8 100644
--- a/keyboards/xelus/kangaroo/config.h
+++ b/keyboards/xelus/kangaroo/rev1/config.h
diff --git a/keyboards/xelus/kangaroo/halconf.h b/keyboards/xelus/kangaroo/rev1/halconf.h
index 633d94a880..633d94a880 100644
--- a/keyboards/xelus/kangaroo/halconf.h
+++ b/keyboards/xelus/kangaroo/rev1/halconf.h
diff --git a/keyboards/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/info.json
new file mode 100644
index 0000000000..523aef4aaa
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Kangaroo Rev 1.0",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/xelus/kangaroo/mcuconf.h b/keyboards/xelus/kangaroo/rev1/mcuconf.h
index 20db196d29..20db196d29 100644
--- a/keyboards/xelus/kangaroo/mcuconf.h
+++ b/keyboards/xelus/kangaroo/rev1/mcuconf.h
diff --git a/keyboards/xelus/kangaroo/readme.md b/keyboards/xelus/kangaroo/rev1/readme.md
index e91f32f96a..800497b698 100644
--- a/keyboards/xelus/kangaroo/readme.md
+++ b/keyboards/xelus/kangaroo/rev1/readme.md
@@ -1,4 +1,4 @@
-# Kangaroo
+# Kangaroo Rev 1
 
 Left Hand Fullsized Keyboard designed by Jono.
 
@@ -8,6 +8,7 @@ Left Hand Fullsized Keyboard designed by Jono.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make xelus/kangaroo:default
+    make xelus/kangaroo/rev1:default
+    make xelus/kangaroo/rev1:via
 
 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/xelus/kangaroo/chconf.h b/keyboards/xelus/kangaroo/rev1/rev1.c
index 71b34b0591..a71f476498 100644
--- a/keyboards/xelus/kangaroo/chconf.h
+++ b/keyboards/xelus/kangaroo/rev1/rev1.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2022 Harrison Chan (Xelus)
  *
  * 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
@@ -14,18 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/xelus/kangaroo/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_FREQUENCY 10000
-
-#define CH_CFG_OPTIMIZE_SPEED FALSE
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
+#include "rev1.h"
 
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
diff --git a/keyboards/xelus/kangaroo/rev1/rev1.h b/keyboards/xelus/kangaroo/rev1/rev1.h
new file mode 100644
index 0000000000..f146b4f964
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev1/rev1.h
@@ -0,0 +1,17 @@
+/* Copyright 2022 Harrison Chan (Xelus)
+ *
+ * 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"
diff --git a/keyboards/xelus/kangaroo/rules.mk b/keyboards/xelus/kangaroo/rev1/rules.mk
index 80826fae5f..80826fae5f 100644
--- a/keyboards/xelus/kangaroo/rules.mk
+++ b/keyboards/xelus/kangaroo/rev1/rules.mk
diff --git a/keyboards/xelus/kangaroo/rev2/config.h b/keyboards/xelus/kangaroo/rev2/config.h
new file mode 100644
index 0000000000..a2f89a0ab1
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 11
+
+#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 }
+#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* 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 WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2
diff --git a/keyboards/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/info.json
new file mode 100644
index 0000000000..8f7a2c6ce9
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Kangaroo Rev 2.0",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/xelus/kangaroo/rev2/readme.md b/keyboards/xelus/kangaroo/rev2/readme.md
new file mode 100644
index 0000000000..b94bd43cd1
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/readme.md
@@ -0,0 +1,14 @@
+# Kangaroo Rev 2
+
+Left Hand Fullsized Keyboard designed by Jono.
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Kangaroo
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/kangaroo/rev2:default
+    make xelus/kangaroo/rev2:via
+
+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/xelus/kangaroo/rev2/rules.mk b/keyboards/xelus/kangaroo/rev2/rules.mk
new file mode 100644
index 0000000000..44ac92bb81
--- /dev/null
+++ b/keyboards/xelus/kangaroo/rev2/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32L412
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+EEPROM_DRIVER = i2c
+
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE