diff --git a/flake.lock b/flake.lock
index 3a76ecf7..1dd2d742 100644
--- a/flake.lock
+++ b/flake.lock
@@ -375,7 +375,8 @@
         "gitui": "gitui",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "stylix": "stylix"
+        "stylix": "stylix",
+        "tokyonight-folke": "tokyonight-folke"
       }
     },
     "stylix": {
@@ -400,6 +401,22 @@
         "repo": "stylix",
         "type": "github"
       }
+    },
+    "tokyonight-folke": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696976278,
+        "narHash": "sha256-eRGrput9GHZcBLCHgKN+IRx/YZEKnIHXwLQZdIuWkLE=",
+        "owner": "folke",
+        "repo": "tokyonight.nvim",
+        "rev": "76a5283b8612d5e7db48db4f341ea0c189b07295",
+        "type": "github"
+      },
+      "original": {
+        "owner": "folke",
+        "repo": "tokyonight.nvim",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 69705eb0..e3fc8c2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,10 @@
       url = "github:extrawurst/gitui";
       flake = false;
     };
+    tokyonight-folke = {
+      url = "github:folke/tokyonight.nvim";
+      flake = false;
+    };
     catppuccin-base16 = {
       url = "github:catppuccin/base16";
       flake = false;
@@ -124,7 +128,7 @@
           };
           extraSpecialArgs = specialArgs // {
             inherit catppuccin-themes;
