9 files changed, 6 insertions, 2 deletions
diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk
index 490ebbf77..9be2f01d4 100644
--- a/layouts/community/ortho_4x12/bakingpy/rules.mk
+++ b/layouts/community/ortho_4x12/bakingpy/rules.mk
@@ -5,6 +5,8 @@ endif
 AUDIO_ENABLE = no
 ifeq ($(strip $(KEYBOARD)), zlant)
   BACKLIGHT_ENABLE = no
+else ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
+	  BACKLIGHT_ENABLE = no
 else
   BACKLIGHT_ENABLE = yes
 endif
diff --git a/layouts/community/ortho_4x12/wanleg/rules.mk b/layouts/community/ortho_4x12/wanleg/rules.mk
index fa433a6b0..835022f4b 100644
--- a/layouts/community/ortho_4x12/wanleg/rules.mk
+++ b/layouts/community/ortho_4x12/wanleg/rules.mk
@@ -5,10 +5,10 @@ ifeq ($(strip $(KEYBOARD)), jj40)
 	SWAP_HANDS_ENABLE = no
 endif
 
-ifeq ($(strip $(KEYBOARD)), 4x4)
+ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
 	SWAP_HANDS_ENABLE = no
 endif
 
 ifeq ($(strip $(KEYBOARD)), zlant)
 	SWAP_HANDS_ENABLE = no
-endif
-\ No newline at end of file
+endif
diff --git a/layouts/community/ortho_4x12/xyverz/rules.mk b/layouts/community/ortho_4x12/xyverz/rules.mk
index 852e38f24..c181e1107 100644
--- a/layouts/community/ortho_4x12/xyverz/rules.mk
+++ b/layouts/community/ortho_4x12/xyverz/rules.mk
@@ -3,6 +3,8 @@ AUDIO_ENABLE = no           # Audio output on port C6
 
 ifeq ("$(KEYBOARD)","vitamins_included")
   RGBLIGHT_ENABLE = no
+else ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
+	  RGBLIGHT_ENABLE = no
 else
   RGBLIGHT_ENABLE = yes
 endif
diff --git a/layouts/community/ortho_4x12/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h
index e22f29803..e22f29803 100644
--- a/layouts/community/ortho_4x12/guidoism/config.h
+++ b/layouts/community/planck_mit/guidoism/config.h
diff --git a/layouts/community/ortho_4x12/guidoism/generate_c.py b/layouts/community/planck_mit/guidoism/generate_c.py
index 5bee57608..5bee57608 100644
--- a/layouts/community/ortho_4x12/guidoism/generate_c.py
+++ b/layouts/community/planck_mit/guidoism/generate_c.py
diff --git a/layouts/community/ortho_4x12/guidoism/guidoism.json b/layouts/community/planck_mit/guidoism/guidoism.json
index 6a4364c6b..6a4364c6b 100644
--- a/layouts/community/ortho_4x12/guidoism/guidoism.json
+++ b/layouts/community/planck_mit/guidoism/guidoism.json
diff --git a/layouts/community/ortho_4x12/guidoism/keymap.c b/layouts/community/planck_mit/guidoism/keymap.c
index 2027e2bfa..2027e2bfa 100644
--- a/layouts/community/ortho_4x12/guidoism/keymap.c
+++ b/layouts/community/planck_mit/guidoism/keymap.c
diff --git a/layouts/community/ortho_4x12/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 791119b4f..791119b4f 100644
--- a/layouts/community/ortho_4x12/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
diff --git a/layouts/community/ortho_4x12/guidoism/readme.md b/layouts/community/planck_mit/guidoism/readme.md
index 540db64e8..540db64e8 100644
--- a/layouts/community/ortho_4x12/guidoism/readme.md
+++ b/layouts/community/planck_mit/guidoism/readme.md