diff --git a/keyboards/klor/keymaps/default/keymap.c b/keyboards/klor/keymaps/default/keymap.c
index a15b4f79..2e0ef826 100644
--- a/keyboards/klor/keymaps/default/keymap.c
+++ b/keyboards/klor/keymaps/default/keymap.c
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPACE │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
- [_QWERTY] = KLOR(
+ [_QWERTY] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPCE │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
- [_COLEMAK] = KLOR(
+ [_COLEMAK] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
KC_TAB, GUI_A, ALT_R, CTL_S, SHT_T, KC_D, KC_H, SHT_N, CTL_E, ALT_I, GUI_O, KC_QUOT,
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ ▼ ││ ▼ │ ▼ │ ADJUST │ 0 │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
- [_LOWER] = KLOR(
+ [_LOWER] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_CAPS, KC_NUM, KC_UP, KC_EQL, KC_LCBR, KC_RCBR, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_ESC, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_MINS, KC_DQT,
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ ADJUST │ ▼ │ ▼ ││ ▼ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
- [_RAISE] = KLOR(
+ [_RAISE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, RALT(KC_U),RALT(KC_3),KC_BSLS,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ ▼ ││ ▼ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
- [_ADJUST] = KLOR(
+ [_ADJUST] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
AU_TOGG, HF_TOGG, RGB_HUI, RGB_MOD, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F14,
QK_BOOT, DB_TOGG, QWERTY, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F12, KC_F13,
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -253,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -276,7 +276,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -300,7 +300,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/klor/keymaps/saegewerk/keymap.c b/keyboards/klor/keymaps/saegewerk/keymap.c
index 168454f7..b3c78874 100644
--- a/keyboards/klor/keymaps/saegewerk/keymap.c
+++ b/keyboards/klor/keymaps/saegewerk/keymap.c
@@ -95,8 +95,6 @@ enum custom_keycodes {
// └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
// ▝▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▘
-//putting this here does make it work
-//#define LAYOUT_KLOR(...) LAYOUT_saegewerk(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -116,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPACE │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
- [_QWERTY] = KLOR(
+ [_QWERTY] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
@@ -138,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPCE │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
- [_COLEMAK] = KLOR(
+ [_COLEMAK] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
GUI_A, ALT_R, CTL_S, SHT_T, KC_D, KC_H, SHT_N, CTL_E, ALT_I, GUI_O,
@@ -162,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ADJUST │ 0 │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
- [_LOWER] = KLOR(
+ [_LOWER] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_CAPS, KC_NUM, KC_UP, KC_EQL, KC_LCBR, KC_RCBR, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_MINS,
@@ -185,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ ADJUST │ ▼ │ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
- [_RAISE] = KLOR(
+ [_RAISE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, RALT(KC_U),RALT(KC_3),KC_BSLS,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@@ -208,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
- [_ADJUST] = KLOR(
+ [_ADJUST] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
AU_TOGG, HF_TOGG, RGB_HUI, RGB_MOD, QK_BOOT, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F11,
DB_TOGG, QWERTY, RGB_SAI, XXXXXXX, QK_MAKE, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F12,
@@ -232,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -255,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -278,7 +276,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -302,7 +300,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
- [_TEMPLATE] = KLOR(
+ [_TEMPLATE] = KLOR_LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/klor/keymaps/t4corun/config.h b/keyboards/klor/keymaps/t4corun/config.h
index e69de29b..21481545 100644
--- a/keyboards/klor/keymaps/t4corun/config.h
+++ b/keyboards/klor/keymaps/t4corun/config.h
@@ -0,0 +1 @@
+# pragma once
\ No newline at end of file
diff --git a/keyboards/klor/keymaps/t4corun/keymap.c b/keyboards/klor/keymaps/t4corun/keymap.c
index e69de29b..690aa5a7 100644
--- a/keyboards/klor/keymaps/t4corun/keymap.c
+++ b/keyboards/klor/keymaps/t4corun/keymap.c
@@ -0,0 +1,48 @@
+#include "t4corun.h"
+
+#define LAYOUT_klor_wrapper(...) KLOR_LAYOUT(__VA_ARGS__)
+
+#define LAYOUT_3x5_3_keymap( \
+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+ k32, k33, k34, k35, k36, k37 \
+) \
+LAYOUT_klor_wrapper ( \
+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+ k20, k21, k22, k23, k24, k32, k37, k25, k26, k27, k28, k29, \
+ KC_BTN1, k33, k34, k35, k36, KC_BTN4 \
+)
+
+#define KLOR(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_QWERTY] = KLOR(LAYER_QWERTY),
+ [_COLEMAK_DH] = KLOR(LAYER_COLEMAK_DH),
+ [_GAME] = KLOR(LAYER_GAME),
+ [_NAVIGATION] = KLOR(LAYER_NAVIGATION),
+ [_NUMBER] = KLOR(LAYER_NUMBER),
+ [_SYMBOL] = KLOR(LAYER_SYMBOL),
+ [_CONFIG] = KLOR(LAYER_CONFIG)
+
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+
+/* These are horizontal encoders. Found I have to make it opposite the rotary encoders for it to feel intuitive*/
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+ [_QWERTY] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+ [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+ [_GAME] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+ [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
+ [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
+ [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
+ [_CONFIG] = { ENCODER_CCW_CW(BASELYR, RBSELYR), ENCODER_CCW_CW(TR_RMOD, TR_RRMD) }
+
+};
+
+#endif
\ No newline at end of file
diff --git a/keyboards/klor/keymaps/t4corun/rules.mk b/keyboards/klor/keymaps/t4corun/rules.mk
index e69de29b..9b44ea0d 100644
--- a/keyboards/klor/keymaps/t4corun/rules.mk
+++ b/keyboards/klor/keymaps/t4corun/rules.mk
@@ -0,0 +1,11 @@
+# override userspace defaults
+
+
+# override keyboard defaults
+# keyboards\klor\info.json
+# keyboards\klor\rules.mk
+# keyboards\klor\2040\rules.mk
+AUDIO_ENABLE = yes
+MUSIC_ENABLE = yes
+HAPTIC_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/klor/klor.h b/keyboards/klor/klor.h
index 26248535..4ccc751a 100644
--- a/keyboards/klor/klor.h
+++ b/keyboards/klor/klor.h
@@ -31,12 +31,13 @@
#define ___ KC_NO
+// it does not like it when the macro starts with LAYOUT...
#ifdef KLOR_POLYDACTYL
-# define KLOR(...) LAYOUT_polydactyl(__VA_ARGS__)
+# define KLOR_LAYOUT(...) LAYOUT_polydactyl(__VA_ARGS__)
#elif defined(KLOR_KONRAD)
-# define KLOR(...) LAYOUT_konrad(__VA_ARGS__)
+# define KLOR_LAYOUT(...) LAYOUT_konrad(__VA_ARGS__)
#elif defined(KLOR_YUBITSUME)
-# define KLOR(...) LAYOUT_yubitsume(__VA_ARGS__)
+# define KLOR_LAYOUT(...) LAYOUT_yubitsume(__VA_ARGS__)
#elif defined(KLOR_SAEGEWERK)
-# define KLOR(...) LAYOUT_saegewerk(__VA_ARGS__)
+# define KLOR_LAYOUT(...) LAYOUT_saegewerk(__VA_ARGS__)
#endif //KLOR_POLYDACTL
diff --git a/qmk.json b/qmk.json
index 92211f97..87bf8394 100644
--- a/qmk.json
+++ b/qmk.json
@@ -8,7 +8,8 @@
["planck/rev6", "t4corun"],
["bluebell/swoop", "t4corun"],
["barbellboards/rollow", "t4corun"],
- ["klor", "default"],
+ ["klor/2040", "t4corun"],
+ ["klor", "default"],fd
["klor/2040", "default"],
["klor/2040", "saegewerk"]