Keyboard: Downbubble refactor and Configurator fix (#4798)

* Downbubble: Configurator fix

Fix the visual key alignment and some typos.

* Downbubble: refactor

Rename layout macros:

- LAYOUT_downbubble_standard to LAYOUT_standard
- LAYOUT_downbubble_splitbackspace to LAYOUT_split_bs
- LAYOUT_downbubble_splitrightshift to LAYOUT_split_rshift
- LAYOUT_downbubble_splitnumpad to LAYOUT_split_numpad
- LAYOUT_downbubble_spliteverything to LAYOUT_all

diff --git a/keyboards/handwired/downbubble/downbubble.h b/keyboards/handwired/downbubble/downbubble.h
index a25a9a5db56ebb73e63f4f7843fc70c2ab812a70..0df39dd9ee059cd5f7a4ca36c11c3d7c81e04464 100644 (file)
--- a/keyboards/handwired/downbubble/downbubble.h
+++ b/keyboards/handwired/downbubble/downbubble.h
@@ -25,7 +25,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_downbubble_standard( \
+#define LAYOUT_standard( \
     K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
     K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
     K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
@@ -42,7 +42,7 @@
     { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
          }
 
-#define LAYOUT_downbubble_splitbackspace( \
+#define LAYOUT_split_bs( \
     K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
     K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,\
     K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
@@ -59,7 +59,7 @@
     { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
          }
 
-#define LAYOUT_downbubble_splitrightshift( \
+#define LAYOUT_split_rshift( \
     K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
     K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
     K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
@@ -76,7 +76,7 @@
     { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
          }
 
-#define LAYOUT_downbubble_splitnumpad( \
+#define LAYOUT_split_numpad( \
     K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
     K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
     K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,  K29,         K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
@@ -93,7 +93,7 @@
     { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  K57,    K58,    K59,    K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
          }
 
-#define LAYOUT_downbubble_spliteverything( \
+#define LAYOUT_all( \
     K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
     K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,\
     K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,  K29,         K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\

diff --git a/keyboards/handwired/downbubble/info.json b/keyboards/handwired/downbubble/info.json
index cd64c0e3695893f82c496073324fdbf3e5a9a06d..c5cd97de5483bc1e969c9054bb5fbb62cf96c769 100644 (file)
--- a/keyboards/handwired/downbubble/info.json
+++ b/keyboards/handwired/downbubble/info.json
@@ -5,550 +5,555 @@
   "width": 22.75,
   "height": 6,
   "layouts": {
-      "LAYOUT_downbubble_standard": {
-          "layout": [
-            {"label":"K00", "x":0, "y":0.5},
-            {"label":"K01", "x":1, "y":0.5},
-            {"label":"K02", "x":2, "y":0.5},
-            {"label":"K03", "x":3, "y":0.5},
-            {"label":"K04", "x":4, "y":0.5},
-            {"label":"K05", "x":5, "y":0.5},
-            {"label":"K06", "x":6, "y":0.5},
-            {"label":"K010", "x":12.75, "y":0.5},
-            {"label":"K011", "x":13.75, "y":0.5},
-            {"label":"K012", "x":14.75, "y":0.5},
-            {"label":"K013", "x":15.75, "y":0.5},
-            {"label":"K014", "x":16.75, "y":0.5},
-            {"label":"K015", "x":17.75, "y":0.5},
-            {"label":"K016", "x":18.75, "y":0.5},
-            {"label":"K017", "x":19.75, "y":0.5},
-            {"label":"K018", "x":20.75, "y":0.5},
-            {"label":"K019", "x":21.75, "y":0.5},
-            {"label":"K10", "x":0, "y":1.5},
-            {"label":"K11", "x":1, "y":1.5},
-            {"label":"K12", "x":2, "y":1.5},
-            {"label":"K13", "x":3, "y":1.5},
-            {"label":"K14", "x":4, "y":1.5},
-            {"label":"K15", "x":5, "y":1.5},
-            {"label":"K16", "x":6, "y":1.5},
-            {"label":"K17", "x":8.75, "y":1.5},
-            {"label":"K18", "x":9.75, "y":1.5},
-            {"label":"K19", "x":10.75, "y":1.5},
-            {"label":"K110", "x":12.75, "y":1.5},
-            {"label":"K111", "x":13.75, "y":1.5},
-            {"label":"K112", "x":14.75, "y":1.5},
-            {"label":"K113", "x":15.75, "y":1.5},
-            {"label":"K114", "x":16.75, "y":1.5},
-            {"label":"K115", "x":17.75, "y":1.5},
-            {"label":"K116", "x":18.75, "y":1.5, "w":2},
-            {"label":"K118", "x":20.75, "y":1.5},
-            {"label":"K119", "x":21.75, "y":1.5},
-            {"label":"K20", "x":0, "y":2.5, "w":1.5},
-            {"label":"K21", "x":1.5, "y":2.5},
-            {"label":"K22", "x":2.5, "y":2.5},
-            {"label":"K23", "x":3.5, "y":2.5},
-            {"label":"K24", "x":4.5, "y":2.5},
-            {"label":"K25", "x":5.5, "y":2.5},
-            {"label":"K26", "x":7.75, "y":2.5},
-            {"label":"K17", "x":8.75, "y":2.5},
-            {"label":"K28", "x":9.75, "y":2.5},
-            {"label":"K210", "x":12.25, "y":2.5},
-            {"label":"K211", "x":13.25, "y":2.5},
-            {"label":"K212", "x":14.25, "y":2.5},
-            {"label":"K213", "x":15.25, "y":2.5},
-            {"label":"K214", "x":16.25, "y":2.5},
-            {"label":"K215", "x":17.25, "y":2.5},
-            {"label":"K216", "x":18.25, "y":2.5},
-            {"label":"K217", "x":19.25, "y":2.5, "w":1.5},
-            {"label":"K218", "x":20.75, "y":2.5},
-            {"label":"K219", "x":21.75, "y":2.5},
-            {"label":"K30", "x":0, "y":3.5, "w":1.75},
-            {"label":"K31", "x":1.75, "y":3.5},
-            {"label":"K32", "x":2.75, "y":3.5},
-            {"label":"K33", "x":3.75, "y":3.5},
-            {"label":"K34", "x":4.75, "y":3.5},
-            {"label":"K35", "x":5.75, "y":3.5},
-            {"label":"K36", "x":7.75, "y":3.5},
-            {"label":"K37", "x":8.75, "y":3.5},
-            {"label":"K38", "x":9.75, "y":3.5},
-            {"label":"K29", "x":10.75, "y":2.5, "h":2},
-            {"label":"K310", "x":12.5, "y":3.5},
-            {"label":"K311", "x":13.5, "y":3.5},
-            {"label":"K312", "x":14.5, "y":3.5},
-            {"label":"K313", "x":15.5, "y":3.5},
-            {"label":"K314", "x":16.5, "y":3.5},
-            {"label":"K315", "x":17.5, "y":3.5},
-            {"label":"K317", "x":18.5, "y":3.5, "w":2.25},
-            {"label":"K40", "x":0, "y":4.5, "w":2.25},
-            {"label":"K41", "x":2.25, "y":4.5},
-            {"label":"K42", "x":3.25, "y":4.5},
-            {"label":"K43", "x":4.25, "y":4.5},
-            {"label":"K44", "x":5.25, "y":4.5},
-            {"label":"K45", "x":6.25, "y":4.5},
-            {"label":"K46", "x":7.75, "y":4.5},
-            {"label":"K47", "x":8.75, "y":4.5},
-            {"label":"K48", "x":9.75, "y":4.5},
-            {"label":"K410", "x":13, "y":4.5},
-            {"label":"K411", "x":14, "y":4.5},
-            {"label":"K412", "x":15, "y":4.5},
-            {"label":"K413", "x":16, "y":4.5},
-            {"label":"K414", "x":17, "y":4.5},
-            {"label":"K416", "x":18, "y":4.5, "w":2.75},
-            {"label":"K418", "x":20.75, "y":4.5},
-            {"label":"K50", "x":0, "y":5.5, "w":1.25},
-            {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
-            {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
-            {"label":"K53", "x":3.75, "y":5.5, "w":1.25},
-            {"label":"K54", "x":5, "y":5.5, "w":2.25},
-            {"label":"K56", "x":7.75, "y":5.5, "w":2},
-            {"label":"K58", "x":9.75, "y":5.5},
-            {"label":"K49", "x":10.75, "y":4.5, "h":2},
-            {"label":"K510", "x":13, "y":5.5, "w":2},
-            {"label":"K512", "x":15, "y":5.5, "w":1.25},
-            {"label":"K513", "x":16.25, "y":5.5, "w":1.25},
-            {"label":"K514", "x":17.5, "y":5.5, "w":1.25},
-            {"label":"K516", "x":18.75, "y":5.5},
-            {"label":"K517", "x":19.75, "y":5.5},
-            {"label":"K518", "x":20.75, "y":5.5},
-            {"label":"K519", "x":21.75, "y":5.5}]
-      },
-      "LAYOUT_downbubbled_splitbackspace": {
-          "layout": [
-            {"label":"K00", "x":0, "y":0.5},
-            {"label":"K01", "x":1, "y":0.5},
-            {"label":"K02", "x":2, "y":0.5},
-            {"label":"K03", "x":3, "y":0.5},
-            {"label":"K04", "x":4, "y":0.5},
-            {"label":"K05", "x":5, "y":0.5},
-            {"label":"K06", "x":6, "y":0.5},
-            {"label":"K010", "x":12.75, "y":0.5},
-            {"label":"K011", "x":13.75, "y":0.5},
-            {"label":"K012", "x":14.75, "y":0.5},
-            {"label":"K013", "x":15.75, "y":0.5},
-            {"label":"K014", "x":16.75, "y":0.5},
-            {"label":"K015", "x":17.75, "y":0.5},
-            {"label":"K016", "x":18.75, "y":0.5},
-            {"label":"K017", "x":19.75, "y":0.5},
-            {"label":"K018", "x":20.75, "y":0.5},
-            {"label":"K019", "x":21.75, "y":0.5},
-            {"label":"K10", "x":0, "y":1.5},
-            {"label":"K11", "x":1, "y":1.5},
-            {"label":"K12", "x":2, "y":1.5},
-            {"label":"K13", "x":3, "y":1.5},
-            {"label":"K14", "x":4, "y":1.5},
-            {"label":"K15", "x":5, "y":1.5},
-            {"label":"K16", "x":6, "y":1.5},
-            {"label":"K17", "x":8.75, "y":1.5},
-            {"label":"K18", "x":9.75, "y":1.5},
-            {"label":"K19", "x":10.75, "y":1.5},
-            {"label":"K110", "x":12.75, "y":1.5},
-            {"label":"K111", "x":13.75, "y":1.5},
-            {"label":"K112", "x":14.75, "y":1.5},
-            {"label":"K113", "x":15.75, "y":1.5},
-            {"label":"K114", "x":16.75, "y":1.5},
-            {"label":"K115", "x":17.75, "y":1.5},
-            {"label":"K116", "x":18.75, "y":1.5},
-            {"label":"K117", "x":19.75, "y":1},
-            {"label":"K118", "x":20.75, "y":1.5},
-            {"label":"K119", "x":21.75, "y":1.5},
-            {"label":"K20", "x":0, "y":2.5, "w":1.5},
-            {"label":"K21", "x":1.5, "y":2.5},
-            {"label":"K22", "x":2.5, "y":2.5},
-            {"label":"K23", "x":3.5, "y":2.5},
-            {"label":"K24", "x":4.5, "y":2.5},
-            {"label":"K25", "x":5.5, "y":2.5},
-            {"label":"K26", "x":7.75, "y":2.5},
-            {"label":"K17", "x":8.75, "y":2.5},
-            {"label":"K28", "x":9.75, "y":2.5},
-            {"label":"K210", "x":12.25, "y":2.5},
-            {"label":"K211", "x":13.25, "y":2.5},
-            {"label":"K212", "x":14.25, "y":2.5},
-            {"label":"K213", "x":15.25, "y":2.5},
-            {"label":"K214", "x":16.25, "y":2.5},
-            {"label":"K215", "x":17.25, "y":2.5},
-            {"label":"K216", "x":18.25, "y":2.5},
-            {"label":"K217", "x":19.25, "y":2.5, "w":1.5},
-            {"label":"K218", "x":20.75, "y":2.5},
-            {"label":"K219", "x":21.75, "y":2.5},
-            {"label":"K30", "x":0, "y":3.5, "w":1.75},
-            {"label":"K31", "x":1.75, "y":3.5},
-            {"label":"K32", "x":2.75, "y":3.5},
-            {"label":"K33", "x":3.75, "y":3.5},
-            {"label":"K34", "x":4.75, "y":3.5},
-            {"label":"K35", "x":5.75, "y":3.5},
-            {"label":"K36", "x":7.75, "y":3.5},
-            {"label":"K37", "x":8.75, "y":3.5},
-            {"label":"K38", "x":9.75, "y":3.5},
-            {"label":"K29", "x":10.75, "y":2.5, "h":2},
-            {"label":"K310", "x":12.5, "y":3.5},
-            {"label":"K311", "x":13.5, "y":3.5},
-            {"label":"K312", "x":14.5, "y":3.5},
-            {"label":"K313", "x":15.5, "y":3.5},
-            {"label":"K314", "x":16.5, "y":3.5},
-            {"label":"K315", "x":17.5, "y":3.5},
-            {"label":"K317", "x":18.5, "y":3.5, "w":2.25},
-            {"label":"K40", "x":0, "y":4.5, "w":2.25},
-            {"label":"K41", "x":2.25, "y":4.5},
-            {"label":"K42", "x":3.25, "y":4.5},
-            {"label":"K43", "x":4.25, "y":4.5},
-            {"label":"K44", "x":5.25, "y":4.5},
-            {"label":"K45", "x":6.25, "y":4.5},
-            {"label":"K46", "x":7.75, "y":4.5},
-            {"label":"K47", "x":8.75, "y":4.5},
-            {"label":"K48", "x":9.75, "y":4.5},
-            {"label":"K410", "x":13, "y":4.5},
-            {"label":"K411", "x":14, "y":4.5},
-            {"label":"K412", "x":15, "y":4.5},
-            {"label":"K413", "x":16, "y":4.5},
-            {"label":"K414", "x":17, "y":4.5},
-            {"label":"K416", "x":18, "y":4.5, "w":2.75},
-            {"label":"K418", "x":20.75, "y":4.5},
-            {"label":"K50", "x":0, "y":5.5, "w":1.25},
-            {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
-            {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
-            {"label":"K53", "x":3.75, "y":5.5, "w":1.25},
-            {"label":"K54", "x":5, "y":5.5, "w":2.25},
-            {"label":"K56", "x":7.75, "y":5.5, "w":2},
-            {"label":"K58", "x":9.75, "y":5.5},
-            {"label":"K49", "x":10.75, "y":4.5, "h":2},
-            {"label":"K510", "x":13, "y":5.5, "w":2},
-            {"label":"K512", "x":15, "y":5.5, "w":1.25},
-            {"label":"K513", "x":16.25, "y":5.5, "w":1.25},
-            {"label":"K514", "x":17.5, "y":5.5, "w":1.25},
-            {"label":"K516", "x":18.75, "y":5.5},
-            {"label":"K517", "x":19.75, "y":5.5},
-            {"label":"K518", "x":20.75, "y":5.5},
-            {"label":"K519", "x":21.75, "y":5.5}]
-      },
-      "LAYOUT_downbubble_splitrightshift": {
-          "layout": [
-            {"label":"K00", "x":0, "y":0.5},
-            {"label":"K01", "x":1, "y":0.5},
-            {"label":"K02", "x":2, "y":0.5},
-            {"label":"K03", "x":3, "y":0.5},
-            {"label":"K04", "x":4, "y":0.5},
-            {"label":"K05", "x":5, "y":0.5},
-            {"label":"K06", "x":6, "y":0.5},
-            {"label":"K010", "x":12.75, "y":0.5},
-            {"label":"K011", "x":13.75, "y":0.5},
-            {"label":"K012", "x":14.75, "y":0.5},
-            {"label":"K013", "x":15.75, "y":0.5},
-            {"label":"K014", "x":16.75, "y":0.5},
-            {"label":"K015", "x":17.75, "y":0.5},
-            {"label":"K016", "x":18.75, "y":0.5},
-            {"label":"K017", "x":19.75, "y":0.5},
-            {"label":"K018", "x":20.75, "y":0.5},
-            {"label":"K019", "x":21.75, "y":0.5},
-            {"label":"K10", "x":0, "y":1.5},
-            {"label":"K11", "x":1, "y":1.5},
-            {"label":"K12", "x":2, "y":1.5},
-            {"label":"K13", "x":3, "y":1.5},
-            {"label":"K14", "x":4, "y":1.5},
-            {"label":"K15", "x":5, "y":1.5},
-            {"label":"K16", "x":6, "y":1.5},
-            {"label":"K17", "x":8.75, "y":1.5},
-            {"label":"K18", "x":9.75, "y":1.5},
-            {"label":"K19", "x":10.75, "y":1.5},
-            {"label":"K110", "x":12.75, "y":1.5},
-            {"label":"K111", "x":13.75, "y":1.5},
-            {"label":"K112", "x":14.75, "y":1.5},
-            {"label":"K113", "x":15.75, "y":1.5},
-            {"label":"K114", "x":16.75, "y":1.5},
-            {"label":"K115", "x":17.75, "y":1.5},
-            {"label":"K116", "x":18.75, "y":1.5, "w":2},
-            {"label":"K118", "x":20.75, "y":1.5},
-            {"label":"K119", "x":21.75, "y":1.5},
-            {"label":"K20", "x":0, "y":2.5, "w":1.5},
-            {"label":"K21", "x":1.5, "y":2.5},
-            {"label":"K22", "x":2.5, "y":2.5},
-            {"label":"K23", "x":3.5, "y":2.5},
-            {"label":"K24", "x":4.5, "y":2.5},
-            {"label":"K25", "x":5.5, "y":2.5},
-            {"label":"K26", "x":7.75, "y":2.5},
-            {"label":"K17", "x":8.75, "y":2.5},
-            {"label":"K28", "x":9.75, "y":2.5},
-            {"label":"K210", "x":12.25, "y":2.5},
-            {"label":"K211", "x":13.25, "y":2.5},
-            {"label":"K212", "x":14.25, "y":2.5},
-            {"label":"K213", "x":15.25, "y":2.5},
-            {"label":"K214", "x":16.25, "y":2.5},
-            {"label":"K215", "x":17.25, "y":2.5},
-            {"label":"K216", "x":18.25, "y":2.5},
-            {"label":"K217", "x":19.25, "y":2.5, "w":1.5},
-            {"label":"K218", "x":20.75, "y":2.5},
-            {"label":"K219", "x":21.75, "y":2.5},
-            {"label":"K30", "x":0, "y":3.5, "w":1.75},
-            {"label":"K31", "x":1.75, "y":3.5},
-            {"label":"K32", "x":2.75, "y":3.5},
-            {"label":"K33", "x":3.75, "y":3.5},
-            {"label":"K34", "x":4.75, "y":3.5},
-            {"label":"K35", "x":5.75, "y":3.5},
-            {"label":"K36", "x":7.75, "y":3.5},
-            {"label":"K37", "x":8.75, "y":3.5},
-            {"label":"K38", "x":9.75, "y":3.5},
-            {"label":"K29", "x":10.75, "y":2.5, "h":2},
-            {"label":"K310", "x":12.5, "y":3.5},
-            {"label":"K311", "x":13.5, "y":3.5},
-            {"label":"K312", "x":14.5, "y":3.5},
-            {"label":"K313", "x":15.5, "y":3.5},
-            {"label":"K314", "x":16.5, "y":3.5},
-            {"label":"K315", "x":17.5, "y":3.5},
-            {"label":"K317", "x":18.5, "y":3.5, "w":2.25},
-            {"label":"K40", "x":0, "y":4.5, "w":2.25},
-            {"label":"K41", "x":2.25, "y":4.5},
-            {"label":"K42", "x":3.25, "y":4.5},
-            {"label":"K43", "x":4.25, "y":4.5},
-            {"label":"K44", "x":5.25, "y":4.5},
-            {"label":"K45", "x":6.25, "y":4.5},
-            {"label":"K46", "x":7.75, "y":4.5},
-            {"label":"K47", "x":8.75, "y":4.5},
-            {"label":"K48", "x":9.75, "y":4.5},
-            {"label":"K410", "x":13, "y":4.5},
-            {"label":"K411", "x":14, "y":4.5},
-            {"label":"K412", "x":15, "y":4.5},
-            {"label":"K413", "x":16, "y":4.5},
-            {"label":"K414", "x":17, "y":4.5},
-            {"label":"K416", "x":18, "y":4.5, "w":1.75},
-            {"label":"K417", "x":19.75, "y":4},
-            {"label":"K418", "x":20.75, "y":4.5},
-            {"label":"K50", "x":0, "y":5.5, "w":1.25},
-            {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
-            {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
-            {"label":"K53", "x":3.75, "y":5.5, "w":1.25},
-            {"label":"K54", "x":5, "y":5.5, "w":2.25},
-            {"label":"K56", "x":7.75, "y":5.5, "w":2},
-            {"label":"K58", "x":9.75, "y":5.5},
-            {"label":"K49", "x":10.75, "y":4.5, "h":2},
-            {"label":"K510", "x":13, "y":5.5, "w":2},
-            {"label":"K512", "x":15, "y":5.5, "w":1.25},
-            {"label":"K513", "x":16.25, "y":5.5, "w":1.25},
-            {"label":"K514", "x":17.5, "y":5.5, "w":1.25},
-            {"label":"K516", "x":18.75, "y":5.5},
-            {"label":"K517", "x":19.75, "y":5.5},
-            {"label":"K518", "x":20.75, "y":5.5},
-            {"label":"K519", "x":21.75, "y":5.5}]
-      },
-      "LAYOUT_downbubble_splitnumpad": {
-          "layout": [
-            {"label":"K00", "x":0, "y":0.5},
-            {"label":"K01", "x":1, "y":0.5},
-            {"label":"K02", "x":2, "y":0.5},
-            {"label":"K03", "x":3, "y":0.5},
-            {"label":"K04", "x":4, "y":0.5},
-            {"label":"K05", "x":5, "y":0.5},
-            {"label":"K06", "x":6, "y":0.5},
-            {"label":"K010", "x":12.75, "y":0.5},
-            {"label":"K011", "x":13.75, "y":0.5},
-            {"label":"K012", "x":14.75, "y":0.5},
-            {"label":"K013", "x":15.75, "y":0.5},
-            {"label":"K014", "x":16.75, "y":0.5},
-            {"label":"K015", "x":17.75, "y":0.5},
-            {"label":"K016", "x":18.75, "y":0.5},
-            {"label":"K017", "x":19.75, "y":0.5},
-            {"label":"K018", "x":20.75, "y":0.5},
-            {"label":"K019", "x":21.75, "y":0.5},
-            {"label":"K10", "x":0, "y":1.5},
-            {"label":"K11", "x":1, "y":1.5},
-            {"label":"K12", "x":2, "y":1.5},
-            {"label":"K13", "x":3, "y":1.5},
-            {"label":"K14", "x":4, "y":1.5},
-            {"label":"K15", "x":5, "y":1.5},
-            {"label":"K16", "x":6, "y":1.5},
-            {"label":"K17", "x":8.75, "y":1.5},
-            {"label":"K18", "x":9.75, "y":1.5},
-            {"label":"K19", "x":10.75, "y":1.5},
-            {"label":"K110", "x":12.75, "y":1.5},
-            {"label":"K111", "x":13.75, "y":1.5},
-            {"label":"K112", "x":14.75, "y":1.5},
-            {"label":"K113", "x":15.75, "y":1.5},
-            {"label":"K114", "x":16.75, "y":1.5},
-            {"label":"K115", "x":17.75, "y":1.5},
-            {"label":"K116", "x":18.75, "y":1.5, "w":2},
-            {"label":"K118", "x":20.75, "y":1.5},
-            {"label":"K119", "x":21.75, "y":1.5},
-            {"label":"K20", "x":0, "y":2.5, "w":1.5},
-            {"label":"K21", "x":1.5, "y":2.5},
-            {"label":"K22", "x":2.5, "y":2.5},
-            {"label":"K23", "x":3.5, "y":2.5},
-            {"label":"K24", "x":4.5, "y":2.5},
-            {"label":"K25", "x":5.5, "y":2.5},
-            {"label":"K26", "x":7.75, "y":2.5},
-            {"label":"K17", "x":8.75, "y":2.5},
-            {"label":"K28", "x":9.75, "y":2.5},
-            {"label":"K29", "x":10.75, "y":2},
-            {"label":"K210", "x":12.25, "y":2.5},
-            {"label":"K211", "x":13.25, "y":2.5},
-            {"label":"K212", "x":14.25, "y":2.5},
-            {"label":"K213", "x":15.25, "y":2.5},
-            {"label":"K214", "x":16.25, "y":2.5},
-            {"label":"K215", "x":17.25, "y":2.5},
-            {"label":"K216", "x":18.25, "y":2.5},
-            {"label":"K217", "x":19.25, "y":2.5, "w":1.5},
-            {"label":"K218", "x":20.75, "y":2.5},
-            {"label":"K219", "x":21.75, "y":2.5},
-            {"label":"K30", "x":0, "y":3.5, "w":1.75},
-            {"label":"K31", "x":1.75, "y":3.5},
-            {"label":"K32", "x":2.75, "y":3.5},
-            {"label":"K33", "x":3.75, "y":3.5},
-            {"label":"K34", "x":4.75, "y":3.5},
-            {"label":"K35", "x":5.75, "y":3.5},
-            {"label":"K36", "x":7.75, "y":3.5},
-            {"label":"K37", "x":8.75, "y":3.5},
-            {"label":"K38", "x":9.75, "y":3.5},
-            {"label":"K39", "x":10.75, "y":3},
-            {"label":"K310", "x":12.5, "y":3.5},
-            {"label":"K311", "x":13.5, "y":3.5},
-            {"label":"K312", "x":14.5, "y":3.5},
-            {"label":"K313", "x":15.5, "y":3.5},
-            {"label":"K314", "x":16.5, "y":3.5},
-            {"label":"K315", "x":17.5, "y":3.5},
-            {"label":"K317", "x":18.5, "y":3.5, "w":2.25},
-            {"label":"K40", "x":0, "y":4.5, "w":2.25},
-            {"label":"K41", "x":2.25, "y":4.5},
-            {"label":"K42", "x":3.25, "y":4.5},
-            {"label":"K43", "x":4.25, "y":4.5},
-            {"label":"K44", "x":5.25, "y":4.5},
-            {"label":"K45", "x":6.25, "y":4.5},
-            {"label":"K46", "x":7.75, "y":4.5},
-            {"label":"K47", "x":8.75, "y":4.5},
-            {"label":"K48", "x":9.75, "y":4.5},
-            {"label":"K49", "x":10.75, "y":4},
-            {"label":"K410", "x":13, "y":4.5},
-            {"label":"K411", "x":14, "y":4.5},
-            {"label":"K412", "x":15, "y":4.5},
-            {"label":"K413", "x":16, "y":4.5},
-            {"label":"K414", "x":17, "y":4.5},
-            {"label":"K416", "x":18, "y":4.5, "w":2.75},
-            {"label":"K418", "x":20.75, "y":4.5},
-            {"label":"K50", "x":0, "y":5.5, "w":1.25},
-            {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
-            {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
-            {"label":"K53", "x":3.75, "y":5.5, "w":1.25},
-            {"label":"K54", "x":5, "y":5.5, "w":2.25},
-            {"label":"K56", "x":7.75, "y":5.5},
-            {"Label":"K57", "x":8.75, "y":5},
-            {"label":"K58", "x":9.75, "y":5},
-            {"label":"K59", "x":10.75, "y":5},
-            {"label":"K510", "x":13, "y":5.5, "w":2},
-            {"label":"K512", "x":15, "y":5.5, "w":1.25},
-            {"label":"K513", "x":16.25, "y":5.5, "w":1.25},
-            {"label":"K514", "x":17.5, "y":5.5, "w":1.25},
-            {"label":"K516", "x":18.75, "y":5.5},
-            {"label":"K517", "x":19.75, "y":5.5},
-            {"label":"K518", "x":20.75, "y":5.5},
-            {"label":"K519", "x":21.75, "y":5.5}]
-      },
-      "LAYOUT_downbubble_spliteverything": {
-          "layout": [
-            {"label":"K00", "x":0, "y":0},
-            {"label":"K01", "x":1, "y":0},
-            {"label":"K02", "x":2, "y":0},
-            {"label":"K03", "x":3, "y":0},
-            {"label":"K04", "x":4, "y":0},
-            {"label":"K05", "x":5, "y":0},
-            {"label":"K06", "x":6, "y":0},
-            {"label":"K010", "x":12.75, "y":0},
-            {"label":"K011", "x":13.75, "y":0},
-            {"label":"K012", "x":14.75, "y":0},
-            {"label":"K013", "x":15.75, "y":0},
-            {"label":"K014", "x":16.75, "y":0},
-            {"label":"K015", "x":17.75, "y":0},
-            {"label":"K016", "x":18.75, "y":0},
-            {"label":"K017", "x":19.75, "y":0},
-            {"label":"K018", "x":20.75, "y":0},
-            {"label":"K019", "X":21.75, "y":0},
-            {"label":"K10", "x":0, "y":1},
-            {"label":"K11", "x":1, "y":1},
-            {"label":"K12", "x":2, "y":1},
-            {"label":"K13", "x":3, "y":1},
-            {"label":"K14", "x":4, "y":1},
-            {"label":"K15", "x":5, "y":1},
-            {"label":"K16", "x":6, "y":1},
-            {"label":"K17", "x":8.75, "y":1},
-            {"label":"K18", "x":9.75, "y":1},
-            {"label":"K19", "x":10.75, "y":1},
-            {"label":"K110", "x":12.75, "y":1},
-            {"label":"K111", "x":13.75, "y":1},
-            {"label":"K112", "x":14.75, "y":1},
-            {"label":"K113", "x":15.75, "y":1},
-            {"label":"K114", "x":16.75, "y":1},
-            {"label":"K115", "x":17.75, "y":1},
-            {"label":"K116", "x":18.75, "y":1},
-            {"label":"K117", "x":19.75, "y":1},
-            {"label":"K118", "x":20.75, "y":1},
-            {"label":"K119", "x":21.75, "y":1},
-            {"label":"K20", "x":0, "y":2, "w":1.5},
-            {"label":"K21", "x":1.5, "y":2},
-            {"label":"K22", "x":2.5, "y":2},
-            {"label":"K23", "x":3.5, "y":2},
-            {"label":"K24", "x":4.5, "y":2},
-            {"label":"K25", "x":5.5, "y":2},
-            {"label":"K26", "x":7.75, "y":2},
-            {"label":"K27", "x":8.75, "y":2},
-            {"label":"K28", "x":9.75, "y":2},
-            {"label":"K29", "x":10.75, "y":2},
-            {"label":"K210", "x":12.25, "y":2},
-            {"label":"K211", "x":13.25, "y":2},
-            {"label":"K212", "x":14.25, "y":2},
-            {"label":"K213", "x":15.25, "y":2},
-            {"label":"K214", "x":16.25, "y":2},
-            {"label":"K215", "x":17.25, "y":2},
-            {"label":"K216", "x":18.25, "y":2},
-            {"label":"K217", "x":19.25, "y":2, "w":1.5},
-            {"label":"K218", "x":20.75, "y":2},
-            {"label":"K219", "x":21.75, "y":2},
-            {"label":"K30", "x":0, "y":3, "w":1.75},
-            {"label":"K31", "x":1.75, "y":3},
-            {"label":"K32", "x":2.75, "y":3},
-            {"label":"K33", "x":3.75, "y":3},
-            {"label":"K34", "x":4.75, "y":3},
-            {"label":"K35", "x":5.75, "y":3},
-            {"label":"K36", "x":7.75, "y":3},
-            {"label":"K37", "x":8.75, "y":3},
-            {"label":"K38", "x":9.75, "y":3},
-            {"label":"K39", "x":10.75, "y":3},
-            {"label":"K310", "x":12.5, "y":3},
-            {"label":"K311", "x":13.5, "y":3},
-            {"label":"K312", "x":14.5, "y":3},
-            {"label":"K313", "x":15.5, "y":3},
-            {"label":"K314", "x":16.5, "y":3},
-            {"label":"K315", "x":17.5, "y":3},
-            {"label":"K317", "x":18.5, "y":3, "w":2.25},
-            {"label":"K40", "x":0, "y":4, "w":2.25},
-            {"label":"K41", "x":2.25, "y":4},
-            {"label":"K42", "x":3.25, "y":4},
-            {"label":"K43", "x":4.25, "y":4},
-            {"label":"K44", "x":5.25, "y":4},
-            {"label":"K45", "x":6.25, "y":4},
-            {"label":"K46", "x":7.75, "y":4},
-            {"label":"K47", "x":8.75, "y":4},
-            {"label":"K48", "x":9.75, "y":4},
-            {"label":"K49", "x":10.75, "y":4},
-            {"label":"K410", "x":13, "y":4},
-            {"label":"K411", "x":14, "y":4},
-            {"label":"K412", "x":15, "y":4},
-            {"label":"K413", "x":16, "y":4},
-            {"label":"K414", "x":17, "y":4},
-            {"label":"K416", "x":18, "y":4, "w":1.75},
-            {"label":"K417", "x":19.75, "y":4},
-            {"label":"K418", "x":20.75, "y":4},
-            {"label":"K50", "x":0, "y":5, "w":1.25},
-            {"label":"K51", "x":1.25, "y":5, "w":1.25},
-            {"label":"K52", "x":2.5, "y":5, "w":1.25},
-            {"label":"K53", "x":3.75, "y":5, "w":1.25},
-            {"label":"K54", "x":5, "y":5, "w":2.25},
-            {"label":"K56", "x":7.75, "y":5},
-            {"label":"K57", "x":8.75, "y":5},
-            {"label":"K58", "x":9.75, "y":5},
-            {"label":"K59", "x":10.75, "y":5},
-            {"label":"K510", "x":13, "y":5, "w":2},
-            {"label":"K512", "x":15, "y":5, "w":1.25},
-            {"label":"K513", "x":16.25, "y":5, "w":1.25},
-            {"label":"K514", "x":17.5, "y":5, "w":1.25},
-            {"label":"K516", "x":18.75, "y":5},
-            {"label":"K517", "x":19.75, "y":5},
-            {"label":"K518", "x":20.75, "y":5},
-            {"label":"K519", "x":21.75, "y":5}]
+    "LAYOUT_standard": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K05", "x":5, "y":0},
+        {"label":"K06", "x":6, "y":0},
+        {"label":"K010", "x":12.75, "y":0},
+        {"label":"K011", "x":13.75, "y":0},
+        {"label":"K012", "x":14.75, "y":0},
+        {"label":"K013", "x":15.75, "y":0},
+        {"label":"K014", "x":16.75, "y":0},
+        {"label":"K015", "x":17.75, "y":0},
+        {"label":"K016", "x":18.75, "y":0},
+        {"label":"K017", "x":19.75, "y":0},
+        {"label":"K018", "x":20.75, "y":0},
+        {"label":"K019", "x":21.75, "y":0},
+        {"label":"K10", "x":0, "y":1},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K14", "x":4, "y":1},
+        {"label":"K15", "x":5, "y":1},
+        {"label":"K16", "x":6, "y":1},
+        {"label":"K17", "x":8.75, "y":1},
+        {"label":"K18", "x":9.75, "y":1},
+        {"label":"K19", "x":10.75, "y":1},
+        {"label":"K110", "x":12.75, "y":1},
+        {"label":"K111", "x":13.75, "y":1},
+        {"label":"K112", "x":14.75, "y":1},
+        {"label":"K113", "x":15.75, "y":1},
+        {"label":"K114", "x":16.75, "y":1},
+        {"label":"K115", "x":17.75, "y":1},
+        {"label":"K116", "x":18.75, "y":1, "w":2},
+        {"label":"K118", "x":20.75, "y":1},
+        {"label":"K119", "x":21.75, "y":1},
+        {"label":"K20", "x":0, "y":2, "w":1.5},
+        {"label":"K21", "x":1.5, "y":2},
+        {"label":"K22", "x":2.5, "y":2},
+        {"label":"K23", "x":3.5, "y":2},
+        {"label":"K24", "x":4.5, "y":2},
+        {"label":"K25", "x":5.5, "y":2},
+        {"label":"K26", "x":7.75, "y":2},
+        {"label":"K17", "x":8.75, "y":2},
+        {"label":"K28", "x":9.75, "y":2},
+        {"label":"K210", "x":12.25, "y":2},
+        {"label":"K211", "x":13.25, "y":2},
+        {"label":"K212", "x":14.25, "y":2},
+        {"label":"K213", "x":15.25, "y":2},
+        {"label":"K214", "x":16.25, "y":2},
+        {"label":"K215", "x":17.25, "y":2},
+        {"label":"K216", "x":18.25, "y":2},
+        {"label":"K217", "x":19.25, "y":2, "w":1.5},
+        {"label":"K218", "x":20.75, "y":2},
+        {"label":"K219", "x":21.75, "y":2},
+        {"label":"K30", "x":0, "y":3, "w":1.75},
+        {"label":"K31", "x":1.75, "y":3},
+        {"label":"K32", "x":2.75, "y":3},
+        {"label":"K33", "x":3.75, "y":3},
+        {"label":"K34", "x":4.75, "y":3},
+        {"label":"K35", "x":5.75, "y":3},
+        {"label":"K36", "x":7.75, "y":3},
+        {"label":"K37", "x":8.75, "y":3},
+        {"label":"K38", "x":9.75, "y":3},
+        {"label":"K29", "x":10.75, "y":2, "h":2},
+        {"label":"K310", "x":12.5, "y":3},
+        {"label":"K311", "x":13.5, "y":3},
+        {"label":"K312", "x":14.5, "y":3},
+        {"label":"K313", "x":15.5, "y":3},
+        {"label":"K314", "x":16.5, "y":3},
+        {"label":"K315", "x":17.5, "y":3},
+        {"label":"K317", "x":18.5, "y":3, "w":2.25},
+        {"label":"K40", "x":0, "y":4, "w":2.25},
+        {"label":"K41", "x":2.25, "y":4},
+        {"label":"K42", "x":3.25, "y":4},
+        {"label":"K43", "x":4.25, "y":4},
+        {"label":"K44", "x":5.25, "y":4},
+        {"label":"K45", "x":6.25, "y":4},
+        {"label":"K46", "x":7.75, "y":4},
+        {"label":"K47", "x":8.75, "y":4},
+        {"label":"K48", "x":9.75, "y":4},
+        {"label":"K410", "x":13, "y":4},
+        {"label":"K411", "x":14, "y":4},
+        {"label":"K412", "x":15, "y":4},
+        {"label":"K413", "x":16, "y":4},
+        {"label":"K414", "x":17, "y":4},
+        {"label":"K416", "x":18, "y":4, "w":2.75},
+        {"label":"K418", "x":20.75, "y":4},
+        {"label":"K50", "x":0, "y":5, "w":1.25},
+        {"label":"K51", "x":1.25, "y":5, "w":1.25},
+        {"label":"K52", "x":2.5, "y":5, "w":1.25},
+        {"label":"K53", "x":3.75, "y":5, "w":1.25},
+        {"label":"K54", "x":5, "y":5, "w":2.25},
+        {"label":"K56", "x":7.75, "y":5, "w":2},
+        {"label":"K58", "x":9.75, "y":5},
+        {"label":"K49", "x":10.75, "y":4, "h":2},
+        {"label":"K510", "x":13, "y":5, "w":2},
+        {"label":"K512", "x":15, "y":5, "w":1.25},
+        {"label":"K513", "x":16.25, "y":5, "w":1.25},
+        {"label":"K514", "x":17.5, "y":5, "w":1.25},
+        {"label":"K516", "x":18.75, "y":5},
+        {"label":"K517", "x":19.75, "y":5},
+        {"label":"K518", "x":20.75, "y":5},
+        {"label":"K519", "x":21.75, "y":5}
+      ]
+    },
+    "LAYOUT_split_bs": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K05", "x":5, "y":0},
+        {"label":"K06", "x":6, "y":0},
+        {"label":"K010", "x":12.75, "y":0},
+        {"label":"K011", "x":13.75, "y":0},
+        {"label":"K012", "x":14.75, "y":0},
+        {"label":"K013", "x":15.75, "y":0},
+        {"label":"K014", "x":16.75, "y":0},
+        {"label":"K015", "x":17.75, "y":0},
+        {"label":"K016", "x":18.75, "y":0},
+        {"label":"K017", "x":19.75, "y":0},
+        {"label":"K018", "x":20.75, "y":0},
+        {"label":"K019", "x":21.75, "y":0},
+        {"label":"K10", "x":0, "y":1},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K14", "x":4, "y":1},
+        {"label":"K15", "x":5, "y":1},
+        {"label":"K16", "x":6, "y":1},
+        {"label":"K17", "x":8.75, "y":1},
+        {"label":"K18", "x":9.75, "y":1},
+        {"label":"K19", "x":10.75, "y":1},
+        {"label":"K110", "x":12.75, "y":1},
+        {"label":"K111", "x":13.75, "y":1},
+        {"label":"K112", "x":14.75, "y":1},
+        {"label":"K113", "x":15.75, "y":1},
+        {"label":"K114", "x":16.75, "y":1},
+        {"label":"K115", "x":17.75, "y":1},
+        {"label":"K116", "x":18.75, "y":1},
+        {"label":"K117", "x":19.75, "y":1},
+        {"label":"K118", "x":20.75, "y":1},
+        {"label":"K119", "x":21.75, "y":1},
+        {"label":"K20", "x":0, "y":2, "w":1.5},
+        {"label":"K21", "x":1.5, "y":2},
+        {"label":"K22", "x":2.5, "y":2},
+        {"label":"K23", "x":3.5, "y":2},
+        {"label":"K24", "x":4.5, "y":2},
+        {"label":"K25", "x":5.5, "y":2},
+        {"label":"K26", "x":7.75, "y":2},
+        {"label":"K17", "x":8.75, "y":2},
+        {"label":"K28", "x":9.75, "y":2},
+        {"label":"K210", "x":12.25, "y":2},
+        {"label":"K211", "x":13.25, "y":2},
+        {"label":"K212", "x":14.25, "y":2},
+        {"label":"K213", "x":15.25, "y":2},
+        {"label":"K214", "x":16.25, "y":2},
+        {"label":"K215", "x":17.25, "y":2},
+        {"label":"K216", "x":18.25, "y":2},
+        {"label":"K217", "x":19.25, "y":2, "w":1.5},
+        {"label":"K218", "x":20.75, "y":2},
+        {"label":"K219", "x":21.75, "y":2},
+        {"label":"K30", "x":0, "y":3, "w":1.75},
+        {"label":"K31", "x":1.75, "y":3},
+        {"label":"K32", "x":2.75, "y":3},
+        {"label":"K33", "x":3.75, "y":3},
+        {"label":"K34", "x":4.75, "y":3},
+        {"label":"K35", "x":5.75, "y":3},
+        {"label":"K36", "x":7.75, "y":3},
+        {"label":"K37", "x":8.75, "y":3},
+        {"label":"K38", "x":9.75, "y":3},
+        {"label":"K29", "x":10.75, "y":2, "h":2},
+        {"label":"K310", "x":12.5, "y":3},
+        {"label":"K311", "x":13.5, "y":3},
+        {"label":"K312", "x":14.5, "y":3},
+        {"label":"K313", "x":15.5, "y":3},
+        {"label":"K314", "x":16.5, "y":3},
+        {"label":"K315", "x":17.5, "y":3},
+        {"label":"K317", "x":18.5, "y":3, "w":2.25},
+        {"label":"K40", "x":0, "y":4, "w":2.25},
+        {"label":"K41", "x":2.25, "y":4},
+        {"label":"K42", "x":3.25, "y":4},
+        {"label":"K43", "x":4.25, "y":4},
+        {"label":"K44", "x":5.25, "y":4},
+        {"label":"K45", "x":6.25, "y":4},
+        {"label":"K46", "x":7.75, "y":4},
+        {"label":"K47", "x":8.75, "y":4},
+        {"label":"K48", "x":9.75, "y":4},
+        {"label":"K410", "x":13, "y":4},
+        {"label":"K411", "x":14, "y":4},
+        {"label":"K412", "x":15, "y":4},
+        {"label":"K413", "x":16, "y":4},
+        {"label":"K414", "x":17, "y":4},
+        {"label":"K416", "x":18, "y":4, "w":2.75},
+        {"label":"K418", "x":20.75, "y":4},
+        {"label":"K50", "x":0, "y":5, "w":1.25},
+        {"label":"K51", "x":1.25, "y":5, "w":1.25},
+        {"label":"K52", "x":2.5, "y":5, "w":1.25},
+        {"label":"K53", "x":3.75, "y":5, "w":1.25},
+        {"label":"K54", "x":5, "y":5, "w":2.25},
+        {"label":"K56", "x":7.75, "y":5, "w":2},
+        {"label":"K58", "x":9.75, "y":5},
+        {"label":"K49", "x":10.75, "y":4, "h":2},
+        {"label":"K510", "x":13, "y":5, "w":2},
+        {"label":"K512", "x":15, "y":5, "w":1.25},
+        {"label":"K513", "x":16.25, "y":5, "w":1.25},
+        {"label":"K514", "x":17.5, "y":5, "w":1.25},
+        {"label":"K516", "x":18.75, "y":5},
+        {"label":"K517", "x":19.75, "y":5},
+        {"label":"K518", "x":20.75, "y":5},
+        {"label":"K519", "x":21.75, "y":5}
+      ]
+    },
+    "LAYOUT_split_rshift": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K05", "x":5, "y":0},
+        {"label":"K06", "x":6, "y":0},
+        {"label":"K010", "x":12.75, "y":0},
+        {"label":"K011", "x":13.75, "y":0},
+        {"label":"K012", "x":14.75, "y":0},
+        {"label":"K013", "x":15.75, "y":0},
+        {"label":"K014", "x":16.75, "y":0},
+        {"label":"K015", "x":17.75, "y":0},
+        {"label":"K016", "x":18.75, "y":0},
+        {"label":"K017", "x":19.75, "y":0},
+        {"label":"K018", "x":20.75, "y":0},
+        {"label":"K019", "x":21.75, "y":0},
+        {"label":"K10", "x":0, "y":1},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K14", "x":4, "y":1},
+        {"label":"K15", "x":5, "y":1},
+        {"label":"K16", "x":6, "y":1},
+        {"label":"K17", "x":8.75, "y":1},
+        {"label":"K18", "x":9.75, "y":1},
+        {"label":"K19", "x":10.75, "y":1},
+        {"label":"K110", "x":12.75, "y":1},
+        {"label":"K111", "x":13.75, "y":1},
+        {"label":"K112", "x":14.75, "y":1},
+        {"label":"K113", "x":15.75, "y":1},
+        {"label":"K114", "x":16.75, "y":1},
+        {"label":"K115", "x":17.75, "y":1},
+        {"label":"K116", "x":18.75, "y":1, "w":2},
+        {"label":"K118", "x":20.75, "y":1},
+        {"label":"K119", "x":21.75, "y":1},
+        {"label":"K20", "x":0, "y":2, "w":1.5},
+        {"label":"K21", "x":1.5, "y":2},
+        {"label":"K22", "x":2.5, "y":2},
+        {"label":"K23", "x":3.5, "y":2},
+        {"label":"K24", "x":4.5, "y":2},
+        {"label":"K25", "x":5.5, "y":2},
+        {"label":"K26", "x":7.75, "y":2},
+        {"label":"K17", "x":8.75, "y":2},
+        {"label":"K28", "x":9.75, "y":2},
+        {"label":"K210", "x":12.25, "y":2},
+        {"label":"K211", "x":13.25, "y":2},
+        {"label":"K212", "x":14.25, "y":2},
+        {"label":"K213", "x":15.25, "y":2},
+        {"label":"K214", "x":16.25, "y":2},
+        {"label":"K215", "x":17.25, "y":2},
+        {"label":"K216", "x":18.25, "y":2},
+        {"label":"K217", "x":19.25, "y":2, "w":1.5},
+        {"label":"K218", "x":20.75, "y":2},
+        {"label":"K219", "x":21.75, "y":2},
+        {"label":"K30", "x":0, "y":3, "w":1.75},
+        {"label":"K31", "x":1.75, "y":3},
+        {"label":"K32", "x":2.75, "y":3},
+        {"label":"K33", "x":3.75, "y":3},
+        {"label":"K34", "x":4.75, "y":3},
+        {"label":"K35", "x":5.75, "y":3},
+        {"label":"K36", "x":7.75, "y":3},
+        {"label":"K37", "x":8.75, "y":3},
+        {"label":"K38", "x":9.75, "y":3},
+        {"label":"K29", "x":10.75, "y":2, "h":2},
+        {"label":"K310", "x":12.5, "y":3},
+        {"label":"K311", "x":13.5, "y":3},
+        {"label":"K312", "x":14.5, "y":3},
+        {"label":"K313", "x":15.5, "y":3},
+        {"label":"K314", "x":16.5, "y":3},
+        {"label":"K315", "x":17.5, "y":3},
+        {"label":"K317", "x":18.5, "y":3, "w":2.25},
+        {"label":"K40", "x":0, "y":4, "w":2.25},
+        {"label":"K41", "x":2.25, "y":4},
+        {"label":"K42", "x":3.25, "y":4},
+        {"label":"K43", "x":4.25, "y":4},
+        {"label":"K44", "x":5.25, "y":4},
+        {"label":"K45", "x":6.25, "y":4},
+        {"label":"K46", "x":7.75, "y":4},
+        {"label":"K47", "x":8.75, "y":4},
+        {"label":"K48", "x":9.75, "y":4},
+        {"label":"K410", "x":13, "y":4},
+        {"label":"K411", "x":14, "y":4},
+        {"label":"K412", "x":15, "y":4},
+        {"label":"K413", "x":16, "y":4},
+        {"label":"K414", "x":17, "y":4},
+        {"label":"K416", "x":18, "y":4, "w":1.75},
+        {"label":"K417", "x":19.75, "y":4},
+        {"label":"K418", "x":20.75, "y":4},
+        {"label":"K50", "x":0, "y":5, "w":1.25},
+        {"label":"K51", "x":1.25, "y":5, "w":1.25},
+        {"label":"K52", "x":2.5, "y":5, "w":1.25},
+        {"label":"K53", "x":3.75, "y":5, "w":1.25},
+        {"label":"K54", "x":5, "y":5, "w":2.25},
+        {"label":"K56", "x":7.75, "y":5, "w":2},
+        {"label":"K58", "x":9.75, "y":5},
+        {"label":"K49", "x":10.75, "y":4, "h":2},
+        {"label":"K510", "x":13, "y":5, "w":2},
+        {"label":"K512", "x":15, "y":5, "w":1.25},
+        {"label":"K513", "x":16.25, "y":5, "w":1.25},
+        {"label":"K514", "x":17.5, "y":5, "w":1.25},
+        {"label":"K516", "x":18.75, "y":5},
+        {"label":"K517", "x":19.75, "y":5},
+        {"label":"K518", "x":20.75, "y":5},
+        {"label":"K519", "x":21.75, "y":5}
+      ]
+    },
+    "LAYOUT_split_numpad": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K05", "x":5, "y":0},
+        {"label":"K06", "x":6, "y":0},
+        {"label":"K010", "x":12.75, "y":0},
+        {"label":"K011", "x":13.75, "y":0},
+        {"label":"K012", "x":14.75, "y":0},
+        {"label":"K013", "x":15.75, "y":0},
+        {"label":"K014", "x":16.75, "y":0},
+        {"label":"K015", "x":17.75, "y":0},
+        {"label":"K016", "x":18.75, "y":0},
+        {"label":"K017", "x":19.75, "y":0},
+        {"label":"K018", "x":20.75, "y":0},
+        {"label":"K019", "x":21.75, "y":0},
+        {"label":"K10", "x":0, "y":1},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K14", "x":4, "y":1},
+        {"label":"K15", "x":5, "y":1},
+        {"label":"K16", "x":6, "y":1},
+        {"label":"K17", "x":8.75, "y":1},
+        {"label":"K18", "x":9.75, "y":1},
+        {"label":"K19", "x":10.75, "y":1},
+        {"label":"K110", "x":12.75, "y":1},
+        {"label":"K111", "x":13.75, "y":1},
+        {"label":"K112", "x":14.75, "y":1},
+        {"label":"K113", "x":15.75, "y":1},
+        {"label":"K114", "x":16.75, "y":1},
+        {"label":"K115", "x":17.75, "y":1},
+        {"label":"K116", "x":18.75, "y":1, "w":2},
+        {"label":"K118", "x":20.75, "y":1},
+        {"label":"K119", "x":21.75, "y":1},
+        {"label":"K20", "x":0, "y":2, "w":1.5},
+        {"label":"K21", "x":1.5, "y":2},
+        {"label":"K22", "x":2.5, "y":2},
+        {"label":"K23", "x":3.5, "y":2},
+        {"label":"K24", "x":4.5, "y":2},
+        {"label":"K25", "x":5.5, "y":2},
+        {"label":"K26", "x":7.75, "y":2},
+        {"label":"K17", "x":8.75, "y":2},
+        {"label":"K28", "x":9.75, "y":2},
+        {"label":"K29", "x":10.75, "y":2},
+        {"label":"K210", "x":12.25, "y":2},
+        {"label":"K211", "x":13.25, "y":2},
+        {"label":"K212", "x":14.25, "y":2},
+        {"label":"K213", "x":15.25, "y":2},
+        {"label":"K214", "x":16.25, "y":2},
+        {"label":"K215", "x":17.25, "y":2},
+        {"label":"K216", "x":18.25, "y":2},
+        {"label":"K217", "x":19.25, "y":2, "w":1.5},
+        {"label":"K218", "x":20.75, "y":2},
+        {"label":"K219", "x":21.75, "y":2},
+        {"label":"K30", "x":0, "y":3, "w":1.75},
+        {"label":"K31", "x":1.75, "y":3},
+        {"label":"K32", "x":2.75, "y":3},
+        {"label":"K33", "x":3.75, "y":3},
+        {"label":"K34", "x":4.75, "y":3},
+        {"label":"K35", "x":5.75, "y":3},
+        {"label":"K36", "x":7.75, "y":3},
+        {"label":"K37", "x":8.75, "y":3},
+        {"label":"K38", "x":9.75, "y":3},
+        {"label":"K39", "x":10.75, "y":3},
+        {"label":"K310", "x":12.5, "y":3},
+        {"label":"K311", "x":13.5, "y":3},
+        {"label":"K312", "x":14.5, "y":3},
+        {"label":"K313", "x":15.5, "y":3},
+        {"label":"K314", "x":16.5, "y":3},
+        {"label":"K315", "x":17.5, "y":3},
+        {"label":"K317", "x":18.5, "y":3, "w":2.25},
+        {"label":"K40", "x":0, "y":4, "w":2.25},
+        {"label":"K41", "x":2.25, "y":4},
+        {"label":"K42", "x":3.25, "y":4},
+        {"label":"K43", "x":4.25, "y":4},
+        {"label":"K44", "x":5.25, "y":4},
+        {"label":"K45", "x":6.25, "y":4},
+        {"label":"K46", "x":7.75, "y":4},
+        {"label":"K47", "x":8.75, "y":4},
+        {"label":"K48", "x":9.75, "y":4},
+        {"label":"K49", "x":10.75, "y":4},
+        {"label":"K410", "x":13, "y":4},
+        {"label":"K411", "x":14, "y":4},
+        {"label":"K412", "x":15, "y":4},
+        {"label":"K413", "x":16, "y":4},
+        {"label":"K414", "x":17, "y":4},
+        {"label":"K416", "x":18, "y":4, "w":2.75},
+        {"label":"K418", "x":20.75, "y":4},
+        {"label":"K50", "x":0, "y":5, "w":1.25},
+        {"label":"K51", "x":1.25, "y":5, "w":1.25},
+        {"label":"K52", "x":2.5, "y":5, "w":1.25},
+        {"label":"K53", "x":3.75, "y":5, "w":1.25},
+        {"label":"K54", "x":5, "y":5, "w":2.25},
+        {"label":"K56", "x":7.75, "y":5},
+        {"Label":"K57", "x":8.75, "y":5},
+        {"label":"K58", "x":9.75, "y":5},
+        {"label":"K59", "x":10.75, "y":5},
+        {"label":"K510", "x":13, "y":5, "w":2},
+        {"label":"K512", "x":15, "y":5, "w":1.25},
+        {"label":"K513", "x":16.25, "y":5, "w":1.25},
+        {"label":"K514", "x":17.5, "y":5, "w":1.25},
+        {"label":"K516", "x":18.75, "y":5},
+        {"label":"K517", "x":19.75, "y":5},
+        {"label":"K518", "x":20.75, "y":5},
+        {"label":"K519", "x":21.75, "y":5}
+      ]
+    },
+    "LAYOUT_all": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K05", "x":5, "y":0},
+        {"label":"K06", "x":6, "y":0},
+        {"label":"K010", "x":12.75, "y":0},
+        {"label":"K011", "x":13.75, "y":0},
+        {"label":"K012", "x":14.75, "y":0},
+        {"label":"K013", "x":15.75, "y":0},
+        {"label":"K014", "x":16.75, "y":0},
+        {"label":"K015", "x":17.75, "y":0},
+        {"label":"K016", "x":18.75, "y":0},
+        {"label":"K017", "x":19.75, "y":0},
+        {"label":"K018", "x":20.75, "y":0},
+        {"label":"K019", "x":21.75, "y":0},
+        {"label":"K10", "x":0, "y":1},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K14", "x":4, "y":1},
+        {"label":"K15", "x":5, "y":1},
+        {"label":"K16", "x":6, "y":1},
+        {"label":"K17", "x":8.75, "y":1},
+        {"label":"K18", "x":9.75, "y":1},
+        {"label":"K19", "x":10.75, "y":1},
+        {"label":"K110", "x":12.75, "y":1},
+        {"label":"K111", "x":13.75, "y":1},
+        {"label":"K112", "x":14.75, "y":1},
+        {"label":"K113", "x":15.75, "y":1},
+        {"label":"K114", "x":16.75, "y":1},
+        {"label":"K115", "x":17.75, "y":1},
+        {"label":"K116", "x":18.75, "y":1},
+        {"label":"K117", "x":19.75, "y":1},
+        {"label":"K118", "x":20.75, "y":1},
+        {"label":"K119", "x":21.75, "y":1},
+        {"label":"K20", "x":0, "y":2, "w":1.5},
+        {"label":"K21", "x":1.5, "y":2},
+        {"label":"K22", "x":2.5, "y":2},
+        {"label":"K23", "x":3.5, "y":2},
+        {"label":"K24", "x":4.5, "y":2},
+        {"label":"K25", "x":5.5, "y":2},
+        {"label":"K26", "x":7.75, "y":2},
+        {"label":"K27", "x":8.75, "y":2},
+        {"label":"K28", "x":9.75, "y":2},
+        {"label":"K29", "x":10.75, "y":2},
+        {"label":"K210", "x":12.25, "y":2},
+        {"label":"K211", "x":13.25, "y":2},
+        {"label":"K212", "x":14.25, "y":2},
+        {"label":"K213", "x":15.25, "y":2},
+        {"label":"K214", "x":16.25, "y":2},
+        {"label":"K215", "x":17.25, "y":2},
+        {"label":"K216", "x":18.25, "y":2},
+        {"label":"K217", "x":19.25, "y":2, "w":1.5},
+        {"label":"K218", "x":20.75, "y":2},
+        {"label":"K219", "x":21.75, "y":2},
+        {"label":"K30", "x":0, "y":3, "w":1.75},
+        {"label":"K31", "x":1.75, "y":3},
+        {"label":"K32", "x":2.75, "y":3},
+        {"label":"K33", "x":3.75, "y":3},
+        {"label":"K34", "x":4.75, "y":3},
+        {"label":"K35", "x":5.75, "y":3},
+        {"label":"K36", "x":7.75, "y":3},
+        {"label":"K37", "x":8.75, "y":3},
+        {"label":"K38", "x":9.75, "y":3},
+        {"label":"K39", "x":10.75, "y":3},
+        {"label":"K310", "x":12.5, "y":3},
+        {"label":"K311", "x":13.5, "y":3},
+        {"label":"K312", "x":14.5, "y":3},
+        {"label":"K313", "x":15.5, "y":3},
+        {"label":"K314", "x":16.5, "y":3},
+        {"label":"K315", "x":17.5, "y":3},
+        {"label":"K317", "x":18.5, "y":3, "w":2.25},
+        {"label":"K40", "x":0, "y":4, "w":2.25},
+        {"label":"K41", "x":2.25, "y":4},
+        {"label":"K42", "x":3.25, "y":4},
+        {"label":"K43", "x":4.25, "y":4},
+        {"label":"K44", "x":5.25, "y":4},
+        {"label":"K45", "x":6.25, "y":4},
+        {"label":"K46", "x":7.75, "y":4},
+        {"label":"K47", "x":8.75, "y":4},
+        {"label":"K48", "x":9.75, "y":4},
+        {"label":"K49", "x":10.75, "y":4},
+        {"label":"K410", "x":13, "y":4},
+        {"label":"K411", "x":14, "y":4},
+        {"label":"K412", "x":15, "y":4},
+        {"label":"K413", "x":16, "y":4},
+        {"label":"K414", "x":17, "y":4},
+        {"label":"K416", "x":18, "y":4, "w":1.75},
+        {"label":"K417", "x":19.75, "y":4},
+        {"label":"K418", "x":20.75, "y":4},
+        {"label":"K50", "x":0, "y":5, "w":1.25},
+        {"label":"K51", "x":1.25, "y":5, "w":1.25},
+        {"label":"K52", "x":2.5, "y":5, "w":1.25},
+        {"label":"K53", "x":3.75, "y":5, "w":1.25},
+        {"label":"K54", "x":5, "y":5, "w":2.25},
+        {"label":"K56", "x":7.75, "y":5},
+        {"label":"K57", "x":8.75, "y":5},
+        {"label":"K58", "x":9.75, "y":5},
+        {"label":"K59", "x":10.75, "y":5},
+        {"label":"K510", "x":13, "y":5, "w":2},
+        {"label":"K512", "x":15, "y":5, "w":1.25},
+        {"label":"K513", "x":16.25, "y":5, "w":1.25},
+        {"label":"K514", "x":17.5, "y":5, "w":1.25},
+        {"label":"K516", "x":18.75, "y":5},
+        {"label":"K517", "x":19.75, "y":5},
+        {"label":"K518", "x":20.75, "y":5},
+        {"label":"K519", "x":21.75, "y":5}
+      ]
     }
-   }
+  }
 }

