diff --git a/flake.lock b/flake.lock
index a20463e..68ff334 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
     "arkenfox-userjs": {
       "flake": false,
       "locked": {
-        "lastModified": 1678691587,
-        "narHash": "sha256-EGfPa1uGYwQLhM27nyWosJo5Pe4yIhC3JOW0vqajK7w=",
+        "lastModified": 1675728165,
+        "narHash": "sha256-ebSx6DaXoGKcCoK6UcDnWvdAW6J2X6pJRPD1Pw7UNOw=",
         "owner": "arkenfox",
         "repo": "user.js",
-        "rev": "e2e8c4ea8f9c8034a2ff72fe3c2d4a4a89404c10",
+        "rev": "73884850632ffe284f76881786f7d5903b917f58",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "flake-utils_3": {
       "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678886248,
-        "narHash": "sha256-ff81NJtc+AgQhUlTCkx8t8hda0o72vSxDeHVGrfxH70=",
+        "lastModified": 1678271387,
+        "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2bd74d92bc7345f323ebcbfeb631d5cf4067ed8e",
+        "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2",
         "type": "github"
       },
       "original": {
@@ -475,11 +475,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1678899680,
-        "narHash": "sha256-o+bo+n1HYvYJVnOG/Y/nnxdx4Lu1oFgVyrHemBbT2sE=",
+        "lastModified": 1678371846,
+        "narHash": "sha256-fOFX0PASpIpU4NK9Wen9yJKwg5RYe5jFIu1H0OUzglE=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f5669a7d6bdb54d21426f6aa31a66fe813fc4e7d",
+        "rev": "c9167d96467f0c1546f337828e874d7dd849f900",
         "type": "github"
       },
       "original": {
@@ -514,11 +514,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1678893556,
-        "narHash": "sha256-FHhBetkV/S7M9BMpbCzUWX/P5E7tGE4mZIpj/2m0K2M=",
+        "lastModified": 1677282271,
+        "narHash": "sha256-wNooEHZpKMJN2jj2qPa1jRhi6f5q1yTYCxQcXEJ32eM=",
         "owner": "hyprwm",
         "repo": "hyprpaper",
-        "rev": "61961973cfd10853b32c7f904cdb88f9ab6d84dd",
+        "rev": "83867464c523c3ac2f7ce53d2c4b8d4f9b7551cd",
         "type": "github"
       },
       "original": {
@@ -545,11 +545,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1678898370,
-        "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
+        "lastModified": 1678375527,
+        "narHash": "sha256-0W7Xu8XJLr8wUAf0fYKI2Ese3HB1fC5b/+lS9BPVgOQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
+        "rev": "87af394014d51f563dade30f3f7ef55a00a3d1d6",
         "type": "github"
       },
       "original": {
@@ -565,11 +565,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1678886704,
-        "narHash": "sha256-eSeJva5Wg9Dlccc9eLR/iPunQPpzHAYh6eGjPCJnnPE=",
+        "lastModified": 1678371176,
+        "narHash": "sha256-tsPKurteDIU0bz9GutdRr4vwQ1kIsbJEbaY0nsz+H94=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "5a38e951ec1532ba1ee8b35b42181003866d479c",
+        "rev": "9ef7297ef142354ace8b1f3f277d0eee3cfdc6d4",
         "type": "github"
       },
       "original": {
@@ -590,11 +590,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1678728829,
-        "narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=",
+        "lastModified": 1678313833,
+        "narHash": "sha256-HUkOzLVYDTYzxH4zMeR2JIrh1zY/n3LIs8rtNnKeOTA=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "e7045f1779fd202a3316f84b864c304f339cccea",
+        "rev": "d1017418841c612552f73d1f670d87f57dc5e090",
         "type": "github"
       },
       "original": {
@@ -733,11 +733,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1678843226,
-        "narHash": "sha256-TkA5tsC8N38HNgaI/odBbSOJWkUrD1uIB2A7Yms72Is=",
+        "lastModified": 1678298120,
+        "narHash": "sha256-iaV5xqgn29xy765Js3EoZePQyZIlLZA3pTYtTnKkejg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "abb2ade261c33516716aa21068d8c10c48d03367",
+        "rev": "1e383aada51b416c6c27d4884d2e258df201bc11",
         "type": "github"
       },
       "original": {
@@ -841,11 +841,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1678376203,
-        "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
+        "lastModified": 1677832802,
+        "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
+        "rev": "382bee738397ca005206eefa36922cc10df8a21c",
         "type": "github"
       },
       "original": {
@@ -921,11 +921,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678415622,
-        "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
+        "lastModified": 1677638104,
+        "narHash": "sha256-vbdOoDYnQ1QYSchMb3fYGCLYeta3XwmGvMrlXchST5s=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
+        "rev": "f388187efb41ce4195b2f4de0b6bb463d3cd0a76",
         "type": "github"
       },
       "original": {
@@ -952,11 +952,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1678761643,
-        "narHash": "sha256-tapXZvg6Kg5Fm7Fm6i+7cRC5Exp2lX7cgMrqsfrGhuc=",
+        "lastModified": 1678230755,
+        "narHash": "sha256-SFAXgNjNTXzcAideXcP0takfUGVft/VR5CACmYHg+Fc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c4aec3c021620d98861639946123214207e98344",
+        "rev": "a7cc81913bb3cd1ef05ed0ece048b773e1839e51",
         "type": "github"
       },
       "original": {
diff --git a/modules/config/theming/catppuccin.nix b/modules/config/theming/catppuccin.nix
index bca09bc..99ecea9 100644
--- a/modules/config/theming/catppuccin.nix
+++ b/modules/config/theming/catppuccin.nix
@@ -36,20 +36,6 @@ in
 {
   home-manager.users.moritz = {
     programs = {
-      fzf.colors = {
-        "bg+" = "#${surface0}";
-        "fg+" = "#${text}";
-        "hl+" = "#${red}";
-        bg = "#${base}";
-        fg = "#${text}";
-        header = "#${red}";
-        hl = "#${red}";
-        info = "#${mauve}";
-        marker = "#${rosewater}";
-        pointer = "#${rosewater}";
-        prompt = "#${mauve}";
-        spinner = "#${rosewater}";
-      };
       kitty.extraConfig = ''
         # vim:ft=kitty
 
diff --git a/modules/config/theming/dracula.nix b/modules/config/theming/dracula.nix
index 76fa25a..22ef8e6 100644
--- a/modules/config/theming/dracula.nix
+++ b/modules/config/theming/dracula.nix
@@ -4,36 +4,22 @@ with lib;
 let
   cfg = config.my.theming;
 
-  background = "282a36";
-  currentLine = "44475a";
-  foreground = "f8f8f2";
-  comment = "6272a4";
-  cyan = "8be9fd";
-  green = "50fa7b";
-  orange = "ffb86c";
-  pink = "ff79c6";
-  purple = "bd93f9";
-  red = "ff5555";
-  yellow = "f1fa8c";
+  background = "#282a36";
+  currentLine = "#44475a";
+  foreground = "#f8f8f2";
+  comment = "#6272a4";
+  cyan = "#8be9fd";
+  green = "#50fa7b";
+  orange = "#ffb86c";
+  pink = "#ff79c6";
+  purple = "#bd93f9";
+  red = "#ff5555";
+  yellow = "#f1fa8c";
 in
 {
   config = mkIf (cfg.enable && cfg.scheme == "dracula") {
     home-manager.users.moritz = {
       programs = {
-        fzf.colors = {
-          "bg+" = "#${currentLine}";
-          "fg+" = "#${foreground}";
-          "hl+" = "#${purple}";
-          bg = "#${background}";
-          fg = "#${foreground}";
-          header = "#${comment}";
-          hl = "#${purple}";
-          info = "#${orange}";
-          marker = "#${pink}";
-          pointer = "#${pink}";
-          prompt = "#${green}";
-          spinner = "#${orange}";
-        };
         kitty.extraConfig =
           ''
             # https://draculatheme.com/kitty
@@ -156,9 +142,9 @@ in
       };
       xsession.windowManager.bspwm = {
         settings = {
-          focused_border_color = "#${purple}";
-          normal_border_color = "#${background}";
-          active_border_color = "#${background}";
+          focused_border_color = purple;
+          normal_border_color = background;
+          active_border_color = background;
         };
       };
       services = {
@@ -195,43 +181,42 @@ in
         polybar = {
           config = {
             "bar/bottom" = {
-              background = "#${background}";
-              foreground = "#${foreground}";
-              border-color = "#${background}";
+              inherit background foreground;
+              border-color = background;
             };
             "module/bspwm" = {
-              label-focused-foreground = "#${pink}";
-              label-occupied-foreground = "#${comment}";
-              label-urgent-foreground = "#${red}";
-              label-empty-foreground = "#${currentLine}";
-              label-separator-foreground = "#${background}";
+              label-focused-foreground = pink;
+              label-occupied-foreground = comment;
+              label-urgent-foreground = red;
+              label-empty-foreground = currentLine;
+              label-separator-foreground = background;
             };
             "module/cpu" = {
-              format-foreground = "#${background}";
-              format-background = "#${green}";
+              format-foreground = background;
+              format-background = green;
             };
             "module/time" = {
-              format-foreground = "#${background}";
-              format-background = "#${cyan}";
+              format-foreground = background;
+              format-background = cyan;
             };
             "module/date" = {
-              format-foreground = "#${background}";
-              format-background = "#${yellow}";
+              format-foreground = background;
+              format-background = yellow;
             };
             "module/memory" = {
-              format-foreground = "#${background}";
-              format-background = "#${cyan}";
+              format-foreground = background;
+              format-background = cyan;
             };
             "module/pulseaudio" = {
-              format-volume-foreground = "#${background}";
-              format-volume-background = "#${purple}";
-              label-muted = "%{F#${red}}婢 %{F#${background}}muted";
-              format-muted-foreground = "#${background}";
-              format-muted-background = "#${red}";
+              format-volume-foreground = background;
+              format-volume-background = purple;
+              label-muted = "%{F${red}}婢 %{F${background}}muted";
+              format-muted-foreground = background;
+              format-muted-background = red;
             };
             "module/network" = {
-              format-connected-foreground = "#${background}";
-              format-connected-background = "#${purple}";
+              format-connected-foreground = background;
+              format-connected-background = purple;
             };
           };
         };
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 7d1c6e7..f24182c 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -45,6 +45,7 @@ in
       aliases = {
         ls = "exa -lh --icons --git";
         cat = "bat";
+        grep = "rg";
         rm = "rm -i";
         mv = "mv -i";
         cd = "z";
@@ -136,14 +137,8 @@ in
     programs = {
       # Let Home Manager install and manage itself.
       home-manager.enable = true;
-      fzf = {
-        enable = true;
-        defaultOptions = [
-          "--height 50%"
-        ];
-      };
+      fzf.enable = true;
       zoxide.enable = true;
-      navi.enable = true;
     };
     home = {
       username = "moritz";
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index 71732d3..cc73d24 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -118,7 +118,7 @@ with lib; {
     keepassxc
     libreoffice
     pavucontrol
-    stable.signal-desktop
+    signal-desktop
     tlaplusToolbox
     vlc
     thunderbird
diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 5ac37d0..c143217 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -32,6 +32,8 @@ in
           shellAliases = shellConfig.aliases;
 
           shellInit = ''
+            fzf_configure_bindings --git_log=\cg
+
             # Vi Mode
             fish_vi_key_bindings
 
@@ -72,6 +74,8 @@ in
             cheat = "cht.sh $argv | bat -p";
           };
         };
+        fzf.enableFishIntegration = true;
+        starship.enableFishIntegration = true;
       };
     };
   };