diff --git a/modules/desktop/home/calendars.nix b/modules/desktop/home/calendars.nix
new file mode 100644
index 0000000..4613760
--- /dev/null
+++ b/modules/desktop/home/calendars.nix
@@ -0,0 +1,39 @@
+{
+    # Thunderbird
+    programs.thunderbird = {
+        enable = true;
+        profiles.default = {
+            # name = "Default";
+            isDefault = true;
+        };
+    };
+
+    # Main calendar
+    accounts.calendar.accounts.Main = {
+        primary = true;
+
+        remote = {
+            type = "caldav";
+            url = "http://dav.kurin.pi/radicale/ghostfox/3c2f5ce4-2fa6-1c5e-b08b-8ce2386c3739/";
+            userName = "ghostfox";
+        };
+    };
+
+    # Zadania
+    accounts.calendar.accounts.Zadania = {
+        remote = {
+            type = "caldav";
+            url = "http://dav.kurin.pi/radicale/ghostfox/68829bfe-6545-7c1a-2edb-3afe3e14c55b/";
+            userName = "ghostfox";
+        };
+    };
+
+    # Lekarze
+    accounts.calendar.accounts.Lekarze = {
+        remote = {
+            type = "caldav";
+            url = "http://dav.kurin.pi/radicale/ghostfox/de221417-0ebf-0ed3-ddf1-2096027b705d/";
+            userName = "ghostfox";
+        };
+    };
+}
\ No newline at end of file
diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix
index 4f51117..500d0e0 100644
--- a/modules/desktop/home/default.nix
+++ b/modules/desktop/home/default.nix
@@ -1,6 +1,7 @@
 {
     imports = [
         ./zen-browser
+        ./calendars.nix
         ./element.nix
         ./packages.nix
         ./thunderbird.nix
diff --git a/modules/desktop/home/thunderbird.nix b/modules/desktop/home/thunderbird.nix
index e1f2d17..da92ce3 100644
--- a/modules/desktop/home/thunderbird.nix
+++ b/modules/desktop/home/thunderbird.nix
@@ -8,27 +8,12 @@
         };
     };
 
-    # Calendars
-    accounts.calendar.accounts.Main = {
-        primary = true;
-
-        remote = {
-            type = "caldav";
-            url = "http://dav.kurin.pi/radicale/ghostfox/3c2f5ce4-2fa6-1c5e-b08b-8ce2386c3739/";
-            userName = "ghostfox";
-        };
-
-        thunderbird.enable = true;
-    };
+    # Main calendar
+    accounts.calendar.accounts.Main.thunderbird.enable = true;
 
     # Zadania
-    accounts.calendar.accounts.Zadania = {
-        remote = {
-            type = "caldav";
-            url = "http://dav.kurin.pi/radicale/ghostfox/68829bfe-6545-7c1a-2edb-3afe3e14c55b/";
-            userName = "ghostfox";
-        };
+    accounts.calendar.accounts.Zadania.thunderbird.enable = true;
 
-        thunderbird.enable = true;
-    };
+    # Lekarze
+    accounts.calendar.accounts.Lekarze.thunderbird.enable = true;
 }
\ No newline at end of file
diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix
index c9679ad..3fc97f0 100644
--- a/modules/desktop/plasma/default.nix
+++ b/modules/desktop/plasma/default.nix
@@ -13,4 +13,15 @@
     ];
 
     services.desktopManager.plasma6.enable = true;
+
+    programs.kde-pim = {
+        enable = true;
+        kmail = true;
+        kontact = true;
+        merkuro = true;
+    };
+    
+    environment.systemPackages = with pkgs.kdePackages; [
+        korganizer
+    ];
 }
\ No newline at end of file
diff --git a/modules/desktop/tailscale.nix b/modules/desktop/tailscale.nix
index 20babec..77567e9 100644
--- a/modules/desktop/tailscale.nix
+++ b/modules/desktop/tailscale.nix
@@ -1,4 +1,11 @@
 {
-
-
+    services.tailscale = {
+        enable = true;
+        disableUpstreamLogging = true;
+        disableTaildrop = true;
+        extraSetFlags = [
+            "--accept-dns=false"
+            "--ssh=false"
+        ];
+    };
 }
\ No newline at end of file