diff --git a/Makefile b/Makefile
index 4cf618e..a09c1b6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ copy-config:
 # 🚀 Deploy the current system configuration and make it the default on boot.
 # Usage: make deploy
 deploy: copy-config
-	sudo nixos-rebuild switch --flake /etc/nixos
+	sudo nixos-rebuild switch --flake .#nixos
 
 # 🏡 Same as `deploy`, but with a custom flake target (e.g., for home-manager).
 # Usage: make home
diff --git a/flake.lock b/flake.lock
index bdd7206..7c6e967 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,89 @@
 {
   "nodes": {
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1765809053,
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732806396,
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      }
+    },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1764873433,
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -21,6 +105,62 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "host": "gitlab.gnome.org",
+        "lastModified": 1767737596,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "gitlab"
+      },
+      "original": {
+        "host": "gitlab.gnome.org",
+        "owner": "GNOME",
+        "ref": "gnome-49",
+        "repo": "gnome-shell",
+        "type": "gitlab"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -95,12 +235,38 @@
         "type": "github"
       }
     },
+    "nur": {
+      "inputs": {
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767810917,
+        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
-        "spicetify-nix": "spicetify-nix"
+        "spicetify-nix": "spicetify-nix",
+        "stylix": "stylix"
       }
     },
     "spicetify-nix": {
@@ -122,6 +288,40 @@
         "type": "github"
       }
     },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-helix": "base16-helix",
+        "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-parts": "flake-parts_2",
+        "gnome-shell": "gnome-shell",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nur": "nur",
+        "systems": "systems_3",
+        "tinted-foot": "tinted-foot",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
+      },
+      "locked": {
+        "lastModified": 1771626923,
+        "narHash": "sha256-Mn6oeKrY+Sw6kH0jK+hp5QQH4MTcqwBRQL/ScZDNcz8=",
+        "owner": "nix-community",
+        "repo": "stylix",
+        "rev": "b09847414b50c65788936199918272377f70fb91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -151,6 +351,102 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tinted-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726913040,
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      }
+    },
+    "tinted-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "type": "github"
+      }
+    },
+    "tinted-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767710407,
+        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767489635,
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767488740,
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 194bb32..0cec238 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,27 +15,43 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # stylix (thx esteban)
+    stylix = {
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs =
-    inputs@{ nixpkgs, home-manager, ... }:
-    {
-      nixosConfigurations = {
-        nixos = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./nixos/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.elisiei = import ./home/home.nix;
-              home-manager.backupFileExtension = "hm-backup";
-              home-manager.extraSpecialArgs = { inherit inputs; };
-            }
-          ];
-        };
+  outputs = inputs @ {
+    nixpkgs,
+    home-manager,
+    stylix,
+    spicetify-nix,
+    ...
+  }: {
+    nixosConfigurations = {
+      nixos = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = {inherit inputs;};
+        modules = [
+          ./nixos/configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.elisiei = {
+              imports = [
+                ./home/home.nix
+                spicetify-nix.homeManagerModules.spicetify
+                stylix.homeModules.stylix
+              ];
+            };
+            home-manager.backupFileExtension = "hm-backup";
+            home-manager.extraSpecialArgs = {inherit inputs;};
+          }
+        ];
       };
     };
+  };
 }
diff --git a/home/home.nix b/home/home.nix
index a571f8c..f0cc25f 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -3,7 +3,6 @@
     ./packages.nix
 
     # hyprland
-    # ./modules/hyprland/default.nix
     ./modules/wm/sway/default.nix
 
     # editors
@@ -14,7 +13,6 @@
 
     # shell stuff
     ./modules/shell/bash/default.nix
-    # ./modules/shell/nushell/default.nix
     ./modules/shell/direnv/default.nix
     ./modules/shell/fish/default.nix
 
@@ -22,6 +20,9 @@
     ./modules/user/tofi/default.nix
     ./modules/user/dunst/default.nix
     ./modules/user/git/default.nix
+    ./modules/user/stylix/default.nix
+    ./modules/user/firefox/default.nix
+    ./modules/user/spotify/default.nix
   ];
 
   home.username = "elisiei";
