diff --git a/boards/arm/zaphod/zaphod.keymap b/boards/arm/zaphod/zaphod.keymap
index 10e27a86..96af19e6 100644
--- a/boards/arm/zaphod/zaphod.keymap
+++ b/boards/arm/zaphod/zaphod.keymap
@@ -9,10 +9,9 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/outputs.h>
 
-// Using layer taps on thumbs, having quick tap as well helps w/ repeating space/backspace
 &lt {
   tapping-term-ms = <150>;
-  quick_tap_ms = <140>;
+  quick_tap_ms = <50>;
 };
 
 / {
@@ -22,17 +21,9 @@
           label = "HOMEROW_MODS";
           #binding-cells = <2>;
           tapping-term-ms = <150>;
-          quick_tap_ms = <140>;
           flavor = "tap-preferred";
           bindings = <&kp>, <&kp>;
         };
-        gresc: grave_escape {
-          compatible = "zmk,behavior-mod-morph";
-          label = "GRAVE_ESCAPE";
-          #binding-cells = <0>;
-          bindings = <&kp ESC>, <&kp GRAVE>;
-          mods = <(MOD_LGUI|MOD_LSFT|MOD_RGUI|MOD_RSFT)>;
-        };
         dbspc: del_backspace {
           compatible = "zmk,behavior-mod-morph";
           label = "DEL_BACKSPACE";
@@ -40,11 +31,59 @@
           bindings = <&kp BSPC>, <&kp DEL>;
           mods = <(MOD_LSFT|MOD_RSFT)>;
         };
+         qescd: qesc_dance {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            tapping-term-ms = <150>;
+            bindings = <&kp Q>, <&kp Q>, <&kp ESC>;
+        };
+    };
+    combos {
+        compatible = "zmk,combos";
+        colon {
+            timeout-ms = <50>;
+            key-positions = <11 19>;
+            bindings = <&kp COLON>;
+        };
+        colon2 {
+            timeout-ms = <50>;
+            key-positions = <18 19>;
+            bindings = <&kp COLON>;
+        };
+        double_quote {
+            timeout-ms = <50>;
+            key-positions = <11 15>;
+            bindings = <&kp DQT>;
+        };
+        double_quote2 {
+            timeout-ms = <50>;
+            key-positions = <18 15>;
+            bindings = <&kp DQT>;
+        };
+        tilda {
+            timeout-ms = <50>;
+            key-positions = <18 9>;
+            bindings = <&kp TILDE>;
+        };
+        pipe {
+            timeout-ms = <50>;
+            key-positions = <18 29>;
+            bindings = <&kp PIPE>;
+        };
+    };
+    macros {
+        term_quit_colon: term_quit_colon {
+            compatible = "zmk,behavior-macro";
+            #binding-cells = <0>;
+            bindings
+                = <&macro_tap &kp ESC>
+                , <&macro_tap &kp COLON>
+                ;
+        };
     };
-
     conditional_layers {
         compatible = "zmk,conditional-layers";
-        tri_layer {
+        quad_layer {
             if-layers = <2 3>;
             then-layer = <4>;
         };
@@ -54,7 +93,7 @@
         compatible = "zmk,keymap";
         default_layer {
             bindings = <
-            &kp Q        &kp W        &kp E        &kp R       &kp T                &kp Y      &kp U       &kp I          &kp O         &kp P
+            &qescd        &kp W        &kp E        &kp R       &kp T                &kp Y      &kp U       &kp I          &kp O         &kp P
             &hm LCTRL A  &hm LSHFT S  &hm LGUI D   &hm LALT F  &kp G                &kp H      &hm RALT J  &hm RGUI K     &hm RSHFT L   &hm RCTRL SEMI
             &kp Z        &kp X        &kp C        &kp V       &kp B                &kp N      &kp M       &kp COMMA      &kp DOT       &kp FSLH
                                                 &lt 3 TAB   &lt 1 SPC            &lt 2 RET  &dbspc
@@ -80,7 +119,7 @@
             bindings = <
             &kp LG(LS(T)) &kp LC(LS(TAB)) &kp LG(W) &kp LC(TAB) &kp LG(T)     &kp LBRC  &kp AMPS  &kp ASTRK  &kp LPAR  &kp RBRC
             &kp LG(Z)     &kp LG(X)       &kp LG(C) &kp LG(V)   &kp LG(Y)     &kp DQT   &kp DLLR  &kp PRCNT  &kp CARET &kp PLUS
-            &trans        &trans          &trans    &trans      &trans        &kp UNDER &kp EXCL  &kp AT     &kp HASH  &kp PIPE
+            &term_quit_colon        &trans          &trans    &trans      &trans        &kp UNDER &kp EXCL  &kp AT     &kp HASH  &kp PIPE
                                                     &trans      &trans        &trans    &kp RPAR
             >;
         };