commit - acaeb7149ca241a3083cec42cd67bd0451dee46c
commit + 7613f658740234db17172c03e5845fde29a7178b
blob - 8a7c306563473801db27622f0d934a57ea29a80c
blob + 30956f193490e0b59e14432cd032104875714258
--- keyboards/crkbd/keymaps/witcher/keymap.c
+++ keyboards/crkbd/keymaps/witcher/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_C
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 	      MO(2),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-	      MO(2),    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+	      MO(8),    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
 	//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 	                                        KC_LCTL, GUI_ESC,  KC_SPC,    KC_LSFT,   MO(1), KC_LALT
 	                                    //`--------------------------'  `--------------------------'
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_C
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 	      MO(5),    DE_A,    DE_S,    DE_D,    DE_F,    DE_G,                         DE_H,    DE_J,    DE_K,    DE_L, DE_SCLN, DE_QUOT,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-	      MO(5),    DE_Z,    DE_X,    DE_C,    DE_V,    DE_B,                         DE_N,    DE_M, DE_COMM,  DE_DOT, DE_SLSH,  KC_ENT,
+	      MO(8),    DE_Z,    DE_X,    DE_C,    DE_V,    DE_B,                         DE_N,    DE_M, DE_COMM,  DE_DOT, DE_SLSH,  KC_ENT,
 	//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 	                                        KC_LCTL, GUI_ESC,  KC_SPC,    KC_LSFT,   MO(4), KC_LALT
 	                                    //`--------------------------'  `--------------------------'
@@ -123,6 +123,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_C
 	                                           KC_2, GUI_ESC,  KC_SPC,    KC_LSFT,   DF(3), KC_LALT
 	                                    //`--------------------------'  `--------------------------'
 	),
+    // 8 - Mouse emulation
+    [8] = LAYOUT_split_3x6_3(
+	//,-----------------------------------------------------.                    ,-----------------------------------------------------.
+	    _______, _______, _______, _______, _______, _______,                      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______,
+	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+	    _______, _______, _______, KC_BTN2, KC_BTN1, _______,                      KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
+	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+	    KC_TRNS, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+	//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+	                                        _______, _______, _______,    _______, _______, _______
+	                                    //`--------------------------'  `--------------------------'
+    ),
 };
 
 #ifdef KEY_OVERRIDE_ENABLE
@@ -185,7 +197,7 @@ const key_override_t **key_overrides = (const key_over
 	&apostrophe_key_override, &slash_key_override, &grave_key_override,
 	&delete_key_override, NULL
 };
-#endif  // KEY_OVERRIDE_ENABLE
+#endif // KEY_OVERRIDE_ENABLE
 
 #ifdef OLED_ENABLE
 #    include <stdio.h>
@@ -197,14 +209,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotatio
 	return rotation;
 }
 
-#    define L_BASE 0
-#    define L_SYMBOLS 2
-#    define L_MAN 4
-#    define L_BASE_GERMAN 8
-#    define L_SYMBOLS_GERMAN 16
-#    define L_MAN_GERMAN 32
-#    define L_EXTRA 64
-
 void oled_render_logo(void) {
 	static const char PROGMEM crkbd_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84,
 		0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,