diff --git a/home/modules/ide/nvim/plugins/completion.nix b/home/modules/ide/nvim/plugins/completion.nix
index afbcce0..ebd1647 100644
--- a/home/modules/ide/nvim/plugins/completion.nix
+++ b/home/modules/ide/nvim/plugins/completion.nix
@@ -1,38 +1,5 @@
-{ lib, ... }:
 {
   plugins.mini-completion = {
     enable = true;
-    settings = {
-      delay = {
-        completion = 100;
-        info = 100;
-        signature = 50;
-      };
-      fallback_action = "<C-n>";
-      lsp_completion = {
-        auto_setup = true;
-        process_items = lib.nixvim.mkRaw "nil";
-        snippet_insert = lib.nixvim.mkRaw "nil";
-        source_func = "completefunc";
-      };
-      mappings = {
-        force_fallback = "<A-Space>";
-        force_twostep = "<C-Space>";
-        scroll_down = "<C-f>";
-        scroll_up = "<C-b>";
-      };
-      window = {
-        info = {
-          border = lib.nixvim.mkRaw "nil";
-          height = 25;
-          width = 80;
-        };
-        signature = {
-          border = lib.nixvim.mkRaw "nil";
-          height = 25;
-          width = 80;
-        };
-      };
-    };
   };
 }
