diff --git a/homeManagerModules/services/waybar/default.nix b/homeManagerModules/services/waybar/default.nix
index c3a3c8b2..44654499 100644
--- a/homeManagerModules/services/waybar/default.nix
+++ b/homeManagerModules/services/waybar/default.nix
@@ -315,7 +315,7 @@ in {
         #tray,
         #workspaces {
             border-radius: 10px;
-            background: rgba (36, 36, 36, 0.6);
+            background: rgba (46, 52, 64, 0.8);
             margin: 5px 10px 0px 10px;
             padding: 0px 10px 0px 10px;
         }
@@ -327,7 +327,7 @@ in {
         #submap,
         #mode {
             color: ${cfg.theme.colors.text};
-            background: rgba(255, 123, 99, 0.6);
+            background: rgba(255, 123, 99, 08);
         }
       '';
 
diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix
index 23421685..d1c86c53 100644
--- a/homeManagerModules/theme.nix
+++ b/homeManagerModules/theme.nix
@@ -95,7 +95,7 @@ in {
           then "Papirus-Dark"
           else "Papirus";
 
-        package = pkgs.papirus-icon-theme.override {color = "adwaita";};
+        package = pkgs.papirus-nord;
       };
 
       gtk3 = {inherit (gtk) extraConfig extraCss;};
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 4eecd433..1a79b2d7 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -45,6 +45,149 @@ in {
     username = "aly";
   };
 
