7 files changed, 17 insertions, 26 deletions
diff --git a/keyboards/kbd6x/keymaps/konstantin/config.h b/keyboards/kbd6x/keymaps/konstantin/config.h
index 4b511eb848..16387fa2f6 100644
--- a/keyboards/kbd6x/keymaps/konstantin/config.h
+++ b/keyboards/kbd6x/keymaps/konstantin/config.h
@@ -1,3 +1,4 @@
 #pragma once
 
 #define LAYER_FN
+#define SEND_STRING_CLEAN
diff --git a/keyboards/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbd6x/keymaps/konstantin/keymap.c
index b400b06810..fa324be9a1 100644
--- a/keyboards/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbd6x/keymaps/konstantin/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
    * │        │Mut│VoD│VoU│Ply│Prv│Nxt│MW←│MW→│M4 │M5 │      │   │
    * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
-   *       │   │     │            MW↓            │     │   │
+   *       │   │     │            MW↓            │MAcl2│   │
    *       └───┴─────┴───────────────────────────┴─────┴───┘
    */
   [L_FN] = LAYOUT(
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_DEL,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, _______,
     _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_WH_L, KC_WH_R, KC_BTN4, KC_BTN5, _______, _______,
-    XXXXXXX, _______, _______,                   KC_WH_D,                   _______, _______, XXXXXXX
+    XXXXXXX, _______, _______,                   KC_WH_D,                   KC_ACL2, _______, XXXXXXX
   ),
 
   /* RCtrl layer
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h
index 99dc6af755..1364fe8a28 100644
--- a/keyboards/whitefox/keymaps/konstantin/config.h
+++ b/keyboards/whitefox/keymaps/konstantin/config.h
@@ -4,24 +4,3 @@
 
 #define LAYER_FN
 #define LAYER_NUMPAD
-
-#define MAGIC_KEY_LAYER0_ALT1 BSLS
-#define MAGIC_KEY_BOOTLOADER  ESC
-
-#define MOUSEKEY_DELAY             50
-#define MOUSEKEY_INTERVAL          15
-#define MOUSEKEY_MAX_SPEED         4
-#define MOUSEKEY_TIME_TO_MAX       50
-#define MOUSEKEY_WHEEL_MAX_SPEED   1
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 50
-
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_MACRO
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM    200
-#define TAPPING_TOGGLE  2
-
-#define UNICODE_CYCLE_PERSIST   false
-#define UNICODE_SELECTED_MODES  UC_WINC, UC_LNX
-#define UNICODE_WINC_KEY        KC_RGUI
diff --git a/users/konstantin/config.h b/users/konstantin/config.h
index d03333f05d..800b8e49ba 100644
--- a/users/konstantin/config.h
+++ b/users/konstantin/config.h
@@ -14,6 +14,7 @@
 
 #define NO_ACTION_FUNCTION
 #define NO_ACTION_MACRO
+#define NO_ACTION_ONESHOT
 
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM    200
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 977111c1f9..47596279c3 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -3,8 +3,9 @@
 #ifdef LAYER_NUMPAD
 static void toggle_numpad(void) {
   layer_invert(L_NUMPAD);
-  bool num_lock = host_keyboard_leds() & 1<<USB_LED_NUM_LOCK;
-  if (num_lock != (bool)IS_LAYER_ON(L_NUMPAD)) {
+  bool numpad_on = IS_LAYER_ON(L_NUMPAD);
+  bool num_lock_on = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
+  if (num_lock_on != numpad_on) {
     tap_code(KC_NLCK); // Toggle Num Lock to match layer state
   }
 }
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index 06081496b6..f67f9f1b7e 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -25,6 +25,16 @@
 
 #define LCT_CPS LCTL_T(KC_CAPS)
 
+#ifdef SEND_STRING_CLEAN
+  #undef  SEND_STRING
+  #define SEND_STRING(...) {            \
+      uint8_t ss_mods = get_mods();     \
+      clear_mods();                     \
+      send_string_P(PSTR(__VA_ARGS__)); \
+      set_mods(ss_mods);                \
+    }
+#endif
+
 enum keycodes_user {
   CLEAR = SAFE_RANGE,
 #ifdef LAYER_NUMPAD
diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
index 7f25a8107a..d2522b9523 100644
--- a/users/konstantin/rules.mk
+++ b/users/konstantin/rules.mk
@@ -2,7 +2,6 @@ BOOTMAGIC_ENABLE   = no
 COMMAND_ENABLE     = yes
 CONSOLE_ENABLE     = yes
 EXTRAKEY_ENABLE    = yes
-KEYBOARD_SHARED_EP = yes # TODO: Disable once Command is fixed
 MOUSEKEY_ENABLE    = yes
 NKRO_ENABLE        = yes
 TAP_DANCE_ENABLE   = yes