diff --git a/assets/default/fish/init/alias.fish b/assets/default/fish/init/alias.fish
index de72209..bfe0fb0 100644
--- a/assets/default/fish/init/alias.fish
+++ b/assets/default/fish/init/alias.fish
@@ -43,3 +43,9 @@ abbr --global --add ns-failure notify-to-slack Failure
 function ns-notify
   notify-to-slack --status $status "Done"
 end
+
+# kitty aliases
+if [ "$TERM" = "xterm-kitty" ]
+  alias ssh="kitty +kitten ssh"
+  alias imgcat="kitty +kitten icat"
+end
diff --git a/assets/default/fish/themes/wombat.fish b/assets/default/fish/themes/wombat.fish
index 71ede38..5fd4d38 100644
--- a/assets/default/fish/themes/wombat.fish
+++ b/assets/default/fish/themes/wombat.fish
@@ -1,4 +1,4 @@
-set -g fish_color_autosuggestion black
+set -g fish_color_autosuggestion default
 set -g fish_color_cancel -r
 set -g fish_color_command yellow
 set -g fish_color_comment normal
diff --git a/assets/default/kitty/current-theme.conf b/assets/default/kitty/current-theme.conf
new file mode 100644
index 0000000..b477da2
--- /dev/null
+++ b/assets/default/kitty/current-theme.conf
@@ -0,0 +1,29 @@
+env KITTY_THEME=Wombat
+background            #1e1e1e
+foreground            #e4e0d7
+selection_background  #574b49
+selection_foreground  #c3c7cb
+cursor                #bbbbbb
+color0                #000000
+color8                #404040
+color1                #ff786c
+color9                #f89f92
+color2                #bde97c
+color10               #e2f6a0
+color3                #efdeab
+color11               #f1e9bf
+color4                #6eb9f8
+color12               #b3d2ff
+color5                #ee87ff
+color13               #e4bcff
+color6                #90fdf8
+color14               #c1fdfa
+color7                #e4e0d7
+color15               #fefefe
+
+active_tab_foreground #CAE682
+active_tab_background #32322F
+active_tab_font_style bold-italic
+inactive_tab_foreground #CAE682
+inactive_tab_background #242424
+inactive_tab_font_style normal
diff --git a/assets/default/kitty/kitty.conf b/assets/default/kitty/kitty.conf
new file mode 100644
index 0000000..0e7c27f
--- /dev/null
+++ b/assets/default/kitty/kitty.conf
@@ -0,0 +1,15 @@
+# include themes/wombat.conf
+# include themes/solarized_light.conf
+cursor_shape block
+macos_custom_beam_cursor yes
+
+macos_option_as_alt yes
+
+tab_bar_edge bottom
+tab_bar_style powerline
+tab_powerline_style slanted
+
+# BEGIN_KITTY_THEME
+# Wombat Iterm
+include current-theme.conf
+# END_KITTY_THEME
diff --git a/assets/default/kitty/kitty.conf.bak b/assets/default/kitty/kitty.conf.bak
new file mode 100644
index 0000000..7ad027a
--- /dev/null
+++ b/assets/default/kitty/kitty.conf.bak
@@ -0,0 +1,3 @@
+include themes/wombat.conf
+# include themes/solarized_light.conf
+cursor_shape block
diff --git a/assets/default/kitty/themes/solarized_light.conf b/assets/default/kitty/themes/solarized_light.conf
new file mode 100644
index 0000000..30169b5
--- /dev/null
+++ b/assets/default/kitty/themes/solarized_light.conf
@@ -0,0 +1,22 @@
+env KITTY_THEME=Solarized_Light
+background            #fdf6e3
+foreground            #52676f
+cursor                #52676f
+selection_background  #e9e2cb
+color0 #e4e4e4
+color8 #ffffd7
+color1 #d70000
+color9 #d75f00
+color2 #5f8700
+color10 #585858
+color3 #af8700
+color11 #626262
+color4 #0087ff
+color12 #808080
+color5 #af005f
+color13 #5f5faf
+color6 #00afaf
+color14 #8a8a8a
+color7 #262626
+color15 #1c1c1c
+selection_foreground #fcf4dc
diff --git a/assets/default/kitty/themes/wombat_iterm.conf b/assets/default/kitty/themes/wombat_iterm.conf
new file mode 100644
index 0000000..bc417ec
--- /dev/null
+++ b/assets/default/kitty/themes/wombat_iterm.conf
@@ -0,0 +1,30 @@
+env KITTY_THEME=Wombat
+
+background            #1e1e1e
+foreground            #e4e0d7
+selection_background  #574b49
+selection_foreground  #c3c7cb
+cursor                #bbbbbb
+color0                #000000
+color8                #404040
+color1                #ff786c
+color9                #f89f92
+color2                #bde97c
+color10               #e2f6a0
+color3                #efdeab
+color11               #f1e9bf
+color4                #6eb9f8
+color12               #b3d2ff
+color5                #ee87ff
+color13               #e4bcff
+color6                #90fdf8
+color14               #c1fdfa
+color7                #e4e0d7
+color15               #fefefe
+
+active_tab_foreground #CAE682
+active_tab_background #32322F
+active_tab_font_style bold-italic
+inactive_tab_foreground #CAE682
+inactive_tab_background #242424
+inactive_tab_font_style normal
diff --git a/assets/default/mac-files/tmuxline.conf b/assets/default/mac-files/tmuxline.conf
index 9844dd6..8bb4ff5 100644
--- a/assets/default/mac-files/tmuxline.conf
+++ b/assets/default/mac-files/tmuxline.conf
@@ -1,22 +1,21 @@
 # This tmux statusbar config was created by tmuxline.vim
