Linworks Fave87 Layout Macro Refactor (#14008)

* correct LAYOUT_tkl_ansi data

Number row was positioned 0.25u too low.

* correct LAYOUT_tkl_ansi macro

- remove position K027 (right half of Split Backspace)
- remove position K096 (right portion of Split Right Shift)

* correct LAYOUT_tkl_iso macro

- remove position K027 (right half of Split Backspace)
- remove position K096 (right portion of Split Right Shift)

* enable Community Layout support

* add LAYOUT_tkl_ansi_split_bs_rshift and LAYOUT_tkl_iso_split_bs_rshift

3 files changed, 531 insertions, 283 deletions

diff --git a/keyboards/linworks/fave87/fave87.h b/keyboards/linworks/fave87/fave87.h
index 400755774a..7c3490f457 100644
--- a/keyboards/linworks/fave87/fave87.h
+++ b/keyboards/linworks/fave87/fave87.h
@@ -42,6 +42,28 @@
 
 #define LAYOUT_tkl_ansi( \
     K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
+    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,         K037,  K028,  K038, \
+    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
+    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,         K076,                             \
+    K080,         K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,         K086,                K088,        \
+    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
+) { \
+  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
+  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
+  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
+  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
+  { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
+  { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
+  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
+  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
+  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
+  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
+  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
+}
+
+#define LAYOUT_tkl_ansi_split_bs_rshift( \
+    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
     K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
     K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
     K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,         K076,                             \
@@ -50,20 +72,42 @@
 ) { \
   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
   { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
   { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
   { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
   { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
   { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
   { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
   { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { KC_NO, K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
+  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
   { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
   { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
 }
 
 #define LAYOUT_tkl_iso( \
     K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
+    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,         K037,  K028,  K038, \
+    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,                K057,  K048,  K058, \
+    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
+    K080,  K090,  K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,         K086,                K088,        \
+    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
+) { \
+  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
+  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
+  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
+  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
+  { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
+  { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
+  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
+  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
+  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
+  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
+  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
+}
+
+#define LAYOUT_tkl_iso_split_bs_rshift( \
+    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
     K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
     K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,                K057,  K048,  K058, \
     K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
@@ -72,14 +116,14 @@
 ) { \
   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
   { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
   { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
   { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
   { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
   { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
   { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
   { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
+  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
   { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
   { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
 }
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index 0612ca91f4..92be78d558 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -6,294 +6,496 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                
-                {"label":"~", "x":0, "y":1.25}, 
-                {"label":"!", "x":1, "y":1.25}, 
-                {"label":"@", "x":2, "y":1.25}, 
-                {"label":"#", "x":3, "y":1.25}, 
-                {"label":"$", "x":4, "y":1.25}, 
-                {"label":"%", "x":5, "y":1.25}, 
-                {"label":"^", "x":6, "y":1.25}, 
-                {"label":"&", "x":7, "y":1.25}, 
-                {"label":"*", "x":8, "y":1.25}, 
-                {"label":"(", "x":9, "y":1.25}, 
-                {"label":")", "x":10, "y":1.25}, 
-                {"label":"_", "x":11, "y":1.25}, 
-                {"label":"+", "x":12, "y":1.25}, 
-                {"x":13, "y":1.25}, 
-                {"label":"Bksp", "x":14, "y":1.25}, 
-                {"label":"Insert", "x":15.25, "y":1.25}, 
-                {"label":"Home", "x":16.25, "y":1.25}, 
-                {"label":"PgUp", "x":17.25, "y":1.25}, 
-                
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"x":12.75, "y":3.25}, 
-                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, 
-                
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
-                {"x":1.25, "y":4.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, 
-                {"x":14, "y":4.25}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"label":"Bksp", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25}]
         },
 
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Bksp", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-                
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
-                {"label":"\u2192", "x":17.25, "y":5.25}]
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Bksp", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         },
+
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Bksp", "x":13, "y":1.25},
+                {"label":"Bksp", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                
-                {"label":"~", "x":0, "y":1.25}, 
-                {"label":"!", "x":1, "y":1.25}, 
-                {"label":"@", "x":2, "y":1.25}, 
-                {"label":"#", "x":3, "y":1.25}, 
-                {"label":"$", "x":4, "y":1.25}, 
-                {"label":"%", "x":5, "y":1.25}, 
-                {"label":"^", "x":6, "y":1.25}, 
-                {"label":"&", "x":7, "y":1.25}, 
-                {"label":"*", "x":8, "y":1.25}, 
-                {"label":"(", "x":9, "y":1.25}, 
-                {"label":")", "x":10, "y":1.25}, 
-                {"label":"_", "x":11, "y":1.25}, 
-                {"label":"+", "x":12, "y":1.25}, 
-                {"label":"Bksp", "x":13, "y":1.25, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.25}, 
-                {"label":"Home", "x":16.25, "y":1.25}, 
-                {"label":"PgUp", "x":17.25, "y":1.25}, 
-                
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"label":"#", "x":12.75, "y":3.25}, 
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Bksp", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"#", "x":12.75, "y":3.25},
                 {"label":"Enter", "x": 13.75, "y":2.25, "w":1.25, "h":2},
-                
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
-                {"x":1.25, "y":4.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
-                {"label":"\u2192", "x":17.25, "y":5.25}]
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ct