diff --git a/.config/kak/autoload/hop.kak b/.config/kak/autoload/hop.kak
index b621de18..82ed23c2 100644
--- a/.config/kak/autoload/hop.kak
+++ b/.config/kak/autoload/hop.kak
@@ -1,6 +1,6 @@
 evaluate-commands %sh{ hop-kak --init }
 
-declare-option str hop_kak_keyset 'tnserigmaodhc,x.plfuwyqz'
+declare-option str hop_kak_keyset 'tnserigmaodhcxplfuwyqz'
 
 # select visible buffer
 map global normal <a-%> ':execute-keys gtGbx<ret>'
@@ -11,13 +11,18 @@ define-command hop-kak %{
     }
 }
 
+
 # TODO: fix the broken interaction with scrolloff
 define-command -override hop-kak-words %{
     eval "ui-scrolloff-disable"
     try %{ ui-wrap-disable }
-    # set-option window scrolloff 0,0
+    map window normal <esc> ': trigger-user-hook donehop<ret><esc>'
+    map window normal , ': trigger-user-hook donehop<ret>,'
+    hook -once window User donehop %{
+        eval "ui-scrolloff-enable"
+        try %{ ui-wrap-enable }
+        unmap window normal <esc>
+        unmap window normal ,
+    }
     execute-keys 'gtGbxs\w+<ret>: hop-kak<ret>'
-    info done
-    # set-option window scrolloff 99,0
-    # eval "ui-scrolloff-enable" 
 }
diff --git a/.config/kak/autoload/plugins.kak b/.config/kak/autoload/plugins.kak
index 0fc9551e..9f2759b0 100644
--- a/.config/kak/autoload/plugins.kak
+++ b/.config/kak/autoload/plugins.kak
@@ -37,7 +37,7 @@ bundle peneira https://github.com/gustavo-hms/peneira %{
 	# require-module peneira
 }
 
-bundle easymotion.kak https://git.sr.ht/~voroskoi/easymotion.kak %{
+bundle-noload easymotion.kak https://git.sr.ht/~voroskoi/easymotion.kak %{
 	require-module easymotion
 	unmap global easymotion h
 	unmap global easymotion j
diff --git a/.config/kak/autoload/title.kak b/.config/kak/autoload/title.kak
index 2f6797e3..d5098049 100644
--- a/.config/kak/autoload/title.kak
+++ b/.config/kak/autoload/title.kak
@@ -25,6 +25,15 @@ declare-option -docstring %{
 
     Default: '%s %s'
 } str bar_inactive_fmt '%s %s'
+declare-option -docstring %{
+    Format string passed to printf for the bufferlist.
+    It should be set in the global scope.
+
+    It receives two string arguments, where the first is the buffer index,
+    and the second is the buffer name.
+
+    Default: '%s %s+'
+} str bar_inactive_modified_fmt '%s %s+'
 define-command -hidden bar-buflist %{
     evaluate-commands %sh{
         # starttime=$(date +%s.%N)