diff --git a/machines/common/configuration.nix b/machines/common/configuration.nix
index 16d0950..6145ee1 100644
--- a/machines/common/configuration.nix
+++ b/machines/common/configuration.nix
@@ -43,9 +43,7 @@
   };
 
   time.timeZone = "Europe/Amsterdam";
-
   services.lorri.enable = true;
-
   services.tailscale.enable = true;
 
   services.mullvad-vpn.enable = true;
@@ -70,11 +68,16 @@
       "syncthing/luna".owner = "horseman";
       "syncthing/terra".owner = "horseman";
       "syncthing/solis".owner = "horseman";
+      "syncthing/user".owner = "horseman";
+      "syncthing/password".owner = "horseman";
     };
     templates = {
       "syncluna".content = ''${config.sops.placeholder."syncthing/luna"}'';
       "syncterra".content = ''${config.sops.placeholder."syncthing/terra"}'';
       "syncsolis".content = ''${config.sops.placeholder."syncthing/solis"}''; 
+      "syncuser".content = ''${config.sops.placeholder."syncthing/user"}''; 
+      "syncpassword".content = ''${config.sops.placeholder."syncthing/password"}''; 
+      
     };
   };
 
@@ -83,9 +86,13 @@
     user = "horseman";
     dataDir = "/home/horseman";
     configDir = "/home/horseman/.config/syncthing";
-    overrideDevices = false;
+    overrideDevices = true;
     overrideFolders = true;
     settings = {
+      gui = {
+        user = config.sops.templates."syncuser".content;
+        password = config.sops.templates."syncpassword".content;
+      };
       devices = {
         "luna" = { id = config.sops.templates."syncluna".content; };
         "terra" = { id = config.sops.templates."syncterra".content; };
@@ -96,10 +103,6 @@
           path = "/home/horseman/Documents";
           devices = [ "luna" "terra" "solis" ];
         };
-        "Programming" = {
-          path = "/home/horseman/Programming";
-          devices = [ "luna" "terra" "solis" ];
-        };
       };
     };
   };
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 889c8be..72138dc 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -2,6 +2,8 @@ syncthing:
     luna: ENC[AES256_GCM,data:ChuiTmmyeogpI1lYr7g3OeTkPF5DRgp5pJCiqoGa2ZqoMGC0lPobj25jE2NsQVVcTrfvKTipXDp++aapp7KI,iv:G8TeHPdcl8CWD55F+qBbw86Uo0hf7+3EPQlWToG1PTc=,tag:by1qHtrMKoWWI5oNQFS4WQ==,type:str]
     terra: ENC[AES256_GCM,data:7qZf6l4nBQxQTtaWKQ+RfzNtohlZdI9UyFm8U++de7LP3yA0Vm05f+Y24HIwOc1m08USu9o5tfA/75zKn+TX,iv:eiwIPpbm/mCilVYn19lFoIn8HLMw2cWU+22TgbUb10c=,tag:x5J9D8aLrLzIhAA311S6Lw==,type:str]
     solis: ENC[AES256_GCM,data:OmEgJbIsIOws4LeOBLxnxa13ABJ+Sle/EDzANkWCpWwnxs23ehrSzSBQXZKPSm1/51BINADiI0xDq+LHKDLy,iv:9KZ7UQK+wWdDMsMNkq2lB7xyLUWcbr48sxy64xSXjII=,tag:mEZuAEe8oaPCIcy4xIAsVA==,type:str]
+    user: ENC[AES256_GCM,data:2R5H0FiHdNg=,iv:ChKjUgXHAJH4ppi3QEDiMn9WDHPXZ1nuoHPMS7pp4c4=,tag:LkVJqudihU1KTYNnvNyzUQ==,type:str]
+    password: ENC[AES256_GCM,data:kedAC1Or3sNg4bHf4dbEQpSY,iv:NUj+hD9AzNSX25rwDtN8KEE+9MlvcjugDHkq32cQb0A=,tag:u5MsHeZFoEra7T/5hfS4fg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -17,8 +19,8 @@ sops:
             ckJwQ3EzU2JzdGhnWkNnRExRNlprM28KUHkZe8FvLOAt+UVqvgOxBQdApbEXQ44v
             vXW8UtZuq7GjsP5qD2MK6oKs/ZDfe+PhqiWl4ONNHvpn8rmfbQDcRw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-06T16:26:48Z"
-    mac: ENC[AES256_GCM,data:TbXRW3CsmA7E17U3U27LOWAE2zp3VxZB0y5qMAhv5ZH8zeTz2fUtbhUoR5XAf4ChA01k7SjZQr4fNz4oRi16lO7fHyTdhBQNkygB3obBM3ac6qm3ildEp6v/3rykKbxOHC2QavsI3qJPOjWinl/Ya3jmvHaJ/qhnpKtYZTdqdqA=,iv:fz7Bqws8rB8KmaO0mR5z2MqvfXIoR5iI1xfLQ8cZejw=,tag:EqUgJsH/IYN19uPEUwifrw==,type:str]
+    lastmodified: "2024-09-17T10:25:22Z"
+    mac: ENC[AES256_GCM,data:ElbjBYlHwwcWQL2y69bHbXntoSM619/5ojol0nptkc4P/8hvctEG9UX7c8asypw00N1TbScZg91vwvTfDMQx+6joq/uCmdtba5OCxsccX9ENdjnej+YGe4vPyqaEVYddKedBT+rub2uYslMBMM1LupA78fYfQ55oIRWU4LNRUwQ=,iv:b6jNwAADXJSIGkm7RB192xFsBRGKBMp4jz+WjM6rt88=,tag:/ZbyWddyeyu6EhoLy/mqcg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0