diff --git a/flake.lock b/flake.lock
index 78fcee0..a11f020 100755
--- a/flake.lock
+++ b/flake.lock
@@ -63,6 +63,38 @@
         "type": "github"
       }
     },
+    "fish-plugin-bobthefish": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1683513744,
+        "narHash": "sha256-DRMBZS8nT0rhKXQEGWNqR1FUavtvxH0xUdHU52WhSJQ=",
+        "owner": "oh-my-fish",
+        "repo": "theme-bobthefish",
+        "rev": "ed896b65c3ddbdf2929c38719adfb940b0d9b90d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oh-my-fish",
+        "repo": "theme-bobthefish",
+        "type": "github"
+      }
+    },
+    "fish-plugin-gruvbox-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1634049082,
+        "narHash": "sha256-vL2/Nm9Z9cdaptx8sJqbX5AnRtfd68x4ZKWdQk5Cngo=",
+        "owner": "Jomik",
+        "repo": "fish-gruvbox",
+        "rev": "80a6f3a7b31beb6f087b0c56cbf3470204759d1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jomik",
+        "repo": "fish-gruvbox",
+        "type": "github"
+      }
+    },
     "gamescope-git-src": {
       "flake": false,
       "locked": {
@@ -378,6 +410,8 @@
       "inputs": {
         "arrpc": "arrpc",
         "chaotic-nyx": "chaotic-nyx",
+        "fish-plugin-bobthefish": "fish-plugin-bobthefish",
+        "fish-plugin-gruvbox-theme": "fish-plugin-gruvbox-theme",
         "grub2-themes": "grub2-themes",
         "gruvbox-kvantum": "gruvbox-kvantum",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 3d1eb5c..12c39ff 100755
--- a/flake.nix
+++ b/flake.nix
@@ -4,17 +4,22 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixpkgs-unstable";
     home-manager.url = "github:nix-community/home-manager";
+
     hyprland.url = "github:hyprwm/hyprland";
     hyprland-contrib.url = "github:hyprwm/contrib";
     hyprpicker.url = "github:hyprwm/hyprpicker";
-    chaotic-nyx.url = "github:chaotic-cx/nyx";
+
+    gruvbox-kvantum = { url = "github:thefallnn/Gruvbox-Kvantum"; flake = false; };
+
+    fish-plugin-gruvbox-theme = { url = "github:Jomik/fish-gruvbox"; flake = false; };
+    fish-plugin-bobthefish = { url = "github:oh-my-fish/theme-bobthefish"; flake = false; };
+
     arrpc = { url = "github:notashelf/arrpc-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
-    xorg-git = { url = "gitlab:xorg/xserver?host=gitlab.freedesktop.org"; flake = false; };
+    chaotic-nyx.url = "github:chaotic-cx/nyx";
     grub2-themes = { url = "github:vinceliuice/grub2-themes"; inputs.nixpkgs.follows = "nixpkgs"; };
     openmw-git = { url = "gitlab:OpenMW/openmw"; flake = false; };
     waybar = { url = "github:alexays/waybar"; flake = false; };
-    gruvbox-kvantum = { url = "github:thefallnn/Gruvbox-Kvantum"; flake = false; };
-    catppuccin-hyprland = { url = "github:catppuccin/hyprland"; flake = false; };
+    xorg-git = { url = "gitlab:xorg/xserver?host=gitlab.freedesktop.org"; flake = false; };
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
diff --git a/overlay.nix b/overlay.nix
index c69add5..93b5d25 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -4,23 +4,6 @@
 
     arrpc = inputs.arrpc.packages.${prev.system}.arrpc;
 
-    catppuccin-kvantum-macchiato = prev.catppuccin-kvantum.override {
-      accent = "Lavender";
-      variant = "Macchiato";
-    };
-
-
-    catppuccin-gtk-macchiato = prev.catppuccin-gtk.override {
-      accents = [ "lavender" ];
-      size = "standard";
-      variant = "macchiato";
-    };
-
-    catppuccin-papirus-folders-macchiato = prev.catppuccin-papirus-folders.override {
-      accent = "lavender";
-      flavor = "macchiato";
-    };
-
     ncmpcpp = prev.ncmpcpp.override {
       visualizerSupport = true;
     };
diff --git a/user/configs/fish/default.nix b/user/configs/fish/default.nix
index 9efb3a9..cf28f8b 100755
--- a/user/configs/fish/default.nix
+++ b/user/configs/fish/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: 
+{ config, pkgs, inputs, ... }: 
 {
     programs.exa = {
         enable = true;
@@ -7,27 +7,25 @@
 
     programs.fish = {
         enable = true;
-
+        
         plugins = [
+          { name = "gruvbox-theme"; src = inputs.fish-plugin-gruvbox-theme; }
+          { name = "bobthefish"; src = inputs.fish-plugin-bobthefish; }
         ];
 
         interactiveShellInit = ''
+            theme_gruvbox dark medium
             ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
+
+            set -g theme_color_scheme gruvbox
+            set -g theme_nerd_fonts yes
+            set -g theme_display_git_default_branch yes
+            set -g theme_git_default_branches master main
         '';
 
         functions = {
             fish_greeting = "";
 
-            fish_prompt = ''
-                set_color -b blue
-                set_color black
-                printf " %s " (prompt_pwd)
-                set_color -b normal
-                set_color blue
-                printf " "
-                set_color normal
-            '';
-
             ec = ''
                 pushd . &> /dev/null
                 cd "${config.home.homeDirectory}/.dotfiles"
diff --git a/user/configs/kvantum/default.nix b/user/configs/kvantum/default.nix
index 4df547e..e633020 100644
--- a/user/configs/kvantum/default.nix
+++ b/user/configs/kvantum/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   home.packages = [
     pkgs.libsForQt5.qtstyleplugin-kvantum
@@ -13,8 +13,7 @@
     platformTheme = "gtk";
   };
 
-  xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=catppuccin";
-  xdg.configFile."Kvantum/catppuccin/catppuccin.kvconfig".source = pkgs.catppuccin-kvantum-macchiato + "/share/Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Lavender.kvconfig";
-  xdg.configFile."Kvantum/catppuccin/catppuccin.svg".source = pkgs.catppuccin-kvantum-macchiato + "/share/Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Lavender.svg";
-
+  xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=gruvbox-kvantum";
+  xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.kvconfig";
+  xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.svg";
 }
diff --git a/user/configs/neovim/default.nix b/user/configs/neovim/default.nix
index eaf7e1d..d125caa 100644
--- a/user/configs/neovim/default.nix
+++ b/user/configs/neovim/default.nix
@@ -5,7 +5,7 @@
 
         plugins = with pkgs.vimPlugins; [
                 bufferline-nvim
-                catppuccin-nvim
+                gruvbox-nvim
                 comment-nvim
                 dressing-nvim
                 lualine-nvim
diff --git a/user/configs/neovim/init.lua b/user/configs/neovim/init.lua
index 06f2eb7..cef1507 100644
--- a/user/configs/neovim/init.lua
+++ b/user/configs/neovim/init.lua
@@ -6,6 +6,7 @@ vim.o.shiftwidth = 2
 vim.o.tabstop = 2
 vim.o.smartindent = true
 
+vim.o.background = "dark"
 vim.o.clipboard = "unnamedplus"
 vim.o.termguicolors = true
 vim.o.ignorecase = true
@@ -16,23 +17,20 @@ vim.o.timeoutlen = 100
 vim.wo.number = true
 vim.wo.relativenumber = true
 
-
-require("catppuccin").setup({
-  flavour = "macchiato",
-  transparent_background = true,
+require("gruvbox").setup({
+  transparent_mode = true
 })
-vim.cmd.colorscheme "catppuccin"
+vim.cmd("colorscheme gruvbox")
 
 require("lualine").setup({
   options = {
-    theme = "catppuccin",
+    theme = "gruvbox_dark",
   }
 })
 
 require("dressing").setup()
 
 require("bufferline").setup({
-  highlights = require("catppuccin.groups.integrations.bufferline").get(),
   options = {
     show_tab_indicators = true,
     -- separator_style = { "", "" },
diff --git a/user/configs/rofi/default.nix b/user/configs/rofi/default.nix
index f0ea14e..e8ddc6f 100644
--- a/user/configs/rofi/default.nix
+++ b/user/configs/rofi/default.nix
@@ -7,6 +7,6 @@
     extraConfig = {
         modi = "drun,run";
     };
-    theme = ./catppuccin-macchiato.rasi;
+    theme = ./theme.rasi;
   };
 }
diff --git a/user/configs/rofi/catppuccin-macchiato.rasi b/user/configs/rofi/theme.rasi
similarity index 74%
rename from user/configs/rofi/catppuccin-macchiato.rasi
rename to user/configs/rofi/theme.rasi
index e55cfb3..78b7136 100644
--- a/user/configs/rofi/catppuccin-macchiato.rasi
+++ b/user/configs/rofi/theme.rasi
@@ -1,12 +1,10 @@
 * {
-    bg-col:  #24273a;
-    bg-col-light: #24273a;
-    border-col: #24273a;
-    selected-col: #24273a;
-    blue: #8aadf4;
-    fg-col: #cad3f5;
-    fg-col2: #ed8796;
-    grey: #6e738d;
+    bg-col:  #282828;
+    border-col: #98971A;
+    selected-col: #504945;
+    prompt: #504945;
+    fg-col: #ebdbb2;
+    fg-col2: #ebdbb2;
 
     width: 800;
     font: "JetBrainsMono Nerd Font 10";
@@ -21,6 +19,7 @@ window {
     height: 460px;
     border: 3px;
     border-color: @border-col;
+    border-radius: 10px;
     background-color: @bg-col;
 }
 
@@ -36,9 +35,9 @@ inputbar {
 }
 
 prompt {
-    background-color: @blue;
+    background-color: @prompt;
     padding: 6px;
-    text-color: @bg-col;
+    text-color: @fg-col;
     border-radius: 3px;
     margin: 20px 0px 0px 20px;
 }
@@ -67,11 +66,11 @@ listview {
 element {
     padding: 5px;
     background-color: @bg-col;
-    text-color: @fg-col  ;
+    text-color: @fg-col;
 }
 
 element-icon {
-    size: 25px;
+    size: 24px;
 }
 
 element selected {
@@ -85,19 +84,19 @@ mode-switcher {
 
 button {
     padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
+    background-color: @bg-col;
+    text-color: @fg-col;
     vertical-align: 0.5; 
     horizontal-align: 0.5;
 }
 
 button selected {
   background-color: @bg-col;
-  text-color: @blue;
+  text-color: @prompt;
 }
 
 message {
-    background-color: @bg-col-light;
+    background-color: @bg-col;
     margin: 2px;
     padding: 2px;
     border-radius: 5px;
@@ -106,6 +105,6 @@ message {
 textbox {
     padding: 6px;
     margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
+    text-color: @prompt;
+    background-color: @bg-col;
 }
diff --git a/user/configs/wayland/foot/default.nix b/user/configs/wayland/foot/default.nix
index 9fa15e2..dbce598 100755
--- a/user/configs/wayland/foot/default.nix
+++ b/user/configs/wayland/foot/default.nix
@@ -12,24 +12,24 @@
       colors = {
         alpha = "0.90";
 
-        foreground = "cad3f5"; # Text
-        background = "24273a"; # Base
-        regular0 = "494d64";   # Surface 1
-        regular1 = "ed8796";   # red
-        regular2 = "a6da95";   # green
-        regular3 = "eed49f";   # yellow
-        regular4 = "8aadf4";   # blue
-        regular5 = "f5bde6";   # pink
-        regular6 = "8bd5ca";   # teal
-        regular7 = "b8c0e0";   # Subtext 1
-        bright0 = "5b6078";    # Surface 2
-        bright1 = "ed8796";    # red
-        bright2 = "a6da95";    # green
-        bright3 = "eed49f";    # yellow
-        bright4 = "8aadf4";    # blue
-        bright5 = "f5bde6";    # pink
-        bright6 = "8bd5ca";    # teal
-        bright7 = "a5adcb";    # Subtext 0
+        background = "282828";
+        foreground = "ebdbb2";
+        regular0 = "282828";
+        regular1 = "cc241d";
+        regular2 = "98971a";
+        regular3 = "d79921";
+        regular4 = "458588";
+        regular5 = "b16286";
+        regular6 = "689d6a";
+        regular7 = "a89984";
+        bright0 = "928374";
+        bright1 = "fb4934";
+        bright2 = "b8bb26";
+        bright3 = "fabd2f";
+        bright4 = "83a598";
+        bright5 = "d3869b";
+        bright6 = "8ec07c";
+        bright7 = "ebdbb2";
       };
     };
   };
diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix
index 734b45a..7f1d55d 100644
--- a/user/configs/wayland/hyprland/default.nix
+++ b/user/configs/wayland/hyprland/default.nix
@@ -63,9 +63,7 @@ in
 
   wayland.windowManager.hyprland = {
     enable = true;
-    extraConfig = lib.concatStrings [
-      (builtins.readFile (inputs.catppuccin-hyprland + "/themes/macchiato.conf"))
-      ''
+    extraConfig = ''
       monitor=${leftMonitor}, 1920x1080@60, 0x0, 1
       monitor=${rightMonitor}, 2560x1440@144, 1920x0, 1
 
@@ -89,8 +87,8 @@ in
       general {
           gaps_in = 16
           border_size = 4
-          col.active_border = 0xff$surface2Alpha 0xff$surface0alpha 45deg
-          col.inactive_border = 0xff$baseAlpha
+          col.active_border = rgba(98971aff)
+          col.inactive_border = rgba(282828ff)
       }
 
       dwindle {
@@ -119,7 +117,7 @@ in
         drop_shadow = yes
         shadow_range = 8
         shadow_render_power = 1
-        col.shadow = $base
+        col.shadow = rgba(282828ff)
       }
 
       animations {
@@ -206,8 +204,7 @@ in
 
       windowrulev2 = fullscreen, class:^(hl2_linux)$
       windowrulev2 = float, class:^(org.kde.dolphin)$
-    ''
-    ];
+    '';
   };
 
   home.file.".local/share/kservices5/swww.desktop".text = ''
diff --git a/user/configs/wayland/mako/default.nix b/user/configs/wayland/mako/default.nix
index 150a304..286c460 100755
--- a/user/configs/wayland/mako/default.nix
+++ b/user/configs/wayland/mako/default.nix
@@ -8,10 +8,10 @@
     width = 440;
     height = 320;
 
-    backgroundColor = "#24273aB3";
-    borderColor = "#8aadf4";
-    textColor = "#cad3f5";
-    progressColor = "over #363a4f" ;
+    backgroundColor = "#282828B3";
+    borderColor = "#98971aff";
+    textColor = "#ebdbb2";
+    progressColor = "over #665c54";
     borderRadius = 10;
     borderSize = 2;
 
diff --git a/user/configs/wayland/waybar/default.nix b/user/configs/wayland/waybar/default.nix
index 6f04c06..d233150 100755
--- a/user/configs/wayland/waybar/default.nix
+++ b/user/configs/wayland/waybar/default.nix
@@ -106,11 +106,7 @@ in
 
     }];
 
-    style = lib.concatStrings [
-      (builtins.readFile ./macchiato.css)
-      "\n"
-      (builtins.readFile ./style.css)
-    ];
+    style = builtins.readFile ./style.css;
   };
 }
 
diff --git a/user/configs/wayland/waybar/style.css b/user/configs/wayland/waybar/style.css
index 2a4289f..57184d1 100644
--- a/user/configs/wayland/waybar/style.css
+++ b/user/configs/wayland/waybar/style.css
@@ -1,3 +1,11 @@
+@define-color bg rgba(40,40,40,0.8);
+@define-color fg rgb(235,219,178);
+@define-color box-bg rgb(80,73,69);
+
+@define-color wsfg rgb(235,219,178);
+@define-color wsbg rgb(60,56,54);
+@define-color activewsbg rgb(102,92,84);
+
 * {
     font-family: "JetBrainsMono Nerd Font";
     font-size: 12;
@@ -5,11 +13,11 @@
 
 window#waybar {
     background: transparent;
-    color: @text;
+    color: @fg;
 }
 
 window#waybar > box {
-  background-color: @base;
+  background-color: @bg;
 }
 
 #wireplumber,
@@ -21,7 +29,7 @@ window#waybar > box {
 #tray,
 #clock,
 #custom-swaync {
-    background: @surface1;
+    background: @box-bg;
     padding: 0px 10px 0px 10px;
     margin: 5px 10px 5px 0px;
     border-radius: 10px;
@@ -54,8 +62,8 @@ window#waybar > box {
 }
 
 #workspaces button {
-    color: @text;
-    background: @surface1;
+    color: @fg;
+    background: @wsbg;
     padding: 0px 5px;
     border-radius: 0;
 }
@@ -73,13 +81,13 @@ window#waybar > box {
 }
 
 #workspaces button.active {
-    color: @mantle;
-    background: @blue;
+    color: @wsfg;
+    background: @activewsbg;
     font-weight: bold;
 }
 
 #workspaces button.persistent {
-    color: @mantle;
-    background: @surface1;
+    color: @wsfg;
+    background: @wsbg;
     font-weight: bold;
 }
diff --git a/user/configs/wayland/wob/default.nix b/user/configs/wayland/wob/default.nix
index 02534f4..32d9ced 100755
--- a/user/configs/wayland/wob/default.nix
+++ b/user/configs/wayland/wob/default.nix
@@ -1,14 +1,14 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 {
   xdg.configFile."wob/wob.ini".text = lib.generators.toINIWithGlobalSection { } {
     globalSection = {
       height = "40";
 
       border_size = "2";
-      border_color = "5A5F78FF";
+      border_color = "98971AFF";
 
-      background_color = "24273AFF";
-      bar_color = "8AADF4FF";
+      background_color = "282828FF";
+      bar_color = "665C54FF";
 
     };
     sections = { };
diff --git a/user/home.nix b/user/home.nix
index 32a436e..d814aca 100755
--- a/user/home.nix
+++ b/user/home.nix
@@ -97,8 +97,8 @@
   gtk = {
     enable = true;
     theme = {
-      package = pkgs.catppuccin-gtk-macchiato;
-      name = "Catppuccin-Macchiato-Standard-Lavender-Dark";
+      package = pkgs.gruvbox-dark-gtk;
+      name = "gruvbox-dark";
     };
 
     font = {
@@ -107,15 +107,15 @@
     };
 
     iconTheme = {
-      package = pkgs.catppuccin-papirus-folders-macchiato;
-      name = "Papirus";
+      package = pkgs.gruvbox-dark-icons-gtk;
+      name = "oomox-gruvbox-dark";
     };
 
-    cursorTheme = {
-      package = pkgs.catppuccin-cursors.macchiatoLavender;
-      name = "Catppuccin-Macchiato-Lavender-Cursors";
-      size = 32;
-    };
+    # cursorTheme = {
+    #   package = pkgs.catppuccin-cursors.macchiatoLavender;
+    #   name = "Catppuccin-Macchiato-Lavender-Cursors";
+    #   size = 32;
+    # };
   };
 
   programs = {