diff --git a/config/.bashrc b/config/.bashrc
index 4f0890b..03be2a1 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -10,6 +10,7 @@ esac
 
 export PATH=~/.local/bin:/snap/bin:/usr/sandbox/:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/share/games:/usr/local/sbin:/usr/sbin:/sbin:$PATH
 PATH=$PATH:~/.local/share/gem/ruby/3.0.0/bin/:~/.scripts
+PATH=$PATH:~/.local/share/gem/ruby/3.4.0/bin/
 PATH=$PATH:~/.cargo/bin
 PATH=$PATH:~/go/bin/
 PATH=$PATH:~/.nimble/bin/
diff --git a/config/.config/kak-tree-sitter/config.toml b/config/.config/kak-tree-sitter/config.toml
index 9ecbe69..6d58e36 100644
--- a/config/.config/kak-tree-sitter/config.toml
+++ b/config/.config/kak-tree-sitter/config.toml
@@ -1,27 +1,69 @@
 # lua
-# [language.lua.grammar.source.git]
-# url = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
-# pin = "88e446476a1e97a8724dff7a23e2d709855077f2"
+[language.lua.grammar.source.git]
+url = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
+pin = "88e446476a1e97a8724dff7a23e2d709855077f2"
 
-# [language.lua.grammar]
-# path = "src"
-# compile = "cc"
-# compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
-# compile_flags = ["-O3"]
-# link = "cc"
-# link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "lua.so"]
-# link_flags = ["-O3"]
+[language.lua.grammar]
+path = "src"
+compile = "cc"
+compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
+compile_flags = ["-O3"]
+link = "cc"
+link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "lua.so"]
+link_flags = ["-O3"]
 
-# [language.lua.queries.source.git]
-# # url = "https://github.com/helix-editor/helix"
-# # pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
+[language.lua.queries.source.git]
+url = "https://github.com/helix-editor/helix"
+pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
 # url = "https://github.com/nvim-treesitter/nvim-treesitter"
 # pin = "5f38dffb6a07669a678f073bfe0f62b1a020dffc"
 
-# [language.lua.queries]
-# # path = "runtime/queries/lua"
+[language.lua.queries]
+path = "runtime/queries/lua"
 # path = "queries/lua"
 
+# clojure
+# [language.clojure.grammar.source.git]
+# url = "https://github.com/sogaiu/tree-sitter-clojure"
+# pin = "f4236d4da8aa92bc105d9c118746474c608e6af7"
+
+# [language.clojure.grammar]
+# path = "src"
+# compile = "cc"
+# compile_args = ["-c", "-fpic", "../parser.c", "-I", ".."]
+# compile_flags = ["-O3"]
+# link = "cc"
+# link_args = ["-shared", "-fpic", "parser.o", "-o", "clojure.so"]
+# link_flags = ["-O3"]
+
+# [language.clojure.queries.source.git]
+# url = "https://github.com/helix-editor/helix"
+# pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
+
+# [language.clojure.queries]
+# path = "runtime/queries/clojure"
+
+#ocaml
+[language.ocaml.grammar.source.git]
+url = "https://github.com/tree-sitter/tree-sitter-ocaml"
+pin = "ef6ed4a773a260545f0b03c43d2ca78235e9a488"
+
+[language.ocaml.grammar]
+path = "grammars/ocaml/src"
+compile = "cc"
+compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
+compile_flags = ["-O3"]
+link = "cc"
+link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "ocaml.so"]
+link_flags = ["-O3"]
+
+[language.ocaml.queries.source.git]
+url = "https://github.com/helix-editor/helix"
+pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
+
+[language.ocaml.queries]
+path = "runtime/queries/ocaml"
+
 # typst
 [language.typst.grammar.source.git]
 url = "https://github.com/uben0/tree-sitter-typst"
diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc
index ae5dddd..c6f9a35 100644
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -25,6 +25,8 @@ plug "gustavo-hms/luar" %{
     }
 }
 
+plug "h-youhei/kakoune-surround"
+
 plug "your-tools/kak-subvert" do %{
     cargo install --locked --force --path .
 }
@@ -232,13 +234,14 @@ hook -group lsp-filetype-swift global BufSetOption filetype=swift %{
         root_globs = [".git", ".hg"]
     }
 }