diff --git a/home/modules/ide/nvim/plugins/files.nix b/home/modules/ide/nvim/plugins/files.nix
index d8b350c..708972c 100644
--- a/home/modules/ide/nvim/plugins/files.nix
+++ b/home/modules/ide/nvim/plugins/files.nix
@@ -6,6 +6,11 @@
   plugins.neo-tree = {
     enable = true;
     settings = {
+      sources = [
+        "filesystem"
+        "buffers"
+        "git_status"
+      ];
       default_component_configs = {
         indent = {
           with_expanders = true;
@@ -15,11 +20,6 @@
         };
       };
     };
-    sources = [
-      "filesystem"
-      "buffers"
-      "git_status"
-    ];
     enable_diagnostics = true;
     enable_git_status = true;
     enable_modified_markers = true;
diff --git a/home/modules/ide/nvim/plugins/icons.nix b/home/modules/ide/nvim/plugins/icons.nix
index b9eca43..113b25a 100644
--- a/home/modules/ide/nvim/plugins/icons.nix
+++ b/home/modules/ide/nvim/plugins/icons.nix
@@ -1,5 +1,6 @@
 {
   plugins.mini-icons = {
     enable = true;
+    mockDevIcons = true;
   };
 }
diff --git a/home/modules/shell/fish/config.fish b/home/modules/shell/fish/config.fish
index 1982a85..bab7d8d 100644
--- a/home/modules/shell/fish/config.fish
+++ b/home/modules/shell/fish/config.fish
@@ -4,8 +4,5 @@ fish_config prompt choose minimalist
 # setup direnv
 direnv hook fish | source
 
-# set theme
-source ~/.config/fish/themes/tokyonight_night.fish
-
 # set aliases
 source ~/.config/fish/aliases/git.fish
diff --git a/home/modules/shell/fish/default.nix b/home/modules/shell/fish/default.nix
index fb3b791..25a626e 100644
--- a/home/modules/shell/fish/default.nix
+++ b/home/modules/shell/fish/default.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
-{
-  home.file.".config/fish/themes".source = ./themes;
+{pkgs, ...}: {
   home.file.".config/fish/aliases".source = ./aliases;
   programs.fish = {
     enable = true;
diff --git a/home/modules/shell/fish/themes/bw.fish b/home/modules/shell/fish/themes/bw.fish
deleted file mode 100644
index a4e4449..0000000
--- a/home/modules/shell/fish/themes/bw.fish
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/fish
-
-set -l fg        ffffff  # primary foreground
-set -l fg_dim    bbbbbb  # dim text
-set -l fg_faint  888888  # comments / autosuggestions
-set -l fg_dark   666666  # secondary elements
-set -l bg_sel    333333  # selection background
-set -l bg_match  2a2a2a  # search match background
-set -l error     ffffff  # errors
-
-set -g fish_color_normal        $fg
-set -g fish_color_command       $fg --bold
-set -g fish_color_keyword       $fg --bold
-set -g fish_color_quote         $fg_dim
-set -g fish_color_redirection   $fg
-set -g fish_color_end           $fg
-set -g fish_color_option        $fg_dim
-set -g fish_color_error         $error --reverse
-set -g fish_color_param         $fg
-set -g fish_color_comment       $fg_faint
-set -g fish_color_selection     --background=$bg_sel
-set -g fish_color_search_match  --background=$bg_match
-set -g fish_color_operator      $fg
-set -g fish_color_escape        $fg_dim
-set -g fish_color_autosuggestion $fg_faint
-
-set -g fish_pager_color_progress      $fg_faint
-set -g fish_pager_color_prefix        $fg --bold
-set -g fish_pager_color_completion    $fg
-set -g fish_pager_color_description   $fg_faint
-set -g fish_pager_color_selected_background --background=$bg_sel
diff --git a/home/modules/shell/fish/themes/kanagawa.fish b/home/modules/shell/fish/themes/kanagawa.fish
deleted file mode 100644
index dec9d04..0000000
--- a/home/modules/shell/fish/themes/kanagawa.fish
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/fish
-
-# Kanagawa Fish shell theme
-# A template was taken and modified from Tokyonight:
-# https://github.com/folke/tokyonight.nvim/blob/main/extras/fish_tokyonight_night.fish
-set -l foreground DCD7BA normal
-set -l selection 2D4F67 brcyan
-set -l comment 727169 brblack
-set -l red C34043 red
-set -l orange FF9E64 brred
-set -l yellow C0A36E yellow
-set -l green 76946A green
-set -l purple 957FB8 magenta
-set -l cyan 7AA89F cyan
-set -l pink D27E99 brmagenta
-
-# Syntax Highlighting Colors
-set -g fish_color_normal $foreground
-set -g fish_color_command $cyan
-set -g fish_color_keyword $pink
-set -g fish_color_quote $yellow
-set -g fish_color_redirection $foreground
-set -g fish_color_end $orange
-set -g fish_color_error $red
-set -g fish_color_param $purple
-set -g fish_color_comment $comment
-set -g fish_color_selection --background=$selection
-set -g fish_color_search_match --background=$selection
-set -g fish_color_operator $green
-set -g fish_color_escape $pink
-set -g fish_color_autosuggestion $comment
-
-# Completion Pager Colors
-set -g fish_pager_color_progress $comment
-set -g fish_pager_color_prefix $cyan
-set -g fish_pager_color_completion $foreground
-set -g fish_pager_color_description $comment
diff --git a/home/modules/shell/fish/themes/tokyonight_night.fish b/home/modules/shell/fish/themes/tokyonight_night.fish
deleted file mode 100644
index e9f7038..0000000
--- a/home/modules/shell/fish/themes/tokyonight_night.fish
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/fish
-
-# tokyonight color palette
-set -l foreground c0caf5
-set -l selection 283457
-set -l comment 565f89
-set -l red f7768e
-set -l orange ff9e64
-set -l yellow e0af68
-set -l green 9ece6a
-set -l purple 9d7cd8
-set -l cyan 7dcfff
-set -l pink bb9af7
-
-# syntax highlighting colors
-set -g fish_color_normal $foreground
-set -g fish_color_command $cyan
-set -g fish_color_keyword $pink
-set -g fish_color_quote $yellow
-set -g fish_color_redirection $foreground
-set -g fish_color_end $orange
-set -g fish_color_option $pink
-set -g fish_color_error $red
-set -g fish_color_param $purple
-set -g fish_color_comment $comment
-set -g fish_color_selection --background=$selection
-set -g fish_color_search_match --background=$selection
-set -g fish_color_operator $green
-set -g fish_color_escape $pink
-set -g fish_color_autosuggestion $comment
-
-# completion pager colors
-set -g fish_pager_color_progress $comment
-set -g fish_pager_color_prefix $cyan
-set -g fish_pager_color_completion $foreground
-set -g fish_pager_color_description $comment
-set -g fish_pager_color_selected_background --background=$selection
diff --git a/home/modules/terminal/foot/default.nix b/home/modules/terminal/foot/default.nix
index 22ac470..8031dc5 100644
--- a/home/modules/terminal/foot/default.nix
+++ b/home/modules/terminal/foot/default.nix
@@ -1,14 +1,11 @@
-{ config, ... }:
-{
-  home.file.".config/foot/themes".source = ./themes;
+{lib, ...}: {
   programs.foot = {
     enable = true;
     settings = {
       main = {
         shell = "fish";
         pad = "0x0center";
-        font = "Maple Mono NF:size=12";
-        include = "${config.xdg.configHome}/foot/themes/tokyonight.ini";
+        font = lib.mkForce "Maple Mono NF:size=12";
       };
       scrollback = {
         lines = 100000;
diff --git a/home/modules/terminal/foot/themes/bw.ini b/home/modules/terminal/foot/themes/bw.ini
deleted file mode 100644
index 51cad28..0000000
--- a/home/modules/terminal/foot/themes/bw.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[colors]
-# alpha=1.0
-background=000000
-foreground=ffffff
-
-## Normal/regular colors (color palette 0-7)
-regular0=000000  # black
-regular1=5a5a5a  # dark gray
-regular2=6a6a6a  # dark gray
-regular3=7a7a7a  # gray
-regular4=8a8a8a  # gray
-regular5=9a9a9a  # light gray
-regular6=aaaaaa  # light gray
-regular7=ffffff  # white
-
-## Bright colors (color palette 8-15)
-bright0=3a3a3a   # bright black
-bright1=6a6a6a   # bright gray
-bright2=7a7a7a
-bright3=8a8a8a
-bright4=9a9a9a
-bright5=bababa
-bright6=dadada
-bright7=ffffff   # bright white
diff --git a/home/modules/terminal/foot/themes/kanagawa.ini b/home/modules/terminal/foot/themes/kanagawa.ini
deleted file mode 100644
index 9facf18..0000000
--- a/home/modules/terminal/foot/themes/kanagawa.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[colors]
-foreground = dcd7ba
-background = 1f1f28
-
-selection-foreground = c8c093
-selection-background = 2d4f67
-
-regular0 = 090618
-regular1 = c34043
-regular2 = 76946a
-regular3 = c0a36e
-regular4 = 7e9cd8
-regular5 = 957fb8
-regular6 = 6a9589
-regular7 = c8c093
-
-bright0  = 727169
-bright1  = e82424
-bright2  = 98bb6c
-bright3  = e6c384
-bright4  = 7fb4ca
-bright5  = 938aa9
-bright6  = 7aa89f
-bright7  = dcd7ba
-
-16       = ffa066
-17       = ff5d62
diff --git a/home/modules/terminal/foot/themes/oxocarbon.ini b/home/modules/terminal/foot/themes/oxocarbon.ini
deleted file mode 100644
index 4dd39ef..0000000
--- a/home/modules/terminal/foot/themes/oxocarbon.ini
+++ /dev/null
@@ -1,44 +0,0 @@
-# oxocarbon-foot
-# oxocarbon foot template by Boyd Kelly
-# include in foot.ini like so:
-# include=~/.config/foot/colours.ini
-# must be included under [main], or untitled section at beginning of file
-
-#dark reference
-#base00: "#161616"
-#base01: "#262626"
-#base02: "#393939"
-#base03: "#525252"
-#base04: "#dde1e6"
-#base05: "#f2f4f8"
-#base06: "#ffffff"
-#base07: "#08bdba"
-#base08: "#3ddbd9"
-#base09: "#78a9ff"
-#base0A: "#ee5396"
-#base0B: "#33b1ff"
-#base0C: "#ff7eb6"
-#base0D: "#42be65"
-#base0E: "#be95ff"
-#base0F: "#82cfff"
-
-[colors]
-foreground=ffffff #base06 white
-background=161616 #base01 black
-
-regular0=262626       #         black
-regular1=ff7eb6       #       magenta
-regular2=42be65       #         green
-regular3=ffe97b       #        yellow
-regular4=33b1ff       #          blue
-regular5=ee5396       #           red
-regular6=3ddbd9       #          cyan
-regular7=dde1e6       #         white
-bright0=393939        #        black
-bright1=ff7eb6        #      magenta
-bright2=42be65        #        green
-bright3=ffe97b        #       yellow
-bright4=33b1ff        #         blue
-bright5=ee5396        #          red
-bright6=3ddbd9        #         cyan
-bright7=ffffff        #        white
diff --git a/home/modules/terminal/foot/themes/tokyonight.ini b/home/modules/terminal/foot/themes/tokyonight.ini
deleted file mode 100644
index deeb464..0000000
--- a/home/modules/terminal/foot/themes/tokyonight.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[colors]
-foreground=c0caf5
-background=1a1b26
-selection-foreground=c0caf5
-selection-background=283457
-urls=73daca
-cursor=1a1b26 e0af68
-
-regular0=15161e
-regular1=f7768e
-regular2=9ece6a
-regular3=e0af68
-regular4=7aa2f7
-regular5=bb9af7
-regular6=7dcfff
-regular7=a9b1d6
-
-bright0=414868
-bright1=f7768e
-bright2=9ece6a
-bright3=e0af68
-bright4=7aa2f7
-bright5=bb9af7
-bright6=7dcfff
-bright7=c0caf5
-
-16=ff9e64
-17=db4b4b
-
-# night variant.
diff --git a/home/modules/user/dunst/default.nix b/home/modules/user/dunst/default.nix
index e544af4..6b4e11c 100644
--- a/home/modules/user/dunst/default.nix
+++ b/home/modules/user/dunst/default.nix
@@ -1,4 +1,4 @@
-{
+{lib, ...}: {
   services.dunst = {
     enable = true;
 
@@ -9,31 +9,10 @@
         transparency = 50;
         frame_width = 1;
         timeout = 3;
-        font = "Maple Mono NF 10";
+        font = lib.mkForce "Maple Mono NF 10";
         icon_corner_radius = 0;
         min_icon_size = 56;
       };
-
-      urgency_low = {
-        background = "#000000";
-        foreground = "#ffffff";
-        frame_color = "#ffffff";
-        timeout = 3;
-      };
-
-      urgency_normal = {
-        background = "#000000";
-        foreground = "#ffffff";
-        frame_color = "#ffffff";
-        timeout = 3;
-      };
-
-      urgency_critical = {
-        background = "#000000";
-        foreground = "#ffffff";
-        frame_color = "#ffffff";
-        timeout = 5;
-      };
     };
   };
 }
diff --git a/home/modules/user/firefox/default.nix b/home/modules/user/firefox/default.nix
new file mode 100644
index 0000000..0f7103f
--- /dev/null
+++ b/home/modules/user/firefox/default.nix
@@ -0,0 +1,5 @@
+{
+  programs.firefox = {
+    enable = true;
+  };
+}
diff --git a/home/modules/user/obs/default.nix b/home/modules/user/obs/default.nix
deleted file mode 100644
index 670dd7c..0000000
--- a/home/modules/user/obs/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.obs-studio = {
-    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-backgroundremoval
-      obs-pipewire-audio-capture
-    ];
-  };
-}
diff --git a/home/modules/user/spotify/default.nix b/home/modules/user/spotify/default.nix
new file mode 100644
index 0000000..dc2e16a
--- /dev/null
+++ b/home/modules/user/spotify/default.nix
@@ -0,0 +1,19 @@
+{
+  pkgs,
+  inputs,
+  lib,
+  ...
+}: let
+  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+in {
+  programs.spicetify = {
+    enable = true;
+
+    enabledExtensions = with spicePkgs.extensions; [
+      adblock
+      hidePodcasts
+    ];
+
+    theme = lib.mkForce spicePkgs.themes.text;
+  };
+}
diff --git a/home/modules/user/stylix/default.nix b/home/modules/user/stylix/default.nix
new file mode 100644
index 0000000..3c48b0c
--- /dev/null
+++ b/home/modules/user/stylix/default.nix
@@ -0,0 +1,34 @@
+{pkgs, ...}: {
+  stylix = {
+    enable = true;
+    autoEnable = true;
+    polarity = "dark";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
+
+    icons = {
+      enable = true;
+      package = pkgs.papirus-icon-theme;
+      dark = "Papirus-Dark";
+      light = "Papirus-Light";
+    };
+
+    fonts = {
+      serif = {
+        package = pkgs.maple-mono.NF;
+        name = "Maple Mono NF";
+      };
+      sansSerif = {
+        package = pkgs.maple-mono.NF;
+        name = "Maple Mono NF";
+      };
+      monospace = {
+        package = pkgs.maple-mono.NF;
+        name = "Maple Mono NF";
+      };
+    };
+  };
+
+  stylix.targets.sway.enable = true;
+  stylix.targets.nixvim.enable = false;
+  stylix.targets.spicetify.enable = false;
+}
diff --git a/home/modules/user/tofi/default.nix b/home/modules/user/tofi/default.nix
index 1b6efb0..35294ab 100644
--- a/home/modules/user/tofi/default.nix
+++ b/home/modules/user/tofi/default.nix
@@ -2,9 +2,7 @@
   programs.tofi = {
     enable = true;
     settings = {
-      background-color = "#000000cc";
       border-width = 0;
-      font = "monospace";
       height = "100%";
       num-results = 5;
       outline-width = 0;
diff --git a/home/modules/user/wofi/default.nix b/home/modules/user/wofi/default.nix
deleted file mode 100644
index 7680608..0000000
--- a/home/modules/user/wofi/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  programs.wofi = {
-    enable = true;
-    style = ./style.css;
-    settings = {
-      show = "drun";
-      width = 750;
-      height = 400;
-      always_parse_args = true;
-      show_all = false;
-      term = "foot";
-      hide_scroll = true;
-      print_command = true;
-      insensitive = true;
-      columns = 1;
-    };
-  };
-}
diff --git a/home/modules/user/wofi/style.css b/home/modules/user/wofi/style.css
deleted file mode 100644
index ac9dee0..0000000
--- a/home/modules/user/wofi/style.css
+++ /dev/null
@@ -1,35 +0,0 @@
-window {
-	background-color: #1a1b26;
-	border: none;
-}
-
-#input {
-	padding: 0.6em 0.8em;
-	background-color: #24283b;
-	color: #c0caf5;
-	border: none;
-	font-size: 14px;
-}
-
-#entry {
-	padding: 0.6em 0.8em;
-	color: #c0caf5;
-	background: transparent;
-	border: none;
-	font-size: 14px;
-}
-
-#entry:selected {
-	background-color: #7aa2f7;
-	color: #1a1b26;
-	font-weight: bold;
-}
-
-#text {
-	color: inherit;
-}
-
-#text:selected {
-	color: #1a1b26;
-	font-weight: bold;
-}
diff --git a/home/modules/wm/sway/default.nix b/home/modules/wm/sway/default.nix
index b6b5498..ffcdbc4 100644
--- a/home/modules/wm/sway/default.nix
+++ b/home/modules/wm/sway/default.nix
@@ -3,18 +3,15 @@
   pkgs,
   lib,
   ...
-}:
-
-let
+}: let
   wallpaperScript = pkgs.writeShellScriptBin "random-wallpaper" ''
