diff --git a/sw-kiosk.nix b/sw-kiosk.nix
index bffdd75..28b7ebd 100644
--- a/sw-kiosk.nix
+++ b/sw-kiosk.nix
@@ -11,7 +11,10 @@
   };
 
   services.displayManager = {
-    gdm.enable = true;
+    gdm = {
+      enable = true;
+      autoSuspend = false;
+    };
     autoLogin = {
       enable = true;
       user = "engr-ugaif";
@@ -96,6 +99,10 @@
       "/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas";
   };
 
+  environment.etc."machine-info".text = ''
+    CHASSIS=handset
+  '';
+
   systemd.user.services."force-osk" = {
     description = "Force the OSK to Enable";
     wantedBy = [ "chromium-kiosk.service" ];
@@ -112,6 +119,26 @@
     };
   };
 
+  systemd.user.services."force-input-sources" = {
+    description = "Force the Gsettings Input Sources";
+    wantedBy = [ "chromium-kiosk.service" ];
+    partOf   = [ "chromium-kiosk.service" ];
+
+    serviceConfig = {
+      ExecStartPre = ''
+	/run/current-system/sw/bin/sleep 5 
+      '';
+      ExecStart = ''
+	/run/current-system/sw/bin/dconf reset /org/gnome/desktop/input-sources/sources
+      '';
+      ExecStartPost = ''
+	/run/current-system/sw/bin/dconf reset /org/gnome/desktop/mru-sources/sources
+      '';
+
+      Type = "simple";
+    };
+  };
+
   systemd.user.services."chromium-kiosk" = {
     description = "Chromium kiosk";
     wantedBy = [ "graphical-session.target" ];
@@ -120,7 +147,7 @@
     serviceConfig = {
       ExecStart = ''
         ${pkgs.chromium}/bin/chromium \
-          --enable-features=UseOzonePlatform,TouchpadOverscrollHistoryNavigation \
+          --enable-features=UseOzonePlatform,TouchpadOverscrollHistoryNavigation,PullToRefresh \
           --ozone-platform=wayland \
           --kiosk \
           --start-fullscreen \
@@ -141,6 +168,7 @@
     IdleAction="ignore";
   };
 
+
   # Enable networking
   networking.networkmanager.enable = false;
   networking.wireless = {