diff --git a/vim/.vimrc b/vim/.vimrc
index 9228ed5..f764953 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -5,40 +5,45 @@ if empty(glob(data_dir . '/autoload/plug.vim'))
   autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
+set nocompatible
 " Specify a directory for plugins
 " - For Neovim: stdpath('data') . '/plugged'
 call plug#begin('~/.vim/plugged')
+"Undo tree
 Plug 'simnalamburt/vim-mundo'
+
+"""""REQUIRED LIBRARIES"""""
+""For :RustPlay via polyglot/syntastic
 Plug 'mattn/webapi-vim'
+
+
 Plug 'junegunn/vim-github-dashboard'
-Plug 'tpope/vim-fugitive'
 Plug 'honza/vim-snippets'
-Plug 'pearofducks/ansible-vim'
 Plug 'preservim/nerdtree'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-Plug 'liuchengxu/vim-which-key'
+
 Plug 'vim-scripts/indentLine.vim'
 Plug 'rhysd/git-messenger.vim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'arcticicestudio/nord-vim'
 Plug 'junegunn/vim-easy-align'
+
+"""""CLUTTER-FREE EDITING"""""
 Plug 'junegunn/goyo.vim'
-Plug 'mattn/emmet-vim'
 Plug 'junegunn/limelight.vim'
+
+"""""COMMENTING WITH \c<space>"""""
+Plug 'scrooloose/nerdcommenter'
+
 Plug 'mg979/vim-visual-multi', {'branch': 'master'}
 Plug 'airblade/vim-gitgutter'
-Plug 'scrooloose/syntastic'
-Plug 'tpope/vim-surround'
 Plug 'vim-airline/vim-airline'
-Plug 'scrooloose/nerdcommenter'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'godlygeek/tabular'
 "Plug 'easymotion/vim-easymotion'
 Plug 'nathanaelkane/vim-indent-guides'
 Plug 'xuyuanp/nerdtree-git-plugin'
-Plug 'sheerun/vim-polyglot'
-Plug 'mbbill/undotree'
 Plug 'bronson/vim-trailing-whitespace'
 " I love you tpope <3
 Plug 'tpope/vim-dadbod'
@@ -49,14 +54,49 @@ Plug 'tpope/vim-rhubarb'
 Plug 'tpope/vim-unimpaired'
 Plug 'tpope/vim-abolish'
 Plug 'tpope/vim-obsession'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-surround'
+
+"""""COMMON SYNTAX CHECKER"""""
+Plug 'scrooloose/syntastic'
+Plug 'sheerun/vim-polyglot'
+"""""HTML"""""
+Plug 'mattn/emmet-vim'
+
 
 " Initialize plugin system
 call plug#end()
 
+
+"""""GOYO SETTINGS BLOCK"""""
+" Color name (:help cterm-colors) or ANSI code
+let g:limelight_conceal_ctermfg = 'DarkGray'
+
+" Color name (:help gui-colors) or RGB color
+let g:limelight_conceal_guifg = 'DarkGray'
+let g:limelight_conceal_guifg = '#777777'
 autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
+
+"""""
+
+if has("persistent_undo")
+   let target_path = expand('~/.undodir')
+
+    " create the directory and any parent directories
+    " if the location does not exist.
+    if !isdirectory(target_path)
+        call mkdir(target_path, "p", 0700)
+    endif
+
+    let &undodir=target_path
+    set undofile
+endif
+
+let g:airline_powerline_fonts = 1
 filetype plugin on
 colorscheme nord
 "Keybinds
+nnoremap <F4> :Goyo<CR>
 set pastetoggle=<F3>
 nnoremap <F5> :MundoToggle<CR>