diff --git a/home/profiles/tsuki/default.nix b/home/profiles/tsuki/default.nix
index 8981892..0aec2f2 100644
--- a/home/profiles/tsuki/default.nix
+++ b/home/profiles/tsuki/default.nix
@@ -4,14 +4,15 @@
   ...
 }: {
   imports = [
+    ./stylix.nix
     ../../services
     ../../programs/anyrun
     ../../programs/ironbar
     ../../programs/browsers/firefox
     ../../programs/terminal/wezterm
     ../../programs/terminal/zellij
-    ../../programs/gtk.nix
     ../../programs/media/cava.nix
+    ../../programs/gtk.nix
     ../../programs/mako.nix
     ../../programs/media/spotify-player.nix
     ../../programs/media/zathura.nix
diff --git a/home/profiles/tsuki/stylix.nix b/home/profiles/tsuki/stylix.nix
new file mode 100644
index 0000000..fa1d621
--- /dev/null
+++ b/home/profiles/tsuki/stylix.nix
@@ -0,0 +1,59 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [inputs.stylix.homeManagerModules.stylix];
+
+  stylix = {
+    autoEnable = false;
+    polarity = "dark";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
+    fonts = {
+      monospace = {
+        name = "JetBrainsMono NF Medium";
+        package = pkgs.nerdfonts;
+      };
+      serif = {
+        name = "Noto Serif";
+        package = pkgs.noto-fonts;
+      };
+      sansSerif = {
+        name = "Noto Sans";
+        package = pkgs.noto-fonts;
+      };
+      emoji = {
+        name = "Twitter Color Emoji";
+        package = pkgs.twitter-color-emoji;
+      };
+      sizes = {
+        applications = 10;
+        desktop = 10;
+        popups = 10;
+        terminal = 12;
+      };
+    };
+    cursor = {
+      name = "Bibata-Modern-Classic";
+      package = pkgs.bibata-cursors;
+      size = 24;
+    };
+    opacity = {
+      terminal = 0.6;
+    };
+    targets = {
+      wezterm.enable = false;
+      helix.enable = false;
+      hyprland.enable = false;
+      firefox.enable = false;
+
+      mako.enable = true;
+      gtk.enable = true;
+      lazygit.enable = true;
+      nushell.enable = true;
+      yazi.enable = true;
+      zellij.enable = true;
+      bat.enable = true;
+    };
+  };
+}
diff --git a/home/programs/editors/helix/default.nix b/home/programs/editors/helix/default.nix
index 82e699a..dd42231 100644
--- a/home/programs/editors/helix/default.nix
+++ b/home/programs/editors/helix/default.nix
@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     ./languages.nix
-    ./themes/catppuccin_mocha.nix
     ./themes/tokyonight.nix
   ];
   programs.helix = {
diff --git a/home/programs/gtk.nix b/home/programs/gtk.nix
index b4eae7a..55323e6 100644
--- a/home/programs/gtk.nix
+++ b/home/programs/gtk.nix
@@ -1,22 +1,20 @@
 {pkgs, ...}: {
-  home.pointerCursor = {
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 24;
-    gtk.enable = true;
-    x11.enable = true;
+  # home.pointerCursor = {
+  #   package = pkgs.bibata-cursors;
+  #   name = "Bibata-Modern-Classic";
+  #   size = 24;
+  #   gtk.enable = true;
+  #   x11.enable = true;
+  # };
+
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+    };
   };
 
   gtk = {
     enable = true;
-    font = {
-      name = "Noto Sans";
-      size = 10;
-    };
-    theme = {
-      name = "Tokyonight-Dark-BL";
-      package = pkgs.tokyo-night-gtk;
-    };
     iconTheme = {
       name = "Papirus";
       package = pkgs.papirus-icon-theme;
diff --git a/home/programs/mako.nix b/home/programs/mako.nix
index 809a8d1..12da6ad 100644
--- a/home/programs/mako.nix
+++ b/home/programs/mako.nix
@@ -8,12 +8,5 @@ _: {
     ignoreTimeout = true;
     anchor = "top-right";
     output = "DP-2";
-    font = "Monaspace Krypton 10";
-    padding = "6";
-    margin = "18,21,0";
-    backgroundColor = "#1a1b26";
-    textColor = "#a9b1d6";
-    borderColor = "#2ac3de";
-    progressColor = "over #313244";
   };
 }
diff --git a/home/programs/terminal/bat.nix b/home/programs/terminal/bat.nix
index 8bdc089..2df8357 100644
--- a/home/programs/terminal/bat.nix
+++ b/home/programs/terminal/bat.nix
@@ -1,3 +1,10 @@
 _: {
-  programs.bat.enable = true;
+  programs.bat = {
+    enable = true;
+    config = {
+      theme = "base16-stylix";
+      pager = "--RAW-CONTROL-CHARS --quit-if-one-screen --mouse";
+      style = "plain";
+    };
+  };
 }
diff --git a/home/programs/terminal/wezterm/config.lua b/home/programs/terminal/wezterm/config.lua
index 786cc84..702ff40 100644
--- a/home/programs/terminal/wezterm/config.lua
+++ b/home/programs/terminal/wezterm/config.lua
@@ -8,13 +8,13 @@ local config = {
 		device_type = "DiscreteGpu",
 		name = "NVIDIA GeForce GTX 1070 Ti",
 	},
+	color_scheme = "Tokyo Night",
 	enable_wayland = false,
 	font = wezterm.font("JetBrainsMono NF Medium"),
 	font_size = 12.0,
 	window_background_opacity = 0.6,
 	text_background_opacity = 1.0,
 	enable_tab_bar = false,
-	color_scheme = "tokyonight",
 	window_padding = { top = 20, bottom = 20, left = 20, right = 20 },
 }
 
diff --git a/home/programs/terminal/zellij/default.nix b/home/programs/terminal/zellij/default.nix
index 205e4b2..81923b4 100644
--- a/home/programs/terminal/zellij/default.nix
+++ b/home/programs/terminal/zellij/default.nix
@@ -10,7 +10,6 @@ _: {
       simplified_ui = false;
       default_layout = "default";
       ui.pane_frames.rounded_corners = true;
-      theme = "tokyo-night-storm";
     };
   };
 }