diff --git a/terminal/vim/keys.vim b/terminal/vim/keys.vim
deleted file mode 100644
index 7d00921..0000000
--- a/terminal/vim/keys.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-nnoremap <C-H> <C-w>h
-nnoremap <C-J> <C-w>j
-nnoremap <C-K> <C-w>k
-nnoremap <C-L> <C-w>l
diff --git a/terminal/vim/packages.vim b/terminal/vim/packages.vim
index 0870d18..12d7117 100644
--- a/terminal/vim/packages.vim
+++ b/terminal/vim/packages.vim
@@ -1,4 +1,4 @@
-command! PackUpdate packadd minpac | source $MYVMRC | redraw | call minpac#update()
+command! PackUpdate packadd minpac | source $MYVIMRC | redraw | call minpac#update()
 command! PackClean packadd minpac | source $MYVIMRC | call minpac#clean()
 
 if !exists('*minpac#init')
@@ -8,3 +8,15 @@ endif
 call minpac#init()
 
 call minpac#add('k-takata/minpac', {'type': 'opt'})
+
+call minpac#add('morhetz/gruvbox')
+
+call minpac#add('tpope/vim-fugitive')
+call minpac#add('mhinz/vim-signify')
+
+call minpac#add('scrooloose/nerdtree')
+
+call minpac#add('tpope/vim-commentary')
+call minpac#add('tpope/vim-unimpaired')
+
+call minpac#add('thomasloven/vim-tstatus')
diff --git a/terminal/vim/vimrc b/terminal/vim/vimrc
index 1e73cae..2611de5 100644
--- a/terminal/vim/vimrc
+++ b/terminal/vim/vimrc
@@ -88,6 +88,70 @@ endif
 let g:dotfiles_vim = expand('<sfile>:p:h')
 
 execute 'source ' . g:dotfiles_vim . '/packages.vim'
-execute 'source ' . g:dotfiles_vim . '/keys.vim'
 
 
+" === COLORS ===
+set background=dark
+set cursorline
+let g:gruvbox_italic=1
+augroup colors
+  au!
+  au colorscheme * hi SpecialKey ctermfg=1
+  au colorscheme * hi CursorLine ctermbg=16
+  au colorscheme * hi SignColumn ctermbg='None'
+augroup END
+colorscheme gruvbox
+
+
+" === OTHER DISPLAY OPTIONS ===
+set list
+set listchars=tab:→\ ,trail:␣,nbsp:⋅
+set noruler
+set laststatus=2
+
+
+" === WINDOW NAVIGATION ===
+nnoremap <C-H> <C-w>h
+nnoremap <C-J> <C-w>j
+nnoremap <C-K> <C-w>k
+nnoremap <C-L> <C-w>l
+
+set number
+set relativenumber
+
+
+let mapleader=' '
+" === REMAPPINGS FOR SWEDISH KEYBOARD ===
+nnoremap ö :
+nnoremap - '
+nnoremap _ `
+
+" Mappings for unimpaired''''''
+nmap å [
+nmap ¨ ]
+omap å [
+omap ¨ ]
+xmap å [
+xmap ¨ ]
+
+
+" === SEARCH OPTIONS ===
+set ignorecase
+set smartcase
+set incsearch
+set showmatch
+set hlsearch
+nnoremap <silent> <leader> :noh<CR>
+noremap / /\v
+nnoremap * mp*`p
+
+
+set expandtab
+set tabstop=2
+set shiftwidth=2
+set softtabstop=2
+set smartindent
+
+
+" === PLUGIN MAPPINGS ===
+nnoremap <silent>§ :NERDTreeToggle<CR>