diff --git a/home/default.nix b/home/default.nix
index c04fb58..040c8fa 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -30,7 +30,61 @@
 
   catppuccin = {
     enable = false;
+    accent = "sky";
     flavor = "mocha";
+
+    eza.enable = true;
+    fzf.enable = true;
+    bat.enable = true;
+
+    element-desktop = {
+      enable = true;
+      accent = "green";
+    };
+
+    btop.enable = true;
+
+    cava = {
+      enable = true;
+      transparent = true;
+    };
+
+    kitty.enable = true;
+    lazygit.enable = true;
+    yazi.enable = true;
+    fish.enable = true;
+
+    cursors = {
+      enable = true;
+      accent = "sapphire";
+    };
+
+    hyprland = {
+      enable = true;
+    };
+
+    hyprlock = {
+      enable = true;
+      useDefaultConfig = false;
+    };
+
+    waybar = {
+      enable = true;
+      mode = "createLink";
+    };
+
+    mako.enable = true;
+    mpv.enable = true;
+    newsboat.enable = true;
+
+    mangohud.enable = true;
+
+    gtk.icon.enable = true;
+    kvantum = {
+      enable = true;
+      apply = true;
+    };
+
   };
 
   home = {
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index ba2bdcb..75b4a74 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -10,7 +10,6 @@
   ];
 
   _module.args.compositor = "hyprland";
-
   home = {
     packages = with pkgs; [
       waypaper
@@ -18,4 +17,32 @@
     ];
     file.".config/waypaper/config.ini".source = ./waypaper.ini;
   };
+  # TODO: Qutebrowser install
+  programs = {
+    mangohud = {
+      enable = true;
+      settings = {
+        position = "top-right";
+
+        offset_x = 20;
+        offset_y = 20;
+
+        fps = true;
+        cpu_stats = true;
+        gpu_stats = true;
+        cpu_temp = true;
+        gpu_temp = true;
+        ram = true;
+        vram = true;
+
+        background_alpha = 0.5;
+      };
+    };
+
+    # TODO: Needs config!
+    mpv = {
+      enable = true;
+
+    };
+  };
 }
diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index b46396a..1fcdc58 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -8,12 +8,12 @@ in
     packages = with pkgs; [
       adwaita-icon-theme
     ];
-    pointerCursor = {
-      gtk.enable = true;
-      name = "catppuccin-mocha-sapphire-cursors";
-      package = pkgs.catppuccin-cursors.mochaSapphire;
-      size = 24;
-    };
+    #pointerCursor = {
+    #  gtk.enable = true;
+    #  name = "catppuccin-mocha-sapphire-cursors";
+    #  package = pkgs.catppuccin-cursors.mochaSapphire;
+    #  size = 24;
+    #};
     file = {
       ".config/gtk-4.0/gtk.css".source = "${theme}/share/themes/${theme_name}/gtk-4.0/gtk.css";
       ".config/gtk-4.0/gtk-dark.css".source = "${theme}/share/themes/${theme_name}/gtk-4.0/gtk-dark.css";
diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix
index 73a72ac..222edbd 100644
--- a/home/desktop/hyprland/default.nix
+++ b/home/desktop/hyprland/default.nix
@@ -19,10 +19,6 @@ in
     ./portal.nix
   ];
 
