Migrate LAYOUTS to data driven, handwired

qmk · zvecr · Jan 10, 2023 · Jan 8, 2023 · Jan 8, 2023 · Jan 8, 2023
commit 9b1598768529067d4c175949c54ed895a589fd8d
diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json
@@ -8,6 +8,7 @@
  "pid": "0x0000",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["planck_mit"],
  "layouts": {
  "LAYOUT_planck_mit": {
  "layout": [

diff --git a/keyboards/handwired/aranck/rules.mk b/keyboards/handwired/aranck/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes # Audio output
-
-LAYOUTS = planck_mit
diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json
@@ -8,6 +8,7 @@
  "pid": "0x0001",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["fullsize_ansi"],
  "layouts": {
  "LAYOUT_fullsize_ansi": {
  "layout": [

diff --git a/keyboards/handwired/boss566y/redragon_vara/rules.mk b/keyboards/handwired/boss566y/redragon_vara/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = fullsize_ansi
diff --git a/keyboards/handwired/co60/info.json b/keyboards/handwired/co60/info.json
@@ -6,6 +6,7 @@
  "vid": "0xFEED",
  "pid": "0x0000"
  },
+ "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
  "layouts": {
  "LAYOUT_all": {
  "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Win", "x":11, "y":4, "w":1}, {"label":"Menu", "x":12, "y":4, "w":1}, {"label":"Ctrl", "x":13, "y":4, "w":1}, {"label":"Fn", "x":14, "y":4, "w":1}]

diff --git a/keyboards/handwired/co60/rev1/rules.mk b/keyboards/handwired/co60/rev1/rules.mk
@@ -16,6 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
 AUDIO_ENABLE = no # Audio output
 LEADER_ENABLE = yes # Turn on leader support
-
-# Layouts supported by this PCB:
-LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_hhkb
diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk
@@ -18,5 +18,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality
 LEADER_ENABLE = yes
-
-LAYOUTS += 60_ansi 60_ansi_split_bs_rshift 60_iso 60_hhkb
diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk
@@ -21,5 +21,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality
 LEADER_ENABLE = yes
-
-LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso 60_hhkb
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
@@ -8,6 +8,7 @@
  "pid": "0x0302",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["alice_split_bs"],
  "layouts": {
  "LAYOUT_alice_split_bs": {
  "layout": [

diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk
@@ -19,5 +19,3 @@ LTO_ENABLE = yes # Use link time optimization
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-
-LAYOUTS = alice_split_bs
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -8,6 +8,7 @@
  "pid": "0x3536",
  "device_version": "0.0.3"
  },
+ "community_layouts": ["split_3x5_3"],
  "layouts": {
  "LAYOUT_split_3x5_3": {
  "layout": [

diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
@@ -23,5 +23,3 @@ SPLIT_KEYBOARD = yes
 
 RGBLIGHT_SUPPORTED = yes
 RGB_MATRIX_SUPPORTED = yes
-
-LAYOUTS = split_3x5_3
diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/info.json
@@ -8,6 +8,7 @@
  "pid": "0x0000",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_4x12"],
  "layouts": {
  "LAYOUT_ortho_4x12": {
  "layout": [

diff --git a/keyboards/handwired/floorboard/rules.mk b/keyboards/handwired/floorboard/rules.mk
@@ -17,5 +17,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = ortho_4x12
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
@@ -8,6 +8,7 @@
  "pid": "0xB170",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["60_tsangan_hhkb"],
  "layouts": {
  "LAYOUT_60_tsangan_hhkb": {
  "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Menu", "x":13.5, "y":4, "w":1.5}]

diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
@@ -21,5 +21,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = BluefruitLE
-
-LAYOUTS = 60_tsangan_hhkb
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
@@ -8,6 +8,7 @@
  "pid": "0x0000",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["planck_mit"],
  "layouts": {
  "LAYOUT_planck_mit": {
  "layout": [

diff --git a/keyboards/handwired/heisenberg/rules.mk b/keyboards/handwired/heisenberg/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes # Audio output
-
-LAYOUTS = planck_mit
diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json
@@ -8,6 +8,7 @@
  "pid": "0x6060",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_5x12"],
  "layouts": {
  "LAYOUT_ortho_5x12": {
  "layout": [

diff --git a/keyboards/handwired/jot50/rules.mk b/keyboards/handwired/jot50/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
 AUDIO_ENABLE = no # Audio output
 RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-LAYOUTS = ortho_5x12 
diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json
@@ -8,6 +8,7 @@
  "pid": "0x6060",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_4x12"],
  "layouts": {
  "LAYOUT_ortho_4x12": {
  "layout": [

diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 AUDIO_ENABLE = no # Audio output
 RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-LAYOUTS = ortho_4x12 
diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json
@@ -8,6 +8,7 @@
  "pid": "0x6060",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_4x4"],
  "layouts": {
  "LAYOUT_ortho_4x4": {
  "layout": [

diff --git a/keyboards/handwired/jotpad16/rules.mk b/keyboards/handwired/jotpad16/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 AUDIO_ENABLE = no # Audio output
 RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-LAYOUTS = ortho_4x4
diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json
@@ -8,6 +8,7 @@
  "pid": "0x6060",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["numpad_5x4"],
  "layouts": {
  "LAYOUT_numpad_5x4": {
  "layout": [

diff --git a/keyboards/handwired/k_numpad17/rules.mk b/keyboards/handwired/k_numpad17/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality 
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 
 AUDIO_ENABLE = no
-
-LAYOUTS = numpad_5x4
diff --git a/keyboards/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/info.json
@@ -8,6 +8,7 @@
  "pid": "0x0000",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["fullsize_ansi"],
  "layouts": {
  "LAYOUT_fullsize_ansi": {
  "layout": [

diff --git a/keyboards/handwired/oem_ansi_fullsize/rules.mk b/keyboards/handwired/oem_ansi_fullsize/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = fullsize_ansi
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json
@@ -8,6 +8,7 @@
  "pid": "0x6060",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_4x12"],
  "layouts": {
  "LAYOUT_ortho_4x12": {
  "layout": [

diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk
@@ -14,6 +14,4 @@ NKRO_ENABLE = yes # Enable N-key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable RGB underlight.
 
-LAYOUTS = ortho_4x12
-
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
@@ -8,6 +8,7 @@
  "pid": "0xDA19",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["alice", "alice_split_bs"],
  "layouts": {
  "LAYOUT_owlet60_full_bsp": {
  "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]

diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk
@@ -20,5 +20,3 @@ CUSTOM_MATRIX = yes
 OLED_ENABLE = no
 
 SRC += matrix.c
-
-LAYOUTS = alice alice_split_bs
diff --git a/keyboards/handwired/pytest/has_community/info.json b/keyboards/handwired/pytest/has_community/info.json
@@ -0,0 +1,3 @@
+{
+ "community_layouts": ["ortho_1x1"]
+}
diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk
@@ -1 +0,0 @@
-LAYOUTS = ortho_1x1

diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json
@@ -8,6 +8,7 @@
  "pid": "0x002A",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_5x12"],
  "layouts": {
  "LAYOUT_ortho_5x12": {
  "layout": [

diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk
@@ -19,5 +19,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
 BACKLIGHT_DRIVER = software
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = ortho_5x12
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json
@@ -8,6 +8,7 @@
  "pid": "0x002B",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_5x12"],
  "layouts": {
  "LAYOUT_ortho_5x12": {
  "layout": [

diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk
@@ -18,5 +18,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = ortho_5x12
diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json
@@ -8,6 +8,7 @@
  "pid": "0x4260",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_5x12"],
  "layouts": {
  "LAYOUT_ortho_5x12": {
  "layout": [

diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled
 AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
 RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-
-LAYOUTS = ortho_5x12
diff --git a/keyboards/handwired/sick68/info.json b/keyboards/handwired/sick68/info.json
@@ -8,6 +8,7 @@
  "pid": "0x5F00",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["65_ansi"],
  "layouts": {
  "LAYOUT_65_ansi": {
  "layout": [

diff --git a/keyboards/handwired/sick68/rules.mk b/keyboards/handwired/sick68/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = 65_ansi
diff --git a/keyboards/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/info.json
@@ -8,6 +8,7 @@
  "pid": "0xDA20",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["numpad_5x4"],
  "layouts": {
  "LAYOUT_numpad_5x4": {
  "layout": [

diff --git a/keyboards/handwired/sick_pad/rules.mk b/keyboards/handwired/sick_pad/rules.mk
@@ -17,4 +17,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-LAYOUTS = numpad_5x4
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -8,6 +8,7 @@
  "pid": "0x1213",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["ortho_2x3"],
  "layouts": {
  "LAYOUT_ortho_2x3": {
  "layout": [

diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = ortho_2x3
diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/info.json
@@ -8,6 +8,7 @@
  "pid": "0xEAEF",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["65_ansi_blocker_split_bs"],
  "layouts": {
  "LAYOUT_65_ansi_blocker_split_bs": {
  "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2, "w":2.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}]

diff --git a/keyboards/handwired/swiftrax/astro65/rules.mk b/keyboards/handwired/swiftrax/astro65/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = 65_ansi_blocker_split_bs
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -8,6 +8,7 @@
  "pid": "0xE7F1",
  "device_version": "0.0.1"
  },
+ "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso", "65_iso_split_bs"],
  "layouts": {
  "LAYOUT_65_ansi": {
  "layout": [

diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk
@@ -17,5 +17,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
 ENCODER_ENABLE = yes # Rotary Encoder
-
-LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso 65_iso_split_bs