+  gtk = let
+    nordCss = ''
+      @define-color window_bg_color #2E3440;
+      @define-color window_fg_color #ECEFF4;
+      @define-color view_bg_color #434C5E;
+      @define-color view_fg_color @window_fg_color;
+      @define-color accent_bg_color #8FBCBB;
+      @define-color accent_fg_color #ffffff;
+      @define-color accent_color @accent_bg_color;
+      @define-color headerbar_bg_color #3B4252;
+      @define-color headerbar_backdrop_color @window_bg_color;
+      @define-color headerbar_fg_color @window_fg_color;
+      @define-color popover_bg_color #4C566A;
+      @define-color popover_fg_color @view_fg_color;
+      @define-color dialog_bg_color @popover_bg_color;
+      @define-color dialog_fg_color @popover_fg_color;
+      @define-color card_bg_color @popover_bg_color;
+      @define-color card_fg_color @window_fg_color;
+      @define-color sidebar_bg_color @headerbar_bg_color;
+      @define-color sidebar_fg_color @window_fg_color;
+      @define-color sidebar_backdrop_color @window_bg_color;
+      @define-color sidebar_shade_color rgba(0,0,0,0.25);
+      decoration {
+        box-shadow: 0 3px 12px 1px rgba(0, 0, 0, 0.7), 0 0 0 1px shade(@headerbar_bg_color,1.3);
+      }
+      decoration:backdrop {
+        box-shadow: 0 3px 12px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.4), 0 0 0 1px shade(@headerbar_bg_color,1.1);
+      }
+      .tiled decoration, .tiled-top decoration, .tiled-bottom decoration, .tiled-right decoration, .tiled-left decoration {
+        box-shadow: 0 0 0 1px shade(@headerbar_bg_color,1.1), 0 0 0 20px transparent;
+      }
+      messagedialog.csd decoration, .csd.popup decoration, .maximized .csd.popup decoration {
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.8), 0 0 0 1px alpha(shade(@headerbar_bg_color,1.3),0.9);
+      }
+      .maximized .csd.popup decoration {
+        border-radius: 6px;
+      }
+      .maximized decoration, .fullscreen decoration {
+        border-radius: 0;
+        box-shadow: none;
+      }
+      .ssd decoration {
+        box-shadow: 0 0 0 1px shade(@headerbar_bg_color,1.3);
+      }
+      .ssd decoration:backdrop {
+        box-shadow: 0 0 0 1px shade(@headerbar_bg_color,1.1);
+      }
+      .ssd.maximized decoration, .ssd.maximized decoration:backdrop {
+        box-shadow: none;
+      }
+      .solid-csd decoration {
+        box-shadow: inset 0 0 0 5px alpha(currentColor,0.5), inset 0 0 0 4px @headerbar_bg_color, inset 0 0 0 1px alpha(currentColor,0.5);
+      }
+      .solid-csd decoration:backdrop {
+        box-shadow: inset 0 0 0 3px @window_bg_color;
+      }
+
+      .titlebar, headerbar {
+        border-bottom-color: alpha(currentColor,0.15);
+      }
+      .titlebar:backdrop, headerbar:backdrop {
+        border-bottom-color: alpha(currentColor,0.2);
+      }
+
+      button.titlebutton,
+      windowcontrols > button {
+        color: transparent;
+        min-width: 18px;
+        min-height: 18px;
+      }
+
+      button.titlebutton:backdrop {
+        opacity: 0.5;
+      }
+
+      windowcontrols > button {
+        border-radius: 100%;
+        padding: 0;
+        margin: 0 5px;
+      }
+      windowcontrols > button > image {
+        padding: 0;
+      }
+
+      button.titlebutton.close,
+      windowcontrols > button.close {
+        background-color: #BF616A;
+      }
+      button.titlebutton.close:hover,
+      windowcontrols > button.close:hover {
+        background-color: #d5979d;
+      }
+      button.titlebutton.maximize,
+      windowcontrols > button.maximize {
+        background-color: #A3BE8C;
+      }
+      button.titlebutton.maximize:hover,
+      windowcontrols > button.maximize:hover {
+        background-color: #cadabd;
+      }
+      button.titlebutton.minimize,
+      windowcontrols > button.minimize {
+        background-color: #EBCB8B;
+      }
+      button.titlebutton.minimize:hover,
+      windowcontrols > button.minimize:hover {
+        background-color: #f6e8cc;
+      }
+      button.titlebutton.close:backdrop, button.titlebutton.maximize:backdrop, button.titlebutton.minimize:backdrop,
+      windowcontrols > button.close:backdrop,
+      windowcontrols > button.maximize:backdrop,
+      windowcontrols > button.minimize:backdrop {
+        background-color: #4C566A;
+      }
+      button.titlebutton.close:backdrop:hover, button.titlebutton.maximize:backdrop:hover, button.titlebutton.minimize:backdrop:hover,
+      windowcontrols > button.close:backdrop:hover,
+      windowcontrols > button.maximize:backdrop:hover,
+      windowcontrols > button.minimize:backdrop:hover {
+        background-color: #6d7a96;
+      }
+      button.titlebutton.close:active, button.titlebutton.maximize:active, button.titlebutton.minimize:active,
+      windowcontrols > button.close:active,
+      windowcontrols > button.maximize:active,
+      windowcontrols > button.minimize:active {
+        box-shadow: inset 0 0 0 3px rgba(0, 0, 0, 0.3);
+      }
+
+      notebook > header tab:not(:backdrop):checked.reorderable-page,
+      tabbar tab:not(:backdrop):checked {
+        background-color: @headerbar_bg_color;
+      }
+
+      .nautilus-window .sidebar {
+        background-color: @view_bg_color;
+      }
+      .nautilus-window .sidebar:backdrop {
+        background-color: @window_bg_color;
+      }'';
+  in {
+    gtk3.extraCss = nordCss;
+    gtk4.extraCss = nordCss;
+  };
+
   programs = {
     git = {
       enable = true;
@@ -99,6 +242,16 @@ in {
       zed = {
         enable = true;
         package = unstable.zed-editor;
+
+        settings = {
+          auto_install_extensions = {nord = true;};
+
+          theme = {
+            dark = "Nord Dark";
+            light = "Nord Light";
+            mode = "system";
+          };
+        };
       };
     };
 
@@ -114,6 +267,14 @@ in {
 
     theme = {
       enable = true;
+
+      colors = {
+        text = "#FFFFFF";
+        background = "#2E3440";
+        primary = "#8FBCBB";
+        secondary = "#CA9EE6";
+      };
+
       wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-6d7xmx.jpg";
     };
   };
diff --git a/homes/aly/firefox/default.nix b/homes/aly/firefox/default.nix
index 1f8cffcd..c12428f0 100644
--- a/homes/aly/firefox/default.nix
+++ b/homes/aly/firefox/default.nix
@@ -3,16 +3,16 @@
   pkgs,
   ...
 }: {
-  home.file = let
-    source = builtins.fetchGit {
-      url = "https://github.com/rafaelmardojai/firefox-gnome-theme.git";
-      rev = "fb5b578a4f49ae8705e5fea0419242ed1b8dba70";
-      ref = "master";
-    };
-  in {
-    ".mozilla/firefox/default/chrome".source = source;
-    ".mozilla/firefox/work/chrome".source = source;
-  };
+  # home.file = let
+  #   source = builtins.fetchGit {
+  #     url = "https://github.com/rafaelmardojai/firefox-gnome-theme.git";
+  #     rev = "fb5b578a4f49ae8705e5fea0419242ed1b8dba70";
+  #     ref = "master";
+  #   };
+  # in {
+  #   ".mozilla/firefox/default/chrome".source = source;
+  #   ".mozilla/firefox/work/chrome".source = source;
+  # };
 
   programs.firefox = {
     enable = true;
diff --git a/homes/aly/mail/default.nix b/homes/aly/mail/default.nix
index 23b52fad..a6672793 100644
--- a/homes/aly/mail/default.nix
+++ b/homes/aly/mail/default.nix
@@ -84,16 +84,16 @@ in {
     };
   };
 
-  home.file = let
-    source = builtins.fetchGit {
-      url = "https://github.com/rafaelmardojai/thunderbird-gnome-theme.git";
-      rev = "628fcccb7788e3e0ad34f67114f563c87ac8c1dc";
-      ref = "main";
-    };
-  in {
-    ".thunderbird/default/chrome".source = source;
-    ".thunderbird/work/chrome".source = source;
-  };
+  # home.file = let
+  #   source = builtins.fetchGit {
+  #     url = "https://github.com/rafaelmardojai/thunderbird-gnome-theme.git";
+  #     rev = "628fcccb7788e3e0ad34f67114f563c87ac8c1dc";
+  #     ref = "main";
+  #   };
+  # in {
+  #   ".thunderbird/default/chrome".source = source;
+  #   ".thunderbird/work/chrome".source = source;
+  # };
 
   programs = {
     himalaya.enable = true;
diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix
index bab4bbb9..7a017501 100644
--- a/homes/aly/windowManagers/default.nix
+++ b/homes/aly/windowManagers/default.nix
@@ -63,6 +63,7 @@
         "center(1),class:(org.keepassxc.KeePassXC)"
         "float,class:(Bitwarden)"
         "float,class:(org.keepassxc.KeePassXC)"
+        "opacity 0.95,class:(dev.zed.Zed)"
         "size 80% 80%,class:(Bitwarden)"
         "size 80% 80%,class:(org.keepassxc.KeePassXC)"
         "workspace 1,class:(brave-browser)"