-  catppuccin.hyprland = {
-    enable = true;
-  };
-
   home.packages = with pkgs; [
     catppuccin-cursors.mochaDark
     grim
diff --git a/home/desktop/hyprland/hyprlock.nix b/home/desktop/hyprland/hyprlock.nix
index 1717797..deaaac9 100644
--- a/home/desktop/hyprland/hyprlock.nix
+++ b/home/desktop/hyprland/hyprlock.nix
@@ -2,8 +2,6 @@
 
 {
 
-  catppuccin.hyprlock.enable = false;
-
   # Hyprlock configuration
   programs.hyprlock = {
     enable = true;
diff --git a/home/desktop/qt.nix b/home/desktop/qt.nix
index d0e4187..1ef26f5 100644
--- a/home/desktop/qt.nix
+++ b/home/desktop/qt.nix
@@ -2,11 +2,8 @@
 {
   qt = {
     enable = true;
+    style.name = "kvantum";
     platformTheme.name = "kvantum";
-    style = {
-      name = "kvantum";
-      package = pkgs.catppuccin-kvantum;
-    };
   };
   home.packages = with pkgs; [
     kdePackages.qt6ct
diff --git a/home/desktop/waybar/default.nix b/home/desktop/waybar/default.nix
index 541ac06..abb663d 100644
--- a/home/desktop/waybar/default.nix
+++ b/home/desktop/waybar/default.nix
@@ -4,10 +4,7 @@
   ...
 }:
 {
-  catppuccin.waybar = {
-    enable = true;
-    mode = "createLink";
-  };
+
   programs.waybar = {
     enable = true;
     package = pkgs.waybar;
diff --git a/home/git.nix b/home/git.nix
index 3b75199..a530dda 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -6,25 +6,30 @@
     gnupg
   ];
 
-  programs.git = {
-    enable = true;
-    settings = {
-      github = {
-        user = primaryUser;
+  programs = {
+    git = {
+      enable = true;
+      settings = {
+        github = {
+          user = primaryUser;
+        };
+        init = {
+          defaultBranch = "main";
+        };
+        user = {
+          name = "DerGrumpf"; # TODO replace
+          email = "p.keier@beyerstedt-it.de"; # TODO replace
+        };
       };
-      init = {
-        defaultBranch = "main";
-      };
-      user = {
-        name = "DerGrumpf"; # TODO replace
-        email = "p.keier@beyerstedt-it.de"; # TODO replace
-      };
-    };
 
-    lfs.enable = true;
-    ignores = [
-      "**/.DS_STORE"
-      "result"
-    ];
+      lfs.enable = true;
+      ignores = [
+        "**/.DS_STORE"
+        "result"
+      ];
+    };
+    lazygit = {
+      enable = true;
+    };
   };
 }
diff --git a/home/packages.nix b/home/packages.nix
index bfefed6..1ce1131 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -38,6 +38,7 @@
       sqlitebrowser
       thunderbird
       xonotic
+      irssi
 
       # PDF Tools
       pandoc
diff --git a/home/shell.nix b/home/shell.nix
index ab6f10b..5ad1bcb 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -2,13 +2,14 @@
 {
   home.packages = with pkgs; [
     eza # ls replacement
-    fzf # FuzzyFinder
     tdf # terminal pdf viewer
     jq # json parser
-    tree
     fastfetch # system stats
     tabiew # Table viewer
     glow # MD Viewer
+    fd # find alternative
+    bat # cat alternative
+    ripgrep # grep alternative
 
     # LLM in the Terminal
     (pkgs.llm.withPlugins { llm-groq = true; })
@@ -21,7 +22,6 @@
 
   programs.kitty = {
     enable = true;
-    themeFile = "Catppuccin-Mocha";
 
     font = {
       name = "Fira Code Nerd Font";
@@ -70,6 +70,43 @@
     };
   };
 
+  programs.newsboat = {
+    enable = true;
+    autoReload = true;
+    browser = "xdg-open";
+    urls = [
+      {
+        url = "https://www.tagesschau.de/xml/rss2";
+        tags = [
+          "news"
+          "de"
+        ];
+      }
+      {
+        url = "https://www.spiegel.de/schlagzeilen/index.rss";
+        tags = [
+          "news"
+          "de"
+        ];
+      }
+      {
+        url = "https://www.focus.de/rss";
+        tags = [
+          "news"
+          "de"
+        ];
+      }
+      {
+        url = "https://feeds.feedburner.com/blogspot/rkEL";
+        tags = [ "blog" ];
+      }
+    ];
+  };
+
+  programs.cava = {
+    enable = true;
+  };
+
   programs.yazi = {
     enable = true;
     enableBashIntegration = true;
@@ -85,30 +122,35 @@
     };
   };
 
-  programs.zsh = {
+  programs.fzf = {
     enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    shellAliases = {
-      ls = "eza";
-      la = "eza -la";
-      f = "fzf";
-      i = "kitty +kitten icat";
-      "nix-switch" = "sudo darwin-rebuild switch --flake ~/.config/nix#cyper-mac";
-    };
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    defaultCommand = "fd --type f --strip-cwd-prefix --hidden --exclude .git";
+    fileWidgetCommand = "fd --type f --strip-cwd-prefix --hidden --exclude .git";
+    defaultOptions = [
+      "--height 100%"
+      "--border sharp"
+      "--layout=reverse"
+      "--inline-info"
+      "--preview 'bat --color=always --style=numbers {}'"
+    ];
   };
 
+  # TODO: Install OpenCode
+  # TODO: Install NuShell
   programs.fish = {
     enable = true;
 
     shellAliases = {
-      ls = "eza";
-      la = "eza -la";
-      f = "fzf";
+      ls = "eza --icons=always";
+      la = "eza -la --icons=always";
+      f = "nvim $(fzf)";
+      tree = "eza --icons=always -T";
       i = "kitty +kitten icat";
-      "nix-switch" = "sudo nixos-rebuild switch --flake ~/.config/nix#$(hostname)";
+      cat = "bat --color=always --style=numbers";
+      grep = "ripgrep";
     };
 
     interactiveShellInit = ''