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

2 files changed, 539 insertions, 870 deletions

diff --git a/keyboards/kakunpc/choc_taro/choc_taro.h b/keyboards/kakunpc/choc_taro/choc_taro.h
deleted file mode 100644
index cf07b80b5c..0000000000
--- a/keyboards/kakunpc/choc_taro/choc_taro.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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 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.
- */
-
-/* LAYOUT_all
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_all( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_ansi( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_ansi_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_ansi_split_bs( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-
-/* LAYOUT_ansi_split_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_ansi_split_rshift( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-
-/* LAYOUT_iso
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_iso_split_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso_split_rshift( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_iso_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso_split_bs( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_iso_split_bs_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso_split_bs_rshift( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
diff --git a/keyboards/kakunpc/choc_taro/info.json b/keyboards/kakunpc/choc_taro/info.json
index 495f8d31bc..6adbb3280a 100644
--- a/keyboards/kakunpc/choc_taro/info.json
+++ b/keyboards/kakunpc/choc_taro/info.json
@@ -13,552 +13,563 @@
     "layouts": {
         "LAYOUT_all": {
             "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":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_ansi": {
-            "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, "w":2}, 
-
-                {"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":2.75}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_ansi_split_bs": {
-            "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":2.75}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_ansi_split_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, "w":2}, 
-
-                {"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":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_iso": {
             "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, "w":2}, 
-
-                {"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.75, "y":1, "w":1.25, "h":2}, 
-
-                {"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}, 
-
-                {"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":2.75}, 
-
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_iso_split_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, "w":2}, 
-
-                {"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.75, "y":1, "w":1.25, "h":2}, 
-
-                {"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}, 
-
-                {"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":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_iso_split_bs": {
             "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.75, "y":1, "w":1.25, "h":2}, 
-
-                {"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}, 
-
-                {"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":2.75}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_iso_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.75, "y":1, "w":1.25, "h":2}, 
-
-                {"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}, 
-
-                {"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":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
         }
     }
 }