diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index c75aa7d..85e53a0 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -34,13 +34,22 @@ set ruler
 
 if !empty(globpath(&rtp, 'autoload/plug.vim'))
   call plug#begin('~/.vim/plugged')
-    Plug 'lifepillar/vim-solarized8'
-    Plug 'tpope/vim-surround'
-    Plug 'editorconfig/editorconfig-vim'
-    Plug 'tpope/vim-fugitive'
+    Plug 'MaxMEllon/vim-jsx-pretty'
     Plug 'ctrlpvim/ctrlp.vim'
-  Plug 'ycm-core/YouCompleteMe', { 'do': './install.py --all' }
-  Plug 'vim-syntastic/syntastic'
+    Plug 'earthly/earthly.vim'
+    Plug 'editorconfig/editorconfig-vim'
+    Plug 'fatih/vim-go'
+    Plug 'grailbio/bazel-compilation-database'
+    Plug 'isobit/vim-caddyfile'
+    Plug 'lifepillar/vim-solarized8'
+    Plug 'mustache/vim-mustache-handlebars'
+    Plug 'rust-lang/rust'
+    Plug 'sirtaj/vim-openscad'
+    Plug 'tpope/vim-fugitive'
+    Plug 'tpope/vim-surround'
+    Plug 'vim-syntastic/syntastic'
+    Plug 'vimwiki/vimwiki'
+    Plug 'ycm-core/YouCompleteMe', { 'do': './install.py --all' }
   call plug#end()
 endif
 
@@ -100,9 +109,6 @@ set smartcase
 " Optional highlighting
 nmap <leader>hs :set hlsearch! hlsearch?<CR>
 
-
-
-
 " Options for syntastic
 let g:syntastic_enable_signs = 1
 let g:syntastic_auto_loc_list = 2
@@ -122,7 +128,6 @@ autocmd BufReadPost *
 " Have F5 run the tests and display errors
 nnoremap <silent> <F5> :SyntasticCheck<CR> :Errors<CR>
 
-
 " Load vim-ycm if installed and compiled
 if filereadable(expand('~/.vim/plugged/YouCompleteMe/python/ycm/ycm_core.so'))
   let g:ycm_autoclose_preview_window_after_insertion=1
@@ -132,11 +137,8 @@ if filereadable(expand('~/.vim/plugged/YouCompleteMe/python/ycm/ycm_core.so'))
     let g:ycm_rust_toolchain_root=g:tmp_rust_path
   endif
   unlet! g:tmp_rust_path
-else
-  echom "YCM plugin found but core library is not compiled. Run :PlugInstall or check build dependencies."
 endif
 
-
 " Include a .vimrc.local if it exists
 if filereadable(glob("~/.vimrc.local"))
   source ~/.vimrc.local
diff --git a/install.sh b/install.sh
index 6ba065a..daf1116 100755
--- a/install.sh
+++ b/install.sh
@@ -184,7 +184,7 @@ install_dotfiles() {
 }
 
 install_main() {
-  if [[ -d "${BASEDIR}/.git" && have_command git ]] ; then
+  if [[ -d "${BASEDIR}/.git" ]] && have_command git ; then
     if [[ -z "$(git -C "${BASEDIR}" status --porcelain)" ]]; then
       git -C "${BASEDIR}" pull --ff-only || true
     else
@@ -202,16 +202,16 @@ install_main() {
       verbose "Installing vim-plug..."
       mkdir -p "${VIM_AUTOLOAD_DIR}"
       if have_command curl; then
-        curl -fLo "${VIM_PLUG_FILE}" --create-dirs "${VIM_PLUG_URL}"
+        curl -fsLo "${VIM_PLUG_FILE}" --create-dirs "${VIM_PLUG_URL}"
       else
         echo "Error: curl not found. Cannot install vim-plug." >&2
       fi
         fi
-    
+
         # Install TPM (Tmux Plugin Manager) if not already present
         local TPM_DIR="${HOME}/.tmux/plugins/tpm"
         local TPM_REPO="https://github.com/tmux-plugins/tpm"
-    
+
         if [[ ! -d "${TPM_DIR}" ]]; then
           verbose "Installing TPM (Tmux Plugin Manager)..."
           if have_command git; then
@@ -220,7 +220,7 @@ install_main() {
             echo "Error: git not found. Cannot install TPM." >&2
           fi
         fi
-    
+
         # try to update dotfile overlays
     if [[ -d "${BASEDIR}/dotfile_overlays" ]] ; then
       for dotfiledir in "${BASEDIR}/dotfile_overlays/"* ; do