diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix
index a5b7e52..4b065fd 100644
--- a/hosts/nixos/thinkpad/home.nix
+++ b/hosts/nixos/thinkpad/home.nix
@@ -9,7 +9,7 @@
     ../home-default.nix
     ../../../modules/syncthing.nix
     ../../../modules/tex.nix
-    ../../../modules/hyprland/home.nix
+    ../../../modules/gnome/home.nix
     ../../../modules/firefox.nix
     ../../../modules/ghostty.nix
     ../../../modules/papis.nix
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index f521893..ff6a5d3 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -4,7 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../system-default.nix
-    ../../../modules/hyprland/system.nix
+    ../../../modules/gnome/system.nix
     ../../../modules/tailscale.nix
     ../../../modules/login-display.nix
   ];
diff --git a/modules/gnome/home.nix b/modules/gnome/home.nix
index bf5d04f..3a7c213 100644
--- a/modules/gnome/home.nix
+++ b/modules/gnome/home.nix
@@ -48,10 +48,9 @@ in
         (lib.optionals (!cfg.alwaysShowTopBar) [ "hidetopbar@mathieu.bidon.ca" ])
         ++ [
           "pano@elhan.io"
-          "rounded-window-corners@fxgn"
         ];
       favorite-apps = [
-        "Thunar.desktop"
+        "thunar.desktop"
         "com.mitchellh.ghostty.desktop"
         "firefox.desktop"
         "obsidian.desktop"
@@ -128,9 +127,19 @@ in
   # Configure GTK theme and icon theme
   gtk = {
     enable = true;
+    theme = {
+      name = "Adwaita-dark";
+      package = pkgs.gnome-themes-extra;
+    };
     iconTheme = {
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus-Dark";
+    };
+    gtk3.extraConfig = {
+      gtk-application-prefer-dark-theme = 1;
+    };
+    gtk4.extraConfig = {
+      gtk-application-prefer-dark-theme = 1;
     };
   };
 
@@ -156,7 +165,6 @@ in
     (lib.optionals (!cfg.alwaysShowTopBar) [ gnomeExtensions.hide-top-bar ])
     ++ [
       gnomeExtensions.pano
-      gnomeExtensions.rounded-window-corners
       xfce.thunar
     ];