diff --git a/.gitmodules b/.gitmodules
index e9ac916..9600ed5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -196,9 +196,6 @@
 [submodule "bundle/jsonc"]
 	path = bundle/jsonc
 	url = https://github.com/neoclide/jsonc.vim
-[submodule "bundle/lexima"]
-	path = bundle/lexima
-	url = https://github.com/cohama/lexima.vim
 [submodule "bundle/closetag"]
 	path = bundle/closetag
 	url = https://github.com/alvan/vim-closetag
@@ -271,3 +268,6 @@
 [submodule "meson"]
 	path = bundle/meson
 	url = https://github.com/mesonbuild/meson
+[submodule "bundle/pear-tree"]
+	path = bundle/pear-tree
+	url = https://github.com/tmsvg/pear-tree
diff --git a/bundle/lexima b/bundle/lexima
deleted file mode 160000
index 89bf4dc..0000000
--- a/bundle/lexima
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89bf4dc13539131a29cf938074b3f1ce9d000bfd
diff --git a/bundle/pear-tree b/bundle/pear-tree
new file mode 160000
index 0000000..3bb209d
--- /dev/null
+++ b/bundle/pear-tree
@@ -0,0 +1 @@
+Subproject commit 3bb209d9637d6bd7506040b2fcd158c9a7917db3
diff --git a/pack/editing/start/lexima b/pack/editing/start/lexima
deleted file mode 120000
index 6049d62..0000000
--- a/pack/editing/start/lexima
+++ /dev/null
@@ -1 +0,0 @@
-../../../bundle/lexima
\ No newline at end of file
diff --git a/pack/editing/start/pear-tree b/pack/editing/start/pear-tree
new file mode 120000
index 0000000..319756d
--- /dev/null
+++ b/pack/editing/start/pear-tree
@@ -0,0 +1 @@
+../../../bundle/pear-tree
\ No newline at end of file
diff --git a/plugin/settings.vim b/plugin/settings.vim
index abc91cc..2b93b0b 100644
--- a/plugin/settings.vim
+++ b/plugin/settings.vim
@@ -85,6 +85,20 @@ let g:NERDSpaceDelims = 1
 let g:NERDComDefaultDelims = 1
 " }}}
 
+" {{{ pear-tree
+let g:pear_tree_ft_disabled = [
+	\ 'gitcommit',
+	\ 'gitsendmail',
+	\ 'mail',
+	\ 'man',
+	\ 'markdown',
+	\ 'rst',
+	\ 'text'
+	\]
+let g:pear_tree_smart_openers = 1
+let g:pear_tree_smart_closers = 1
+" }}}
+
 " {{{ fugitive
 command! Gcommend Gcommit --amend --no-edit
 let g:fugitive_gitlab_domains = [