diff --git a/.gitignore b/.gitignore
index 099cab7..c9d80b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *.un~
+*.swp
diff --git a/lsp.vimrc b/lsp.vimrc
index 21c1455..340e5ac 100644
--- a/lsp.vimrc
+++ b/lsp.vimrc
@@ -4,7 +4,6 @@ syntax on
 
 set nocompatible hidden laststatus=2
 
-
 let g:mapleader=" "
 let g:just_installed = 0
 
@@ -44,7 +43,7 @@ if g:just_installed == 1
 endif
 
 call plug#begin()
-Plug 'arcticicestudio/nord-vim'
+Plug 'catppuccin/vim'
 
 Plug 'prabirshrestha/asyncomplete.vim'
 Plug 'prabirshrestha/vim-lsp'
@@ -164,12 +163,12 @@ endif
 
 set termguicolors
 set background=dark
-colorscheme nord
+colorscheme catppuccin_macchiato
 
 autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
 
-let g:airline_theme = "nord"
+let g:airline_theme = "catppuccin_macchiato"
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_solarized_bg='dark'
diff --git a/minimal.vimrc b/minimal.vimrc
index 25ee120..dc7d441 100644
--- a/minimal.vimrc
+++ b/minimal.vimrc
@@ -10,18 +10,22 @@ function! InstallPlug()
   if !filereadable(expand("~/.vim/autoload/plug.vim"))
     " try to install plug using curl and wget
     " If installation succeeds, we should source vim plug.
-    let result = system('curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim')
-    if v:shell_error == 0
-      let g:just_installed = 1
-      return
+    if executable('curl')
+      let result = system('curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim')
+      if v:shell_error == 0
+        let g:just_installed = 1
+        return
+      endif
     endif
 
     echom 'curl failed, trying wget. ' . result
 
-    let result = system('mkdir -p ~/.vim/autoload && wget -O ~/.vim/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim')
-    if v:shell_error == 0
-      let g:just_installed = 1
-      return
+    if executable('wget') && executable('mkdir')
+      let result = system('mkdir -p ~/.vim/autoload && wget -O ~/.vim/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim')
+      if v:shell_error == 0
+        let g:just_installed = 1
+        return
+      endif
     endif
 
     echom 'wget failed too. ' . result
@@ -37,7 +41,7 @@ if g:just_installed == 1
 endif
 
 call plug#begin()
-  Plug 'arcticicestudio/nord-vim'
+  Plug 'catppuccin/vim'
 
   Plug 'Townk/vim-autoclose'
   Plug 'tpope/vim-fugitive'
@@ -151,15 +155,13 @@ endif
 
 set termguicolors
 set background=dark
-colorscheme nord
+colorscheme catppuccin_macchiato
 
 autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
 
-let g:airline_theme = "nord"
-let g:airline_powerline_fonts = 1
+let g:airline_theme = "catppuccin_macchiato"
 let g:airline#extensions#tabline#enabled = 1
-let g:airline_solarized_bg='dark'
 
 nnoremap <leader>z :Goyo <CR>
 nnoremap <leader>gs :Git <CR>