diff --git a/zegonix/configs/sofle/keymaps/quaken/keymap.c b/zegonix/configs/sofle/keymaps/quaken/keymap.c
index 47d49e7..7f2eec0 100644
--- a/zegonix/configs/sofle/keymaps/quaken/keymap.c
+++ b/zegonix/configs/sofle/keymaps/quaken/keymap.c
@@ -14,7 +14,6 @@ enum sofle_layers {
     _GAME,
     _NAV,
     _CHAR,
-    _MOUS,
 };
 
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
@@ -22,7 +21,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_GAME] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) },
     [_NAV]  = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(_______, _______) },
     [_CHAR] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-    [_MOUS] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -48,7 +46,7 @@ KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,      KC_5,
 KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,                             KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_BSLS,
 MO(_CHAR), QUAK_A,    QUAK_S,    QUAK_D,    QUAK_F,    KC_G,                             KC_H,      QUAK_J,    QUAK_K,    QUAK_L,    QUAK__,    KC_QUOT,
 KC_LSFT,   KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_MUTE,    DF(_GAME), KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,
-           KC_LALT,   KC_LCTL,   MO(_MOUS), KC_SPC,    KC_DEL,                           KC_BSPC,   KC_ENT,    MO(_NAV),  KC_RALT,   KC_LGUI
+           KC_LALT,   KC_LCTL,   KC_DEL,    KC_SPC,    KC_ESC,                           KC_BSPC,   KC_ENT,    MO(_NAV),  KC_RALT,   KC_LGUI
 ),
 
 // GAME LAYER
@@ -78,15 +76,6 @@ _______,   _______,   _______,   _______,   _______,   _______,   _______,    __
            QK_BOOT,   _______,   _______,   KC_CAPS,   _______,                          _______,   _______,   _______,   _______,   _______
 ),
 
-// MOUSE KEYS LAYER
-[_MOUS] = LAYOUT(
-_______,   _______,   _______,   _______,   _______,   _______,                          _______,   _______,   _______,   _______,   _______,   _______,
-_______,   _______,   _______,   _______,   _______,   _______,                          KC_WH_U,   KC_BTN1,   KC_MS_U,   KC_BTN2,   _______,   _______,
-_______,   KC_LGUI,   KC_LALT,   KC_LSFT,   KC_LCTL,   _______,                          KC_WH_D,   KC_MS_L,   KC_MS_D,   KC_MS_R,   _______,   _______,
-_______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,
-           _______,   _______,   _______,   _______,   _______,                          _______,   _______,   _______,   _______,   _______
-)
-
 };
 
 #ifdef OLED_ENABLE
diff --git a/zegonix/qua_ken/config.h b/zegonix/qua_ken/config.h
index 55691bb..2a8b3e7 100644
--- a/zegonix/qua_ken/config.h
+++ b/zegonix/qua_ken/config.h
@@ -21,7 +21,10 @@
 
 /* split settings */
 #define	SPLIT_HAND_PIN_LOW_IS_LEFT
-#define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
-#define SERIAL_USART_TX_PIN A11    // USART TX pin
-#define SERIAL_USART_RX_PIN A12    // USART RX pin
-#define SERIAL_USART_DRIVER SD6    // Select UART Driver for interface 6
+#define SERIAL_USART_FULL_DUPLEX     // Enable full duplex operation mode.
+#define SERIAL_USART_TX_PIN      C6  // USART TX pin
+#define SERIAL_USART_RX_PIN      C7  // USART RX pin
+#define SERIAL_USART_DRIVER      SD6 // Select UART Driver for interface 6
+#define SERIAL_USART_TX_PAL_MODE 8   // USART6 is Alternate Function 8 on C6/7
+#define SERIAL_USART_RX_PAL_MODE 8
+
diff --git a/zegonix/qua_ken/keyboard.json b/zegonix/qua_ken/keyboard.json
index 40ef431..1a7f8a7 100644
--- a/zegonix/qua_ken/keyboard.json
+++ b/zegonix/qua_ken/keyboard.json
@@ -1,5 +1,5 @@
 {
-    "manufacturer": "=",
+    "manufacturer": "zegonix :",
     "keyboard_name": "qua-ken",
     "maintainer": "zegonix",
     "processor": "STM32F401",
@@ -24,11 +24,15 @@
     },
     "encoder": {
         "rotary": [
-            { "pin_a": "B14", "pin_b": "B15", "resolution": 2 }
+            { "pin_a": "B14", "pin_b": "B15", "resolution": 4 }
         ]
     },
     "split" : {
         "enabled": true,
+        "serial": {
+            "driver": "usart",
+        },
+        "soft_serial_speed": 1,
         "handedness": {
             "pin": "A2",
         },
diff --git a/zegonix/qua_ken/rules.mk b/zegonix/qua_ken/rules.mk
index 297f055..4971f30 100644
--- a/zegonix/qua_ken/rules.mk
+++ b/zegonix/qua_ken/rules.mk
@@ -1,5 +1,3 @@
-SERIAL_DRIVER = usart
-
 ENCODER_ENABLE = yes
 ENCODER_MAP_ENABLE = yes