diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc
index dc58dca..f731457 100644
--- a/kakoune/.config/kak/kakrc
+++ b/kakoune/.config/kak/kakrc
@@ -131,15 +131,21 @@ hook global BufCreate [^*].* %{
             echo "$kak_buffile" | awk '!seen[$0]++' - "$mru" | sponge "$mru"
 }}
 
-# SURROUND
+# MATCH
 
-bundle kakoune-surround "https://github.com/h-youhei/kakoune-surround" %{
-    declare-user-mode surround
-    map global surround s ': surround<ret>' -docstring 'surround'
-    map global surround c ': change-surround<ret>' -docstring 'change'
-    map global surround d ': delete-surround<ret>' -docstring 'delete'
-    map global surround t ': select-surrounding-tag<ret>' -docstring 'select tag'
-    map global -docstring 'Surround' user 'S' ': enter-user-mode surround<ret>'
+bundle match 'https://github.com/kmafeni04/match.kak' %{
+    declare-user-mode match
+    map global user m ': enter-user-mode match<ret>'
+    map global match m m -docstring 'Match next matching pair'
+    map global match i ': match-inside<ret>' -docstring 'Match inside object'
+    map global match a ': match-around<ret>' -docstring 'Match around object'
+    map global match n ': match-next<ret>' -docstring 'Match next object'
+    map global match p ': match-prev<ret>' -docstring 'Match previous object'
+    map global match s ': match-surround-add<ret>' -docstring 'Surround selection with character'
+    map global match d ': match-surround-delete<ret>' -docstring "Delete selection's surrounding character"
+    map global match r ': match-surround-replace<ret>' -docstring "Replace selection's surrounding character"
+    map global match u ': match-surround-undo<ret>' -docstring "Undo"
+    map global match U ': match-surround-redo<ret>' -docstring "Redo"
 }
 
 # HARPOON