diff --git a/flake.lock b/flake.lock
index ebe1119..0427470 100644
--- a/flake.lock
+++ b/flake.lock
@@ -13,11 +13,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1752383772,
-        "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
+        "lastModified": 1758228441,
+        "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
+        "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740828860,
-        "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+        "lastModified": 1757745802,
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -328,7 +328,7 @@
     "sf-compact": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
+        "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
       },
@@ -376,7 +376,7 @@
     "sf-pro": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
+        "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=",
         "type": "file",
         "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
       },
diff --git a/home/default.nix b/home/default.nix
index 8fafcb0..e1fcca2 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,23 +1,24 @@
-{pkgs, lib, super-config, ...}:
+{pkgs, ...}:
 let
   user = import ../data/user.nix {};
 in {
   imports = [
     ./alacritty.nix
+    ./development
+    ./emacs.nix
     ./firefox.nix
-    ./sway.nix
+    ./git-ssh.nix
     ./hyprlock_idle.nix
+    ./libinput.nix
+    ./mako.nix
+    ./rofi.nix
+    ./sway.nix
+    ./syncthing.nix
+    ./theme.nix
+    ./udiskie.nix
     ./wallpapers.nix
     ./waybar.nix
-    ./udiskie.nix
-    ./mako.nix
     ./zsh.nix
-    ./rofi.nix
-    ./libinput.nix
-    ./git-ssh.nix
-    ./emacs.nix
-    ./syncthing.nix
-    ./development
   ];
 
   programs.nh = {
@@ -36,43 +37,14 @@ in {
     portal = {
       enable = true;
       extraPortals = with pkgs; [
+        xdg-desktop-portal
         xdg-desktop-portal-wlr
         xdg-desktop-portal-gtk
+        xdg-desktop-portal-xapp
       ];
     };
   };
 
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Breeze-Dark";
-      package = pkgs.kdePackages.breeze-gtk;
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    cursorTheme = {
-      name = "WhiteSur-cursors";
-      package = pkgs.whitesur-cursors;
-      size = 24;
-    };
-
-    gtk3.extraConfig = {
-        gtk-application-prefer-dark-theme = super-config.darkMode == true;
-    };
-
-    gtk4.extraConfig = {
-        gtk-application-prefer-dark-theme = super-config.darkMode == true;
-    };
-  };
-
-  dconf.settings = {
-    "org/gnome/desktop/interface" = {
-      color-scheme = lib.optionals (super-config.darkMode == true) "prefer-dark";
-    };
-  };
-
   fonts.fontconfig.enable = true;
   home = {
     stateVersion = "25.05";
@@ -89,16 +61,6 @@ in {
       NIXOS_OZONE_WL = "1";
     };
 
-    pointerCursor = {
-      gtk.enable = true;
-      x11.enable = true;
-      x11.defaultCursor = "WhiteSur-cursors";
-      name = "WhiteSur-cursors";
-      package = pkgs.whitesur-cursors;
-      size = 32;
-    };
-
-
     packages = with pkgs; [
       # Add your global packages here
       mpv
@@ -128,6 +90,12 @@ in {
       bitwarden-desktop
       bitwarden-cli
 
+      # for running wayland apps over ssh
+      waypipe
+      pkgs.unstable.deskflow
+      
+      foliate
+
       # file manager
       nemo-with-extensions
 
diff --git a/home/hyprlock_idle.nix b/home/hyprlock_idle.nix
index 0ad7153..75b837e 100644
--- a/home/hyprlock_idle.nix
+++ b/home/hyprlock_idle.nix
@@ -70,7 +70,7 @@
     };
   };
 
-  services.hypridle = lib.optionals (super-config.enableHypridle == true) {
+  services.hypridle = lib.mkIf (super-config.enableHypridle == true) {
     enable = true;
     settings = let
       idle_timeout = "300"; # 5 minutes
diff --git a/home/theme.nix b/home/theme.nix
new file mode 100644
index 0000000..cea6308
--- /dev/null
+++ b/home/theme.nix
@@ -0,0 +1,100 @@
+# Theme for graphical apps
+{ lib, super-config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    (catppuccin-kvantum.override {
+      accent = "blue";
+      variant = "mocha";
+    })
+    papirus-folders
+  ];
+
+  # Cursor setup
+  home.pointerCursor = {
+    # name = "Catppuccin-Mocha-Lavender-Cursors";
+    # package = pkgs.catppuccin-cursors.mochaLavender;
+    name = "WhiteSur-cursors";
+    package = pkgs.whitesur-cursors;
+    gtk.enable = true;
+    x11.enable = true;
+    x11.defaultCursor = "WhiteSur-cursors";
+    size = 24;
+  };
+
+  # GTK Setup
+  gtk = {
+    enable = true;
+    theme = {
+      name = "catppuccin-mocha-standard-blue-dark";
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "blue" ];
+        size = "standard";
+        variant = "mocha";
+      };
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.catppuccin-papirus-folders.override {
+        flavor = "mocha";
+        accent = "blue";
+      };
+    };
+    cursorTheme = {
+      name = "catppuccin-mocha-lavender-cursors";
+      package = pkgs.catppuccin-cursors.mochaLavender;
+    };
+    gtk3 = {
+      extraConfig.gtk-application-prefer-dark-theme = super-config.darkMode == true;
+    };
+  };
+  dconf.settings = {
+    "org/gtk/settings/file-chooser" = {
+      sort-directories-first = true;
+    };
+
+    # GTK4 Setup
+    "org/gnome/desktop/interface" = {
+      gtk-theme = "catppuccin-mocha-standard-blue-dark";
+      color-scheme = lib.mkIf (super-config.darkMode == true) "prefer-dark";
+    };
+  };
+
+  xdg.configFile = {
+    kvantum = {
+      target = "Kvantum/kvantum.kvconfig";
+      text = lib.generators.toINI { } {
+        General.theme = "catppuccin-mocha-blue";
+      };
+    };
+
+    qt5ct = {
+      target = "qt5ct/qt5ct.conf";
+      text = lib.generators.toINI { } {
+        Appearance = {
+          icon_theme = "Papirus-Dark";
+        };
+      };
+    };
+
+    qt6ct = {
+      target = "qt6ct/qt6ct.conf";
+      text = lib.generators.toINI { } {
+        Appearance = {
+          icon_theme = "Papirus-Dark";
+        };
+      };
+    };
+  };
+
+  qt = {
+    enable = true;
+    platformTheme = "qtct";
+    style = {
+      name = "kvantum";
+    };
+  };
+
+  systemd.user.sessionVariables = {
+    QT_STYLE_OVERRIDE = "kvantum";
+  };
+}
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 1f76edd..94ec739 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -9,6 +9,8 @@
   enableHypridle = true;
   has_battery = false;
 
+  networking.hostName = "desktop";
+
   extraOutputConfig = {
 "HDMI-A-3" = {pos = "0 0";};
 "HDMI-A-1" = { pos = "1920 0"; };
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 69675e0..1b1b90a 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -6,6 +6,7 @@
   ];
 
   has_battery = true;
+  darkMode = true;
   useThermald = true;
   desktop_scale = 1.3;
 
@@ -14,6 +15,8 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
+  networking.hostName = "laptop";
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction