diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 8264987..e0571ab 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -226,7 +226,7 @@ bindm = $mainMod, mouse:273, resizewindow
 #exec-once = wpaperd
 
 # status bar
-exec-once = waybar
+exec-once = noctalia-shell
 layerrule = blur , waybar
 layerrule = ignorezero , waybar
 
diff --git a/flake.nix b/flake.nix
index 3a24822..170185f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     noctalia = {
       url = "github:noctalia-dev/noctalia-shell";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.quickshell.follows = "quickshell";  # Use same quickshell version
+      inputs.quickshell.follows = "quickshell"; # Use same quickshell version
     };
 
     nix-colors.url = "github:misterio77/nix-colors";
@@ -82,6 +82,8 @@
         ./hosts/archangel/configuration.nix
         home-manager.nixosModules.home-manager
         inputs.disko.nixosModules.disko
+        stylix.nixosModules.stylix
+        ./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -104,6 +106,8 @@
         ./hosts/phoenix/configuration.nix
         home-manager.nixosModules.home-manager
         inputs.disko.nixosModules.disko
+        stylix.nixosModules.stylix
+        ./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
index 6b4ffe8..595a3ef 100644
--- a/modules/home-manager/home.nix
+++ b/modules/home-manager/home.nix
@@ -11,15 +11,20 @@ in {
   imports = [
     inputs.zen-browser.homeModules.twilight
     inputs.spicetify-nix.homeManagerModules.default
+    inputs.noctalia.homeModules.default
+
     ./noctalia.nix
   ];
   # Home Manager settings
+  programs.noctalia-shell.enable = true;
   nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
   home.username = "tulg";
   home.homeDirectory = "/home/tulg";
   home.stateVersion = "25.05";
   home.packages = with pkgs; [
+    quickshell
     networkmanagerapplet
+    inputs.noctalia.packages.${pkgs.system}.default
     wdisplays
     nwg-look
     rose-pine-gtk-theme
@@ -29,7 +34,6 @@ in {
     tmux
     fastfetch
     btop
-    #spotify
     pavucontrol
     wl-clipboard
     hyprcursor
@@ -47,12 +51,20 @@ in {
     wofi
     mako
     kitty
-#    vesktop
     libsForQt5.qtstyleplugin-kvantum
     libsForQt5.qt5ct
     rose-pine-kvantum
   ];
-  programs.vscode.enable = true;
+  programs.vscode = {
+    enable = true;
+    extensions = with pkgs.vscode-extensions; [
+      #pkgs.vscode-extensions.bbenoist.nix
+
+      pkgs.vscode-extensions.kamadorueda.alejandra
+
+      pkgs.vscode-extensions.jnoortheen.nix-ide
+    ];
+  };
   programs.zen-browser.enable = true;
   programs.zen-browser.policies = {
     DisableAppUpdate = true;
@@ -62,8 +74,8 @@ in {
 
   programs.spicetify = {
     enable = true;
-  #  theme = spicePkgs.themes.ziro;
-  #  colorScheme = "rose-pine-moon";
+    #  theme = spicePkgs.themes.ziro;
+    #  colorScheme = "rose-pine-moon";
   };
 
   xdg.configFile."hypr" = {
@@ -115,7 +127,37 @@ in {
     userEmail = "tulg@protonmail.ch";
   };
 
+  # gtk = {
+  # enable = true;
 
+  # theme = {
+  #   name = "Nordic-darker";
+  #   package = pkgs.nordic;
+  # };
+
+  #  iconTheme = {
+  #    name = "Papirus-Dark";
+  #    package = pkgs.papirus-icon-theme;
+  #  };
+  #};
+
+  #home.pointerCursor = {
+  #  gtk.enable = true;
+  #  x11.enable = true;
+  #  package = pkgs.bibata-cursors;
+  #  name = "Bibata-Modern-Classic";
+  #  size = 16;
+  #};
+  #nixpkgs.config.qt5 = {
+  #  enable = true;
+  #  platformTheme = "qt5ct";
+  #  style = {
+  #    package = pkgs.rose-pine-kvantum;
+  #    name = "Rose-pine";
+  #  };
+  #};
+  #
+  #
   home.sessionVariables = {
     NIXOS_OZONE_WL = "1"; # hint Electron apps to use Wayland
     # GTK_THEME = "rose-pine";
diff --git a/modules/home-manager/noctalia.nix b/modules/home-manager/noctalia.nix
index c00de0b..2aa1861 100644
--- a/modules/home-manager/noctalia.nix
+++ b/modules/home-manager/noctalia.nix
@@ -1,69 +1,58 @@
 { pkgs, inputs, ... }:
 {
-  home-manager.users.drfoobar = {
-    # import the home manager module
-    imports = [
-      inputs.noctalia.homeModules.default
-    ];
+  imports = [
+    #inputs.noctalia.homeModules.default
+  ];
 
-    # configure options
-    programs.noctalia-shell = {
-      enable = true;
-      settings = {
-        # configure noctalia here; defaults will
-        # be deep merged with these attributes.
-        bar = {
-          density = "compact";
-          position = "right";
-          showCapsule = false;
-          widgets = {
-            left = [
-              {
-                id = "SidePanelToggle";
-                useDistroLogo = true;
-              }
-              {
-                id = "WiFi";
-              }
-              {
-                id = "Bluetooth";
-              }
-            ];
-            center = [
-              {
-                hideUnoccupied = false;
-                id = "Workspace";
-                labelMode = "none";
-              }
-            ];
-            right = [
-              {
-                alwaysShowPercentage = false;
-                id = "Battery";
-                warningThreshold = 30;
-              }
-              {
-                formatHorizontal = "HH:mm";
-                formatVertical = "HH mm";
-                id = "Clock";
-                useMonospacedFont = true;
-                usePrimaryColor = true;
-              }
-            ];
-          };
-        };
-        colorSchemes.predefinedScheme = "Rosepine";
-        general = {
-          avatarImage = "/home/drfoobar/.face";
-          radiusRatio = 0.2;
-        };
-        location = {
-          monthBeforeDay = true;
-          name = "Bursa";
+
+  programs.noctalia-shell = {
+    enable = true;
+    settings = {
+      # configure noctalia here; defaults will
+      # be deep merged with these attributes.
+      bar = {
+        density = "compact";
+        position = "top";
+        showCapsule = false;
+        widgets = {
+          left = [
+            { id = "Workspace"; }
+            { id = "ActiveWindow"; }
+
+            
+            
+          ];
+          center = [
+            { hideUnoccupied = false; id = "Workspace"; labelMode = "none"; }
+          ];
+          right = [
+                        { id = "Tray"; }
+
+            { alwaysShowPercentage = false; id = "Battery"; warningThreshold = 30; }
+            {
+              formatHorizontal = "HH:mm";
+              formatVertical = "HH mm";
+              id = "Clock";
+              useMonospacedFont = true;
+              usePrimaryColor = true;
+
+            }
+            { id = "SidePanelToggle"; useDistroLogo = true; }
+
+          ];
         };
       };
-      # this may also be a string or a path to a JSON file,
-      # but in this case must include *all* settings.
+      colorSchemes.predefinedScheme = "Rosepine";
+      general = {
+        avatarImage = "/home/drfoobar/.face";
+        radiusRatio = 0.2;
+      };
+      location = {
+        monthBeforeDay = true;
+        name = "Bursa";
+      };
     };
+    # this may also be a string or a path to a JSON file,
+    # but in this case must include *all* settings.
   };
 }