diff --git a/keyboards/handwired/downbubble/keymaps/default/keymap.c b/keyboards/handwired/downbubble/keymaps/default/keymap.c
index d35d367394617b11e3e9fe63aadcf21c1cee9c7e..48303900fb8159e09ddce4541956c75a54c2b93d 100644 (file)
--- a/keyboards/handwired/downbubble/keymaps/default/keymap.c
+++ b/keyboards/handwired/downbubble/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_downbubble_standard(\
+  [0] = LAYOUT_standard(\
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,                    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,          KC_SPC,               KC_P0,            KC_PDOT, KC_PENT,         KC_BSPC,          KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  LAYOUT_downbubble_splitbackspace(\
+  LAYOUT_split_bs(\
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_TRNS, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,                    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,          KC_SPC,               KC_P0,            KC_PDOT, KC_PENT,         KC_BSPC,          KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  LAYOUT_downbubble_splitrightshift(\
+  LAYOUT_split_rshift(\
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,                    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,          KC_SPC,               KC_P0,            KC_PDOT, KC_PENT,         KC_BSPC,          KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  LAYOUT_downbubble_splitnumpad(\
+  LAYOUT_split_numpad(\
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,   KC_PPLS,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,          KC_SPC,               KC_P0,   KC_TRNS, KC_PDOT, KC_TRNS,         KC_BSPC,          KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  LAYOUT_downbubble_spliteverything(\
+  LAYOUT_all(\
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_NLCK, KC_HOME, KC_TRNS,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                 KC_PSLS, KC_PAST, KC_PMNS,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_TRNS, KC_END,  KC_PGUP,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_P7,   KC_P8,   KC_P9,   KC_PPLS,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_PGDN,