6 files changed, 7 insertions, 12 deletions
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
index 026f20dc8f..63d02fc807 100644
--- a/layouts/community/60_iso/unxmaal/config.h
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -17,8 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifndef RGB_DI_PIN
-    #define RGB_DI_PIN F4
+#define RGB_DI_PIN F4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
index 2ce7257d2b..c2d3c6b075 100644
--- a/layouts/community/60_iso/unxmaal/rules.mk
+++ b/layouts/community/60_iso/unxmaal/rules.mk
@@ -1,4 +1,7 @@
-# Only enable RGB on avr boards
-ifndef MCU_FAMILY
-    RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
+# Only enable RGBLIGHT on avr boards
+ifeq ($(strip $(PLATFORM_KEY)),avr)
+    # ...that are at least prepared for it
+    ifdef RGBLIGHT_DRIVER
+        RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
+    endif
 endif
diff --git a/layouts/community/ergodox/berfarah/config.h b/layouts/community/ergodox/berfarah/config.h
index 0acb95b85f..381b66edf1 100644
--- a/layouts/community/ergodox/berfarah/config.h
+++ b/layouts/community/ergodox/berfarah/config.h
@@ -6,4 +6,3 @@
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.4
 #define RGBLIGHT_EFFECT_BREATHE_MAX 150
 
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/kejadlen/config.h b/layouts/community/ergodox/kejadlen/config.h
index 4e554e8a1a..4f14eff96b 100644
--- a/layouts/community/ergodox/kejadlen/config.h
+++ b/layouts/community/ergodox/kejadlen/config.h
@@ -3,4 +3,3 @@
 #define FORCE_NKRO
 
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ortho_4x12/junonum/config.h b/layouts/community/ortho_4x12/junonum/config.h
index 91be890a8b..c16d74892d 100644
--- a/layouts/community/ortho_4x12/junonum/config.h
+++ b/layouts/community/ortho_4x12/junonum/config.h
@@ -38,6 +38,3 @@
 
 // Short tap threshold
 #define TAPPING_TERM 250
-
-// For homerow mods
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/planck_mit/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h
index e22f298035..df53dda471 100644
--- a/layouts/community/planck_mit/guidoism/config.h
+++ b/layouts/community/planck_mit/guidoism/config.h
@@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define USB_MAX_POWER_CONSUMPTION 50