diff --git a/keyboards/klor/keymaps/default/rules.mk b/keyboards/klor/keymaps/default/rules.mk
index 8589fb8c..6b62723a 100644
--- a/keyboards/klor/keymaps/default/rules.mk
+++ b/keyboards/klor/keymaps/default/rules.mk
@@ -11,4 +11,4 @@ HAPTIC_ENABLE = no
 RGB_MATRIX_ENABLE = no
 
 # Choose your layout
-KLOR_LAYOUT = polydactyl
\ No newline at end of file
+KLOR_CONFIG = polydactyl
\ No newline at end of file
diff --git a/keyboards/klor/keymaps/saegewerk/rules.mk b/keyboards/klor/keymaps/saegewerk/rules.mk
index 3c6c3e29..8d2f16c3 100644
--- a/keyboards/klor/keymaps/saegewerk/rules.mk
+++ b/keyboards/klor/keymaps/saegewerk/rules.mk
@@ -11,4 +11,4 @@ HAPTIC_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 
 # Choose your layout
-KLOR_LAYOUT = saegewerk
\ No newline at end of file
+KLOR_CONFIG = saegewerk
\ No newline at end of file
diff --git a/keyboards/klor/keymaps/t4corun/rules.mk b/keyboards/klor/keymaps/t4corun/rules.mk
index 9b44ea0d..9125104c 100644
--- a/keyboards/klor/keymaps/t4corun/rules.mk
+++ b/keyboards/klor/keymaps/t4corun/rules.mk
@@ -1,6 +1,5 @@
 # override userspace defaults
 
-
 # override keyboard defaults
 #	keyboards\klor\info.json
 #	keyboards\klor\rules.mk
@@ -8,4 +7,7 @@
 AUDIO_ENABLE = yes
 MUSIC_ENABLE = yes
 HAPTIC_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
\ No newline at end of file
+RGB_MATRIX_ENABLE = yes
+
+# Choose your layout
+KLOR_CONFIG = saegewerk
\ No newline at end of file
diff --git a/keyboards/klor/post_rules.mk b/keyboards/klor/post_rules.mk
index d2e4f737..edfbe8c7 100644
--- a/keyboards/klor/post_rules.mk
+++ b/keyboards/klor/post_rules.mk
@@ -1,9 +1,9 @@
-VALID_KLOR_LAYOUTS := polydactyl konrad yubitsume saegewerk
+VALID_KLOR_CONFIG := polydactyl konrad yubitsume saegewerk
 
-ifeq ($(filter $(KLOR_LAYOUT),$(VALID_KLOR_LAYOUTS)),)
-    $(call CATASTROPHIC_ERROR,Invalid KLOR_LAYOUT,KLOR_LAYOUT="$(KLOR_LAYOUT)" is not a valid KLOR Layout)
+ifeq ($(filter $(KLOR_CONFIG),$(VALID_KLOR_CONFIG)),)
+    $(call CATASTROPHIC_ERROR,Invalid KLOR_LAYOUT,KLOR_LAYOUT="$(KLOR_CONFIG)" is not a valid KLOR Layout)
 else
-    OPT_DEFS += -DKLOR_$(strip $(shell echo $(KLOR_LAYOUT) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DKLOR_$(strip $(shell echo $(KLOR_CONFIG) | tr '[:lower:]' '[:upper:]'))
 endif
 
 # Turn off features for AVR Processors due to memory size
diff --git a/qmk.json b/qmk.json
index 87bf8394..48af71e4 100644
--- a/qmk.json
+++ b/qmk.json
@@ -9,7 +9,7 @@
 		["bluebell/swoop", "t4corun"],
 		["barbellboards/rollow", "t4corun"],
 		["klor/2040", "t4corun"],
-		["klor", "default"],fd
+		["klor", "default"],
 		["klor/2040", "default"],
 		["klor/2040", "saegewerk"]