diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile
index 1fe98a0..b37b69d 100644
--- a/dotfiles/bash/bash_profile
+++ b/dotfiles/bash/bash_profile
@@ -18,4 +18,6 @@ fi
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
 
-[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
\ No newline at end of file
+[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
+
+test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index 62841d1..04879e4 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -13,7 +13,10 @@ endif
 call plug#begin('~/.config/nvim/plugged')
 
 " Material theme
-Plug 'hzchirs/vim-material'
+" Plug 'hzchirs/vim-material'
+
+" Nord Theme
+Plug 'arcticicestudio/nord-vim'
 
 " Syntastic
 Plug 'scrooloose/syntastic'
@@ -36,7 +39,7 @@ Plug 'mileszs/ack.vim'
 " Improved vim status bar
 Plug 'bling/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
-let g:airline_theme='material'
+let g:airline_theme='nord'
 
 " Indent guides
 Plug 'Yggdroot/indentLine'
@@ -278,4 +281,13 @@ map <silent> <Leader>i :IndentLinesToggle<CR>
 " Color scheme setting is done absolutely last to make sure everything is
 " available to vim
 set background=dark
-colorscheme vim-material
+colorscheme nord
+
+let g:ycm_language_server =
+      \ [
+      \  {
+      \    'name': 'ocaml',
+      \    'cmdline': ['ocamllsp'],
+      \    'filetypes': ['ocaml']
+      \  }
+      \]
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 2c8312a..6b28dd9 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -16,7 +16,10 @@ call vundle#begin()
 Plugin 'gmarik/Vundle.vim'
 
 " Solarized theme
-Plugin 'altercation/vim-colors-solarized'
+" Plugin 'altercation/vim-colors-solarized'
+
+" Nord theme
+Plug 'arcticicestudio/nord-vim'
 
 " Syntastic
 Plugin 'scrooloose/syntastic'