diff --git a/modules/gui.nix b/modules/gui.nix
index 4d779e5..1e402ed 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -42,7 +42,7 @@
       export QT_QPA_PLATFORM=wayland
       export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
       export SDL_VIDEODRIVER=wayland
-      export WLR_DRM_NO_ATOMIC=1
+      export GTK_THEME=Adapta-Eta
     '';
     wrapperFeatures.gtk = true;
   };
@@ -72,7 +72,7 @@
   # GPG agent
   programs.gnupg.agent = {
     enable = true;
-    pinentryFlavor = "gnome3";
+    pinentryFlavor = "gtk2";
   };
 
   # Tmux
diff --git a/modules/software.nix b/modules/software.nix
index 0d859f2..f221f6d 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -6,10 +6,10 @@
     htop
     # Password management
     gnupg
-    pinentry-gnome
     pass-wayland
     passff-host
     gitAndTools.pass-git-helper
+    pinentry-gtk2
     # Browsers
     (firefox.override { extraNativeMessagingHosts = [ passff-host ]; })
     chromium
@@ -34,6 +34,7 @@
     nixfmt
     podman-compose
     shellcheck
+    android-studio
     # Rice
     adapta-gtk-theme
     paper-icon-theme