diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 5b11127..bc982a8 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -51,9 +51,6 @@
 
         command fzf
       '';
-      vterm_printf = ''
-        printf "\e]%s\e\\" "$argv"
-      '';
       nn = ''
         # Require a title argument
         if test (count $argv) -lt 1
@@ -159,6 +156,9 @@
       direnv hook fish | source
       fnm env --use-on-cd --shell fish | source
 
+      # Temporary fix because of https://github.com/atuinsh/atuin/issues/2803
+      atuin init fish | sed 's/-k up/up/' | source
+
       if test -d (brew --prefix)"/share/fish/completions"
           set -p fish_complete_path (brew --prefix)/share/fish/completions
       end
diff --git a/modules/fish/work.nix b/modules/fish/work.nix
index 6f614a2..b544b51 100644
--- a/modules/fish/work.nix
+++ b/modules/fish/work.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ _config, _pkgs, ... }:
 
 {
   programs.fish = {
@@ -141,11 +141,32 @@
       pr_comments = ''
         gh api repos/digital-h-gmbh/ride/pulls/$argv/comments | jq -r '.[] | "- [ ] Fix \nnvim +\(.line) \(.path)\n\"\(.body)\"\n\n"' >./pr-comments.md && nvim ./pr-comments.md
       '';
+      fish_mode_prompt = ''
+        switch $fish_bind_mode
+          case default
+            set_color --bold blue
+            echo '[N] '
+          case insert
+            set_color --bold green
+            echo '[I] '
+          case replace_one
+            set_color --bold green
+            echo '[R] '
+          case replace
+            set_color --bold bryellow
+            echo '[R] '
+          case visual
+            set_color --bold brmagenta
+            echo '[V] '
+          case '*'
+            set_color --bold red
+            echo '[?] '
+        end
+        set_color normal
+      '';
     };
 
     interactiveShellInit = ''
-      source ~/.config/fish/themes/modus-vivendi-tinted.fish
-
       set hn (prompt_hostname)
       set fish_cursor_default     block      blink
       set fish_cursor_insert      line       blink
@@ -154,6 +175,30 @@
       set fish_vi_force_cursor 1
       fish_vi_key_bindings
 
+      # Custom Colorscheme
+      set --universal fish_color_autosuggestion brblack # autosuggestions
+      set --universal fish_color_command        brwhite # commands
+      set --universal fish_color_comment        brblack # code comments
+      set --universal fish_color_cwd            brblack # current working directory in the default prompt
+      set --universal fish_color_end            brblack # process separators like ';' and '&'
+      set --universal fish_color_error          brwhite # highlight potential errors
+      set --universal fish_color_escape         brblack # highlight character escapes like '\n' and '\x70'
+      set --universal fish_color_match          yellow # highlight matching parenthesis
+      set --universal fish_color_normal         brwhite # default color
+      set --universal fish_color_operator       brblack # parameter expansion operators like '*' and '~'
+      set --universal fish_color_param          brmagenta # regular command parameters
+      set --universal fish_color_quote          bryellow # quoted blocks of text
+      set --universal fish_color_redirection    brwhite # IO redirections
+      set --universal fish_color_search         --bold --background=black --foreground=bryellow
+      set --universal fish_color_search_match   --background black # highlight history search matches and the selected pager item (must be a background)
+      set --universal fish_pager_color_selected_background  --background black --foreground brmagenta 
+      set --universal fish_pager_color_progress --foreground=brwhite --background=black
+      set --universal fish_color_selection      --background magenta  # when selecting text (in vi visual mode)
+      set --universal fish_color_cancel         brblack # the '^C' indicator on a canceled command
+      set --universal fish_color_host           brwhite # current host system in some of fish default prompts
+      set --universal fish_color_host_remote    yellow #ayu:syntax.constant  current host system in some of fish default prompts, if fish is running remotely (via ssh or similar)
+      set --universal fish_color_user           brwhite # current username in some of fish default prompts
+
       fish_add_path /run/current-system/sw/bin
       fish_add_path /opt/homebrew/bin
       fish_add_path $ANDROID_HOME/emulator
@@ -177,6 +222,4 @@
       frc = "source ~/.config/fish/**/*.fish";
     };
   };
-
-  home.file.".config/fish/themes".source = ./themes;
 }
diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json
index b7feec7..ebaffc7 100644
--- a/modules/nvim/config/lazy-lock.json
+++ b/modules/nvim/config/lazy-lock.json
@@ -1,25 +1,23 @@
 {
   "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
-  "codecompanion.nvim": { "branch": "main", "commit": "991dd81ac37b56b6d13529a08e86a42d183d79dc" },
+  "codecompanion.nvim": { "branch": "main", "commit": "ca87f13b7559257f5aa91e4fcd1326a61311be13" },
   "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gopher.nvim": { "branch": "main", "commit": "295e21e637f9194a4d2bc34622d324a88b028141" },
-  "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
-  "mini.diff": { "branch": "main", "commit": "fbb93ea1728e7c9d0944df8bd022a68402bd2e7e" },
   "mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" },
-  "neogit": { "branch": "master", "commit": "d2a2ae4415872fbddb2441920ab109ee52fd4916" },
+  "neogit": { "branch": "master", "commit": "2cc5daffb838f718174d2c07f2ca0c39149bb2c1" },
   "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "schemastore.nvim": { "branch": "main", "commit": "976b31e094615b2c27009561b3c67a37c87c93c2" },
-  "snacks.nvim": { "branch": "main", "commit": "8ca098ca360b45a361c475be6ea7dd81e438cc35" },
+  "snacks.nvim": { "branch": "main", "commit": "dec29f55666f8f4545835636077a86b150faf630" },
   "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
   "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" },
   "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },