diff --git a/SwarselSystems.org b/SwarselSystems.org
index 32f070c..a193afd 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -4799,8 +4799,8 @@ in
     type = types.listOf (types.attrsOf types.str);
     default = [
       { command = "nextcloud --background"; }
-      { command = "vesktop --start-minimized"; }
-      { command = "element-desktop --hidden  -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
+      { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; }
+      { command = "element-desktop --hidden  --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
       { command = "ANKI_WAYLAND=1 anki"; }
       { command = "OBSIDIAN_USE_WAYLAND=1 obsidian"; }
       { command = "nm-applet"; }
@@ -4893,7 +4893,6 @@ Also, the system state version is set here. No need to touch it.
       ./zsh.nix
       ./syncthing.nix
       ./blueman.nix
-      ./safeeyes.nix
       ./networkdevices.nix
       ./gvfs.nix
       ./interceptiontools.nix
@@ -5712,20 +5711,6 @@ Enables the blueman service including the nice system tray icon.
   }
 #+end_src
 
-***** safeeyes
-:PROPERTIES:
-:CUSTOM_ID: h:d33c93f5-0ac8-44e5-8756-02dc0e6975e4
-:END:
-
-A friend of mine used this service and I used to make fun of him. But I have to admit this is actually a nice program. It forces you to look away from the screen from time to time, reducing eye strain.
-
-#+begin_src nix :tangle profiles/common/nixos/safeeyes.nix
-  _:
-  {
-    services.safeeyes.enable = true;
-  }
-#+end_src
-
 ***** Network devices
 :PROPERTIES:
 :CUSTOM_ID: h:73ed28cb-2f82-47b2-8bc5-208278b55788
@@ -6435,6 +6420,7 @@ This section sets up all the imports that are used in the home-manager section.
       ./sway.nix
       ./gpg-agent.nix
       ./gammastep.nix
+      ./safeeyes.nix
     ];
 
     nix = {
@@ -8061,6 +8047,20 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
   }
 #+end_src
 
+***** safeeyes
+:PROPERTIES:
+:CUSTOM_ID: h:d33c93f5-0ac8-44e5-8756-02dc0e6975e4
+:END:
+
+A friend of mine used this service and I used to make fun of him. But I have to admit this is actually a nice program. It forces you to look away from the screen from time to time, reducing eye strain.
+
+#+begin_src nix :tangle profiles/common/home/safeeyes.nix
+  _:
+  {
+    services.safeeyes.enable = true;
+  }
+#+end_src
+
 **** Sway
 :PROPERTIES:
 :CUSTOM_ID: h:02df9dfc-d1af-4a37-a7a0-d8da0af96a20
@@ -8400,6 +8400,7 @@ This service changes the screen hue at night. I am not sure if that really does
   }
 #+end_src
 
+
 *** Optional
 :PROPERTIES:
 :CUSTOM_ID: h:be623200-557e-4bb7-bb11-1ec5d76c6b8b
diff --git a/modules/home/startup.nix b/modules/home/startup.nix
index c7710df..9a47570 100644
--- a/modules/home/startup.nix
+++ b/modules/home/startup.nix
@@ -8,8 +8,8 @@ in
     type = types.listOf (types.attrsOf types.str);
     default = [
       { command = "nextcloud --background"; }
-      { command = "vesktop --start-minimized"; }
-      { command = "element-desktop --hidden  -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
+      { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; }
+      { command = "element-desktop --hidden  --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
       { command = "ANKI_WAYLAND=1 anki"; }
       { command = "OBSIDIAN_USE_WAYLAND=1 obsidian"; }
       { command = "nm-applet"; }
diff --git a/profiles/common/home/default.nix b/profiles/common/home/default.nix
index f80f07c..6af7b1d 100644
--- a/profiles/common/home/default.nix
+++ b/profiles/common/home/default.nix
@@ -29,6 +29,7 @@
     ./sway.nix
     ./gpg-agent.nix
     ./gammastep.nix
+    ./safeeyes.nix
   ];
 
   nix = {
diff --git a/profiles/common/home/safeeyes.nix b/profiles/common/home/safeeyes.nix
new file mode 100644
index 0000000..5c5959d
--- /dev/null
+++ b/profiles/common/home/safeeyes.nix
@@ -0,0 +1,4 @@
+_:
+{
+  services.safeeyes.enable = true;
+}
diff --git a/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix
index 62b7128..fa13b79 100644
--- a/profiles/common/nixos/default.nix
+++ b/profiles/common/nixos/default.nix
@@ -19,7 +19,6 @@
     ./zsh.nix
     ./syncthing.nix
     ./blueman.nix
-    ./safeeyes.nix
     ./networkdevices.nix
     ./gvfs.nix
     ./interceptiontools.nix