Move 60% layouts to data driven (#20477)

2 files changed, 281 insertions, 347 deletions

diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 50e94f22d2..52d75d6a13 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -25,290 +25,292 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_60_ansi_split_bs_rshift": {
-			"layout": [
-				{"x":0, "y":0}, 
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":9, "y":0}, 
-				{"x":10, "y":0}, 
-				{"x":11, "y":0}, 
-				{"x":12, "y":0}, 
-				{"x":13, "y":0}, 
-				{"x":14, "y":0}, 
-			
-				{"x":0, "y":1, "w":1.5}, 
-				{"x":1.5, "y":1}, 
-				{"x":2.5, "y":1}, 
-				{"x":3.5, "y":1}, 
-				{"x":4.5, "y":1}, 
-				{"x":5.5, "y":1}, 
-				{"x":6.5, "y":1}, 
-				{"x":7.5, "y":1}, 
-				{"x":8.5, "y":1}, 
-				{"x":9.5, "y":1}, 
-				{"x":10.5, "y":1}, 
-				{"x":11.5, "y":1}, 
-				{"x":12.5, "y":1}, 
-				{"x":13.5, "y":1, "w":1.5},
-				
-				{"x":0, "y":2, "w":1.75}, 
-				{"x":1.75, "y":2}, 
-				{"x":2.75, "y":2}, 
-				{"x":3.75, "y":2}, 
-				{"x":4.75, "y":2}, 
-				{"x":5.75, "y":2}, 
-				{"x":6.75, "y":2}, 
-				{"x":7.75, "y":2}, 
-				{"x":8.75, "y":2}, 
-				{"x":9.75, "y":2}, 
-				{"x":10.75, "y":2}, 
-				{"x":11.75, "y":2}, 
-				{"x":12.75, "y":2, "w":2.25}, 
-				
-				{"x":0, "y":3, "w":2.25}, 
-				{"x":2.25, "y":3}, 
-				{"x":3.25, "y":3}, 
-				{"x":4.25, "y":3}, 
-				{"x":5.25, "y":3}, 
-				{"x":6.25, "y":3}, 
-				{"x":7.25, "y":3}, 
-				{"x":8.25, "y":3}, 
-				{"x":9.25, "y":3}, 
-				{"x":10.25, "y":3}, 
-				{"x":11.25, "y":3}, 
-				{"x":12.25, "y":3, "w":1.75}, 
-				{"x":14, "y":3}, 
-				
-				{"x":0, "y":4, "w":1.25}, 
-				{"x":1.25, "y":4, "w":1.25}, 
-				{"x":2.5, "y":4, "w":1.25}, 
-				{"x":3.75, "y":4, "w":6.25}, 
-				{"x":10, "y":4, "w":1.25}, 
-				{"x":11.25, "y":4, "w":1.25}, 
-				{"x":12.5, "y":4, "w":1.25}, 
-				{"x":13.75, "y":4, "w":1.25}
-			]
+            "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, 13], "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, 12], "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, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "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_encoder": {
-			"layout": [
-				{"x":0, "y":0}, 
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":9, "y":0}, 
-				{"x":10, "y":0}, 
-				{"x":11, "y":0}, 
-				{"x":12, "y":0}, 
-				{"x":13, "y":0}, 
-				{"x":14, "y":0}, 
-				
-				{"x":0, "y":1, "w":1.5}, 
-				{"x":1.5, "y":1}, 
-				{"x":2.5, "y":1}, 
-				{"x":3.5, "y":1}, 
-				{"x":4.5, "y":1}, 
-				{"x":5.5, "y":1}, 
-				{"x":6.5, "y":1}, 
-				{"x":7.5, "y":1}, 
-				{"x":8.5, "y":1}, 
-				{"x":9.5, "y":1}, 
-				{"x":10.5, "y":1}, 
-				{"x":11.5, "y":1}, 
-				{"x":12.5, "y":1}, 
-				{"x":13.5, "y":1, "w":1.5},
-				
-				{"x":0, "y":2, "w":1.75}, 
-				{"x":1.75, "y":2}, 
-				{"x":2.75, "y":2}, 
-				{"x":3.75, "y":2}, 
-				{"x":4.75, "y":2}, 
-				{"x":5.75, "y":2}, 
-				{"x":6.75, "y":2}, 
-				{"x":7.75, "y":2}, 
-				{"x":8.75, "y":2}, 
-				{"x":9.75, "y":2}, 
-				{"x":10.75, "y":2}, 
-				{"x":11.75, "y":2}, 
-				{"x":12.75, "y":2, "w":2.25}, 
-				
-				{"x":0, "y":3, "w":2.25}, 
-				{"x":2.25, "y":3}, 
-				{"x":3.25, "y":3}, 
-				{"x":4.25, "y":3}, 
-				{"x":5.25, "y":3}, 
-				{"x":6.25, "y":3}, 
-				{"x":7.25, "y":3}, 
-				{"x":8.25, "y":3}, 
-				{"x":9.25, "y":3}, 
-				{"x":10.25, "y":3}, 
-				{"x":11.25, "y":3}, 
-				{"x":12.25, "y":3, "w":1.75}, 
-				{"x":14, "y":3}, 
-				{"x":15.25, "y":3}, 
-				{"x":16.25, "y":3}, 
-				
-				{"x":0, "y":4, "w":1.25}, 
-				{"x":1.25, "y":4, "w":1.25}, 
-				{"x":2.5, "y":4, "w":1.25}, 
-				{"x":3.75, "y":4, "w":6.25}, 
-				{"x":10, "y":4, "w":1.25}, 
-				{"x":11.25, "y":4, "w":1.25}, 
-				{"x":12.5, "y":4, "w":1.25}, 
-				{"x":13.75, "y":4, "w":1.25}
-			]
+            "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, 13], "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, 12], "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": [5, 0], "x": 15.25, "y": 3},
+                {"matrix": [5, 1], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "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_tsangan": {
-			"layout": [
-				{"x":0, "y":0}, 
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":9, "y":0}, 
-				{"x":10, "y":0}, 
-				{"x":11, "y":0}, 
-				{"x":12, "y":0}, 
-				{"x":13, "y":0}, 
-				{"x":14, "y":0}, 
-				
-				{"x":0, "y":1, "w":1.5}, 
-				{"x":1.5, "y":1}, 
-				{"x":2.5, "y":1}, 
-				{"x":3.5, "y":1}, 
-				{"x":4.5, "y":1}, 
-				{"x":5.5, "y":1}, 
-				{"x":6.5, "y":1}, 
-				{"x":7.5, "y":1}, 
-				{"x":8.5, "y":1}, 
-				{"x":9.5, "y":1}, 
-				{"x":10.5, "y":1}, 
-				{"x":11.5, "y":1}, 
-				{"x":12.5, "y":1}, 
-				{"x":13.5, "y":1, "w":1.5},
-				
-				{"x":0, "y":2, "w":1.75}, 
-				{"x":1.75, "y":2}, 
-				{"x":2.75, "y":2}, 
-				{"x":3.75, "y":2}, 
-				{"x":4.75, "y":2}, 
-				{"x":5.75, "y":2}, 
-				{"x":6.75, "y":2}, 
-				{"x":7.75, "y":2}, 
-				{"x":8.75, "y":2}, 
-				{"x":9.75, "y":2}, 
-				{"x":10.75, "y":2}, 
-				{"x":11.75, "y":2}, 
-				{"x":12.75, "y":2, "w":2.25}, 
-				
-				{"x":0, "y":3, "w":2.25}, 
-				{"x":2.25, "y":3}, 
-				{"x":3.25, "y":3}, 
-				{"x":4.25, "y":3}, 
-				{"x":5.25, "y":3}, 
-				{"x":6.25, "y":3}, 
-				{"x":7.25, "y":3}, 
-				{"x":8.25, "y":3}, 
-				{"x":9.25, "y":3}, 
-				{"x":10.25, "y":3}, 
-				{"x":11.25, "y":3}, 
-				{"x":12.25, "y":3, "w":1.75}, 
-				{"x":14, "y":3}, 
-						
-				{"x":0, "y":4, "w":1.5}, 
-				{"x":1.5, "y":4}, 
-				{"x":2.5, "y":4, "w":1.5}, 
-				{"x":4, "y":4, "w":7}, 
-				{"x":11, "y":4, "w":1.5}, 
-				{"x":12.5, "y":4}, 
-				{"x":13.5, "y":4, "w":1.5}
-			]
+        "LAYOUT_60_ansi_split_bs_rshift_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},
+                {"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, 13], "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, 12], "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, 2], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "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_ansi_split_bs_rshift_tsangan_encoder": {
-			"layout": [
-				{"x":0, "y":0}, 
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":9, "y":0}, 
-				{"x":10, "y":0}, 
-				{"x":11, "y":0}, 
-				{"x":12, "y":0}, 
-				{"x":13, "y":0}, 
-				{"x":14, "y":0}, 
-				
-				{"x":0, "y":1, "w":1.5}, 
-				{"x":1.5, "y":1}, 
-				{"x":2.5, "y":1}, 
-				{"x":3.5, "y":1}, 
-				{"x":4.5, "y":1}, 
-				{"x":5.5, "y":1}, 
-				{"x":6.5, "y":1}, 
-				{"x":7.5, "y":1}, 
-				{"x":8.5, "y":1}, 
-				{"x":9.5, "y":1}, 
-				{"x":10.5, "y":1}, 
-				{"x":11.5, "y":1}, 
-				{"x":12.5, "y":1}, 
-				{"x":13.5, "y":1, "w":1.5},
-				
-				{"x":0, "y":2, "w":1.75}, 
-				{"x":1.75, "y":2}, 
-				{"x":2.75, "y":2}, 
-				{"x":3.75, "y":2}, 
-				{"x":4.75, "y":2}, 
-				{"x":5.75, "y":2}, 
-				{"x":6.75, "y":2}, 
-				{"x":7.75, "y":2}, 
-				{"x":8.75, "y":2}, 
-				{"x":9.75, "y":2}, 
-				{"x":10.75, "y":2}, 
-				{"x":11.75, "y":2}, 
-				{"x":12.75, "y":2, "w":2.25}, 
-				
-				{"x":0, "y":3, "w":2.25}, 
-				{"x":2.25, "y":3}, 
-				{"x":3.25, "y":3}, 
-				{"x":4.25, "y":3}, 
-				{"x":5.25, "y":3}, 
-				{"x":6.25, "y":3}, 
-				{"x":7.25, "y":3}, 
-				{"x":8.25, "y":3}, 
-				{"x":9.25, "y":3}, 
-				{"x":10.25, "y":3}, 
-				{"x":11.25, "y":3}, 
-				{"x":12.25, "y":3, "w":1.75}, 
-				{"x":14, "y":3}, 
-				{"x":15.25, "y":3}, 
-				{"x":16.25, "y":3}, 
-				
-				{"x":0, "y":4, "w":1.5}, 
-				{"x":1.5, "y":4}, 
-				{"x":2.5, "y":4, "w":1.5}, 
-				{"x":4, "y":4, "w":7}, 
-				{"x":11, "y":4, "w":1.5}, 
-				{"x":12.5, "y":4}, 
-				{"x":13.5, "y":4, "w":1.5}
-			]
+            "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, 13], "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, 12], "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": [5, 0], "x": 15.25, "y": 3},
+                {"matrix": [5, 1], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "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/nightly_boards/n60_s/n60_s.h b/keyboards/nightly_boards/n60_s/n60_s.h
index 1f85674803..33cf8e0b68 100644
--- a/keyboards/nightly_boards/n60_s/n60_s.h
+++ b/keyboards/nightly_boards/n60_s/n60_s.h
@@ -18,71 +18,3 @@
 
 #include "quantum.h"
 #include "encoder_action.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_60_ansi_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D,      \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,  \
-    K40,  K42,  K43,              K47,                K4A,  K4B,  K4C,  K4D   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D   }, \
-	{ KC_NO,  KC_NO } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift_encoder( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D,      \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D, E00A,  E00B,  \
-    K40,  K42,  K43,              K47,                K4A,  K4B,  K4C,  K4D   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D   }, \
-	{ E00A,  E00B } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D,      \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,   \
-    K40,  K42,  K43,                K47,                    K4B,  K4C,  K4D      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO,  KC_NO, KC_NO, K4B,   K4C,   K4D   }, \
-	{ KC_NO,  KC_NO } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift_tsangan_encoder( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D,      \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D, E00A,  E00B,   \
-    K40,  K42,  K43,                K47,                    K4B,  K4C,  K4D      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO,  KC_NO, KC_NO, K4B,   K4C,   K4D   }, \
-	{ E00A,  E00B } \
-}