diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index a2ce35f..56e1bac 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,3 +1,4 @@
 setlocal list
+setlocal sw=2 ts=2
 
 nnoremap <buffer> <silent> <localleader>x :term ++close ++rows=5 grip -b %<cr>
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
index 8f32c9a..3dd10c4 100644
--- a/ftplugin/vim.vim
+++ b/ftplugin/vim.vim
@@ -1 +1,2 @@
 setlocal foldmethod=marker foldlevel=0
+nnoremap <buffer> <localleader>x :source %<cr>
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
new file mode 100644
index 0000000..adbd4e3
--- /dev/null
+++ b/ftplugin/yaml.vim
@@ -0,0 +1 @@
+setlocal sw=2 ts=2
diff --git a/plugin/comment.vim b/plugin/comment.vim
index e4eb9f8..e96f3c7 100644
--- a/plugin/comment.vim
+++ b/plugin/comment.vim
@@ -17,6 +17,7 @@ let s:comment_map = {
             \ 'vue': '\/\/',
             \ 'cmake': '#',
             \ 'scheme': ';;',
+            \ 'yaml': '#'
             \ }
 
 let s:block_map = {
diff --git a/plugin/settings.vim b/plugin/settings.vim
index 12c210d..684ef97 100644
--- a/plugin/settings.vim
+++ b/plugin/settings.vim
@@ -46,8 +46,8 @@ let g:javaScript_fold = 1
 " {{{
 set guicursor=n-v-i-c:block-Cursor
 set guicursor+=n-v-i-c:blinkon0
-set guioptions=
-set mouse=c
+set guioptions=a
+set mouse=a
 
 set langmenu=en_US.UTF-8
 " }}}
@@ -90,6 +90,7 @@ let g:LatexBox_latexmk_options = '-outdir=build -shell-escape'
 set completeopt-=preview
 let g:ycm_autoclose_preview_window_after_completion = 0
 let g:ycm_key_detailed_diagnostics = ''
+let g:ycm_extra_conf_globlist  = ['!*']
 let g:ycm_filetype_blacklist = {
             \ 'tex': 1,
             \ 'plaintex': 1,
@@ -183,7 +184,7 @@ nnoremap ql :lclose<cr>
 nnoremap qq :cclose<cr>
 nnoremap qp :pclose<cr>
 nnoremap qh :helpclose<cr>
-" nnoremap qN :NERDTreeClose<cr>
+nnoremap qN :NERDTreeClose<cr>
 nnoremap qT :TagbarClose<cr>
 
 nnoremap <silent> gb :bn<cr>
@@ -218,7 +219,6 @@ nnoremap <silent> <leader>xb mc:CommenseUnblock<cr>`c:delm c<cr>
 nnoremap <leader>sl :pedit $MYVIMRC<cr>
 nnoremap <leader>ss :execute 'pedit' my_settings_file<cr>
 nnoremap <leader>sv :source $MYVIMRC<cr>:execute 'source' my_settings_file<cr>
-nnoremap <leader>st :source %<cr>
 nnoremap <leader>w <c-w>
 tnoremap <leader>w <c-w>
 nnoremap <leader>dd cc<esc>
@@ -245,7 +245,7 @@ nnoremap <leader>lp :lprev<cr>
 
 " Mappings for Plugins
 " {{{
-nnoremap <leader>N :Explore<cr>
+nnoremap <leader>N :NERDTree<cr>
 nnoremap <leader>] :YcmCompleter GoTo<cr>
 nnoremap <leader>yt :YcmCompleter GetType<cr>
 nnoremap <leader>ye :YcmShowDetailedDiagnostic<cr>
@@ -263,6 +263,7 @@ nnoremap <leader>g :Gstatus<cr>
 " {{{
 iabbrev rr return
 iabbrev itt import
+iabbrev miu µ
 cabbrev w!! w !sudo tee > /dev/null %<cr>
 cabbrev ddf %:p:h
 cabbrev Pydoc term ++close python -m pydoc