Move remaining `LAYOUT_all`s to data driven (#20463)

3 files changed, 204 insertions, 71 deletions

diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json
index 22b115fb8f..02f8ac7927 100644
--- a/keyboards/pom_keyboards/tnln95/info.json
+++ b/keyboards/pom_keyboards/tnln95/info.json
@@ -30,20 +30,213 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Calc", "x": 0, "y": 0 },{ "label": "/", "x": 1, "y": 0 },{ "label": "*", "x": 2, "y": 0 },{ "label": "Bksp", "x": 3, "y": 0 },{ "label": "Esc", "x": 4, "y": 0 },{ "label": "~", "x": 5.25, "y": 0 },{ "label": "!", "x": 6.25, "y": 0 },{ "label": "@", "x": 7.25, "y": 0 },{ "label": "#", "x": 8.25, "y": 0 },{ "label": "$", "x": 9.25, "y": 0 },{ "label": "%", "x": 10.25, "y": 0 },{ "label": "^", "x": 11.25, "y": 0 },{ "label": "&", "x": 12.25, "y": 0 },{ "label": "*", "x": 13.25, "y": 0 },{ "label": "(", "x": 14.25, "y": 0 },{ "label": ")", "x": 15.25, "y": 0 },{ "label": "_", "x": 16.25, "y": 0 },{ "label": "+", "x": 17.25, "y": 0 },{ "label": "|", "x": 18.25, "y": 0 },{ "label": "PrintScr", "x": 19.25, "y": 0 },{ "label": "Home", "x": 20.25, "y": 0 },
-                { "label": "-", "x": 0, "y": 1 },{ "label": "7", "x": 1, "y": 1 },{ "label": "8", "x": 2, "y": 1 },{ "label": "9", "x": 3, "y": 1 },{ "label": "Num Lock", "x": 4, "y": 1 },{ "label": "Tab", "x": 5.25, "y": 1, "w": 1.5 },{ "label": "Q", "x": 6.75, "y": 1 },{ "label": "W", "x": 7.75, "y": 1 },{ "label": "E", "x": 8.75, "y": 1 },{ "label": "R", "x": 9.75, "y": 1 },{ "label": "T", "x": 10.75, "y": 1 },{ "label": "Y", "x": 11.75, "y": 1 },{ "label": "U", "x": 12.75, "y": 1 },{ "label": "I", "x": 13.75, "y": 1 },{ "label": "O", "x": 14.75, "y": 1 },{ "label": "P", "x": 15.75, "y": 1 },{ "label": "{", "x": 16.75, "y": 1 },{ "label": "}", "x": 17.75, "y": 1 },{ "label": "Backspace", "x": 18.75, "y": 1, "w": 1.5 },{ "label": "PageUp", "x": 20.25, "y": 1 },
-                { "label": "+", "x": 0, "y": 2 },{ "label": "4", "x": 1, "y": 2 },{ "label": "5", "x": 2, "y": 2 },{ "label": "6", "x": 3, "y": 2 },{ "label": "Copy", "x": 4, "y": 2 },{ "label": "Capslock", "x": 5.25, "y": 2, "w": 1.75 },{ "label": "A", "x": 7, "y": 2 },{ "label": "S", "x": 8, "y": 2 },{ "label": "D", "x": 9, "y": 2 },{ "label": "F", "x": 10, "y": 2 },{ "label": "G", "x": 11, "y": 2 },{ "label": "H", "x": 12, "y": 2 },{ "label": "J", "x": 13, "y": 2 },{ "label": "K", "x": 14, "y": 2 },{ "label": "L", "x": 15, "y": 2 },{ "label": ":", "x": 16, "y": 2 },{ "label": "\"", "x": 17, "y": 2 },{ "label": "Enter", "x": 18, "y": 2, "w": 2.25 },{ "label": "PageDown", "x": 20.25, "y": 2 },
-                { "label": "=", "x": 0, "y": 3 },{ "label": "1", "x": 1, "y": 3 },{ "label": "2", "x": 2, "y": 3 },{ "label": "3", "x": 3, "y": 3 },{ "label": "Paste", "x": 4, "y": 3 },{ "label": "Shift", "x": 5.25, "y": 3, "w": 2.25 },{ "label": "Z", "x": 7.5, "y": 3 },{ "label": "X", "x": 8.5, "y": 3 },{ "label": "C", "x": 9.5, "y": 3 },{ "label": "V", "x": 10.5, "y": 3 },{ "label": "B", "x": 11.5, "y": 3 },{ "label": "N", "x": 12.5, "y": 3 },{ "label": "M", "x": 13.5, "y": 3 },{ "label": "<", "x": 14.5, "y": 3 },{ "label": ">", "x": 15.5, "y": 3 },{ "label": "?", "x": 16.5, "y": 3 },{ "label": "Shift", "x": 17.5, "y": 3, "w": 1.75 },{ "label": "Up", "x": 19.25, "y": 3 },{ "label": "End", "x": 20.25, "y": 3 },
-                { "label": "Enter", "x": 0, "y": 4 },{ "label": ".", "x": 1, "y": 4 },{ "label": "0", "x": 2, "y": 4 },{ "label": "00", "x": 3, "y": 4 },{ "label": ",", "x": 4, "y": 4 },{ "label": "Ctrl", "x": 5.25, "y": 4, "w": 1.25 },{ "label": "Win", "x": 6.5, "y": 4, "w": 1.25 },{ "label": "Alt", "x": 7.75, "y": 4, "w": 1.25 },{ "label": "Space", "x": 9, "y": 4, "w": 2.25 },{ "label": "Space", "x": 11.25, "y": 4, "w": 1.25 },{ "label": "Space", "x": 12.5, "y": 4, "w": 2.25 },{ "label": "Alt", "x": 14.75, "y": 4, "w": 1.25 },{ "label": "Fn", "x": 16, "y": 4 },{ "label": "Ctrl", "x": 17, "y": 4, "w": 1.25 },{ "label": "Left", "x": 18.25, "y": 4 },{ "label": "Down", "x": 19.25, "y": 4 },{ "label": "Right", "x": 20.25, "y": 4 }
+                {"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.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": [1, 0], "x": 10.25, "y": 0},
+                {"matrix": [1, 1], "x": 11.25, "y": 0},
+                {"matrix": [1, 2], "x": 12.25, "y": 0},
+                {"matrix": [1, 3], "x": 13.25, "y": 0},
+                {"matrix": [1, 4], "x": 14.25, "y": 0},
+                {"matrix": [1, 5], "x": 15.25, "y": 0},
+                {"matrix": [1, 6], "x": 16.25, "y": 0},
+                {"matrix": [1, 7], "x": 17.25, "y": 0},
+                {"matrix": [1, 8], "x": 18.25, "y": 0},
+                {"matrix": [1, 9], "x": 19.25, "y": 0},
+                {"matrix": [9, 6], "x": 20.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 1},
+                {"matrix": [2, 7], "x": 7.75, "y": 1},
+                {"matrix": [2, 8], "x": 8.75, "y": 1},
+                {"matrix": [2, 9], "x": 9.75, "y": 1},
+                {"matrix": [3, 0], "x": 10.75, "y": 1},
+                {"matrix": [3, 1], "x": 11.75, "y": 1},
+                {"matrix": [3, 2], "x": 12.75, "y": 1},
+                {"matrix": [3, 3], "x": 13.75, "y": 1},
+                {"matrix": [3, 4], "x": 14.75, "y": 1},
+                {"matrix": [3, 5], "x": 15.75, "y": 1},
+                {"matrix": [3, 6], "x": 16.75, "y": 1},
+                {"matrix": [3, 7], "x": 17.75, "y": 1},
+                {"matrix": [3, 8], "x": 18.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 9], "x": 20.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+
+                {"matrix": [4, 5], "x": 5.25, "y": 2, "w": 1.75},
+                {"matrix": [4, 6], "x": 7, "y": 2},
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [4, 8], "x": 9, "y": 2},
+                {"matrix": [4, 9], "x": 10, "y": 2},
+                {"matrix": [5, 0], "x": 11, "y": 2},
+                {"matrix": [5, 1], "x": 12, "y": 2},
+                {"matrix": [5, 2], "x": 13, "y": 2},
+                {"matrix": [5, 3], "x": 14, "y": 2},
+                {"matrix": [5, 4], "x": 15, "y": 2},
+                {"matrix": [5, 5], "x": 16, "y": 2},
+                {"matrix": [5, 6], "x": 17, "y": 2},
+                {"matrix": [5, 8], "x": 18, "y": 2, "w": 2.25},
+                {"matrix": [5, 9], "x": 20.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+
+                {"matrix": [6, 5], "x": 5.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 6], "x": 7.5, "y": 3},
+                {"matrix": [6, 7], "x": 8.5, "y": 3},
+                {"matrix": [6, 8], "x": 9.5, "y": 3},
+                {"matrix": [6, 9], "x": 10.5, "y": 3},
+                {"matrix": [7, 0], "x": 11.5, "y": 3},
+                {"matrix": [7, 1], "x": 12.5, "y": 3},
+                {"matrix": [7, 2], "x": 13.5, "y": 3},
+                {"matrix": [7, 3], "x": 14.5, "y": 3},
+                {"matrix": [7, 4], "x": 15.5, "y": 3},
+                {"matrix": [7, 5], "x": 16.5, "y": 3},
+                {"matrix": [7, 7], "x": 17.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 8], "x": 19.25, "y": 3},
+                {"matrix": [7, 9], "x": 20.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 4], "x": 4, "y": 4},
+
+                {"matrix": [8, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 8], "x": 9, "y": 4, "w": 2.25},
+                {"matrix": [8, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4, "w": 2.25},
+                {"matrix": [9, 3], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16, "y": 4},
+                {"matrix": [9, 5], "x": 17, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 18.25, "y": 4},
+                {"matrix": [9, 8], "x": 19.25, "y": 4},
+                {"matrix": [9, 9], "x": 20.25, "y": 4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                { "label": "-", "x": 0, "y": 0 },{ "label": "/", "x": 1, "y": 0 },{ "label": "*", "x": 2, "y": 0 },{ "label": "Bksp", "x": 3, "y": 0 },{ "label": "Esc", "x": 4, "y": 0 },{ "label": "~", "x": 5.25, "y": 0 },{ "label": "!", "x": 6.25, "y": 0 },{ "label": "@", "x": 7.25, "y": 0 },{ "label": "#", "x": 8.25, "y": 0 },{ "label": "$", "x": 9.25, "y": 0 },{ "label": "%", "x": 10.25, "y": 0 },{ "label": "^", "x": 11.25, "y": 0 },{ "label": "&", "x": 12.25, "y": 0 },{ "label": "*", "x": 13.25, "y": 0 },{ "label": "(", "x": 14.25, "y": 0 },{ "label": ")", "x": 15.25, "y": 0 },{ "label": "_", "x": 16.25, "y": 0 },{ "label": "+", "x": 17.25, "y": 0 },{ "label": "Backspace", "x": 18.25, "y": 0, "w": 2 },{ "label": "Home", "x": 20.25, "y": 0 },
-                { "label": "+", "x": 0, "y": 1, "h": 2 },{ "label": "7", "x": 1, "y": 1 },{ "label": "8", "x": 2, "y": 1 },{ "label": "9", "x": 3, "y": 1 },{ "label": "Num Lock", "x": 4, "y": 1 },{ "label": "Tab", "x": 5.25, "y": 1, "w": 1.5 },{ "label": "Q", "x": 6.75, "y": 1 },{ "label": "W", "x": 7.75, "y": 1 },{ "label": "E", "x": 8.75, "y": 1 },{ "label": "R", "x": 9.75, "y": 1 },{ "label": "T", "x": 10.75, "y": 1 },{ "label": "Y", "x": 11.75, "y": 1 },{ "label": "U", "x": 12.75, "y": 1 },{ "label": "I", "x": 13.75, "y": 1 },{ "label": "O", "x": 14.75, "y": 1 },{ "label": "P", "x": 15.75, "y": 1 },{ "label": "{", "x": 16.75, "y": 1 },{ "label": "}", "x": 17.75, "y": 1 },{ "label": "|", "x": 18.75, "y": 1, "w": 1.5 },{ "label": "Delete", "x": 20.25, "y": 1 },
-                { "label": "4", "x": 1, "y": 2 },{ "label": "5", "x": 2, "y": 2 },{ "label": "6", "x": 3, "y": 2 },{ "label": "Copy", "x": 4, "y": 2 },{ "label": "Capslock", "x": 5.25, "y": 2, "w": 1.75 },{ "label": "A", "x": 7, "y": 2 },{ "label": "S", "x": 8, "y": 2 },{ "label": "D", "x": 9, "y": 2 },{ "label": "F", "x": 10, "y": 2 },{ "label": "G", "x": 11, "y": 2 },{ "label": "H", "x": 12, "y": 2 },{ "label": "J", "x": 13, "y": 2 },{ "label": "K", "x": 14, "y": 2 },{ "label": "L", "x": 15, "y": 2 },{ "label": ":", "x": 16, "y": 2 },{ "label": "\"", "x": 17, "y": 2 },{ "label": "Enter", "x": 18, "y": 2, "w": 2.25 },{ "label": "PageUp", "x": 20.25, "y": 2 },
-                { "label": "Enter", "x": 0, "y": 3, "h": 2 },{ "label": "1", "x": 1, "y": 3 },{ "label": "2", "x": 2, "y": 3 },{ "label": "3", "x": 3, "y": 3 },{ "label": "Paste", "x": 4, "y": 3 },{ "label": "Shift", "x": 5.25, "y": 3, "w": 2.25 },{ "label": "Z", "x": 7.5, "y": 3 },{ "label": "X", "x": 8.5, "y": 3 },{ "label": "C", "x": 9.5, "y": 3 },{ "label": "V", "x": 10.5, "y": 3 },{ "label": "B", "x": 11.5, "y": 3 },{ "label": "N", "x": 12.5, "y": 3 },{ "label": "M", "x": 13.5, "y": 3 },{ "label": "<", "x": 14.5, "y": 3 },{ "label": ">", "x": 15.5, "y": 3 },{ "label": "?", "x": 16.5, "y": 3 },{ "label": "Shift", "x": 17.5, "y": 3, "w": 1.75 },{ "label": "Up", "x": 19.25, "y": 3 },{ "label": "PageDown", "x": 20.25, "y": 3 },
-                { "label": ".", "x": 1, "y": 4 },{ "label": "0", "x": 2, "y": 4, "w": 2 },{ "label": ",", "x": 4, "y": 4 },{ "label": "Ctrl", "x": 5.25, "y": 4, "w": 1.25 },{ "label": "Win", "x": 6.5, "y": 4, "w": 1.25 },{ "label": "Alt", "x": 7.75, "y": 4, "w": 1.25 },{ "label": "Space", "x": 9, "y": 4, "w": 6.25 },{ "label": "Alt", "x": 15.25, "y": 4, "w": 1.5 },{ "label": "Fn", "x": 16.75, "y": 4, "w": 1.5 },{ "label": "Left", "x": 18.25, "y": 4 },{ "label": "Down", "x": 19.25, "y": 4 },{ "label": "Right", "x": 20.25, "y": 4 }
+                {"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.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": [1, 0], "x": 10.25, "y": 0},
+                {"matrix": [1, 1], "x": 11.25, "y": 0},
+                {"matrix": [1, 2], "x": 12.25, "y": 0},
+                {"matrix": [1, 3], "x": 13.25, "y": 0},
+                {"matrix": [1, 4], "x": 14.25, "y": 0},
+                {"matrix": [1, 5], "x": 15.25, "y": 0},
+                {"matrix": [1, 6], "x": 16.25, "y": 0},
+                {"matrix": [1, 7], "x": 17.25, "y": 0},
+                {"matrix": [1, 9], "x": 18.25, "y": 0, "w": 2},
+                {"matrix": [9, 6], "x": 20.25, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1, "h": 2},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 1},
+                {"matrix": [2, 7], "x": 7.75, "y": 1},
+                {"matrix": [2, 8], "x": 8.75, "y": 1},
+                {"matrix": [2, 9], "x": 9.75, "y": 1},
+                {"matrix": [3, 0], "x": 10.75, "y": 1},
+                {"matrix": [3, 1], "x": 11.75, "y": 1},
+                {"matrix": [3, 2], "x": 12.75, "y": 1},
+                {"matrix": [3, 3], "x": 13.75, "y": 1},
+                {"matrix": [3, 4], "x": 14.75, "y": 1},
+                {"matrix": [3, 5], "x": 15.75, "y": 1},
+                {"matrix": [3, 6], "x": 16.75, "y": 1},
+                {"matrix": [3, 7], "x": 17.75, "y": 1},
+                {"matrix": [3, 8], "x": 18.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 9], "x": 20.25, "y": 1},
+
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+
+                {"matrix": [4, 5], "x": 5.25, "y": 2, "w": 1.75},
+                {"matrix": [4, 6], "x": 7, "y": 2},
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [4, 8], "x": 9, "y": 2},
+                {"matrix": [4, 9], "x": 10, "y": 2},
+                {"matrix": [5, 0], "x": 11, "y": 2},
+                {"matrix": [5, 1], "x": 12, "y": 2},
+                {"matrix": [5, 2], "x": 13, "y": 2},
+                {"matrix": [5, 3], "x": 14, "y": 2},
+                {"matrix": [5, 4], "x": 15, "y": 2},
+                {"matrix": [5, 5], "x": 16, "y": 2},
+                {"matrix": [5, 6], "x": 17, "y": 2},
+                {"matrix": [5, 8], "x": 18, "y": 2, "w": 2.25},
+                {"matrix": [5, 9], "x": 20.25, "y": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+
+                {"matrix": [6, 5], "x": 5.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 6], "x": 7.5, "y": 3},
+                {"matrix": [6, 7], "x": 8.5, "y": 3},
+                {"matrix": [6, 8], "x": 9.5, "y": 3},
+                {"matrix": [6, 9], "x": 10.5, "y": 3},
+                {"matrix": [7, 0], "x": 11.5, "y": 3},
+                {"matrix": [7, 1], "x": 12.5, "y": 3},
+                {"matrix": [7, 2], "x": 13.5, "y": 3},
+                {"matrix": [7, 3], "x": 14.5, "y": 3},
+                {"matrix": [7, 4], "x": 15.5, "y": 3},
+                {"matrix": [7, 5], "x": 16.5, "y": 3},
+                {"matrix": [7, 7], "x": 17.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 8], "x": 19.25, "y": 3},
+                {"matrix": [7, 9], "x": 20.25, "y": 3},
+
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 3], "x": 2, "y": 4, "w": 2},
+                {"matrix": [8, 4], "x": 4, "y": 4},
+
+                {"matrix": [8, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 9], "x": 9, "y": 4, "w": 6.25},
+                {"matrix": [9, 3], "x": 15.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 16.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 18.25, "y": 4},
+                {"matrix": [9, 8], "x": 19.25, "y": 4},
+                {"matrix": [9, 9], "x": 20.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/pom_keyboards/tnln95/tnln95.c b/keyboards/pom_keyboards/tnln95/tnln95.c
index 14b851163f..12651327ea 100644
--- a/keyboards/pom_keyboards/tnln95/tnln95.c
+++ b/keyboards/pom_keyboards/tnln95/tnln95.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "tnln95.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(B1);
diff --git a/keyboards/pom_keyboards/tnln95/tnln95.h b/keyboards/pom_keyboards/tnln95/tnln95.h
deleted file mode 100644
index 33a59b3a75..0000000000
--- a/keyboards/pom_keyboards/tnln95/tnln95.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2020 Nguyen Minh Hoang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_all(\
-    K00, K01, K02, K03, K04,   K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K96, \
-    K20, K21, K22, K23, K24,     K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37,  K38,   K39, \
-    K40, K41, K42, K43, K44,      K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, K56,     K58,    K59, \
-    K60, K61, K62, K63, K64,       K65,   K66, K67, K68, K69, K70, K71, K72, K73, K74, K75,   K77,   K78, K79, \
-    K80, K81, K82, K83, K84,    K85,  K86,  K87,     K88,    K89,     K92,     K93,  K94,  K95, K97, K98, K99 \
-) {\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 },\
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 },\
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 },\
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 },\
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 },\
-    { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, K59 },\
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69 },\
-    { K70, K71, K72, K73, K74, K75, KC_NO, K77, K78, K79 },\
-    { K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 },\
-    { KC_NO, KC_NO, K92, K93, K94, K95, K96, K97, K98, K99 } \
-}
-
-#define LAYOUT_ansi(\
-    K00, K01, K02, K03, K04,   K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17,   K19,    K96, \
-    K40, K21, K22, K23, K24,     K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37,  K38,   K39, \
-         K41, K42, K43, K44,      K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, K56,     K58,    K59, \
-    K80, K61, K62, K63, K64,       K65,   K66, K67, K68, K69, K70, K71, K72, K73, K74, K75,   K77,   K78, K79, \
-         K81,   K83,    K84,    K85,  K86,  K87,              K89,              K93,    K95,    K97, K98, K99 \
-) {\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 },\
-    { K10, K11, K12, K13, K14, K15, K16, K17, KC_NO, K19 },\
-    { KC_NO, K21, K22, K23, K24, K25, K26, K27, K28, K29 },\
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 },\
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 },\
-    { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, K59 },\
-    { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68, K69 },\
-    { K70, K71, K72, K73, K74, K75, KC_NO, K77, K78, K79 },\
-    { K80, K81, KC_NO, K83, K84, K85, K86, K87, KC_NO, K89 },\
-    { KC_NO, KC_NO, KC_NO, K93, KC_NO, K95, K96, K97, K98, K99 } \
-}