diff --git a/.config/helix/scripts/kak-typ-zathura.fish b/.config/kak/scripts/kak-typ-zathura.fish
similarity index 55%
rename from .config/helix/scripts/kak-typ-zathura.fish
rename to .config/kak/scripts/kak-typ-zathura.fish
index e948ad69..88d4940c 100755
--- a/.config/helix/scripts/kak-typ-zathura.fish
+++ b/.config/kak/scripts/kak-typ-zathura.fish
@@ -3,13 +3,14 @@
 # hx-typ-zathura: easily preview your typst documents from Helix!
 # This script will automatically find a pdf that matches your
 # current Typst document and attempt to open it with Zathura.
-# Optionally, it will quit Zathura when you close Helix.
+# Optionally, it will quit Zathura when you close Helix, and
+# uses typst watch to continuously compile the file.
 # Run this script with --help for usage info!
 
 # Author: Daniel Fichtinger <daniel@ficd.ca
 # License: MIT
 
-argparse q/quiet k/kill-on-exit h/help -- $argv
+argparse q/quiet k/kill-on-exit w/watch h/help s/session -- $argv
 
 if test (count $argv) -eq 0; or set -q _flag_h
     echo "Helper script for opening Typst files from Helix in Zathura."\n
@@ -21,7 +22,11 @@ if test (count $argv) -eq 0; or set -q _flag_h
     echo "Options:"
     echo "-q/--quiet: Don't \`echo\` on caught errors, return 1 instead."
     echo "-k/--kill-on-exit: Kill Zathura when parent Helix process exits."
+    echo "-w/--watch: live preview mode"
     echo "-h/--help: print this screen"\n
+    echo "Note:"
+    echo "To avoid spawning a large number of typst processes,"
+    echo "--watch is only effective if --kill-on-exit is also set."\n
     echo 'Author: Daniel Fichtinger <daniel@ficd.ca>'
     echo 'License: MIT'
     return 0
@@ -43,36 +48,70 @@ function qecho
     end
 end
 
-# check if the user asked to kill zathura on helix exit
-if set -q _flag_k
-    set kill_parent
-    # traverse up process tree to find caller Helix PID
-    # We use this PID to kill zathura if Helix exits first!
-    # we only need to define this function
-    # inside this scope
+# absolute path of %{buffer_name} file
+set -g src_path (path resolve $argv[1])
 
-    set kak_session $argv[2]
-    if not command kak -l | rg -xqF "$kak_session"
-        qecho "Couldn't find kak session!"
+# check if the user asked to kill zathura on helix exit
+# or to watch the pdf
+if set -q _flag_k || set -q _flag_w
+    if set -q _flag_k
+        set kill_parent
+    end
+    if set -q _flag_w
+        set typst_watch
+    end
+
+    if not set -q _flag_s
+        qecho "You must provide --session=<name> with --kill-on-exit or --watch."
         return $ret
     end
+    set session_name $_flag_s
+    set session_socket "$XDG_RUNTIME_DIR/kakoune/$session_name"
+    if not test -S "$session_socket"
+        qecho "Session $session_name not found!"
+        return $ret
+    end
+
+end
+
+function monitor_kak
+    set -l socket $argv[1]
+    set -l zathura_pid $argv[2]
+    set -l typst_pid $argv[3]
+
+    set -l dir (path dirname "$socket")
+    set -l file (path basename "$socket")
+
+    inotifywait -q -e delete,delete_self,moved_from --format '%f' "$dir" | while read filename
+        if test "$filename" = "$file"
+            kill $zathura_pid &> /dev/null
+            if test -n "$typst_pid"
+                kill $typst_pid &>/dev/null
+            end
+            break
+        end
+    end
 end
 
 # opens zathura, optionally watching for helix closing
 function zopen --wraps zathura
-    # this should be set if the user asked to watch
+    set -f pdf_path $argv[1]
+    # this should be set if the user asked to kill
     if set -q kill_parent
         # create background sub-process
         # otherwise helix will hang
         begin
-            zathura "$argv[1]" &>/dev/null &
+            zathura "$pdf_path" &>/dev/null &
             set zathura_pid $last_pid
-            waitpid -c 1 "$parent_pid" "$zathura_pid"
-            kill $zathura_pid &>/dev/null
+            if set -q typst_watch
+                typst watch "$src_path" "$pdf_path" &>/dev/null &
+                set -f typst_pid $last_pid
+            end
+            monitor_kak "$session_socket" "$zathura_pid" "$typst_pid" &
         end &
     else
-        # user didn't ask for watch, so open normally
-        zathura "$argv[1]" &>/dev/null &
+        # user didn't ask for kill, so open normally
+        zathura "$pdf_path" &>/dev/null &
     end
     true
 end
@@ -89,19 +128,17 @@ function find_pdf
     end
 end
 
-# absolute path of %{buffer_name} file
-set -l src (path resolve $argv[1])
-# echo $src
+# echo $src_path
 # return 0
 # exit if not a typst file
-if not string match -q '*.typ' $src
-    qecho "$(path basename $src) is not a Typst file!"
+if not string match -q '*.typ' $src_path
+    qecho "$(path basename $src_path) is not a Typst file!"
     return $ret
 end
 # change abs path to pdf extension
-set -l targ (string replace --regex '\.typ$' '.pdf' $src)
+set -l targ (string replace --regex '\.typ$' '.pdf' $src_path)
 # get pdf target's base name
-set -l base (path basename --no-extension $src).pdf
+set -l base (path basename --no-extension $src_path).pdf
 
 # if a suitable pdf exists in the same dir, open it
 if test -f "$targ"