diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf
new file mode 100644
index 0000000..2533db7
--- /dev/null
+++ b/.config/kitty/current-theme.conf
@@ -0,0 +1,80 @@
+# vim:ft=kitty
+
+## name:     Catppuccin-Mocha
+## author:   Pocco81 (https://github.com/Pocco81)
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground              #CDD6F4
+background              #1E1E2E
+selection_foreground    #1E1E2E
+selection_background    #F5E0DC
+
+# Cursor colors
+cursor                  #F5E0DC
+cursor_text_color       #1E1E2E
+
+# URL underline color when hovering with mouse
+url_color               #F5E0DC
+
+# Kitty window border colors
+active_border_color     #B4BEFE
+inactive_border_color   #6C7086
+bell_border_color       #F9E2AF
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111B
+active_tab_background   #CBA6F7
+inactive_tab_foreground #CDD6F4
+inactive_tab_background #181825
+tab_bar_background      #11111B
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1E1E2E
+mark1_background #B4BEFE
+mark2_foreground #1E1E2E
+mark2_background #CBA6F7
+mark3_foreground #1E1E2E
+mark3_background #74C7EC
+
+# The 16 terminal colors
+
+# black
+color0 #45475A
+color8 #585B70
+
+# red
+color1 #F38BA8
+color9 #F38BA8
+
+# green
+color2  #A6E3A1
+color10 #A6E3A1
+
+# yellow
+color3  #F9E2AF
+color11 #F9E2AF
+
+# blue
+color4  #89B4FA
+color12 #89B4FA
+
+# magenta
+color5  #F5C2E7
+color13 #F5C2E7
+
+# cyan
+color6  #94E2D5
+color14 #94E2D5
+
+# white
+color7  #BAC2DE
+color15 #A6ADC8
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
new file mode 100644
index 0000000..0222018
--- /dev/null
+++ b/.config/kitty/kitty.conf
@@ -0,0 +1,17 @@
+# Font Configuration
+font_family      JetBrainsMono Nerd Font
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+
+# Shell Integration - Start tmux by default
+shell /usr/bin/tmux new-session -A -D -s main
+
+# Terminal Type
+term xterm-256color
+
+
+# BEGIN_KITTY_THEME
+# Catppuccin-Mocha
+include current-theme.conf
+# END_KITTY_THEME
\ No newline at end of file
diff --git a/.config/kitty/kitty.conf.bak b/.config/kitty/kitty.conf.bak
new file mode 100644
index 0000000..7871ede
--- /dev/null
+++ b/.config/kitty/kitty.conf.bak
@@ -0,0 +1,11 @@
+# Font Configuration
+font_family      JetBrainsMono Nerd Font
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+
+# Shell Integration - Start tmux by default
+shell /usr/bin/tmux new-session -A -D -s main
+
+# Terminal Type
+term xterm-256color
diff --git a/.config/sway/config b/.config/sway/config
index cb3475a..cb4602f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -81,7 +81,7 @@ set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term ghostty
+set $term kitty
 # Your preferred application launcher
 set $menu rofi -show drun
 
diff --git a/.tmux.conf b/.tmux.conf
index 0ed8641..a36365c 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,8 +3,8 @@ set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'catppuccin/tmux#v2.1.3'
 set -g @plugin 'tmux-plugins/tpm'
 
-set -g @continuum-save-interval '2'
 set -g @continuum-restore 'on'
+set -g @resurrect-processes 'lazygit yazi'
 
 set -g mouse on
 
@@ -18,12 +18,15 @@ set -s escape-time 10
 set -g history-limit 50000
 
 # True color settings
-set -g default-terminal "$TERM"
-set -ag terminal-overrides ",$TERM:Tc"
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",xterm-256color:RGB"
+
 set -g status-interval 10
 set -g allow-passthrough on
+
 set -ga update-environment TERM
 set -ga update-environment TERM_PROGRAM
+set -ga update-environment SSH_CONNECTION
 
 set -g @catppuccin_window_text " #W"
 set -g @catppuccin_window_default_text " #W"