diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 4aff201..628bf4d 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -2,8 +2,8 @@ env:
   TERM: xterm-256color
 window:
   dimensions:
-    columns: 120
-    lines: 30
+    columns: 150
+    lines: 50
   padding:
     x: 5
     y: 5
@@ -24,16 +24,16 @@ scrolling:
 font:
   size: 10.0
   normal:
-    family: JetBrains Mono Nerd Font
+    family: Comic Mono
     style: Normal
   bold:
-    family: JetBrains Mono Nerd Font
+    family: Comic Mono
     style: Bold
   italic:
-    family: JetBrains Mono Nerd Font
+    family: Comic Mono
     style: Italic
   bold_italic:
-    family: JetBrains Mono Nerd Font
+    family: Comic Mono
     style: Bold Italic
   offset:
     x: 0
@@ -49,5 +49,4 @@ selection:
   save_to_clipboard: true
 
 import:
-  - ~/.config/alacritty/alacritty-theme/themes/gruvbox_dark.yaml
-
+  - ~/.config/alacritty/catppuccin/catppuccin-mocha.yml
diff --git a/.config/alacritty/catppuccin b/.config/alacritty/catppuccin
new file mode 160000
index 0000000..3c808cb
--- /dev/null
+++ b/.config/alacritty/catppuccin
@@ -0,0 +1 @@
+Subproject commit 3c808cbb4f9c87be43ba5241bc57373c793d2f17
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 0227684..7bf6ac5 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -101,10 +101,11 @@ call plug#begin(data_dir . '/plugins')
 source ~/.config/nvim/plugins/airline.vim
 " source ~/.config/nvim/plugins/arduino.vim
 " source ~/.config/nvim/plugins/coc.vim
+source ~/.config/nvim/plugins/catppuccin.vim
 source ~/.config/nvim/plugins/commentary.vim
 source ~/.config/nvim/plugins/context-commentstring.vim
 source ~/.config/nvim/plugins/dispatch.vim
-source ~/.config/nvim/plugins/gruvbox.vim 
+" source ~/.config/nvim/plugins/gruvbox.vim 
 source ~/.config/nvim/plugins/editorconfig.vim
 source ~/.config/nvim/plugins/eunuch.vim
 source ~/.config/nvim/plugins/exchange.vim
@@ -142,6 +143,8 @@ source ~/.config/nvim/plugins/which-key.vim
 call plug#end()
 doautocmd User PlugLoaded
 
+colorscheme catppuccin
+
 "--------------------------------------------------------------------------
 " Miscellaneous
 "--------------------------------------------------------------------------
diff --git a/.config/nvim/plugins/airline.vim b/.config/nvim/plugins/airline.vim
index ed860be..5f137fc 100644
--- a/.config/nvim/plugins/airline.vim
+++ b/.config/nvim/plugins/airline.vim
@@ -1,7 +1,7 @@
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 
-let g:airline_theme = 'gruvbox'
+let g:airline_theme = 'catppuccin'
 let g:airline_powerline_fonts = 1
 let g:airline_skip_empty_sections = 1
 
diff --git a/.gitmodules b/.gitmodules
index 79856d5..d44ab18 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule ".config/alacritty/alacritty-theme"]
 	path = .config/alacritty/alacritty-theme
 	url = https://github.com/eendroroy/alacritty-theme
+[submodule "/home/anthony/.config/alacritty/catppuccin"]
+	path = /home/anthony/.config/alacritty/catppuccin
+	url = https://github.com/catppuccin/alacritty.git
diff --git a/.tmux.conf b/.tmux.conf
index f0a16ee..5a88c9c 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,7 @@
 # -- general ------------------------------------------------------------------
 
 set -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-256color:Tc"
 setw -g xterm-keys on
 set -sg repeat-time 600
 
@@ -9,7 +10,7 @@ setw -q -g utf8 on
 
 set -g mouse on
 
-set-option -g default-shell /usr/bin/bash
+#set-option -g default-shell /usr/bin/bash
 # -- display ------------------------------------------------------------------
 
 set -g base-index 1
@@ -71,8 +72,12 @@ set -g @plugin 'tmux-plugins/tmux-copycat'
 set -g @plugin 'tmux-plugins/tmux-pain-control'
 set -g @plugin 'tmux-plugins/tmux-open'
 set -g @plugin 'tmux-plugins/tmux-battery'
-set -g @plugin 'egel/tmux-gruvbox'
-set -g @tmux-gruvbox 'dark'
+#set -g @plugin 'egel/tmux-gruvbox'
+#set -g @tmux-gruvbox 'dark'
+set -g @plugin 'catppuccin/tmux'
+set -g @plugin 'tmux-plugins/tmux-yank'
+
+set -g @catppuccin_flavour 'mocha'
 
 run ~/.tmux/plugins/tpm/tpm