-# on Tue, 12 Nov 2019
+# on Mon, 04 Apr 2022
 
 set -g status-justify "left"
 set -g status "on"
 set -g status-left-style "none"
-set -g message-command-style "fg=colour7,bg=colour11"
+set -g message-command-style "fg=#CAE682,bg=#32322F"
 set -g status-right-style "none"
-set -g pane-active-border-style "fg=colour14"
-set -g status-style "none,bg=colour0"
-set -g message-style "fg=colour7,bg=colour11"
-set -g pane-border-style "fg=colour11"
+set -g pane-active-border-style "fg=#CAE682"
+set -g status-style "none,bg=#242424"
+set -g message-style "fg=#CAE682,bg=#32322F"
+set -g pane-border-style "fg=#32322F"
 set -g status-right-length "100"
 set -g status-left-length "100"
 setw -g window-status-activity-style "none"
 setw -g window-status-separator ""
-setw -g window-status-style "none,fg=colour10,bg=colour0"
-set -g status-left "#[fg=colour15,bg=colour14,bold] #S #[fg=colour14,bg=colour0,nobold,nounderscore,noitalics]"
-# Set right status with icalBuddy output for calendar event
-set -g status-right "#[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11]#(cal_now) %Y-%m-%d | %H:%M #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour14] #h"
-setw -g window-status-format "#[fg=colour10,bg=colour0] #I |#[fg=colour10,bg=colour0] #W "
-setw -g window-status-current-format "#[fg=colour0,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] #I |#[fg=colour7,bg=colour11] #W #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]"
+setw -g window-status-style "none,fg=#CAE682,bg=#242424"
+set -g status-left "#[fg=#141413,bg=#CAE682] #S #[fg=#CAE682,bg=#242424,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#32322F,bg=#242424,nobold,nounderscore,noitalics]#[fg=#CAE682,bg=#32322F] %Y-%m-%d | %H:%M #[fg=#CAE682,bg=#32322F,nobold,nounderscore,noitalics]#[fg=#141413,bg=#CAE682] #h "
+setw -g window-status-format "#[fg=#CAE682,bg=#242424] #I |#[fg=#CAE682,bg=#242424] #W "
+setw -g window-status-current-format "#[fg=#242424,bg=#32322F,nobold,nounderscore,noitalics]#[fg=#CAE682,bg=#32322F] #I |#[fg=#CAE682,bg=#32322F] #W #[fg=#32322F,bg=#242424,nobold,nounderscore,noitalics]"
diff --git a/recipes/default/kitty b/recipes/default/kitty
index 7b30115..7fe9a2d 100755
--- a/recipes/default/kitty
+++ b/recipes/default/kitty
@@ -1,4 +1,5 @@
 #! /bin/bash
 
-sudo_package_update
+# Link and add source all synced alacritty configs
+try_link "$DEFAULT_ASSETS_PATH" "$XDG_CONFIG_HOME/kitty"
 sudo_package "kitty"