diff --git a/.gitmodules b/.gitmodules
index e2b6e56..963e405 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,15 +19,9 @@
 [submodule "bundle/matchit"]
 	path = bundle/matchit
 	url = https://github.com/tmhedberg/matchit
-[submodule "bundle/vim-css-color"]
-	path = bundle/vim-css-color
-	url = https://github.com/skammer/vim-css-color
 [submodule "bundle/vim-css3-syntax"]
 	path = bundle/vim-css3-syntax
 	url = https://github.com/hail2u/vim-css3-syntax
-[submodule "bundle/vim-markdown"]
-	path = bundle/vim-markdown
-	url = https://github.com/plasticboy/vim-markdown.git
 [submodule "bundle/TeX-PDF"]
 	path = bundle/TeX-PDF
 	url = https://github.com/vim-scripts/TeX-PDF
@@ -46,3 +40,6 @@
 [submodule "bundle/vim-table-mode"]
 	path = bundle/vim-table-mode
 	url = https://github.com/dhruvasagar/vim-table-mode
+[submodule "bundle/goyo.vim"]
+	path = bundle/goyo.vim
+	url = https://github.com/junegunn/goyo.vim
diff --git a/.vimrc b/.vimrc
index 99df88d..3d82068 100644
--- a/.vimrc
+++ b/.vimrc
@@ -297,7 +297,7 @@ endfun
 "Make web files fold on indent {{{2
 augroup file_web
 	autocmd!
-	autocmd FileType html,css,less,javascript,php setlocal foldmethod=indent foldenable
+	autocmd FileType html,xhtml,css,less,javascript,php setlocal foldmethod=indent foldenable
 augroup END
 
 " Add Html maps, Currently only pandoc conversion {{{2
diff --git a/bundle/goyo.vim b/bundle/goyo.vim
new file mode 160000
index 0000000..64e750f
--- /dev/null
+++ b/bundle/goyo.vim
@@ -0,0 +1 @@
+Subproject commit 64e750f726d8758c493931938a17c50f75e6f823
diff --git a/bundle/vim-css-color b/bundle/vim-css-color
deleted file mode 160000
index 417eaf8..0000000
--- a/bundle/vim-css-color
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 417eaf8a20a6208e34ff167f5636b20f8f812ed8
diff --git a/bundle/vim-markdown b/bundle/vim-markdown
deleted file mode 160000
index 2cd50d2..0000000
--- a/bundle/vim-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2cd50d2ca657091c6aa787a3847284fb4cceff49