diff --git a/config/adv360pro.conf b/config/adv360pro.conf
index 3dfb0ae..e928e9f 100644
--- a/config/adv360pro.conf
+++ b/config/adv360pro.conf
@@ -1,8 +1,12 @@
+# Set sleep timeout to 30min (30*60*1000ms)
+CONFIG_ZMK_SLEEP=y
+CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
+
 # Mouse config, requires PR #778
 CONFIG_ZMK_MOUSE=y
 CONFIG_ZMK_MOUSE_TICK_DURATION=8
 
 # Combo config, automated by build script
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=4
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
 CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
 
diff --git a/config/base.keymap b/config/base.keymap
index 5878232..45362e0 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -28,6 +28,7 @@
 #include "extra_keys.h"
 
 ZMK_CONDITIONAL_LAYER(SYS NAV, MOUSE)  // SYS + NAV --> MOUSE
+ZMK_CONDITIONAL_LAYER(SYS NUM, FN)     // SYS + NUM --> FN
 
 /* Navigation keys and misc shortcuts */
 
@@ -209,6 +210,12 @@ ZMK_BEHAVIOR(dot_morph, mod_morph,
     mods = <(MOD_LSFT|MOD_RSFT)>;
 )
 
+// tap: qmark | shift + tap: excl
+ZMK_BEHAVIOR(qexcl, mod_morph,
+    bindings = <&kp QMARK>, <&kp EXCL>;
+    mods = <(MOD_LSFT|MOD_RSFT)>;
+)
+
 // Swapper, requires PR #1366
 ZMK_BEHAVIOR(swap, tri_state,
     bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
@@ -223,7 +230,7 @@ ZMK_LAYER(base,
 //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
     X_LM     &hml LGUI A   &hml LALT R   &hml LCTRL S  &hml LSHFT T  &kp G           X_MM     &kp M         &hmr RSHFT N  &hmr LCTRL E  &hmr LALT I   &hmr LGUI O     X_RM
 //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
-    X_LB     &kp Z         &kp X         &kp C         &kp D         &kp V           X_MB     &kp K         &kp H         &comma_morph  &dot_morph    &key_repeat     X_RB
+    X_LB     &kp Z         &kp X         &kp C         &kp D         &kp V           X_MB     &kp K         &kp H         &comma_morph  &dot_morph    &qexcl          X_RB
 //├──────┤ ╰─────────────┼─────────────┴─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┴───────────────────────────╯ ├──────┤
     X_LH                                               &lt_spc NAV 0 &bs_del_sys     X_MH     NUM_WORD      &ss_cw                                                    X_RH
 //╰──────╯                                           ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯                                           ╰──────╯
diff --git a/config/combos.dtsi b/config/combos.dtsi
index b6d2aa9..0b08612 100644
--- a/config/combos.dtsi
+++ b/config/combos.dtsi
@@ -15,12 +15,11 @@
 #define COMBO_TERM_SLOW 35
 
 /* Punctuation (horizontal left hand) */
-// ZMK_COMBO_ADV(mwh,   &scroll_mode,  LT3 LT1,     DEF NAV NUM, COMBO_TERM_SLOW)
 ZMK_COMBO(esc,   &kp ESC,       LT3 LT2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(app,   &kp LG(SPACE), LT2 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(tab,   &kp TAB,       LT2 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
 
-ZMK_COMBO(excl,  &kp EXCL,      LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(qmark, &kp QMARK,     LM2 LM1,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(repeat,&key_repeat,   LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(ret,   &kp RETURN,    LM2 LM1,     DEF NAV NUM, COMBO_TERM_FAST)
 
 ZMK_COMBO(cut,   &kp LC(X),     LB3 LB1,     DEF NAV NUM, COMBO_TERM_SLOW)
 ZMK_COMBO(copy,  &kp LC(INS),   LB3 LB2,     DEF NAV NUM, COMBO_TERM_FAST)
diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf
index d454bdd..faa22f8 100644
--- a/config/corneish_zen.conf
+++ b/config/corneish_zen.conf
@@ -12,9 +12,13 @@ CONFIG_ZMK_MOUSE=y
 CONFIG_ZMK_MOUSE_TICK_DURATION=8
 
 # Combo config, automated by build script
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=4
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
 CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
 
 # Clear all bluetooth bonds on start up
 # CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
 
+# Turn on logging
+# CONFIG_ZMK_USB_LOGGING=y
+# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
+
diff --git a/config/planck_rev6.conf b/config/planck_rev6.conf
index 791ceba..266116f 100644
--- a/config/planck_rev6.conf
+++ b/config/planck_rev6.conf
@@ -5,5 +5,5 @@ CONFIG_ZMK_MOUSE=y
 CONFIG_ZMK_MOUSE_TICK_DURATION=8
 
 # Combo config, automated by build script
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=4
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
 CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
diff --git a/img/keymap.png b/img/keymap.png
index 6d71571..209999d 100644
Binary files a/img/keymap.png and b/img/keymap.png differ