-            inherit (inputs) doom-emacs gitui;
+            inherit (inputs) doom-emacs gitui tokyonight-folke;
           };
         in nixpkgs.lib.nixosSystem {
           inherit system specialArgs;
diff --git a/home/alacritty.nix b/home/alacritty.nix
index 23fdf2a7..3b164825 100644
--- a/home/alacritty.nix
+++ b/home/alacritty.nix
@@ -1,10 +1,11 @@
-{ pkgs, catppuccin-themes, ... }:
+{ pkgs, tokyonight-folke, ... }:
 
 {
+  stylix.targets.alacritty.enable = false;
   programs.alacritty = {
     enable = true;
     settings = {
-      import = [ catppuccin-themes.alacritty ];
+      import = [ "${tokyonight-folke}/extras/alacritty/tokyonight_night.yml" ];
       window = {
         dynamic_title = true;
         padding = {
diff --git a/home/default.nix b/home/default.nix
index 746170e8..b65c1e23 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,10 +1,6 @@
 { config, lib, pkgs, catppuccin-themes, gitui, ... }:
 
 {
-  stylix.targets = {
-    fzf.enable = true;
-    tmux.enable = true;
-  };
   programs = {
     bash.enable = true;
     readline = {
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index b33973e1..3c188d60 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -14,6 +14,7 @@ in {
     enable = true;
     package = pkgs.emacs29-pgtk;
   };
+  stylix.targets.emacs.enable = false;
   home = {
     inherit sessionVariables;
     sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];
diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el
index aad690b9..175d33a4 100644
--- a/home/emacs/doom/config.el
+++ b/home/emacs/doom/config.el
@@ -13,16 +13,13 @@
 (setq user-full-name "Evie Litherland-Smith"
       user-mail-address "e.litherlandsmith@proton.me"
       doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular)
-      doom-theme 'catppuccin
+      doom-theme 'doom-tokyo-night
       doom-emoji-fallback-font-families '("Noto Color Emoji")
-      catppuccin-flavor 'macchiato
       display-line-numbers-type 'relative
       org-directory "~/Notes/"
       +latex-viewers '(pdf-tools)
       +format-with-lsp nil)
 (+global-word-wrap-mode +1)
-(load-theme 'catppuccin t t)
-(catppuccin-reload)
 
 ;; elfeed RSS sources
 (after! elfeed
diff --git a/home/emacs/doom/packages.el b/home/emacs/doom/packages.el
index 68d985d7..6eff5117 100644
--- a/home/emacs/doom/packages.el
+++ b/home/emacs/doom/packages.el
@@ -2,7 +2,6 @@
 ;;; $DOOMDIR/packages.el
 
 (package! pdf-tools :built-in 'prefer)
-(package! catppuccin-theme)
 (package! pocket-reader)
 (package! magit-delta)
 (package! yuck-mode)
diff --git a/home/firefox.nix b/home/firefox.nix
index daebea47..af89be63 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -14,7 +14,8 @@
         "browser.warnOnQuitShortcut" = false;
         "distribution.searchplugins.defaultLocale" = "en-GB";
         "doh-rollout.home-region" = "GB";
-        "extensions.activeThemeID" = "default-theme@mozilla.org";
+        # Tokyonight theme
+        "extensions.activeThemeID" = "{995463c6-18a1-4cf7-b0f1-564e050d778b}";
         "extensions.formautofill.creditCards.enabled" = false;
         "general.useragent.locale" = "en-GB";
         "intl.accept_languages" = "en-gb,en";
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index b99be4d1..40daa4e2 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -11,10 +11,6 @@
     ./gtk.nix
   ];
   services.swayosd.enable = true;
-  stylix.targets = {
-    hyprland.enable = true;
-    xresources.enable = true;
-  };
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix
index 1955c087..ffcc10ec 100644
--- a/home/hyprland/gtk.nix
+++ b/home/hyprland/gtk.nix
@@ -6,12 +6,11 @@ let
     tweaks = [ "rimless" ];
     variant = "macchiato";
   };
-  delta-icon-theme = pkgs.callPackage ./pkgs/delta-icon-theme { };
+  # delta-icon-theme = pkgs.callPackage ./pkgs/delta-icon-theme { };
   candy-icon-theme = pkgs.callPackage ./pkgs/candy-icon-theme { };
 in {
+  stylix.targets.gtk.enable = false;
   home.packages = with pkgs; [
-    delta-icon-theme
-    candy-icon-theme
     gnome.adwaita-icon-theme
     libsForQt5.breeze-gtk
     hicolor-icon-theme
@@ -23,8 +22,8 @@ in {
       name = "Catppuccin-Macchiato-Lavender-Cursors";
     };
     iconTheme = {
-      package = delta-icon-theme;
-      name = "Delta";
+      package = candy-icon-theme;
+      name = "candy-icons";
     };
     theme = {
       package = catppuccin-gtk;
diff --git a/home/hyprland/ironbar/config/config.toml b/home/hyprland/ironbar/config/config.toml
index 2f3ce442..bf542460 100644
--- a/home/hyprland/ironbar/config/config.toml
+++ b/home/hyprland/ironbar/config/config.toml
@@ -1,5 +1,5 @@
 anchor_to_edges = true
-icon_theme = "Delta"
+icon_theme = "candy-icons"
 position = "top"
 
 [[start]]
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
index 43380376..db75d6ea 100644
--- a/home/hyprland/rofi/default.nix
+++ b/home/hyprland/rofi/default.nix
@@ -1,7 +1,6 @@
 { pkgs, config, ... }:
 
 {
-  stylix.targets.rofi.enable = true;
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
diff --git a/home/hyprland/swaylock.nix b/home/hyprland/swaylock.nix
index af8e1746..5721b4c9 100644
--- a/home/hyprland/swaylock.nix
+++ b/home/hyprland/swaylock.nix
@@ -1,5 +1,4 @@
 { pkgs, ... }: {
-  stylix.targets.swaylock.enable = true;
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 0a25e219..962bee16 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -2,7 +2,7 @@
   home.packages = with pkgs; [ networkmanagerapplet bluez ];
   programs.waybar = {
     enable = true;
-    style = ./style.css;
+    # style = ./style.css;
     settings.main = {
       layer = "top";
       position = "top";
diff --git a/system/desktop.nix b/system/desktop.nix
index 4ed55d25..15e02b49 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, catppuccin-base16, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [ ./default.nix ./firefox.nix ];
@@ -25,9 +25,8 @@
       nomachine-client
     ];
   stylix = {
-    autoEnable = false;
     image = ./wallpapers/waves/cat-waves.png;
-    base16Scheme = "${catppuccin-base16}/base16/macchiato.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
     fonts = {
       emoji = {
         name = "Noto Color Emoji";
@@ -47,7 +46,6 @@
       };
     };
     homeManagerIntegration.followSystem = true;
-    targets.chromium.enable = true;
   };
   fonts = {
     packages = with pkgs; [
diff --git a/system/firefox.nix b/system/firefox.nix
index 14dc1310..3edeab29 100644
--- a/system/firefox.nix
+++ b/system/firefox.nix
@@ -35,6 +35,12 @@
           install_url =
             "https://github.com/mkaply/queryamoid/releases/download/v0.1/query_amo_addon_id-0.1-fx.xpi";
         };
+        "{995463c6-18a1-4cf7-b0f1-564e050d778b}" = {
+          # Tokyonight theme
+          installation_mode = "force_installed";
+          install_url =
+            "https://addons.mozilla.org/firefox/downloads/latest/tokyonight_vim/latest.xpi";
+        };
         "addon@simplelogin" = {
           installation_mode = "normal_installed";
           install_url =