diff --git a/fish/config.fish b/fish/config.fish
index 4dcd510..58a4c79 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,4 +1,5 @@
-fish_config theme choose "Dracula Official"
+# fish_config theme choose "Dracula Official"
+source ~/.config/fish/themes/tokyonight_storm.fish
 
 if status is-interactive
     # Commands to run in interactive sessions can go here    
diff --git a/fish/themes/tokyonight_storm.fish b/fish/themes/tokyonight_storm.fish
new file mode 100644
index 0000000..c9ea983
--- /dev/null
+++ b/fish/themes/tokyonight_storm.fish
@@ -0,0 +1,37 @@
+    # TokyoNight Color Palette
+    set -l foreground c0caf5
+    set -l selection 2e3c64
+    set -l comment 565f89
+    set -l red f7768e
+    set -l orange ff9e64
+    set -l yellow e0af68
+    set -l green 9ece6a
+    set -l purple 9d7cd8
+    set -l cyan 7dcfff
+    set -l pink bb9af7
+
+    # Syntax Highlighting Colors
+    set -g fish_color_normal $foreground
+    set -g fish_color_command $cyan
+    set -g fish_color_keyword $pink
+    set -g fish_color_quote $yellow
+    set -g fish_color_redirection $foreground
+    set -g fish_color_end $orange
+    set -g fish_color_option $pink
+    set -g fish_color_error $red
+    set -g fish_color_param $purple
+    set -g fish_color_comment $comment
+    set -g fish_color_selection --background=$selection
+    set -g fish_color_search_match --background=$selection
+    set -g fish_color_operator $green
+    set -g fish_color_escape $pink
+    set -g fish_color_autosuggestion $comment
+
+    # Completion Pager Colors
+    set -g fish_pager_color_progress $comment
+    set -g fish_pager_color_prefix $cyan
+    set -g fish_pager_color_completion $foreground
+    set -g fish_pager_color_description $comment
+    set -g fish_pager_color_selected_background --background=$selection
+
+  
diff --git a/kitty/current-theme.conf b/kitty/current-theme.conf
index 014901b..20e6fca 100644
--- a/kitty/current-theme.conf
+++ b/kitty/current-theme.conf
@@ -1,50 +1,50 @@
 # vim:ft=kitty
 
-## name: Tokyo Night Moon
+## name: Tokyo Night Storm
 ## license: MIT
 ## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
 
 
-background #222436
-foreground #c8d3f5
-selection_background #2d3f76
-selection_foreground #c8d3f5
-url_color #4fd6be
-cursor #c8d3f5
-cursor_text_color #222436
+background #24283b
+foreground #c0caf5
+selection_background #2e3c64
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
 
 # Tabs
-active_tab_background #82aaff
-active_tab_foreground #1e2030
-inactive_tab_background #2f334d
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
 inactive_tab_foreground #545c7e
-#tab_bar_background #1b1d2b
+#tab_bar_background #1d202f
 
 # Windows
-active_border_color #82aaff
-inactive_border_color #2f334d
+active_border_color #7aa2f7
+inactive_border_color #292e42
 
 # normal
-color0 #1b1d2b
-color1 #ff757f
-color2 #c3e88d
-color3 #ffc777
-color4 #82aaff
-color5 #c099ff
-color6 #86e1fc
-color7 #828bb8
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
 
 # bright
-color8 #444a73
-color9 #ff757f
-color10 #c3e88d
-color11 #ffc777
-color12 #82aaff
-color13 #c099ff
-color14 #86e1fc
-color15 #c8d3f5
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
 
 # extended colors
-color16 #ff966c
-color17 #c53b53
+color16 #ff9e64
+color17 #db4b4b
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index ba0aceb..018cd7f 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -193,6 +193,6 @@ map alt+down neighboring_window down
 
 
 # BEGIN_KITTY_THEME
-# Tokyo Night Moon
+# Tokyo Night Storm
 include current-theme.conf
 # END_KITTY_THEME