6 files changed, 3 insertions, 6 deletions
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index 594f08a2fc..325670d304 100644
--- a/keyboards/keebsforall/coarse60/info.json
+++ b/keyboards/keebsforall/coarse60/info.json
@@ -8,6 +8,7 @@
         "pid": "0x5341",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
diff --git a/keyboards/keebsforall/coarse60/rules.mk b/keyboards/keebsforall/coarse60/rules.mk
index 3c7ef02d4b..8c88a08e06 100644
--- a/keyboards/keebsforall/coarse60/rules.mk
+++ b/keyboards/keebsforall/coarse60/rules.mk
@@ -22,5 +22,3 @@ ENCODER_ENABLE = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-LAYOUTS = alice alice_split_bs
diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json
index 4cab1d4cdb..7e84e2527b 100644
--- a/keyboards/keebsforall/freebirdnp/lite/info.json
+++ b/keyboards/keebsforall/freebirdnp/lite/info.json
@@ -8,6 +8,7 @@
         "pid": "0x1013",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["numpad_5x4", "ortho_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
diff --git a/keyboards/keebsforall/freebirdnp/lite/rules.mk b/keyboards/keebsforall/freebirdnp/lite/rules.mk
index 9f2621eeb3..20c49d4776 100644
--- a/keyboards/keebsforall/freebirdnp/lite/rules.mk
+++ b/keyboards/keebsforall/freebirdnp/lite/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 = numpad_5x4 ortho_5x4
diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json
index c2432d6adc..7f2ab93341 100644
--- a/keyboards/keebsforall/freebirdnp/pro/info.json
+++ b/keyboards/keebsforall/freebirdnp/pro/info.json
@@ -8,6 +8,7 @@
         "pid": "0x1014",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["numpad_6x4", "ortho_6x4"],
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
diff --git a/keyboards/keebsforall/freebirdnp/pro/rules.mk b/keyboards/keebsforall/freebirdnp/pro/rules.mk
index fae02c7844..86534dd307 100644
--- a/keyboards/keebsforall/freebirdnp/pro/rules.mk
+++ b/keyboards/keebsforall/freebirdnp/pro/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
-
-LAYOUTS = numpad_6x4 ortho_6x4