diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index 66cd24e20b..47eaab67a7 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -19,96 +19,366 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space_split_bs"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_split_space": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "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": [1, 14], "x": 15.25, "y": 0},
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
 
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F2", "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": 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": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
 
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F3", "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": 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], "x": 14, "y": 2, "w": 2.25},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
 
-                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
 
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
 
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
 
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
-                {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
 
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_space_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_625u_space_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/cyberstar/keymaps/default/keymap.c b/keyboards/handwired/cyberstar/keymaps/default/keymap.c
index 67b5639c12..29587ebde9 100644
--- a/keyboards/handwired/cyberstar/keymaps/default/keymap.c
+++ b/keyboards/handwired/cyberstar/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT_split_space_split_bs( /* Base */
     KC_F1,    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_DEL,    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_BSLS,            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, MO(1),                     KC_UP,
                              KC_LCTL, KC_LALT,         KC_SPC,       KC_SPC,                   KC_RALT, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RGHT),
 
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT_split_space_split_bs( /* FN */
     KC_VOLU,    KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
     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_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,
diff --git a/keyboards/handwired/cyberstar/keymaps/via/keymap.c b/keyboards/handwired/cyberstar/keymaps/via/keymap.c
index 2577c2ac80..e36c2bcb49 100644
--- a/keyboards/handwired/cyberstar/keymaps/via/keymap.c
+++ b/keyboards/handwired/cyberstar/keymaps/via/keymap.c
@@ -16,28 +16,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT_split_space_split_bs( /* Base */
     KC_F1,    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_DEL,    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_BSLS,            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, MO(1),                     KC_UP,
                              KC_LCTL, KC_LALT,         KC_SPC,       KC_SPC,                   KC_RALT, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RGHT),
 
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT_split_space_split_bs( /* FN */
     KC_VOLU,    KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
     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_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),
 
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT_split_space_split_bs( /* Empty for dynamic keymaps */
     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,                      KC_TRNS,
                                   KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS),
 
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT_split_space_split_bs( /* Empty for dynamic keymaps */
     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,    KC_TRNS, 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/handwired/cyberstar/matrix_diagram.md b/keyboards/handwired/cyberstar/matrix_diagram.md
new file mode 100644
index 0000000000..19349aec98
--- /dev/null
+++ b/keyboards/handwired/cyberstar/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for Yiancar-Designs Cyberstar
+
+```
+┌───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐   ┌───────┐
+│00 ││01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │1E ││0F │0G │0H │   │0E     │ 2u Backspace
+├───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤   └───────┘
+│10 ││11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D   ││1F │1G │1H │  
+├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ 
+│20 ││21    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E      │             
+├───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐   
+│30 ││31      │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │    │3G │  
+└───┘└───────┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┴──────┴───┘┌───┼───┼───┐   
+             │43 │44   │46      │48        │4B   │4C │            │4F │4G │4H │
+             └───┴─────┴────────┴──────────┴─────┴───┘            └───┴───┴───┘
+             ┌───┬─────┬────────────────────────┬────┐
+             │43 │44   │48                      │4C  │ 6.25u Spacebar
+             └───┴─────┴────────────────────────┴────┘
+```