-    pkill -x wbg 2>/dev/null || true
+    pkill -f swaybg 2>/dev/null || true
 
     walp=$(find "$HOME/wallpapers" -type f \( -iname "*.jpg" -o -iname "*.png" \) | shuf -n 1)
-    [ -n "$walp" ] && ${pkgs.wbg}/bin/wbg "$walp" &
+    [ -n "$walp" ] && ${pkgs.swaybg}/bin/swaybg -m "fill" -i "$walp" &
   '';
-in
-{
-  home.packages = [ wallpaperScript ];
+in {
+  home.packages = [wallpaperScript];
 
   wayland.windowManager.sway = {
     enable = true;
@@ -23,7 +20,7 @@ in
     config = rec {
       modifier = "Mod4";
       terminal = "foot";
-      menu = "exec $(tofi-drun)";
+      menu = "exec $(tofi-run)";
 
       # outputs
       output."*" = {
@@ -33,7 +30,7 @@ in
 
       # startup
       startup = [
-        { command = "${wallpaperScript}/bin/random-wallpaper"; }
+        {command = "${wallpaperScript}/bin/random-wallpaper";}
       ];
 
       # input
@@ -50,8 +47,8 @@ in
       };
 
       # borders
-      window.border = 1;
-      floating.border = 1;
+      window.border = 0;
+      floating.border = 0;
 
       # focus
       focus.followMouse = true;
@@ -60,7 +57,7 @@ in
       keybindings = lib.mkOptionDefault {
         # screenshots
         "${modifier}+Shift+Print" = "exec ~/bin/grimblast copy screen";
-        "${modifier}+Print" = "exec ~/bin/grimblast copy area --freeze";
+        "${modifier}+Print" = "exec ~/bin/grimblast --freeze copy area";
 
         # launchers
         "${modifier}+space" = "exec ${menu}";
@@ -114,30 +111,30 @@ in
         Return = "mode default";
       };
 
-      bars = [ ];
+      bars = [];
     };
 
     extraConfig = ''
-      			set $opacity 0.97
-            for_window [class=".*"] opacity $opacity
-            for_window [app_id=".*"] opacity $opacity
+      set $opacity 0.97
+         for_window [class=".*"] opacity $opacity
+         for_window [app_id=".*"] opacity $opacity
 
-            # borders
-            default_border pixel 1
-            default_floating_border pixel 1
+         # borders
+         default_border pixel 0
+         default_floating_border pixel 0
 
-            # colors
-            client.focused          #3a3a3a #000000 #ffffff #3a3a3a #3a3a3a
-            client.focused_inactive #2a2a2a #000000 #bbbbbb #2a2a2a #2a2a2a
-            client.unfocused        #1e1e1e #000000 #888888 #1e1e1e #1e1e1e
-            client.urgent           #5a5a5a #000000 #ffffff #5a5a5a #5a5a5a
-            client.placeholder      #1e1e1e #000000 #888888 #1e1e1e #1e1e1e
+         # colors
+         client.focused          #3a3a3a #000000 #ffffff #3a3a3a #3a3a3a
+         client.focused_inactive #2a2a2a #000000 #bbbbbb #2a2a2a #2a2a2a
+         client.unfocused        #1e1e1e #000000 #888888 #1e1e1e #1e1e1e
+         client.urgent           #5a5a5a #000000 #ffffff #5a5a5a #5a5a5a
+         client.placeholder      #1e1e1e #000000 #888888 #1e1e1e #1e1e1e
 
-            # mouse
-            floating_modifier ${config.wayland.windowManager.sway.config.modifier} normal
+         # mouse
+         floating_modifier ${config.wayland.windowManager.sway.config.modifier} normal
 
-            # cursor
-            seat seat0 xcursor_theme macOS 24
+         # cursor
+         seat seat0 xcursor_theme macOS 24
     '';
   };
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 2b6b5b8..1c6a1e2 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -1,5 +1,4 @@
-{ inputs, ... }:
-{
+{inputs, ...}: {
   imports = [
     inputs.spicetify-nix.nixosModules.default
 
@@ -12,7 +11,6 @@
     ./modules/programs.nix
     ./modules/boot.nix
     ./modules/fonts.nix
-    ./modules/spicetify.nix
 
     # gaming shi
     ./modules/gaming.nix
diff --git a/nixos/modules/programs.nix b/nixos/modules/programs.nix
index 928b78c..b75c911 100644
--- a/nixos/modules/programs.nix
+++ b/nixos/modules/programs.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   environment.sessionVariables = {
     WLR_NO_HARDWARE_CURSORS = "1";
     NIXOS_OZONE_WL = "1";
@@ -34,15 +33,12 @@
     # email client
     thunderbird
 
-    # browser
-    firefox
-
     # wayland
-    wbg
     apple-cursor
+    swaybg
   ];
 
-  environment.gnome.excludePackages = [ pkgs.gnome-tour ];
-  services.xserver.excludePackages = [ pkgs.xterm ];
+  environment.gnome.excludePackages = [pkgs.gnome-tour];
+  services.xserver.excludePackages = [pkgs.xterm];
   services.xserver.desktopManager.xterm.enable = false;
 }
diff --git a/nixos/modules/spicetify.nix b/nixos/modules/spicetify.nix
deleted file mode 100644
index 6dbd4f0..0000000
--- a/nixos/modules/spicetify.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
-
-let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
-
-{
-  programs.spicetify = {
-    enable = true;
-
-    enabledExtensions = with spicePkgs.extensions; [
-      adblock
-      hidePodcasts
-    ];
-
-    theme = spicePkgs.themes.text;
-    colorScheme = "custom";
-    customColorScheme = {
-      text = "FFFFFF";
-      subtext = "C0C0C0";
-      sidebar-text = "FFFFFF";
-      main = "000000";
-      sidebar = "1A1A1A";
-      player = "000000";
-      card = "121212";
-      shadow = "000000";
-      selected-row = "404040";
-      button = "B0B0B0";
-      button-active = "FFFFFF";
-      button-disabled = "4A4A4A";
-      tab-active = "FFFFFF";
-      notification = "121212";
-      notification-error = "FFFFFF";
-      misc = "000000";
-    };
-
-  };
-}