diff --git a/config/adv360pro.conf b/config/adv360pro.conf
index 5ce21da..e928e9f 100644
--- a/config/adv360pro.conf
+++ b/config/adv360pro.conf
@@ -7,6 +7,6 @@ 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/combos.dtsi b/config/combos.dtsi
index a2c127d..3bb9521 100644
--- a/config/combos.dtsi
+++ b/config/combos.dtsi
@@ -15,17 +15,17 @@
 #define COMBO_TERM_SLOW 35
 
 // make homerow combos tap-only (so mods can be chorded correctly)
-#define HRC_RETURN &hml        LA(LCTRL) RETURN
+#define HRC_TAB    &hml        LA(LCTRL) TAB
 #define HRC_REPEAT &hml_repeat LS(LCTRL) 0
 #define HRC_LPAR   &hmr        RS(LCTRL) LPAR
 #define HRC_RPAR   &hmr        LA(LCTRL) RPAR
 
 /* Punctuation (horizontal left hand) */
 ZMK_COMBO(esc,   &kp ESC,       LT3 LT2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(tab,   &kp TAB,       LT2 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(ret,   &kp RETURN,    LT2 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(mouse, &smart_mouse,  LT3 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
 
-ZMK_COMBO(ret,   HRC_RETURN,    LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(tab,   HRC_TAB,       LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(repeat,HRC_REPEAT,    LM2 LM1,     DEF NAV NUM, COMBO_TERM_FAST)
 
 ZMK_COMBO(cut,   &kp LC(X),     LB3 LB1,     DEF NAV NUM, COMBO_TERM_SLOW)
@@ -33,12 +33,16 @@ ZMK_COMBO(copy,  &kp LC(INS),   LB3 LB2,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(paste, &kp LS(INS),   LB2 LB1,     DEF NAV NUM, COMBO_TERM_FAST)
 
 /* Brackets (horizontal right hand) */
-ZMK_COMBO(lbrc,  &kp LBRC,      RT1 RT2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(rbrc,  &kp RBRC,      RT2 RT3,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(lpar,  HRC_LPAR,      RM1 RM2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(rpar,  HRC_RPAR,      RM2 RM3,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(lbrk,  &kp LBKT,      RB1 RB2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(rbrk,  &kp RBKT,      RB2 RB3,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(bspc,  &kp BSPC,      RT1 RT2,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(del,   &kp DEL,       RT2 RT3,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(lpar,  HRC_LPAR,      RM1 RM2,     DEF     NUM, COMBO_TERM_FAST)
+ZMK_COMBO(rpar,  HRC_RPAR,      RM2 RM3,     DEF     NUM, COMBO_TERM_FAST)
+ZMK_COMBO(lt,    &kp LT,        RM1 RM2,         NAV    , COMBO_TERM_FAST)
+ZMK_COMBO(gt,    &kp GT,        RM2 RM3,         NAV    , COMBO_TERM_FAST)
+ZMK_COMBO(lbkt,  &kp LBKT,      RB1 RB2,     DEF     NUM, COMBO_TERM_FAST)
+ZMK_COMBO(rbkt,  &kp RBKT,      RB2 RB3,     DEF     NUM, COMBO_TERM_FAST)
+ZMK_COMBO(lbrc,  &kp LBRC,      RB1 RB2,         NAV    , COMBO_TERM_FAST)
+ZMK_COMBO(rbrc,  &kp RBRC,      RB2 RB3,         NAV    , COMBO_TERM_FAST)
 
 ZMK_COMBO(grk,   &sl UC,        RT1 RT3,     DEF NAV NUM, COMBO_TERM_SLOW)
 ZMK_COMBO(cpgrk, &sls 0,        RT1 RT2 RT3, DEF NAV NUM, COMBO_TERM_SLOW)
diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf
index bd86997..6e73eb5 100644
--- a/config/corneish_zen.conf
+++ b/config/corneish_zen.conf
@@ -12,9 +12,12 @@ 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
 
+# Windows battery reporting fix
+# CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
+
 # Clear all bluetooth bonds on start up
 # CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
 
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