diff --git a/.config/kak/autoload/grep.kak b/.config/kak/autoload/grep.kak
index a1d23277..8837c816 100644
--- a/.config/kak/autoload/grep.kak
+++ b/.config/kak/autoload/grep.kak
@@ -1,6 +1,8 @@
 # https://strongly-typed-thoughts.net/blog/kakoune-philosophy
 set-option global grepcmd 'rg --column --smart-case --sort path'
 
+# TODO: Highlight the actual search term, too? would be cool
+
 define-command -hidden grep-jump-current-line %{
     evaluate-commands -save-regs clp %{
         execute-keys -draft 'ghT:"py2lT:"ly2lT:"cy'
@@ -9,4 +11,9 @@ define-command -hidden grep-jump-current-line %{
 }
 hook global WinSetOption filetype=grep %{
     map window normal <ret> ': grep-jump-current-line<ret>'
+    try %{
+        remove-highlighter window/number-lines
+		remove-highlighter window/show-whitespaces
+		ui-wrap-disable
+    }
 }
diff --git a/.config/kak/autoload/hop.kak b/.config/kak/autoload/hop.kak
new file mode 100644
index 00000000..b35cf5cc
--- /dev/null
+++ b/.config/kak/autoload/hop.kak
@@ -0,0 +1,3 @@
+evaluate-commands %sh{ hop-kak --init }
+
+declare-option str hop_kak_keyset 'tnserigmaodhc,x.plfuwyqz'
diff --git a/.config/kak/autoload/picker.kak b/.config/kak/autoload/picker.kak
new file mode 100644
index 00000000..dc721b6e
--- /dev/null
+++ b/.config/kak/autoload/picker.kak
@@ -0,0 +1,7 @@
+define-command file-picker %{
+    prompt -shell-script-candidates 'fd . --type f --follow --no-ignore-vcs' open: %{
+        edit -existing %val{text}
+    }
+}
+
+map global user F ':file-picker<ret>'