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

2 files changed, 369 insertions, 92 deletions

diff --git a/keyboards/hineybush/hineyg80/hineyg80.h b/keyboards/hineybush/hineyg80/hineyg80.h
deleted file mode 100644
index 617c5166a9..0000000000
--- a/keyboards/hineybush/hineyg80/hineyg80.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2019 Josh Hinnebusch
- *
- * 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"
-
-#define LAYOUT_all( \
-    K000,K010,K001,K011,K002,K012,K003,K013,K004,K014,K005,K015,K006,         K007,K017,K008,K018, \
-																		      K027,K016,K028,K038, \
-	K020,K030,K021,K031,K022,K032,K023,K033,K024,K034,K025,K035,K026,K036,K037,K047,K057,K048,K058, \
-	K040,K050,K041,K051,K042,K052,K043,K053,K044,K054,K045,K055,K046,K056,    K067,K077,K068,K078, \
-	K060,K070,K061,K071,K062,K072,K063,K073,K064,K074,K065,K075,K066,K076,    K087,K097,K088,K098, \
-	K080,K090,K081,K091,K082,K092,K083,K093,K084,K094,K085,K095,K086,K096,    K106,K116,K108,K118, \
-	K100,K110,K101,     		K102,            K112,K103,K113,K104,K114,    K105,K115,K117,K107  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068 }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088 }, \
-	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
-	{ K110,  KC_NO, K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
-}
-
-/* 6U spacebar, 1U mods */
-#define LAYOUT_ansi_100u_mods( \
-    K000,K010,K001,K011,K002,K012,K003,K013,K004,K014,K005,K015,K006,     K007,K017,K008,K018, \
-																		  K027,K016,K028,K038, \
-	K020,K030,K021,K031,K022,K032,K023,K033,K024,K034,K025,K035,K026,K036,K047,K057,K048,K058, \
-	K040,K050,K041,K051,K042,K052,K043,K053,K044,K054,K045,K055,K046,K056,K067,K077,K068,K078, \
-	K060,K070,K061,K071,K062,K072,K063,K073,K064,K074,K065,K075,     K076,K087,K097,K088,K098, \
-	K080     ,K081,K091,K082,K092,K083,K093,K084,K094,K085,K095,K086,K096,K106,K116,K108,K118, \
-	K100,K110,K101,     		K102,            K112,K103,K113,K104,K114,K105,K115,K117,K107  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036, KC_NO,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  K067,  K068 }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088 }, \
-	{KC_NO,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
-	{ K110,  KC_NO, K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
-}
-
-/* 7U spacebar, 1.5U mods */
-#define LAYOUT_ansi_150u_mods( \
-    K000,K010,K001,K011,K002,K012,K003,K013,K004,K014,K005,K015,K006,     K007,K017,K008,K018, \
-																		  K027,K016,K028,K038, \
-	K020,K030,K021,K031,K022,K032,K023,K033,K024,K034,K025,K035,K026,K036,K047,K057,K048,K058, \
-	K040,K050,K041,K051,K042,K052,K043,K053,K044,K054,K045,K055,K046,K056,K067,K077,K068,K078, \
-	K060,K070,K061,K071,K062,K072,K063,K073,K064,K074,K065,K075     ,K076,K087,K097,K088,K098, \
-	K080     ,K081,K091,K082,K092,K083,K093,K084,K094,K085,K095,K086,K096,K106,K116,K108,K118, \
-	K100,      K101,     		K102,                 K103,     K104,K114,K105,K115,K117,K107  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036, KC_NO,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  K067,  K068 }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088 }, \
-	{KC_NO,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, K114,  K115,  K116,  K117,  K118 }  \
-}
diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/info.json
index 2df90c7957..85e4ca0e36 100644
--- a/keyboards/hineybush/hineyg80/info.json
+++ b/keyboards/hineybush/hineyg80/info.json
@@ -22,13 +22,379 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Pause", "x":15.5, "y":0}, {"label":"Insert", "x":16.5, "y":0}, {"label":"Home", "x":17.5, "y":0}, {"label":"PgUp", "x":18.5, "y":0}, {"label":"Scroll Lock", "x":15.5, "y":1}, {"label":"Delete", "x":16.5, "y":1}, {"label":"End", "x":17.5, "y":1}, {"label":"PgDn", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Bksp", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"-", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"+", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"x":12.75, "y":4}, {"label":"Enter", "x":13.75, "y":4, "w":1.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":1.25}, {"x":1.25, "y":5}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"Alt", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+                {"matrix": [1, 7], "x": 16.5, "y": 0},
+                {"matrix": [0, 8], "x": 17.5, "y": 0},
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+                {"matrix": [2, 7], "x": 15.5, "y": 1},
+                {"matrix": [1, 6], "x": 16.5, "y": 1},
+                {"matrix": [2, 8], "x": 17.5, "y": 1},
+                {"matrix": [3, 8], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [3, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [3, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+                {"matrix": [2, 4], "x": 8, "y": 2},
+                {"matrix": [3, 4], "x": 9, "y": 2},
+                {"matrix": [2, 5], "x": 10, "y": 2},
+                {"matrix": [3, 5], "x": 11, "y": 2},
+                {"matrix": [2, 6], "x": 12, "y": 2},
+                {"matrix": [3, 6], "x": 13, "y": 2},
+                {"matrix": [3, 7], "x": 14, "y": 2},
+
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+                {"matrix": [5, 7], "x": 16.5, "y": 2},
+                {"matrix": [4, 8], "x": 17.5, "y": 2},
+                {"matrix": [5, 8], "x": 18.5, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 3},
+                {"matrix": [4, 1], "x": 2.5, "y": 3},
+                {"matrix": [5, 1], "x": 3.5, "y": 3},
+                {"matrix": [4, 2], "x": 4.5, "y": 3},
+                {"matrix": [5, 2], "x": 5.5, "y": 3},
+                {"matrix": [4, 3], "x": 6.5, "y": 3},
+                {"matrix": [5, 3], "x": 7.5, "y": 3},
+                {"matrix": [4, 4], "x": 8.5, "y": 3},
+                {"matrix": [5, 4], "x": 9.5, "y": 3},
+                {"matrix": [4, 5], "x": 10.5, "y": 3},
+                {"matrix": [5, 5], "x": 11.5, "y": 3},
+                {"matrix": [4, 6], "x": 12.5, "y": 3},
+                {"matrix": [5, 6], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+                {"matrix": [7, 7], "x": 16.5, "y": 3},
+                {"matrix": [6, 8], "x": 17.5, "y": 3},
+                {"matrix": [7, 8], "x": 18.5, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 4},
+                {"matrix": [6, 1], "x": 2.75, "y": 4},
+                {"matrix": [7, 1], "x": 3.75, "y": 4},
+                {"matrix": [6, 2], "x": 4.75, "y": 4},
+                {"matrix": [7, 2], "x": 5.75, "y": 4},
+                {"matrix": [6, 3], "x": 6.75, "y": 4},
+                {"matrix": [7, 3], "x": 7.75, "y": 4},
+                {"matrix": [6, 4], "x": 8.75, "y": 4},
+                {"matrix": [7, 4], "x": 9.75, "y": 4},
+                {"matrix": [6, 5], "x": 10.75, "y": 4},
+                {"matrix": [7, 5], "x": 11.75, "y": 4},
+                {"matrix": [6, 6], "x": 12.75, "y": 4},
+                {"matrix": [7, 6], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.5, "y": 4},
+                {"matrix": [9, 7], "x": 16.5, "y": 4},
+                {"matrix": [8, 8], "x": 17.5, "y": 4},
+                {"matrix": [9, 8], "x": 18.5, "y": 4},
+
+                {"matrix": [8, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 5},
+                {"matrix": [8, 1], "x": 2.25, "y": 5},
+                {"matrix": [9, 1], "x": 3.25, "y": 5},
+                {"matrix": [8, 2], "x": 4.25, "y": 5},
+                {"matrix": [9, 2], "x": 5.25, "y": 5},
+                {"matrix": [8, 3], "x": 6.25, "y": 5},
+                {"matrix": [9, 3], "x": 7.25, "y": 5},
+                {"matrix": [8, 4], "x": 8.25, "y": 5},
+                {"matrix": [9, 4], "x": 9.25, "y": 5},
+                {"matrix": [8, 5], "x": 10.25, "y": 5},
+                {"matrix": [9, 5], "x": 11.25, "y": 5},
+                {"matrix": [8, 6], "x": 12.25, "y": 5, "w": 1.75},
+
+                {"matrix": [9, 6], "x": 14.25, "y": 5.25},
+
+                {"matrix": [10, 6], "x": 15.5, "y": 5},
+                {"matrix": [11, 6], "x": 16.5, "y": 5},
+                {"matrix": [10, 8], "x": 17.5, "y": 5},
+                {"matrix": [11, 8], "x": 18.5, "y": 5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 6},
+                {"matrix": [11, 0], "x": 1, "y": 6},
+                {"matrix": [10, 1], "x": 2, "y": 6},
+                {"matrix": [10, 2], "x": 3, "y": 6, "w": 6},
+                {"matrix": [11, 2], "x": 9, "y": 6},
+                {"matrix": [10, 3], "x": 10, "y": 6},
+                {"matrix": [11, 3], "x": 11, "y": 6},
+                {"matrix": [10, 4], "x": 12, "y": 6},
+
+                {"matrix": [11, 4], "x": 13.25, "y": 6.25},
+                {"matrix": [10, 5], "x": 14.25, "y": 6.25},
+                {"matrix": [11, 5], "x": 15.25, "y": 6.25},
+
+                {"matrix": [11, 7], "x": 16.5, "y": 6},
+                {"matrix": [10, 7], "x": 17.5, "y": 6}
+            ]
         },
         "LAYOUT_ansi_100u_mods": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"PgUp", "x":17.5, "y":0}, {"label":"Prt Sc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"Scroll", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2, "w":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"Pause", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"-", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"label":"Enter", "x":12.75, "y":4, "w":2.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"label":"+", "x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":2.25}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"Alt", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+                {"matrix": [1, 7], "x": 16.5, "y": 0},
+                {"matrix": [0, 8], "x": 17.5, "y": 0},
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+                {"matrix": [2, 7], "x": 15.5, "y": 1},
+                {"matrix": [1, 6], "x": 16.5, "y": 1},
+                {"matrix": [2, 8], "x": 17.5, "y": 1},
+                {"matrix": [3, 8], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [3, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [3, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+                {"matrix": [2, 4], "x": 8, "y": 2},
+                {"matrix": [3, 4], "x": 9, "y": 2},
+                {"matrix": [2, 5], "x": 10, "y": 2},
+                {"matrix": [3, 5], "x": 11, "y": 2},
+                {"matrix": [2, 6], "x": 12, "y": 2},
+                {"matrix": [3, 6], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+                {"matrix": [5, 7], "x": 16.5, "y": 2},
+                {"matrix": [4, 8], "x": 17.5, "y": 2},
+                {"matrix": [5, 8], "x": 18.5, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 3},
+                {"matrix": [4, 1], "x": 2.5, "y": 3},
+                {"matrix": [5, 1], "x": 3.5, "y": 3},
+                {"matrix": [4, 2], "x": 4.5, "y": 3},
+                {"matrix": [5, 2], "x": 5.5, "y": 3},
+                {"matrix": [4, 3], "x": 6.5, "y": 3},
+                {"matrix": [5, 3], "x": 7.5, "y": 3},
+                {"matrix": [4, 4], "x": 8.5, "y": 3},
+                {"matrix": [5, 4], "x": 9.5, "y": 3},
+                {"matrix": [4, 5], "x": 10.5, "y": 3},
+                {"matrix": [5, 5], "x": 11.5, "y": 3},
+                {"matrix": [4, 6], "x": 12.5, "y": 3},
+                {"matrix": [5, 6], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+                {"matrix": [7, 7], "x": 16.5, "y": 3},
+                {"matrix": [6, 8], "x": 17.5, "y": 3},
+                {"matrix": [7, 8], "x": 18.5, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 4},
+                {"matrix": [6, 1], "x": 2.75, "y": 4},
+                {"matrix": [7, 1], "x": 3.75, "y": 4},
+                {"matrix": [6, 2], "x": 4.75, "y": 4},
+                {"matrix": [7, 2], "x": 5.75, "y": 4},
+                {"matrix": [6, 3], "x": 6.75, "y": 4},
+                {"matrix": [7, 3], "x": 7.75, "y": 4},
+                {"matrix": [6, 4], "x": 8.75, "y": 4},
+                {"matrix": [7, 4], "x": 9.75, "y": 4},
+                {"matrix": [6, 5], "x": 10.75, "y": 4},
+                {"matrix": [7, 5], "x": 11.75, "y": 4},
+                {"matrix": [7, 6], "x": 12.75, "y": 4, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 15.5, "y": 4},
+                {"matrix": [9, 7], "x": 16.5, "y": 4},
+                {"matrix": [8, 8], "x": 17.5, "y": 4},
+                {"matrix": [9, 8], "x": 18.5, "y": 4},
+
+                {"matrix": [8, 0], "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 5},
+                {"matrix": [9, 1], "x": 3.25, "y": 5},
+                {"matrix": [8, 2], "x": 4.25, "y": 5},
+                {"matrix": [9, 2], "x": 5.25, "y": 5},
+                {"matrix": [8, 3], "x": 6.25, "y": 5},
+                {"matrix": [9, 3], "x": 7.25, "y": 5},
+                {"matrix": [8, 4], "x": 8.25, "y": 5},
+                {"matrix": [9, 4], "x": 9.25, "y": 5},
+                {"matrix": [8, 5], "x": 10.25, "y": 5},
+                {"matrix": [9, 5], "x": 11.25, "y": 5},
+                {"matrix": [8, 6], "x": 12.25, "y": 5, "w": 1.75},
+
+                {"matrix": [9, 6], "x": 14.25, "y": 5.25},
+
+                {"matrix": [10, 6], "x": 15.5, "y": 5},
+                {"matrix": [11, 6], "x": 16.5, "y": 5},
+                {"matrix": [10, 8], "x": 17.5, "y": 5},
+                {"matrix": [11, 8], "x": 18.5, "y": 5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 6},
+                {"matrix": [11, 0], "x": 1, "y": 6},
+                {"matrix": [10, 1], "x": 2, "y": 6},
+                {"matrix": [10, 2], "x": 3, "y": 6, "w": 6},
+                {"matrix": [11, 2], "x": 9, "y": 6},
+                {"matrix": [10, 3], "x": 10, "y": 6},
+                {"matrix": [11, 3], "x": 11, "y": 6},
+                {"matrix": [10, 4], "x": 12, "y": 6},
+
+                {"matrix": [11, 4], "x": 13.25, "y": 6.25},
+                {"matrix": [10, 5], "x": 14.25, "y": 6.25},
+                {"matrix": [11, 5], "x": 15.25, "y": 6.25},
+
+                {"matrix": [11, 7], "x": 16.5, "y": 6},
+                {"matrix": [10, 7], "x": 17.5, "y": 6}
+            ]
         },
         "LAYOUT_ansi_150u_mods": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"PgUp", "x":17.5, "y":0}, {"label":"Prt Sc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"Scroll", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2, "w":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"Pause", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"-", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"label":"Enter", "x":12.75, "y":4, "w":2.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"label":"+", "x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":2.25}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6, "w":1.5}, {"label":"Alt", "x":1.5, "y":6, "w":1.5}, {"x":3, "y":6, "w":7}, {"label":"Menu", "x":10, "y":6, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":6, "w":1.5}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+                {"matrix": [1, 7], "x": 16.5, "y": 0},
+                {"matrix": [0, 8], "x": 17.5, "y": 0},
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+                {"matrix": [2, 7], "x": 15.5, "y": 1},
+                {"matrix": [1, 6], "x": 16.5, "y": 1},
+                {"matrix": [2, 8], "x": 17.5, "y": 1},
+                {"matrix": [3, 8], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [3, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [3, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+                {"matrix": [2, 4], "x": 8, "y": 2},
+                {"matrix": [3, 4], "x": 9, "y": 2},
+                {"matrix": [2, 5], "x": 10, "y": 2},
+                {"matrix": [3, 5], "x": 11, "y": 2},
+                {"matrix": [2, 6], "x": 12, "y": 2},
+                {"matrix": [3, 6], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+                {"matrix": [5, 7], "x": 16.5, "y": 2},
+                {"matrix": [4, 8], "x": 17.5, "y": 2},
+                {"matrix": [5, 8], "x": 18.5, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 3},
+                {"matrix": [4, 1], "x": 2.5, "y": 3},
+                {"matrix": [5, 1], "x": 3.5, "y": 3},
+                {"matrix": [4, 2], "x": 4.5, "y": 3},
+                {"matrix": [5, 2], "x": 5.5, "y": 3},
+                {"matrix": [4, 3], "x": 6.5, "y": 3},
+                {"matrix": [5, 3], "x": 7.5, "y": 3},
+                {"matrix": [4, 4], "x": 8.5, "y": 3},
+                {"matrix": [5, 4], "x": 9.5, "y": 3},
+                {"matrix": [4, 5], "x": 10.5, "y": 3},
+                {"matrix": [5, 5], "x": 11.5, "y": 3},
+                {"matrix": [4, 6], "x": 12.5, "y": 3},
+                {"matrix": [5, 6], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+                {"matrix": [7, 7], "x": 16.5, "y": 3},
+                {"matrix": [6, 8], "x": 17.5, "y": 3},
+                {"matrix": [7, 8], "x": 18.5, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 4},
+                {"matrix": [6, 1], "x": 2.75, "y": 4},
+                {"matrix": [7, 1], "x": 3.75, "y": 4},
+                {"matrix": [6, 2], "x": 4.75, "y": 4},
+                {"matrix": [7, 2], "x": 5.75, "y": 4},
+                {"matrix": [6, 3], "x": 6.75, "y": 4},
+                {"matrix": [7, 3], "x": 7.75, "y": 4},
+                {"matrix": [6, 4], "x": 8.75, "y": 4},
+                {"matrix": [7, 4], "x": 9.75, "y": 4},
+                {"matrix": [6, 5], "x": 10.75, "y": 4},
+                {"matrix": [7, 5], "x": 11.75, "y": 4},
+                {"matrix": [7, 6], "x": 12.75, "y": 4, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 15.5, "y": 4},
+                {"matrix": [9, 7], "x": 16.5, "y": 4},
+                {"matrix": [8, 8], "x": 17.5, "y": 4},
+                {"matrix": [9, 8], "x": 18.5, "y": 4},
+
+                {"matrix": [8, 0], "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 5},
+                {"matrix": [9, 1], "x": 3.25, "y": 5},
+                {"matrix": [8, 2], "x": 4.25, "y": 5},
+                {"matrix": [9, 2], "x": 5.25, "y": 5},
+                {"matrix": [8, 3], "x": 6.25, "y": 5},
+                {"matrix": [9, 3], "x": 7.25, "y": 5},
+                {"matrix": [8, 4], "x": 8.25, "y": 5},
+                {"matrix": [9, 4], "x": 9.25, "y": 5},
+                {"matrix": [8, 5], "x": 10.25, "y": 5},
+                {"matrix": [9, 5], "x": 11.25, "y": 5},
+                {"matrix": [8, 6], "x": 12.25, "y": 5, "w": 1.75},
+
+                {"matrix": [9, 6], "x": 14.25, "y": 5.25},
+
+                {"matrix": [10, 6], "x": 15.5, "y": 5},
+                {"matrix": [11, 6], "x": 16.5, "y": 5},
+                {"matrix": [10, 8], "x": 17.5, "y": 5},
+                {"matrix": [11, 8], "x": 18.5, "y": 5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [10, 1], "x": 1.5, "y": 6, "w": 1.5},
+                {"matrix": [10, 2], "x": 3, "y": 6, "w": 7},
+                {"matrix": [10, 3], "x": 10, "y": 6, "w": 1.5},
+                {"matrix": [10, 4], "x": 11.5, "y": 6, "w": 1.5},
+
+                {"matrix": [11, 4], "x": 13.25, "y": 6.25},
+                {"matrix": [10, 5], "x": 14.25, "y": 6.25},
+                {"matrix": [11, 5], "x": 15.25, "y": 6.25},
+
+                {"matrix": [11, 7], "x": 16.5, "y": 6},
+                {"matrix": [10, 7], "x": 17.5, "y": 6}
+            ]
         }
     }
 }