diff --git a/.gitmodules b/.gitmodules
index e18d627..f408e6b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "pack/third-party/start/apprentice"]
 	path = pack/third-party/start/apprentice
 	url = https://github.com/romainl/apprentice
+[submodule "pack/third-party/start/vim-colors-solarized"]
+	path = pack/third-party/start/vim-colors-solarized
+	url = https://github.com/altercation/vim-colors-solarized
diff --git a/after/ftplugin/bash.vim b/after/ftplugin/bash.vim
index b6b9f59..0adb933 100644
--- a/after/ftplugin/bash.vim
+++ b/after/ftplugin/bash.vim
@@ -1,5 +1,5 @@
 setlocal noexpandtab
-setlocal shiftwidth=2
+setlocal shiftwidth=0
 setlocal softtabstop=-1
 setlocal tabstop=2
 setlocal textwidth=80
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index 8b00424..07e4954 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -2,6 +2,5 @@ setlocal shiftwidth=2
 setlocal softtabstop=2
 setlocal expandtab
 setlocal foldmethod=indent
-setlocal cursorcolumn | " Easy to follow indent levels with vertical line
 
 let b:undo_ftplugin .= '|setlocal shiftwidth< softtabstop< et< fdm< cursorcolumn<'
diff --git a/after/ftplugin/zsh.vim b/after/ftplugin/zsh.vim
index 3191b65..afe8682 100644
--- a/after/ftplugin/zsh.vim
+++ b/after/ftplugin/zsh.vim
@@ -2,3 +2,8 @@ setlocal tabstop=2
 setlocal softtabstop=2
 setlocal shiftwidth=2
 setlocal expandtab
+
+augroup zsh
+	autocmd!
+	autocmd FileType zsh if bufname() ==# '.zshrc' | setlocal fdm=marker | endif 
+augroup END
diff --git a/pack/third-party/start/vim-colors-solarized b/pack/third-party/start/vim-colors-solarized
new file mode 160000
index 0000000..528a59f
--- /dev/null
+++ b/pack/third-party/start/vim-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
diff --git a/vimrc b/vimrc
index 99d661b..22b2324 100644
--- a/vimrc
+++ b/vimrc
@@ -5,9 +5,8 @@ syntax on
 set encoding=utf-8
 scriptencoding utf-8
 let mapleader=' '
-colorscheme apprentice
+colorscheme solarized
 
-" set statusline=%!vim9utils#MyStatusline()
 set autoindent smartindent
 set autoread
 set backspace=indent,eol,start
@@ -15,6 +14,8 @@ set belloff=all
 set clipboard=unnamed,unnamedplus
 set complete-=i
 set completeopt=menuone,popup
+" BUG: see https://github.com/vim/vim/issues/10250
+" if has('patch-8.1.0360') | set diffopt+=algorithm:patience | endif
 set display=truncate
 set errorformat+=%f | " :cexpr system('cat /tmp/list-o-filenames.txt')
 set exrc secure