diff --git a/sw-kiosk.nix b/sw-kiosk.nix
index 76c8b66..83388c1 100644
--- a/sw-kiosk.nix
+++ b/sw-kiosk.nix
@@ -1,43 +1,38 @@
 { pkgs, inputs, ... }:
 
 {
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
-  
-  # Login manager that starts sway on a real TTY
+  programs.wayfire.enable = true;
+
+  environment.etc."wayfire.ini".text = ''
+    [core]
+    plugins = autostart wlr-layer-shell virtual-keyboard idle
+
+    [autostart]
+    chromium = ${pkgs.chromium}/bin/chromium \
+      --enable-features=UseOzonePlatform \
+      --ozone-platform=wayland \
+      --kiosk https://ha.factory.uga.edu
+
+    keyboard = ${pkgs.squeekboard}/bin/squeekboard
+  '';
+
   services.greetd = {
     enable = true;
     settings = {
       default_session = {
-        user = "engr-ugaif";
-        command = ''
-          /run/current-system/sw/bin/sway --config /etc/sway-kiosk.conf
-        '';
+	user = "engr-ugaif";
+	command = ''
+          env WAYFIRE_CONFIG_FILE=/etc/wayfire.ini \
+            /run/current-system/sw/bin/wayfire
+	'';
       };
     };
   };
 
-  # Sway config for kiosk
-  environment.etc."sway-kiosk.conf".text = ''
-    # No fancy tiling, just a fullscreen kiosk
-    exec_always {
-      export LANG=en_US.UTF-8
-      export LC_ALL=en_US.UTF-8
-      exec ${pkgs.chromium}/bin/chromium \
-        --kiosk "https://ha.factory.uga.edu"
-    }
-
-    # On-screen keyboard (once you add wvkbd)
-    exec_always ${pkgs.wvkbd}/bin/wvkbd-mobintl
-
-    # Basic output config if needed
-    output * scale 1
-  '';
-
-  services.dbus.enable = true;
-  services.dbus.implementation = "dbus";
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+  };
 
   services.cage = {
     enable = false;
diff --git a/users/default.nix b/users/default.nix
index 4bb1059..50b5695 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -9,7 +9,7 @@ in
     engr-ugaif = {
       isNormalUser = true;
       description = "UGA Innovation Factory";
-      extraGroups = [ "networkmanager" "wheel" ];
+      extraGroups = [ "networkmanager" "wheel" "video" "input" ];
       packages = with pkgs; [
         kdePackages.kate
       ] ++ pythonPkgs;