diff --git a/SwarselSystems.org b/SwarselSystems.org
index 5acc547..a572bdd 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -10873,11 +10873,11 @@ To get other URLs (token, etc.), use https://<kanidmDomain>/oauth2/openid/<clien
               };
             };
           }) [
-          "${serviceDir}/data"
-          "${serviceDir}/data/cache"
-          "${serviceDir}/data/locks"
-          "${serviceDir}/data/log"
-          "${serviceDir}/data/proxies"
+          "data"
+          "data/cache"
+          "data/locks"
+          "data/log"
+          "data/proxies"
         ]
       );
 
@@ -10974,8 +10974,8 @@ Deployment notes:
               };
             };
           }) [
-          "${serviceDir}/var/data"
-          "${serviceDir}/images"
+          "var/data"
+          "images"
         ]
       );
 
@@ -13835,7 +13835,7 @@ Lastly, I am defining some more packages here that the parser has problems findi
 #+begin_src nix-ts :tangle modules/home/common/emacs.nix
   { self, lib, config, pkgs, globals, inputs, ... }:
   let
-    inherit (config.swarselsystems) homeDir isPublic isNixos;
+    inherit (config.swarselsystems) homeDir mainUser isPublic isNixos;
     inherit (config.repo.secrets.common.emacs) radicaleUser;
   in
   {
@@ -13844,6 +13844,31 @@ Lastly, I am defining some more packages here that the parser has problems findi
       # needed for elfeed
       # enable emacs overlay for bleeding edge features
       # also read init.el file and install use-package packages
+
+      home.activation.setupEmacsOrgFiles =
+        lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+          set -eu
+
+          if [ ! -d ${homeDir}/Org ]; then
+            ${pkgs.coreutils}/bin/install -d -m 0755 ${homeDir}/Org
+            ${pkgs.coreutils}/bin/chown ${mainUser}:syncthing ${homeDir}/Org
+          fi
+
+          # create dummy files to make Emacs calendar work
+          # these have low modified dates and should be marked as sync-conflicts
+          for file in "Tasks" "Archive" "Journal"; do
+            if [ ! -f ${homeDir}/Org/"$file".org ]; then
+              ${pkgs.coreutils}/bin/touch --time=access --time=modify -t 197001010000.00 ${homeDir}/Org/"$file".org
+              ${pkgs.coreutils}/bin/chown ${mainUser}:syncthing ${homeDir}/Org/"$file".org
+            fi
+          done
+
+          # when the configuration is build again, these sync-conflicts will be cleaned up
+          for file in $(find ${homeDir}/Org/ -name "*sync-conflict*"); do
+            ${pkgs.coreutils}/bin/rm "$file"
+          done
+        '';
+
       programs.emacs = {
         enable = true;
         package = pkgs.emacsWithPackagesFromUsePackage {
diff --git a/modules/home/common/emacs.nix b/modules/home/common/emacs.nix
index 95512fa..4fe4d82 100644
--- a/modules/home/common/emacs.nix
+++ b/modules/home/common/emacs.nix
@@ -1,6 +1,6 @@
 { self, lib, config, pkgs, globals, inputs, ... }:
 let
-  inherit (config.swarselsystems) homeDir isPublic isNixos;
+  inherit (config.swarselsystems) homeDir mainUser isPublic isNixos;
   inherit (config.repo.secrets.common.emacs) radicaleUser;
 in
 {
@@ -9,6 +9,31 @@ in
     # needed for elfeed
     # enable emacs overlay for bleeding edge features
     # also read init.el file and install use-package packages
+
+    home.activation.setupEmacsOrgFiles =
+      lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        set -eu
+
+        if [ ! -d ${homeDir}/Org ]; then
+          ${pkgs.coreutils}/bin/install -d -m 0755 ${homeDir}/Org
+          ${pkgs.coreutils}/bin/chown ${mainUser}:syncthing ${homeDir}/Org
+        fi
+
+        # create dummy files to make Emacs calendar work
+        # these have low modified dates and should be marked as sync-conflicts
+        for file in "Tasks" "Archive" "Journal"; do
+          if [ ! -f ${homeDir}/Org/"$file".org ]; then
+            ${pkgs.coreutils}/bin/touch --time=access --time=modify -t 197001010000.00 ${homeDir}/Org/"$file".org
+            ${pkgs.coreutils}/bin/chown ${mainUser}:syncthing ${homeDir}/Org/"$file".org
+          fi
+        done
+
+        # when the configuration is build again, these sync-conflicts will be cleaned up
+        for file in $(find ${homeDir}/Org/ -name "*sync-conflict*"); do
+          ${pkgs.coreutils}/bin/rm "$file"
+        done
+      '';
+
     programs.emacs = {
       enable = true;
       package = pkgs.emacsWithPackagesFromUsePackage {
diff --git a/modules/nixos/server/shlink.nix b/modules/nixos/server/shlink.nix
index 527eaa2..4c61caa 100644
--- a/modules/nixos/server/shlink.nix
+++ b/modules/nixos/server/shlink.nix
@@ -60,11 +60,11 @@ in
             };
           };
         }) [
-        "${serviceDir}/data"
-        "${serviceDir}/data/cache"
-        "${serviceDir}/data/locks"
-        "${serviceDir}/data/log"
-        "${serviceDir}/data/proxies"
+        "data"
+        "data/cache"
+        "data/locks"
+        "data/log"
+        "data/proxies"
       ]
     );
 
diff --git a/modules/nixos/server/slink.nix b/modules/nixos/server/slink.nix
index 4f54b8a..1d92892 100644
--- a/modules/nixos/server/slink.nix
+++ b/modules/nixos/server/slink.nix
@@ -41,8 +41,8 @@ in
             };
           };
         }) [
-        "${serviceDir}/var/data"
-        "${serviceDir}/images"
+        "var/data"
+        "images"
       ]
     );