diff --git a/.vim/vimrc b/.vim/vimrc
index e985cd5..f13df7d 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -36,8 +36,7 @@ Plug 'tpope/vim-commentary' " Toggle C style comments with gc
 "Plug 'KabbAmine/zeavim.vim' " gz to open zeal
 Plug 'mbbill/undotree'
 "Plug 'kkoomen/vim-doge'
-Plug 'SirVer/ultisnips'
-Plug 'honza/vim-snippets'
+Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 Plug 'wellle/context.vim'
 Plug 'svermeulen/vim-yoink'
 Plug 'will133/vim-dirdiff'
@@ -46,8 +45,7 @@ Plug 'will133/vim-dirdiff'
 
 " Files switch, jump and grep-like tools {{{
 "Plug 'ericcurtin/CurtineIncSw.vim' "Toggle .c .h files
-Plug 'preservim/nerdtree'
-Plug 'Xuyuanp/nerdtree-git-plugin'
+Plug 'preservim/nerdtree' | Plug 'Xuyuanp/nerdtree-git-plugin'
 "Plug 'mileszs/ack.vim' " Ack integration
 Plug 'junegunn/fzf.vim'
 "Plug 'fholgado/minibufexpl.vim'
@@ -64,12 +62,11 @@ Plug 'mhinz/vim-signify' " Mark edited lines - faster gitgutter
 " }}}
 
 " Syntax for random filetypes {{{
-"Plug 'gabrielelana/vim-markdown'
+Plug 'plasticboy/vim-markdown'
 Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
 "Plug 'vim-scripts/DoxygenToolkit.vim' " Doxygen support
 Plug 'pboettch/vim-cmake-syntax'
 Plug 'aklt/plantuml-syntax'
-Plug 'vim-pandoc/vim-pandoc-syntax'
 " }}}
 
 " Colorschemes {{{
@@ -82,18 +79,18 @@ Plug 'vim-pandoc/vim-pandoc-syntax'
 "Plug 'adrian5/oceanic-next-vim'
 "Black and white:
 "Plug 'ewilazarus/preto'
-Plug 'andreasvc/vim-256noir'
+"Plug 'andreasvc/vim-256noir'
+Plug 'jaredgorski/spacecamp'
 " }}}
 
 " Other plugins (external tools, etc) {{{
 Plug 'junegunn/goyo.vim'
-Plug 'jez/vim-superman' "vman application
-Plug 'vimwiki/vimwiki'
+"Plug 'jez/vim-superman' "vman application
+"Plug 'vimwiki/vimwiki'
 "Plug 'metakirby5/codi.vim' " live coding
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
+Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes'
 Plug 'mhinz/vim-startify'
-Plug 'vim-pandoc/vim-pandoc'
+Plug 'vim-pandoc/vim-pandoc' | Plug 'vim-pandoc/vim-pandoc-syntax'
 " }}}
 
 call plug#end()            " required
@@ -171,6 +168,8 @@ set spelllang=en
 set dictionary+=/usr/share/dict/words
 set clipboard=unnamed
 
+set exrc
+
 " }}}
 
 " Undofile {{{
@@ -211,9 +210,8 @@ inoremap jk <ESC>
 inoremap :w<CR> <Esc>:w<CR>i
 
 " space one line, home,end globally increase/decrease
-nnoremap <space><space> za
-nnoremap <Home> zm
-nnoremap <End> zr
+nnoremap <Home> zc
+nnoremap <End> zo
 
 " Map : to ; also in command mode
 "nnoremap ; :
@@ -305,7 +303,7 @@ nnoremap <leader>ff :FZF!<CR>
 nnoremap <leader>fl :Lines!<CR>
 nnoremap <leader>fb :Buffers<CR>
 inoremap <leader>fs <ESC>:Snippets!<CR>
-nnoremap <leader>fa :Ag! <C-R><C-W><CR>
+nnoremap <leader>fa :Rg! <C-R><C-W><CR>
 
 " Disable context.vim on json files
 let g:context_filetype_blacklist = ["json"]