diff --git a/README.md b/README.md
index 016ff61..d8362ea 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ A dark Neovim theme written in Lua ported from the Visual Studio Code [TokyoNigh
 + vim terminal colors
 + darker background for sidebar-like windows
 + color configs for [Kitty](https://sw.kovidgoyal.net/kitty/conf.html?highlight=include)
++ color configs for [Fish Shell](https://fishshell.com/)
 + **lualine** theme
 
 ### Plugin Support
@@ -106,8 +107,4 @@ let g:tokyonight_sidebars = [ "quickfix", "__vista__", "terminal" ]
 
 ## 🍭 Extras
 
-Two color configs for **Kitty** can be found at [/extra](extra/). To use them, copy the color config you want to your Kitty condif directory and append the following in yout `kitty.conf`
-
-```kitty
-include other.conf
-```
+Two color configs for **Kitty** and **Fish** can be found in [extras](extras/). To use them, refer to their respective documentation.
diff --git a/extra/build b/extra/build
deleted file mode 100755
index 8cfa3cb..0000000
--- a/extra/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-cd "$DIR/.."
-
-export LUA_PATH="./lua/?/init.lua;./lua/?.lua"
-lua -e 'require"tokyonight.extra"'
diff --git a/extras/fish_tokyonight_night.fish b/extras/fish_tokyonight_night.fish
new file mode 100644
index 0000000..39d4b00
--- /dev/null
+++ b/extras/fish_tokyonight_night.fish
@@ -0,0 +1,35 @@
+    # TokyoNight Color Palette
+    set -l foreground c0caf5
+    set -l selection 33467C
+    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_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
+    
+  
\ No newline at end of file
diff --git a/extras/fish_tokyonight_storm.fish b/extras/fish_tokyonight_storm.fish
new file mode 100644
index 0000000..0611a04
--- /dev/null
+++ b/extras/fish_tokyonight_storm.fish
@@ -0,0 +1,35 @@
+    # TokyoNight Color Palette
+    set -l foreground c0caf5
+    set -l selection 364A82
+    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_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
+    
+  
\ No newline at end of file
diff --git a/extra/kitty_tokyonight_night.conf b/extras/kitty_tokyonight_night.conf
similarity index 100%
rename from extra/kitty_tokyonight_night.conf
rename to extras/kitty_tokyonight_night.conf
diff --git a/extra/kitty_tokyonight_storm.conf b/extras/kitty_tokyonight_storm.conf
similarity index 100%
rename from extra/kitty_tokyonight_storm.conf
rename to extras/kitty_tokyonight_storm.conf
diff --git a/lua/tokyonight/extra.lua b/lua/tokyonight/extra.lua
deleted file mode 100644
index ed18325..0000000
--- a/lua/tokyonight/extra.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local config = require("tokyonight.config")
-local kitty = require("tokyonight.kitty")
-
-local function write(str, fileName)
-  local file = io.open("extra/" .. fileName, "w")
-  file:write(str)
-  file:close()
-end
-
-config.style = "storm"
-
-write(kitty.kitty(config), "kitty_tokyonight_storm.conf")
-
-config.style = "night"
-
-write(kitty.kitty(config), "kitty_tokyonight_night.conf")
diff --git a/lua/tokyonight/extra/fish.lua b/lua/tokyonight/extra/fish.lua
new file mode 100644
index 0000000..9d3030d
--- /dev/null
+++ b/lua/tokyonight/extra/fish.lua
@@ -0,0 +1,53 @@
+local util = require("tokyonight.util")
+
+local M = {}
+
+function M.fish(config)
+  config = config or require("tokyonight.config")
+  local colors = require("tokyonight.colors").setup(config)
+
+  local fishColors = {}
+  for k, v in pairs(colors) do if type(v) == "string" then fishColors[k] = v:gsub("^#", "") end end
+
+  local fish = util.template([[
+    # TokyoNight Color Palette
+    set -l foreground ${fg}
+    set -l selection ${bg_visual}
+    set -l comment ${comment}
+    set -l red ${red}
+    set -l orange ${orange}
+    set -l yellow ${yellow}
+    set -l green ${green}
+    set -l purple ${purple}
+    set -l cyan ${cyan}
+    set -l pink ${magenta}
+    
+    # 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_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
+    
+  ]], fishColors)
+
+  return fish
+end
+
+return M
+
diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua
new file mode 100644
index 0000000..67c62f0
--- /dev/null
+++ b/lua/tokyonight/extra/init.lua
@@ -0,0 +1,22 @@
+package.path = "./lua/?/init.lua;./lua/?.lua"
+
+local config = require("tokyonight.config")
+local kitty = require("tokyonight.extra.kitty")
+local fish = require("tokyonight.extra.fish")
+
+local function write(str, fileName)
+  print("[write] extra/" .. fileName)
+  local file = io.open("extras/" .. fileName, "w")
+  file:write(str)
+  file:close()
+end
+
+config.style = "storm"
+
+write(kitty.kitty(config), "kitty_tokyonight_storm.conf")
+write(fish.fish(config), "fish_tokyonight_storm.fish")
+
+config.style = "night"
+
+write(kitty.kitty(config), "kitty_tokyonight_night.conf")
+write(fish.fish(config), "fish_tokyonight_night.fish")
diff --git a/lua/tokyonight/kitty.lua b/lua/tokyonight/extra/kitty.lua
similarity index 100%
rename from lua/tokyonight/kitty.lua
rename to lua/tokyonight/extra/kitty.lua