5 files changed, 3 insertions, 5 deletions
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index f1b7267681..a8e43410ff 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -8,6 +8,7 @@
         "pid": "0x474E",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["60_hhkb"],
     "layouts": {
         "LAYOUT_60_hhkb": {
             "layout": [
diff --git a/keyboards/matrix/falcon/rules.mk b/keyboards/matrix/falcon/rules.mk
index a279def303..3ff392a61f 100644
--- a/keyboards/matrix/falcon/rules.mk
+++ b/keyboards/matrix/falcon/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 = no           # Audio output
-
-LAYOUTS = 60_hhkb
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 5a4477931b..9251760aa2 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -8,6 +8,7 @@
     "pid": "0x0065",
     "device_version": "0.0.1"
   },
+  "community_layouts": ["65_iso_blocker"],
   "layouts": {
     "LAYOUT_default": {
       "layout": [
diff --git a/keyboards/matrix/noah/keymaps/blockader/keymap.c b/keyboards/matrix/noah/keymaps/blockader/keymap.c
index b6d9a9acc3..cec0905677 100644
--- a/keyboards/matrix/noah/keymaps/blockader/keymap.c
+++ b/keyboards/matrix/noah/keymaps/blockader/keymap.c
@@ -32,7 +32,7 @@ enum{
     DANCE_PGUP_TOP,
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [DANCE_PGDN_BOTTOM] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, LGUI(KC_DOWN)),
     [DANCE_PGUP_TOP] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, LGUI(KC_UP)),
 };
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 7971d628d6..616574f4ae 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -33,5 +33,3 @@ RGBLIGHT_CUSTOM_DRIVER = yes
 CUSTOM_MATRIX = yes
 # project specific files
 SRC += ws2812.c matrix.c
-
-LAYOUTS = 65_iso_blocker