diff --git a/hosts/nix-surface.nix b/hosts/nix-surface.nix
index ea460d0..6e8bfa2 100644
--- a/hosts/nix-surface.nix
+++ b/hosts/nix-surface.nix
@@ -23,6 +23,9 @@ in
     "rd.systemd.show_status=auto"
     "intel_ipu3_imgu"
     "intel_ipu3_isys"
+    "fbcon=map:1"
+    "i915.enable_psr=0"  # Panel Self Refresh breaks resume on Surface
+    "i915.enable_dc=0"
   ];
 
   boot.kernelPackages = lib.mkForce refKernelPackages;
diff --git a/sw-kiosk.nix b/sw-kiosk.nix
index ab5c187..bffdd75 100644
--- a/sw-kiosk.nix
+++ b/sw-kiosk.nix
@@ -38,6 +38,27 @@
 	  "org/gnome/settings-daemon/plugins/power" = {
 	    sleep-inactive-ac-type = "nothing";
 	  };
+	  "org/gnome/desktop/lockdown" = {
+            disable-lock-screen = true;
+	  };
+	  "org/gnome/desktop/screensaver" = {
+            lock-enabled = false;
+	  };
+	  "org/gnome/desktop/session" = {
+            idle-delay = inputs.nixpkgs.lib.gvariant.mkUint32 0;
+	  };
+	  "org/gnome/desktop/interface" = {
+            show-battery-percentage = true;
+	  };
+	  "org/gnome/desktop/input-sources" = {
+            sources = "[('ibus', 'xkb:us::eng')]";
+	  };
+	  "org/gnome/desktop/mru-sources" = {
+            sources = "[('ibus', 'xkb:us::eng')]";
+	  };
+	  "sm/puri/phosh" = {
+            lock-enabled = false;
+	  };
 	  "org/gnome/desktop/a11y/applications" = {
             screen-keyboard-enabled = true;
 	  };
@@ -66,7 +87,7 @@
   };
 
   environment.sessionVariables = {
-    GDK_SCALE = "2";
+    GDK_SCALE = "1.25";
     GDK_DPI_SCALE = "0.5";
 
     # Make GLib / gsettings actually see schemas
@@ -110,6 +131,15 @@
       '';
     };
   };
+  
+  services.logind.settings.Login = {
+    HandlePowerKey="ignore";
+    HandleSuspendKey="ignore";
+    HandleHibernateKey="ignore";
+    HandleLidSwitch="ignore";
+    HandleLidSwitchExternalPower="ignore";
+    IdleAction="ignore";
+  };
 
   # Enable networking
   networking.networkmanager.enable = false;