diff --git a/bin/nixos-operations-script.sh b/bin/nixos-operations-script.sh
index 7de2060..0fb9c5e 100755
--- a/bin/nixos-operations-script.sh
+++ b/bin/nixos-operations-script.sh
@@ -2,6 +2,9 @@
 # The NixOS Operations Script (NOS) is a wrapper script for nixos-rebuild and Flake-based configurations.
 # It handles pulling the latest version of your repository using Git, running system updates, and pushing changes back up.
 
+# Exit on error
+set -e
+
 # Configuration parameters
 operation="switch"                              # The nixos-rebuild operation to use
 hostname=$(/run/current-system/sw/bin/hostname) # The name of the host to build
diff --git a/modules/nixos/services/syncthing/default.nix b/modules/nixos/services/syncthing/default.nix
index fdf1c6a..8338673 100644
--- a/modules/nixos/services/syncthing/default.nix
+++ b/modules/nixos/services/syncthing/default.nix
@@ -13,12 +13,12 @@ in
   options = {
     ${namespace}.services.syncthing = {
       enable = lib.mkEnableOption "Enables Syncthing.";
-      enableTray = lib.mkEnableOption "Enables the Syncthing Tray applet.";
       home = lib.mkOption {
         default = "/var/lib/syncthing";
         type = lib.types.str;
         description = "Where to store Syncthing's configuration files";
       };
+      tray.enable = lib.mkEnableOption "Enables the Syncthing Tray applet.";
       user = lib.mkOption {
         type = lib.types.str;
         default = "syncthing";
@@ -41,7 +41,7 @@ in
     networking.firewall.allowedTCPPorts = with cfg.web; lib.mkIf (enable && public) [ port ];
 
     services = {
-      flatpak.packages = lib.mkIf (config.${namespace}.ui.flatpak.enable && cfg.enableTray) [
+      flatpak.packages = lib.mkIf (config.${namespace}.ui.flatpak.enable && cfg.tray.enable) [
         "io.github.martchus.syncthingtray"
       ];
 
diff --git a/systems/x86_64-linux/Khanda/default.nix b/systems/x86_64-linux/Khanda/default.nix
index 82e9eab..ff3c433 100644
--- a/systems/x86_64-linux/Khanda/default.nix
+++ b/systems/x86_64-linux/Khanda/default.nix
@@ -57,6 +57,7 @@ in
       syncthing = {
         enable = true;
         home = "/home/aires/.config/syncthing";
+        tray.enable = true;
         user = "aires";
         web.enable = true;
       };
diff --git a/systems/x86_64-linux/Shura/default.nix b/systems/x86_64-linux/Shura/default.nix
index ea13340..e918d22 100644
--- a/systems/x86_64-linux/Shura/default.nix
+++ b/systems/x86_64-linux/Shura/default.nix
@@ -73,6 +73,7 @@ in
       syncthing = {
         enable = true;
         home = "/home/aires/.config/syncthing";
+        tray.enable = true;
         user = "aires";
         web.enable = true;
       };