diff --git a/keyboards/klor/2040/2040.c b/keyboards/klor/2040/2040.c
index c8a237b4..504d8fc2 100644
--- a/keyboards/klor/2040/2040.c
+++ b/keyboards/klor/2040/2040.c
@@ -1 +1,4 @@
+// Copyright 2022 @geigeigeist
+// SPDX-License-Identifier: GPL-2.0+
+
#include "2040.h"
\ No newline at end of file
diff --git a/keyboards/klor/2040/2040.h b/keyboards/klor/2040/2040.h
index 2b748f70..fe69da9f 100644
--- a/keyboards/klor/2040/2040.h
+++ b/keyboards/klor/2040/2040.h
@@ -1,3 +1,6 @@
+// Copyright 2022 @geigeigeist
+// SPDX-License-Identifier: GPL-2.0+
+
#pragma once
#include "klor.h"
\ No newline at end of file
diff --git a/keyboards/klor/2040/config.h b/keyboards/klor/2040/config.h
index 8fbc56f0..c3c566e1 100644
--- a/keyboards/klor/2040/config.h
+++ b/keyboards/klor/2040/config.h
@@ -1,3 +1,7 @@
+// Copyright 2022 @geigeigeist
+// SPDX-License-Identifier: GPL-2.0+
+// here you find only RP2040 specific configurations
+
#pragma once
#include "config_common.h"
diff --git a/keyboards/klor/config.h b/keyboards/klor/config.h
index e29d34b3..4f826db9 100644
--- a/keyboards/klor/config.h
+++ b/keyboards/klor/config.h
@@ -1,4 +1,22 @@
+/*
+Copyright 2022 GEIST <@geigeigeist>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#pragma once
+#include "config_common.h"
// Most configuration will be found in info.json
diff --git a/keyboards/klor/keymaps/default/config.h b/keyboards/klor/keymaps/default/config.h
index 62175180..95ce1828 100644
--- a/keyboards/klor/keymaps/default/config.h
+++ b/keyboards/klor/keymaps/default/config.h
@@ -11,11 +11,6 @@ for more options.
//#define TAPPING_TERM 170
#define TAPPING_TERM 170
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define TAPPING_FORCE_HOLD
// Auto Shift
#define NO_AUTO_SHIFT_ALPHA
diff --git a/keyboards/klor/keymaps/default/keymap.c b/keyboards/klor/keymaps/default/keymap.c
index 3d6d43cd..4faf89c4 100644
--- a/keyboards/klor/keymaps/default/keymap.c
+++ b/keyboards/klor/keymaps/default/keymap.c
@@ -20,9 +20,9 @@
#include <stdio.h>
#include <string.h>
#include "klor.h"
-#ifdef HAPTIC_ENABLE
-#include "drivers/haptic/DRV2605L.h"
-#endif //HAPTIC ENABLE
+//#ifdef HAPTIC_ENABLE
+//#include "drivers/haptic/DRV2605L.h"
+//#endif //HAPTIC ENABLE
// ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
diff --git a/keyboards/klor/keymaps/default/rules.mk b/keyboards/klor/keymaps/default/rules.mk
index 98144ed9..b838d215 100644
--- a/keyboards/klor/keymaps/default/rules.mk
+++ b/keyboards/klor/keymaps/default/rules.mk
@@ -1,9 +1,4 @@
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-ENCODER_ENABLE = yes
EXTRAKEY_ENABLE = yes
-AUDIO_ENABLE = no
-MUSIC_ENABLE = no
DYNAMIC_MACRO_ENABLE = no
COMBO_ENABLE = no
@@ -13,4 +8,4 @@ KEY_OVERRIDE_ENABLE = no
HAPTIC_ENABLE = no
#PER KEY RGB
-RGB_MATRIX_ENABLE = no
+RGB_MATRIX_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/klor/keymaps/default/geist/config.h b/keyboards/klor/keymaps/geist/config.h
similarity index 100%
rename from keyboards/klor/keymaps/default/geist/config.h
rename to keyboards/klor/keymaps/geist/config.h
diff --git a/keyboards/klor/keymaps/default/geist/keymap.c b/keyboards/klor/keymaps/geist/keymap.c
similarity index 100%
rename from keyboards/klor/keymaps/default/geist/keymap.c
rename to keyboards/klor/keymaps/geist/keymap.c
diff --git a/keyboards/klor/keymaps/default/geist/rules.mk b/keyboards/klor/keymaps/geist/rules.mk
similarity index 100%
rename from keyboards/klor/keymaps/default/geist/rules.mk
rename to keyboards/klor/keymaps/geist/rules.mk
diff --git a/keyboards/klor/klor.c b/keyboards/klor/klor.c
index e374b1bc..ebfc7652 100644
--- a/keyboards/klor/klor.c
+++ b/keyboards/klor/klor.c
@@ -17,6 +17,81 @@
#include "klor.h"
+#define LAYOUT_polydactyl( \
+ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
+ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
+ L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25, \
+ L31, L32, L33, L34, R31, R32, R33, R34 \
+ ) \
+ { \
+ { ___, L01, L02, L03, L04, L05 }, \
+ { L10, L11, L12, L13, L14, L15 }, \
+ { L20, L21, L22, L23, L24, L25 }, \
+ { ___, L31, L32, L33, L34, L35 }, \
+ { ___, R04, R03, R02, R01, R00 }, \
+ { R15, R14, R13, R12, R11, R10 }, \
+ { R25, R24, R23, R22, R21, R20 }, \
+ { ___, R34, R33, R32, R31, R30 }, \
+ }
+
+
+#define LAYOUT_konrad( \
+ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
+ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
+ L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25, \
+ L31, L32, L33, R32, R33, R34 \
+ ) \
+ { \
+ { ___, L01, L02, L03, L04, L05 }, \
+ { L10, L11, L12, L13, L14, L15 }, \
+ { L20, L21, L22, L23, L24, L25 }, \
+ { ___, L31, L32, L33, ___, L35 }, \
+ { ___, R04, R03, R02, R01, R00 }, \
+ { R15, R14, R13, R12, R11, R10 }, \
+ { R25, R24, R23, R22, R21, R20 }, \
+ { ___, R34, R33, R32, ___, R30 }, \
+ }
+
+
+#define LAYOUT_yubitsume( \
+ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
+ L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
+ L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, \
+ L31, L32, L33, L34, R31, R32, R33, R34 \
+ ) \
+ { \
+ { ___, L01, L02, L03, L04, L05 }, \
+ { ___, L11, L12, L13, L14, L15 }, \
+ { ___, L21, L22, L23, L24, L25 }, \
+ { ___, L31, L32, L33, L34, L35 }, \
+ { ___, R04, R03, R02, R01, R00 }, \
+ { ___, R14, R13, R12, R11, R10 }, \
+ { ___, R24, R23, R22, R21, R20 }, \
+ { ___, R34, R33, R32, R31, R30 }, \
+ }
+
+
+#define LAYOUT_saegewerk( \
+ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
+ L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
+ L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, \
+ L31, L32, L33, R32, R33, R34 \
+ ) \
+ { \
+ { ___, L01, L02, L03, L04, L05 }, \
+ { ___, L11, L12, L13, L14, L15 }, \
+ { ___, L21, L22, L23, L24, L25 }, \
+ { ___, L31, L32, L33, ___, L35 }, \
+ { ___, R04, R03, R02, R01, R00 }, \
+ { ___, R14, R13, R12, R11, R10 }, \
+ { ___, R24, R23, R22, R21, R20 }, \
+ { ___, R34, R33, R32, ___, R30 }, \
+ }
+
+
+#define LAYOUT LAYOUT_polydactyl
+
+
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
return OLED_ROTATION_180;
diff --git a/keyboards/klor/klor.h b/keyboards/klor/klor.h
index 7d0934cd..f087d80d 100644
--- a/keyboards/klor/klor.h
+++ b/keyboards/klor/klor.h
@@ -28,78 +28,4 @@
*/
// readability
-#define ___ KC_NO
-
-#define LAYOUT_polydactyl( \
- L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25, \
- L31, L32, L33, L34, R31, R32, R33, R34 \
- ) \
- { \
- { ___, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { ___, L31, L32, L33, L34, L35 }, \
- { ___, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { ___, R34, R33, R32, R31, R30 }, \
- }
-
-
-#define LAYOUT_konrad( \
- L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25, \
- L31, L32, L33, R32, R33, R34 \
- ) \
- { \
- { ___, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { ___, L31, L32, L33, ___, L35 }, \
- { ___, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { ___, R34, R33, R32, ___, R30 }, \
- }
-
-
-#define LAYOUT_yubitsume( \
- L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
- L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
- L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, \
- L31, L32, L33, L34, R31, R32, R33, R34 \
- ) \
- { \
- { ___, L01, L02, L03, L04, L05 }, \
- { ___, L11, L12, L13, L14, L15 }, \
- { ___, L21, L22, L23, L24, L25 }, \
- { ___, L31, L32, L33, L34, L35 }, \
- { ___, R04, R03, R02, R01, R00 }, \
- { ___, R14, R13, R12, R11, R10 }, \
- { ___, R24, R23, R22, R21, R20 }, \
- { ___, R34, R33, R32, R31, R30 }, \
- }
-
-
-#define LAYOUT_saegewerk( \
- L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
- L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
- L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, \
- L31, L32, L33, R32, R33, R34 \
- ) \
- { \
- { ___, L01, L02, L03, L04, L05 }, \
- { ___, L11, L12, L13, L14, L15 }, \
- { ___, L21, L22, L23, L24, L25 }, \
- { ___, L31, L32, L33, ___, L35 }, \
- { ___, R04, R03, R02, R01, R00 }, \
- { ___, R14, R13, R12, R11, R10 }, \
- { ___, R24, R23, R22, R21, R20 }, \
- { ___, R34, R33, R32, ___, R30 }, \
- }
-
-
-#define LAYOUT LAYOUT_polydactyl
\ No newline at end of file
+#define ___ KC_NO
\ No newline at end of file
diff --git a/keyboards/klor/rules.mk b/keyboards/klor/rules.mk
index b71d7dde..75752de2 100644
--- a/keyboards/klor/rules.mk
+++ b/keyboards/klor/rules.mk
@@ -5,13 +5,15 @@
#
SWAP_HANDS_ENABLE = yes
+OLED_ENABLE = yes
+
# HAPTIC FEEDBACK
HAPTIC_DRIVER = drv2605l
# PER KEY RGB
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
# SPACE SAVING
EXTRAKEY_ENABLE = no