diff --git a/config/base.keymap b/config/base.keymap
index e6c85043b..7dd22ae56 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -54,16 +54,16 @@
 
 /* Homerow mods */
 
-/* Definition for Corne (6-column layout) */
-// #include "../zmk-nodefree-config/keypos_def/keypos_42keys.h"
-// #define KEYS_L LT0 LT1 LT2 LT3 LT4 LT5 LM0 LM1 LM2 LM3 LM4 LM5 LB0 LB1 LB2 LB3 LB4 LB5  // left hand
-// #define KEYS_R RT0 RT1 RT2 RT3 RT4 RT5 RM0 RM1 RM2 RM3 RM4 RM5 RB0 RB1 RB2 RB3 RB4 RB5  // right hand
-// #define THUMBS LH2 LH1 LH0 RH0 RH1 RH2                                                  // thumbs
-
 /* use helper macros to define left and right hand keys */
-// #define KEYS_L LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4  // left hand
-// #define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4  // right hand
-// #define THUMBS LH2 LH1 LH0 RH0 RH1 RH2                                      // thumbs
+#if !defined KEYS_L  // left hand
+    #define KEYS_L LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4
+#endif
+#if !defined KEYS_R  // right hand
+    #define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4
+#endif
+#if !defined THUMBS  // thumbs
+    #define THUMBS LH2 LH1 LH0 RH0 RH1 RH2
+#endif
 
 #define MAKE_HRM(NAME, HOLD, TAP, TRIGGER_POS) \
     ZMK_BEHAVIOR(NAME, hold_tap, \
diff --git a/config/corne.keymap b/config/corne.keymap
index df43dac21..866a6e6fa 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -20,6 +20,7 @@
 /* activate bluetooth */
 #define CONFIG_WIRELESS 1
 
+/* Definition for Corne (6-column layout) */
 #define KEYS_L LT0 LT1 LT2 LT3 LT4 LT5 LM0 LM1 LM2 LM3 LM4 LM5 LB0 LB1 LB2 LB3 LB4 LB5  // left hand
 #define KEYS_R RT0 RT1 RT2 RT3 RT4 RT5 RM0 RM1 RM2 RM3 RM4 RM5 RB0 RB1 RB2 RB3 RB4 RB5  // right hand
 #define THUMBS LH2 LH1 LH0 RH0 RH1 RH2                                                  // thumbs