diff --git a/.gitmodules b/.gitmodules
index 69506305..f80aae5b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,3 +73,9 @@
 [submodule "nvim/.config/nvim/pack/bundle/opt/lexima.vim"]
 	path = nvim/.config/nvim/pack/bundle/opt/lexima.vim
 	url = https://github.com/cohama/lexima.vim
+[submodule "nvim/.config/nvim/pack/bundle/nvim-biscuits"]
+	path = nvim/.config/nvim/pack/bundle/opt/nvim-biscuits
+	url = https://github.com/code-biscuits/nvim-biscuits
+[submodule "nvim/.config/nvim/pack/bundle/opt/nvim-treesitter"]
+	path = nvim/.config/nvim/pack/bundle/opt/nvim-treesitter
+	url = https://github.com/nvim-treesitter/nvim-treesitter
diff --git a/nvim/.config/nvim/after/plugin/biscuit.vim b/nvim/.config/nvim/after/plugin/biscuit.vim
new file mode 100644
index 00000000..edfba2d6
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/biscuit.vim
@@ -0,0 +1 @@
+highlight BiscuitColor gui=italic
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 5bd66e9a..554a900f 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -22,6 +22,8 @@ if has('packages')
 		packadd! deoplete-lsp
 		packadd! deoplete-notmuch
 		packadd! firenvim
+		packadd! nvim-treesitter
+		packadd! nvim-biscuits
 		lua <<EOF
 		if ( vim.lsp ~= nil ) then
 			vim.cmd "packadd! nvim-lspconfig"
diff --git a/nvim/.config/nvim/pack/bundle/opt/nvim-biscuits b/nvim/.config/nvim/pack/bundle/opt/nvim-biscuits
new file mode 160000
index 00000000..15a0cb12
--- /dev/null
+++ b/nvim/.config/nvim/pack/bundle/opt/nvim-biscuits
@@ -0,0 +1 @@
+Subproject commit 15a0cb1273bd36d5a734210cdc3406fb4bcfb733
diff --git a/nvim/.config/nvim/pack/bundle/opt/nvim-treesitter b/nvim/.config/nvim/pack/bundle/opt/nvim-treesitter
new file mode 160000
index 00000000..a47df48e
--- /dev/null
+++ b/nvim/.config/nvim/pack/bundle/opt/nvim-treesitter
@@ -0,0 +1 @@
+Subproject commit a47df48e7d4232fd771f2537a4fb43f582c026c9
diff --git a/nvim/.config/nvim/plugin/biscuits.vim b/nvim/.config/nvim/plugin/biscuits.vim
new file mode 100644
index 00000000..f6181959
--- /dev/null
+++ b/nvim/.config/nvim/plugin/biscuits.vim
@@ -0,0 +1,12 @@
+lua <<EOF
+require('nvim-biscuits').setup({
+  default_config = {
+    min_distance = 3,
+    prefix_string = "  "
+  },
+  show_on_start = true,
+  toggle_keybind = "<leader>cb"
+})
+
+EOF
+
diff --git a/nvim/.config/nvim/plugin/mappings.vim b/nvim/.config/nvim/plugin/mappings.vim
index 66ed4bd0..fb57fa13 100644
--- a/nvim/.config/nvim/plugin/mappings.vim
+++ b/nvim/.config/nvim/plugin/mappings.vim
@@ -85,6 +85,8 @@ nnoremap <leader>p :call mine#functions#proselint()<CR>
 if has('nvim')
 	if !empty($SUDO_ASKPASS)
 		cnoremap WW w !sudo -A tee % > /dev/null
+	else
+		cnoremap WW echo "SUDO_ASKPASS variable needs to be set"<cr>
 	endif
 else
 	cnoremap WW w !sudo tee % > /dev/null
diff --git a/nvim/.config/nvim/plugin/treesitter.vim b/nvim/.config/nvim/plugin/treesitter.vim
new file mode 100644
index 00000000..32681ea0
--- /dev/null
+++ b/nvim/.config/nvim/plugin/treesitter.vim
@@ -0,0 +1,11 @@
+lua <<EOF
+require'nvim-treesitter.configs'.setup {
+	ensure_installed = "all",
+	highlight = {
+		enable = true
+	},
+	indent = {
+		enable = true
+	}
+}
+EOF