Merge remote-tracking branch 'origin/master' into develop

2 files changed, 331 insertions, 331 deletions

diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
index 2797d771d0..ba4a76ea10 100644
--- a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
@@ -14,65 +14,65 @@ 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 XXX KC_NO
+
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
+
+#define LAYOUT_65_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
 
- #define LAYOUT_65_ansi( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
-  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
-  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,KC_NO,K2F }, \
-  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
-  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B,   K4C,   K4D, K4E, K4F }, \
- }
+#define LAYOUT_65_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
 
- #define LAYOUT_65_iso( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,     K4D,   K4E, K4F }, \
- }
- #define LAYOUT_65_ansi_split_bs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C, K4D,   K4E, K4F }, \
- }
 #define LAYOUT_65_iso_split_bs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E, K4F }, \
- }
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
index a5fe908e5d..48a4d31368 100644
--- a/keyboards/handwired/swiftrax/digicarp65/info.json
+++ b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -5,310 +5,310 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"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": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"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": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 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, "w": 2.25},
+                {"x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"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": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"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": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 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": 13.75, "y": 1, "w":1.25, "h":2},
+                {"x": 15, "y": 2},
 
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
-
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"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": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"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": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 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, "w": 2.25},
+                {"x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
-
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"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": 15, "y": 0},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 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": 15, "y": 1},
 
+                {"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": 13.75, "y": 1, "w":1.25, "h":2},
+                {"x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         }
     }