Synth Labs 060 Layout Additions and Fixes (#19575)

4 files changed, 561 insertions, 19 deletions

diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json
index 8258fced72..f210deacd8 100644
--- a/keyboards/synthlabs/060/info.json
+++ b/keyboards/synthlabs/060/info.json
@@ -43,7 +43,7 @@
         { "flags": 4, "matrix": [0,11], "x":176, "y": 0 },
         { "flags": 4, "matrix": [0,12], "x":192, "y": 0 },
         { "flags": 1, "matrix": [0,13], "x":216, "y": 0 },
- 
+
         { "flags": 1, "matrix": [2,12], "x":220, "y":16 },
         { "flags": 4, "matrix": [1,12], "x":200, "y":16 },
         { "flags": 4, "matrix": [1,11], "x":184, "y":16 },
@@ -58,7 +58,7 @@
         { "flags": 4, "matrix": [1, 2], "x": 40, "y":16 },
         { "flags": 4, "matrix": [1, 1], "x": 24, "y":16 },
         { "flags": 1, "matrix": [1, 0], "x":  4, "y":16 },
-        
+
         { "flags": 1, "matrix": [2, 0], "x":  6, "y":32 },
         { "flags": 4, "matrix": [2, 1], "x": 28, "y":32 },
         { "flags": 4, "matrix": [2, 2], "x": 44, "y":32 },
@@ -98,8 +98,17 @@
         { "flags": 1, "matrix": [4,13], "x":220, "y":64 }
     ]
   },
