diff --git a/machines/newton/syncthing.nix b/machines/newton/syncthing.nix
index d8a2710..8d2b2b3 100644
--- a/machines/newton/syncthing.nix
+++ b/machines/newton/syncthing.nix
@@ -17,60 +17,60 @@
     openDefaultPorts = true;
     key = config.sops.secrets."syncthing/key".path;
     cert = config.sops.secrets."syncthing/cert".path;
-    extraOptions = {
+    settings = {
       options = {
         localAnnounceEnabled = false;
         urAccepted = 3;
       };
-    };
-    devices = {
-      "thinkman" = {
-        id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
+      devices = {
+        "thinkman" = {
+          id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
+        };
+        "birdman" = {
+          id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
+        };
+        "serverle" = {
+          id = "PVPEIN7-PI226LR-ULSBYKT-JGRQ3PS-WSPLGBP-TKYRJVP-OTWE7IV-NLKTBA3";
+        };
       };
-      "birdman" = {
-        id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
-      };
-      "serverle" = {
-        id = "PVPEIN7-PI226LR-ULSBYKT-JGRQ3PS-WSPLGBP-TKYRJVP-OTWE7IV-NLKTBA3";
-      };
-    };
-    folders = {
-      "Computer" = {
-        id = "djdxo-1akub";
-        path = "/data/computer";
-        devices = [
-          "thinkman"
-          "birdman"
-          "serverle"
-        ];
-      };
-      "Phone" = {
-        id = "4hds7-gpypp";
-        path = "/data/phone";
-        devices = [
-          "thinkman"
-          "birdman"
-          "serverle"
-        ];
-      };
-      "Music" = {
-        id = "mphdq-n6q7y";
-        path = "/data/music";
-        watch = false;
-        devices = [
-          "thinkman"
-          "birdman"
-          "serverle"
-        ];
-      };
-      "Pictures" = {
-        id = "cujyo-yiabu";
-        path = "/data/photos";
-        watch = false;
-        devices = [
-          "thinkman"
-          "serverle"
-        ];
+      folders = {
+        "Computer" = {
+          id = "djdxo-1akub";
+          path = "/data/computer";
+          devices = [
+            "thinkman"
+            "birdman"
+            "serverle"
+          ];
+        };
+        "Phone" = {
+          id = "4hds7-gpypp";
+          path = "/data/phone";
+          devices = [
+            "thinkman"
+            "birdman"
+            "serverle"
+          ];
+        };
+        "Music" = {
+          id = "mphdq-n6q7y";
+          path = "/data/music";
+          fsWatcherEnabled = false;
+          devices = [
+            "thinkman"
+            "birdman"
+            "serverle"
+          ];
+        };
+        "Pictures" = {
+          id = "cujyo-yiabu";
+          path = "/data/photos";
+          fsWatcherEnabled = false;
+          devices = [
+            "thinkman"
+            "serverle"
+          ];
+        };
       };
     };
   };
diff --git a/machines/serverle/syncthing.nix b/machines/serverle/syncthing.nix
index 755fb1b..96b0d19 100644
--- a/machines/serverle/syncthing.nix
+++ b/machines/serverle/syncthing.nix
@@ -18,66 +18,66 @@
     openDefaultPorts = true;
     key = config.sops.secrets."syncthing/key".path;
     cert = config.sops.secrets."syncthing/cert".path;
-    extraOptions = {
+    settings = {
       options = {
         urAccepted = 3;
       };
-    };
-    devices = {
-      "thinkman" = {
-        id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
+      devices = {
+        "thinkman" = {
+          id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
+        };
+        "birdman" = {
+          id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
+        };
+        "newton" = {
+          id = "5RISLVO-U5A5A7N-5BRYF2X-FTPNAI6-LOQDIMP-MVSM663-6W6VYBL-L7626A6";
+        };
       };
-      "birdman" = {
-        id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
-      };
-      "newton" = {
-        id = "5RISLVO-U5A5A7N-5BRYF2X-FTPNAI6-LOQDIMP-MVSM663-6W6VYBL-L7626A6";
-      };
-    };
-    folders = {
-      "Computer" = {
-        id = "djdxo-1akub";
-        path = "/data/computer";
-        devices = [
-          "thinkman"
-          "birdman"
-          "newton"
-        ];
-      };
-      "Phone" = {
-        id = "4hds7-gpypp";
-        path = "/data/phone";
-        devices = [
-          "thinkman"
-          "birdman"
-          "newton"
-        ];
-      };
-      "Music" = {
-        id = "mphdq-n6q7y";
-        path = "/data/music";
-        watch = false;
-        devices = [
-          "thinkman"
-          "birdman"
-          "newton"
-        ];
-      };
-      "Pictures" = {
-        id = "cujyo-yiabu";
-        path = "/data/photos";
-        watch = false;
-        devices = [
-          "thinkman"
-          "newton"
-        ];
-      };
-      "Aria2" = {
-        id = "jjnzq-pgzua";
-        path = "/data/tmp/aria2";
-        devices = [
-          "thinkman"
-        ];
+      folders = {
+        "Computer" = {
+          id = "djdxo-1akub";
+          path = "/data/computer";
+          devices = [
+            "thinkman"
+            "birdman"
+            "newton"
+          ];
+        };
+        "Phone" = {
+          id = "4hds7-gpypp";
+          path = "/data/phone";
+          devices = [
+            "thinkman"
+            "birdman"
+            "newton"
+          ];
+        };
+        "Music" = {
+          id = "mphdq-n6q7y";
+          path = "/data/music";
+          fsWatcherEnabled = false;
+          devices = [
+            "thinkman"
+            "birdman"
+            "newton"
+          ];
+        };
+        "Pictures" = {
+          id = "cujyo-yiabu";
+          path = "/data/photos";
+          fsWatcherEnabled = false;
+          devices = [
+            "thinkman"
+            "newton"
+          ];
+        };
+        "Aria2" = {
+          id = "jjnzq-pgzua";
+          path = "/data/tmp/aria2";
+          devices = [
+            "thinkman"
+          ];
+        };
       };
     };
   };