+
 set-option global lsp_config %{
 }
 
 define-command fzf-buffer -docstring 'Invoke fzf to select a buffer' %{
     evaluate-commands %sh{
-        tmux split-window -l 30% "(echo $kak_buflist | tr ' ' '\n' | fzf --bind 'focus:execute-silent(echo \"eval -client $kak_client %{ e {} }\" | kak -p $kak_session)' || echo \"$kak_buffile\") | xargs -I{} echo \"eval -client $kak_client %{ e {} }\" | /usr/bin/kak -p $kak_session"
-}
+        tmux split-window -l 30% "(printf \"%s\n\" $kak_quoted_buflist | fzf --bind 'focus:execute-silent(echo \"eval -client $kak_client %{ e {} }\" | kak -p $kak_session)' || echo \"$kak_buffile\") | xargs -I{} echo \"eval -client $kak_client %{ e '{}' }\" | /usr/bin/kak -p $kak_session"
+    }
 }
 
 define-command -docstring 'Invoke fzf to select a buffer' prev-fzf-buff %{
diff --git a/config/.doom.d/init.el b/config/.doom.d/init.el
index d3a6f65..2837a70 100644
--- a/config/.doom.d/init.el
+++ b/config/.doom.d/init.el
@@ -23,7 +23,7 @@
        :completion
        company           ; the ultimate code completion backend
        ;;helm              ; the *other* search engine for love and life
-       n       ;;ido               ; the other *other* search engine...
+       ;;ido               ; the other *other* search engine...
        ;;ivy               ; a search engine for love and life
        vertico           ; the search engine of the future
 
diff --git a/config/.icons/default/index.theme b/config/.icons/default/index.theme
index eb495ee..3fe07f3 100644
--- a/config/.icons/default/index.theme
+++ b/config/.icons/default/index.theme
@@ -2,4 +2,4 @@
 [Icon Theme]
 Name=Default
 Comment=Default Cursor Theme
-Inherits=Adwaita
+Inherits=BreezeX-RosePineDawn-Linux
diff --git a/config/.scripts/gb.sh b/config/.scripts/gb.sh
index ec29ab6..c1e0ec2 100755
--- a/config/.scripts/gb.sh
+++ b/config/.scripts/gb.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAMES=$(find /home/mikec/Documents/Games/ROMS/GB -iname "*.zip" | bemenu -i --fn "Cascadia Code 12")
+GAMES=$(find /home/mikec/Documents/Games/ROMS/GB -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] || mgba "$GAMES"
diff --git a/config/.scripts/gba.sh b/config/.scripts/gba.sh
index 4b5d516..92668c5 100755
--- a/config/.scripts/gba.sh
+++ b/config/.scripts/gba.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAMES=$(find /home/mikec/Documents/Games/ROMS/GBA -iname "*.zip" | bemenu -i --fn "Cascadia Code 12")
+GAMES=$(find /home/mikec/Documents/Games/ROMS/GBA -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] || mgba "$GAMES"
diff --git a/config/.scripts/gbc.sh b/config/.scripts/gbc.sh
index a9170b7..6bf22b4 100755
--- a/config/.scripts/gbc.sh
+++ b/config/.scripts/gbc.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAMES=$(find /home/mikec/Documents/Games/ROMS/GBC -iname "*.zip" | bemenu -i --fn "Cascadia Code 12")
+GAMES=$(find /home/mikec/Documents/Games/ROMS/GBC -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] || mgba "$GAMES"
diff --git a/config/.scripts/genesis.sh b/config/.scripts/genesis.sh
index 4fa6efd..718f18a 100755
--- a/config/.scripts/genesis.sh
+++ b/config/.scripts/genesis.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAMES=$(find /home/mikec/Documents/Games/ROMS/Genesis -iname "*.zip" | bemenu -i --fn "Cascadia Code 12")
+GAMES=$(find /home/mikec/Documents/Games/ROMS/Genesis -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] || blastem "$GAMES"
diff --git a/config/.scripts/n64.sh b/config/.scripts/n64.sh
index d0bc6b9..cda915e 100755
--- a/config/.scripts/n64.sh
+++ b/config/.scripts/n64.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # MON=$(xrandr | grep ' connected' | cut -d' ' -f1 | dmenu -i)
-GAMES=$(find /home/mikec/Documents/Games/ROMS/N64 -iname "*.zip" | dmenu -i -l 10)
+GAMES=$(find /home/mikec/Documents/Games/ROMS/N64 -iname "*.zip" | bemenu -i -l 10 --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] && exit
 # GAME=$(mktemp)
 # RES=$(xrandr | grep "$MON" | sed -E 's/.*connected (primary )?([0-9]*x[0-9]*).*/\2/')
diff --git a/config/.scripts/nes.sh b/config/.scripts/nes.sh
index 89b50f4..e763119 100755
--- a/config/.scripts/nes.sh
+++ b/config/.scripts/nes.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAMES=$(find /home/mikec/Documents/Games/ROMS/NES/USA -iname "*.nes" | dmenu -i)
+GAMES=$(find /home/mikec/Documents/Games/ROMS/NES/USA -iname "*.nes" | bemenu -i --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] || fceux "$GAMES"
diff --git a/config/.scripts/snes.sh b/config/.scripts/snes.sh
index d44bff9..230b5ef 100755
--- a/config/.scripts/snes.sh
+++ b/config/.scripts/snes.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-GAMES=$(find /home/mikec/Documents/Games/ROMS/SNES/USA -iname "*.zip" | bemenu -i --fn "Cascadia Code 12")
+GAMES=$(find /home/mikec/Documents/Games/ROMS/SNES/USA -iname "*.zip" | bemenu -i --fn "Iosevka Term SS12 12")
 [ -z "$GAMES" ] || snes9x-gtk "$GAMES"