+  "community_layouts": [
+    "60_ansi",
+    "60_ansi_split_bs_rshift",
+    "60_ansi_tsangan",
+    "60_tsangan_hhkb",
+    "60_iso",
+    "60_iso_split_bs_rshift",
+    "60_iso_tsangan"
+  ],
   "layouts": {
-    "LAYOUT_60_ansi": {
+    "LAYOUT_all": {
         "layout": [
           { "matrix": [0,0], "x":0, "y":0 },
           { "matrix": [0,1], "x":1, "y":0 },
@@ -115,6 +124,8 @@
           { "matrix": [0,11], "x":11, "y":0 },
           { "matrix": [0,12], "x":12, "y":0 },
           { "matrix": [0,13], "x":13, "y":0 },
+          { "matrix": [1,13], "x":14, "y":0 },
+
           { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
           { "matrix": [1,1], "x":1.5, "y":1 },
           { "matrix": [1,2], "x":2.5, "y":1 },
@@ -128,7 +139,8 @@
           { "matrix": [1,10], "x":10.5, "y":1 },
           { "matrix": [1,11], "x":11.5, "y":1 },
           { "matrix": [1,12], "x":12.5, "y":1 },
-          { "matrix": [1,13], "x":14, "y":0 },
+          { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 },
+
           { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
           { "matrix": [2,1], "x":1.75, "y":2 },
           { "matrix": [2,2], "x":2.75, "y":2 },
@@ -141,8 +153,8 @@
           { "matrix": [2,9], "x":9.75, "y":2 },
           { "matrix": [2,10], "x":10.75, "y":2 },
           { "matrix": [2,11], "x":11.75, "y":2 },
-          { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 },
           { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+
           { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
           { "matrix": [3,1], "x":1.25, "y":3 },
           { "matrix": [3,2], "x":2.25, "y":3 },
@@ -157,6 +169,7 @@
           { "matrix": [3,11], "x":11.25, "y":3 },
           { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
           { "matrix": [3,13], "x":14, "y":3 },
+
           { "matrix": [4,0], "x":0, "y":4, "w":1.5 },
           { "matrix": [4,1], "x":1.5, "y":4 },
           { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 },
@@ -168,6 +181,495 @@
           { "matrix": [4,12], "x":12.5, "y":4 },
           { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 }
         ]
+    },
+    "LAYOUT_60_ansi": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0, "w":2 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+        { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":2.25 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+        { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+        { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+        { "matrix": [4,10], "x":10, "y":4, "w":1.25 },
+        { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 },
+        { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 },
+        { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 }
+      ]
+    },
+    "LAYOUT_60_ansi_split_bs_rshift": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0 },
+        { "matrix": [1,13], "x":14, "y":0 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+        { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":2.25 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
+        { "matrix": [3,13], "x":14, "y":3 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+        { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+        { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+        { "matrix": [4,10], "x":10, "y":4, "w":1.25 },
+        { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 },
+        { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 },
+        { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 }
+      ]
+    },
+    "LAYOUT_60_ansi_tsangan": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0, "w":2 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+        { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":2.25 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.5 },
+        { "matrix": [4,1], "x":1.5, "y":4 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 },
+        { "matrix": [4,7], "x":4, "y":4, "w":7 },
+        { "matrix": [4,11], "x":11, "y":4, "w":1.5 },
+        { "matrix": [4,12], "x":12.5, "y":4 },
+        { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 }
+      ]
+    },
+    "LAYOUT_60_tsangan_hhkb": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0 },
+        { "matrix": [1,13], "x":14, "y":0 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+        { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":2.25 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
+        { "matrix": [3,13], "x":14, "y":3 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.5 },
+        { "matrix": [4,1], "x":1.5, "y":4 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 },
+        { "matrix": [4,7], "x":4, "y":4, "w":7 },
+        { "matrix": [4,11], "x":11, "y":4, "w":1.5 },
+        { "matrix": [4,12], "x":12.5, "y":4 },
+        { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 }
+      ]
+    },
+    "LAYOUT_60_iso": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0, "w":2 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,12], "x":12.75, "y":2 },
+        { "matrix": [2,13], "x":13.75, "y":1, "w":1.25, "h":2 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+        { "matrix": [3,1], "x":1.25, "y":3 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+        { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+        { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+        { "matrix": [4,10], "x":10, "y":4, "w":1.25 },
+        { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 },
+        { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 },
+        { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 }
+      ]
+    },
+    "LAYOUT_60_iso_split_bs_rshift": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0 },
+        { "matrix": [1,13], "x":14, "y":0 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,12], "x":12.75, "y":2 },
+        { "matrix": [2,13], "x":13.75, "y":1, "w":1.25, "h":2 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+        { "matrix": [3,1], "x":1.25, "y":3 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 },
+        { "matrix": [3,13], "x":14, "y":3 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.25 },
+        { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+        { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 },
+        { "matrix": [4,10], "x":10, "y":4, "w":1.25 },
+        { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 },
+        { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 },
+        { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 }
+      ]
+    },
+    "LAYOUT_60_iso_tsangan": {
+      "layout": [
+        { "matrix": [0,0], "x":0, "y":0 },
+        { "matrix": [0,1], "x":1, "y":0 },
+        { "matrix": [0,2], "x":2, "y":0 },
+        { "matrix": [0,3], "x":3, "y":0 },
+        { "matrix": [0,4], "x":4, "y":0 },
+        { "matrix": [0,5], "x":5, "y":0 },
+        { "matrix": [0,6], "x":6, "y":0 },
+        { "matrix": [0,7], "x":7, "y":0 },
+        { "matrix": [0,8], "x":8, "y":0 },
+        { "matrix": [0,9], "x":9, "y":0 },
+        { "matrix": [0,10], "x":10, "y":0 },
+        { "matrix": [0,11], "x":11, "y":0 },
+        { "matrix": [0,12], "x":12, "y":0 },
+        { "matrix": [0,13], "x":13, "y":0, "w":2 },
+
+        { "matrix": [1,0], "x":0, "y":1, "w":1.5 },
+        { "matrix": [1,1], "x":1.5, "y":1 },
+        { "matrix": [1,2], "x":2.5, "y":1 },
+        { "matrix": [1,3], "x":3.5, "y":1 },
+        { "matrix": [1,4], "x":4.5, "y":1 },
+        { "matrix": [1,5], "x":5.5, "y":1 },
+        { "matrix": [1,6], "x":6.5, "y":1 },
+        { "matrix": [1,7], "x":7.5, "y":1 },
+        { "matrix": [1,8], "x":8.5, "y":1 },
+        { "matrix": [1,9], "x":9.5, "y":1 },
+        { "matrix": [1,10], "x":10.5, "y":1 },
+        { "matrix": [1,11], "x":11.5, "y":1 },
+        { "matrix": [1,12], "x":12.5, "y":1 },
+
+        { "matrix": [2,0], "x":0, "y":2, "w":1.75 },
+        { "matrix": [2,1], "x":1.75, "y":2 },
+        { "matrix": [2,2], "x":2.75, "y":2 },
+        { "matrix": [2,3], "x":3.75, "y":2 },
+        { "matrix": [2,4], "x":4.75, "y":2 },
+        { "matrix": [2,5], "x":5.75, "y":2 },
+        { "matrix": [2,6], "x":6.75, "y":2 },
+        { "matrix": [2,7], "x":7.75, "y":2 },
+        { "matrix": [2,8], "x":8.75, "y":2 },
+        { "matrix": [2,9], "x":9.75, "y":2 },
+        { "matrix": [2,10], "x":10.75, "y":2 },
+        { "matrix": [2,11], "x":11.75, "y":2 },
+        { "matrix": [2,12], "x":12.75, "y":2 },
+        { "matrix": [2,13], "x":13.75, "y":1, "w":1.25, "h":2 },
+
+        { "matrix": [3,0], "x":0, "y":3, "w":1.25 },
+        { "matrix": [3,1], "x":1.25, "y":3 },
+        { "matrix": [3,2], "x":2.25, "y":3 },
+        { "matrix": [3,3], "x":3.25, "y":3 },
+        { "matrix": [3,4], "x":4.25, "y":3 },
+        { "matrix": [3,5], "x":5.25, "y":3 },
+        { "matrix": [3,6], "x":6.25, "y":3 },
+        { "matrix": [3,7], "x":7.25, "y":3 },
+        { "matrix": [3,8], "x":8.25, "y":3 },
+        { "matrix": [3,9], "x":9.25, "y":3 },
+        { "matrix": [3,10], "x":10.25, "y":3 },
+        { "matrix": [3,11], "x":11.25, "y":3 },
+        { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 },
+
+        { "matrix": [4,0], "x":0, "y":4, "w":1.5 },
+        { "matrix": [4,1], "x":1.5, "y":4 },
+        { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 },
+        { "matrix": [4,7], "x":4, "y":4, "w":7 },
+        { "matrix": [4,11], "x":11, "y":4, "w":1.5 },
+        { "matrix": [4,12], "x":12.5, "y":4 },
+        { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 }
+      ]
     }
   }
 }
diff --git a/keyboards/synthlabs/060/keymaps/default/keymap.c b/keyboards/synthlabs/060/keymaps/default/keymap.c
index a912a27c74..20409e07f6 100644
--- a/keyboards/synthlabs/060/keymaps/default/keymap.c
+++ b/keyboards/synthlabs/060/keymaps/default/keymap.c
@@ -5,17 +5,17 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi(
-     KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
-     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,  KC_DEL,
-    KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
+    [0] = LAYOUT_all(
+     KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,  KC_DEL,
+     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   MO(1),
     KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,           KC_SPC,           KC_SPC, KC_MENU, KC_RALT, KC_RGUI, KC_RCTL
     ),
-    [1] = LAYOUT_60_ansi(
-     KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    [1] = LAYOUT_all(
+     KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     _______, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
     _______, _______, _______,                    KC_ENT,           KC_ENT,           KC_ENT, _______, _______, _______, _______
     )
diff --git a/keyboards/synthlabs/060/keymaps/via/keymap.c b/keyboards/synthlabs/060/keymaps/via/keymap.c
index a912a27c74..20409e07f6 100644
--- a/keyboards/synthlabs/060/keymaps/via/keymap.c
+++ b/keyboards/synthlabs/060/keymaps/via/keymap.c
@@ -5,17 +5,17 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi(
-     KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
-     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,  KC_DEL,
-    KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,
+    [0] = LAYOUT_all(
+     KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,  KC_DEL,
+     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
     KC_LSFT, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   MO(1),
     KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,           KC_SPC,           KC_SPC, KC_MENU, KC_RALT, KC_RGUI, KC_RCTL
     ),
-    [1] = LAYOUT_60_ansi(
-     KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    [1] = LAYOUT_all(
+     KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
     _______, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
     _______, _______, _______,                    KC_ENT,           KC_ENT,           KC_ENT, _______, _______, _______, _______
     )
diff --git a/keyboards/synthlabs/060/matrix_diagram.md b/keyboards/synthlabs/060/matrix_diagram.md
new file mode 100644
index 0000000000..404fb57fa7
--- /dev/null
+++ b/keyboards/synthlabs/060/matrix_diagram.md
@@ -0,0 +1,40 @@
+# Synth Labs 060 Solder Matrix Diagram
+
+```
+
+             ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+             │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │      │0D     │ 2u Backspace
+             ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+             │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │        │     │
+ 2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐2D  │ ISO Enter
+ LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │     │2C │    │
+┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤
+│30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C        │ 2.75u RShift
+└────────┘   ├────┴┬──┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴──┬┴───┼───┴┬───┬─┴───┤   └──────────┘
+             │40   │41 │42   │45        │47 │49      │4A  │4B  │4C │4D   │
+             └─────┴───┴─────┴──────────┴───┴────────┴────┴────┴───┴─────┘
+             └─────┬───┬─────┬──────────┬───┬────────┬────┬────┬───┬─────┘
+                   │41 │42   │45        │47 │49      │4A  │4B  │4C │
+                   └───┴─────┴──────────┴───┴────────┴────┴────┴───┘
+             ┌─────┬───┬─────┬──────────┬───┬────────┬────┬────┬───┬─────┐
+             │40   │   │42   │45        │47 │49      │4A  │4B  │   │4D   │
+             └─────┘   └─────┴──────────┴───┴────────┴────┴────┘   └─────┘
+             ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+             │40  │41  │42  │47                      │4A  │4B  │4C  │4D  │ Standard
+             └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+             └─────┬───┬────┬────────────────────────┬────┬────┬───┬─────┘
+                   │41 │42  │47                      │4A  │4B  │4C │ 
+                   └───┴────┴────────────────────────┴────┴────┴───┘
+             ┌─────┬───┬────┬────────────────────────┬────┬────┬───┬─────┐
+             │40   │   │42  │47                      │4A  │4B  │   │4D   │ 
+             └─────┘   └────┴────────────────────────┴────┴────┘   └─────┘
+             ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+             │40   │41 │42   │47                         │4B   │4C │4D   │ Tsangan
+             └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+                   ┌───┬─────┬───────────────────────────┬─────┬───┐      
+                   │41 │42   │47                         │4B   │4C │       HHKB
+                   └───┴─────┴───────────────────────────┴─────┴───┘      
+             ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+             │40   │   │42   │47                         │4B   │   │4D   │ WKL
+             └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```