diff --git a/alacritty/alacritty.yml b/alacritty/alacritty_desktop.yml
similarity index 96%
rename from alacritty/alacritty.yml
rename to alacritty/alacritty_desktop.yml
index 75e09b92..c4d3391e 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty_desktop.yml
@@ -339,7 +339,7 @@ window:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.93 
+background_opacity: 0.90 
 
 #selection:
   # This string contains all characters that are used as separators for
@@ -812,33 +812,61 @@ background_opacity: 0.93
   #print_events: false
 
 # Colors (Monokai Dark)
+#colors:
+  # Default colors
+#  primary:
+#    background: '#272822'
+#    foreground: '#F8F8F2'
+
+  # Normal colors
+#  normal:
+#   black:   '#272822'
+#   red:     '#F92672'
+#   green:   '#A6E22E'
+#   yellow:  '#F4BF75'
+#   blue:    '#66D9EF'
+#   magenta: '#AE81FF'
+#   cyan:    '#A1EFE4'
+#   white:   '#F8F8F2'
+
+  # Bright colors
+#  bright:
+#   black:   '#75715E'
+#   red:     '#F92672'
+#   green:   '#A6E22E'
+#   yellow:  '#F4BF75'
+#   blue:    '#66D9EF'
+#   magenta: '#AE81FF'
+#   cyan:    '#A1EFE4'
+#   white:   '#F9F8F5'
+
+
+# Colors (Nord)
 colors:
   # Default colors
   primary:
-    background: '#272822'
-    foreground: '#F8F8F2'
+    background: '0x2E3440'
+    foreground: '0xD8DEE9'
 
   # Normal colors
   normal:
-   black:   '#272822'
-   red:     '#F92672'
-   green:   '#A6E22E'
-   yellow:  '#F4BF75'
-   blue:    '#66D9EF'
-   magenta: '#AE81FF'
-   cyan:    '#A1EFE4'
-   white:   '#F8F8F2'
+    black:   '0x3B4252'
+    red:     '0xBF616A'
+    green:   '0xA3BE8C'
+    yellow:  '0xEBCB8B'
+    blue:    '0x81A1C1'
+    magenta: '0xB48EAD'
+    cyan:    '0x88C0D0'
+    white:   '0xE5E9F0'
 
   # Bright colors
   bright:
-   black:   '#75715E'
-   red:     '#F92672'
-   green:   '#A6E22E'
-   yellow:  '#F4BF75'
-   blue:    '#66D9EF'
-   magenta: '#AE81FF'
-   cyan:    '#A1EFE4'
-   white:   '#F9F8F5'
-
-
+    black:   '0x4C566A'
+    red:     '0xBF616A'
+    green:   '0xA3BE8C'
+    yellow:  '0xEBCB8B'
+    blue:    '0x81A1C1'
+    magenta: '0xB48EAD'
+    cyan:    '0x8FBCBB'
+    white:   '0xECEFF4'
 
diff --git a/bashrc.txt b/bashrc.txt
index 237f8877..56f9f108 100644
--- a/bashrc.txt
+++ b/bashrc.txt
@@ -155,9 +155,13 @@ alias config="cd ~/.config"
 alias Code="cd ~/Documents/Code" 
 alias js="cd ~/Documents/Code/javascript"
 alias ls="ls -lah --color=auto"
-alias firefox="firefox-developer-edition"
-alias thinkorswim="/home/brian/thinkorswim/thinkorswim"
-alias vim="nvim"
+alias {top,htop,btop}="xfce4-terminal --geometry=127x51+0+0 -x btop"
+alias {firefox,ff}="firefox-developer-edition"
+alias {sq,sql,sqlite}="sqlite3"
+alias {nvi,vim,vi}="nvim"
+alias {mi,mic,nano}="micro"
+alias {mysql,maria,mdb}="mariadb"
+alias thinkorswim="~/thinkorswim/thinkorswim"
 alias shutdown="shutdown -h now"
 alias logout="xfce4-session-logout --logout"
 alias curltime="curl -w \"@$HOME/Documents/notes/curl-format.txt\" -o /dev/null -s"
@@ -166,4 +170,6 @@ alias rmorphans="sudo pacman -Rs $(pacman -Qdtq)"
 alias rmcache="paccache -rvk3"
 alias rm="rm -i"
 alias sudo="doas"
-alias doasedit="doas rnano"
+alias {doasedit,sudoedit}="doas rnano"
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/nvim/init.vim b/nvim/init.vim
index 01736a03..2edd330b 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -11,7 +11,8 @@ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
 Plug 'ryanoasis/vim-devicons'
 Plug 'airblade/vim-gitgutter'
 Plug 'ctrlpvim/ctrlp.vim' " fuzzy find files
-Plug 'scrooloose/nerdcommenter'
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'preservim/nerdcommenter'
 Plug 'luochen1990/rainbow'
 Plug 'yaegassy/coc-volar'
 "Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
@@ -25,12 +26,12 @@ call plug#end()
 
 inoremap jk <ESC>
 nmap <C-n> :NERDTreeToggle<CR>
-vmap ++ plug>NERDCommenterToggle
-nmap ++ plug>NERDCommenterToggle
 
 " open NERDTree automatically
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter * NERDTree
+" Exit Vim if NERDTree is the only window remaining in the only tab.
+autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
 
 "set colored brackets via rainbow"
 let g:rainbow_active = 1 "set to 0 if you want to enable it later via :RainbowToggle"
@@ -53,7 +54,7 @@ let g:NERDTreeGitStatusWithFlags = 1
     "\ }                         
 
 
-let g:NERDTreeIgnore = ['^node_modules$']
+"let g:NERDTreeIgnore = ['^node_modules$']
 
 " vim-prettier
 "let g:prettier#quickfix_enabled = 0
@@ -89,9 +90,9 @@ if(has("termguicolors"))
 endif
 
 syntax enable
-colorscheme gruvbox
-"colorscheme menguless "wish this had syntax highlighting..."
-"colorscheme nord
+"colorscheme gruvbox
+"colorscheme menguless
+colorscheme nord
 "colorscheme molokai
 
 "Enable transparency
@@ -227,6 +228,10 @@ command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organize
 " Add status line support, for integration with other plugin, checkout `:h coc-status`
 set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
 
+" Shortcut mappings for FZF
+nnoremap <silent> <leader>f :FZF<cr>
+nnoremap <silent> <leader>F :FZF<cr>
+
 " Using CocList
 " Show all diagnostics
 nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>