diff --git a/home-manager/shell/alacritty.nix b/home-manager/shell/alacritty.nix
index 21ab827..4a580de 100644
--- a/home-manager/shell/alacritty.nix
+++ b/home-manager/shell/alacritty.nix
@@ -12,17 +12,17 @@
       };
       colors.normal = {
         black   = "#32344a";
-        red     = "#ce7284";
-        green   = "#7dc5a0";
-        yellow  = "#caaa6a";
-        blue    = "#7bc5e4";
+        red     = "#f7768e";
+        green   = "#9ece6a";
+        yellow  = "#e0af68";
+        blue    = "#7aa2f7";
         magenta = "#ad8ee6";
         cyan    = "#449dab";
         white   = "#787c99";
       };
       colors.bright = {
         black   = "#444b6a";
-        red     = "#d5556f";
+        red     = "#ff7a93";
         green   = "#b9f27c";
         yellow  = "#ff9e64";
         blue    = "#7da6ff";
diff --git a/home-manager/shell/default.nix b/home-manager/shell/default.nix
index 3bb6ea0..68d1176 100644
--- a/home-manager/shell/default.nix
+++ b/home-manager/shell/default.nix
@@ -2,16 +2,10 @@
 {
   imports = [
     ./alacritty.nix
+    ./fish.nix
     ./starship.nix
   ];
 
-  # Fish shell
-
-  programs.fish.enable = true;
-  # Disable greeting
-  programs.fish.interactiveShellInit =
-    "set -g fish_greeting";
-
   # Eza - ls replacement
 
   programs.eza.enable = true;
diff --git a/home-manager/shell/fish.nix b/home-manager/shell/fish.nix
new file mode 100644
index 0000000..6d42d00
--- /dev/null
+++ b/home-manager/shell/fish.nix
@@ -0,0 +1,47 @@
+{ ... }:
+{
+  programs.fish.enable = true;
+
+  # Disable greeting
+  programs.fish.interactiveShellInit =
+    "set -g fish_greeting";
+
+  # Set colors
+  programs.fish.shellInit = ''
+    set -g fish_color_normal normal
+    set -g fish_color_command brcyan
+    set -g fish_color_keyword
+    set -g fish_color_quote green
+    set -g fish_color_redirection yellow
+    set -g fish_color_end magenta
+    set -g fish_color_error brred
+    set -g fish_color_param brblue
+    set -g fish_color_comment white
+    set -g fish_color_match --background=brblue
+    set -g fish_color_selection white --bold --background=brblack
+    set -g fish_color_search_match bryellow --background=brblack
+    set -g fish_color_history_current --bold
+    set -g fish_color_operator brmagenta
+    set -g fish_color_escape yellow
+    set -g fish_color_cwd green
+    set -g fish_color_cwd_root red
+    set -g fish_color_option blue
+    set -g fish_color_valid_path --underline
+    set -g fish_color_autosuggestion brblack
+    set -g fish_color_history_current --bold
+    set -g fish_color_cancel --reverse
+    set -g fish_pager_color_prefix normal --bold --underline
+    set -g fish_pager_color_progress brwhite --background=cyan
+    set -g fish_pager_color_completion normal
+    set -g fish_pager_color_description yellow
+    set -g fish_pager_color_selected_background --background=black
+    set -g fish_pager_color_selected_completion
+    set -g fish_pager_color_secondary_background
+    set -g fish_pager_color_secondary_description
+    set -g fish_pager_color_selected_prefix
+    set -g fish_pager_color_secondary_prefix
+    set -g fish_pager_color_selected_description
+    set -g fish_pager_color_background
+    set -g fish_pager_color_secondary_completion
+  '';
+}