diff --git a/home/common/programs/desktop.nix b/home/common/programs/desktop.nix
index 93e3735..50aa2a8 100644
--- a/home/common/programs/desktop.nix
+++ b/home/common/programs/desktop.nix
@@ -26,4 +26,16 @@
     bruno
     bun
   ];
+
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Orchis";
+      package = pkgs.orchis-theme;
+    };
+    iconTheme = {
+      name = "tela";
+      package = pkgs.tela-icon-theme;
+    };
+  };
 }
diff --git a/home/common/programs/eww/eww.scss b/home/common/programs/eww/config/eww.scss
similarity index 100%
rename from home/common/programs/eww/eww.scss
rename to home/common/programs/eww/config/eww.scss
diff --git a/home/common/programs/eww/eww.yuck b/home/common/programs/eww/config/eww.yuck
similarity index 100%
rename from home/common/programs/eww/eww.yuck
rename to home/common/programs/eww/config/eww.yuck
diff --git a/home/common/programs/eww/scripts/getvol b/home/common/programs/eww/config/scripts/getvol
similarity index 100%
rename from home/common/programs/eww/scripts/getvol
rename to home/common/programs/eww/config/scripts/getvol
diff --git a/home/common/programs/eww/default.nix b/home/common/programs/eww/default.nix
index 462ac11..8da75eb 100644
--- a/home/common/programs/eww/default.nix
+++ b/home/common/programs/eww/default.nix
@@ -1,9 +1,14 @@
 { config, pkgs, ... }:
 {
-  home.packages = [ pkgs.eww ];
-  xdg.configFile = {
-    "eww/eww.yuck".source = ./eww.yuck;
-    "eww/eww.scss".source = ./eww.scss;
-    "eww/scripts".source = ./scripts;
+  programs.eww = {
+    enable = true;
+    enableZshIntegration = true;
+    configDir = ./config;
   };
+
+  # xdg.configFile = {
+  #   "eww/eww.yuck".source = ./eww.yuck;
+  #   "eww/eww.scss".source = ./eww.scss;
+  #   "eww/scripts".source = ./scripts;
+  # };
 }
diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix
index e30fbac..fd9f684 100644
--- a/home/common/programs/hyprland/default.nix
+++ b/home/common/programs/hyprland/default.nix
@@ -87,7 +87,7 @@ in
 
       "exec-once" = [
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
-        "eww daemon & eww -c $HOME/.config/eww open bar"
+        "eww daemon"
       ];
 
       windowrulev2 = [