diff --git a/common/home.nix b/common/home.nix
index 9ecc824..2f7cfbe 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -49,6 +49,16 @@
   services.ssh-agent.enable = true;
 
   services.flatpak.packages = [ "im.riot.Riot" ];
+  services.flatpak.update.onActivation = true;
+  services.flatpak.overrides = {
+    global = {
+      Context.sockets = [ "wayland" "!x11" "!fallback-x11" ];
+      Environment = {
+        XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
+        GTK_THEME = "Adwaita:dark";
+      };
+    };
+  };
 
   programs.home-manager.enable = true;
   programs.firefox.enable = true;