diff --git a/home/calendars/default.nix b/home/calendars/default.nix
index 9577c0a..f0db4ba 100644
--- a/home/calendars/default.nix
+++ b/home/calendars/default.nix
@@ -7,8 +7,9 @@ let
     type = "caldav";
     url = "https://baikal.ktiu.net/dav.php/calendars/till/${slug}";
   };
-  calDefaults = { 
-    # khal.enable = true;
+
+  calDefaults = {
+    khal.type = "calendar";
     local = {
       type = "filesystem";
       fileExt = ".ics";
@@ -19,68 +20,95 @@ let
 in
 
 {
-  xdg.configFile."khal/config".source = ./khal.config;
+  # xdg.configFile."khal/config".source = ./khal.config;
   services.vdirsyncer.enable = true;
   programs.vdirsyncer.enable = true;
 
-  # programs.khal = {
-  #   enable = true;
-  #   locale = {
-  #     timefomat          = "%H:%M";
-  #     dateformat         = "%d %b";
-  #     longdateformat     = "%d %b %Y";
-  #     datetimeformat     = "%d %b %H:%M";
-  #     longdatetimeformat = "%d %b %Y %H:%M";
-  #     weeknumbers        = "left";
-  #   };
-  # };
+  programs.khal = {
+    enable = true;
+    locale = {
+       timeformat         = "%H:%M";
+       dateformat         = "%d %b";
+       longdateformat     = "%d %b %Y";
+       datetimeformat     = "%d %b %H:%M";
+       longdatetimeformat = "%d %b %Y %H:%M";
+       weeknumbers        = "left";
+    };
+    settings = {
+      default = {
+        timedelta = "5d";
+        print_new = "event";
+      };
+      keybindings.external_edit = "ctrl e";
+      view = {
+        agenda_event_format = "{calendar-color}{cancelled}{start-end-time-style} {title}{repeat-symbol} {location} {url}{reset}";
+        event_format = "{calendar-color}{cancelled}{start}-{end} {title}{repeat-symbol} {location} {url}{reset}";
+        "blank_line_before_day" = true;
+      };
+    };
+  };
 
   accounts.calendar.basePath = "${config.xdg.dataHome}/calendars";
   accounts.calendar.accounts = {
-    till = calDefaults // {
-      # primary = true;
-      # khal.color = "light blue";
+    till = {
+      khal.enable = true;
+      local = {
+        type = "filesystem";
+        fileExt = ".ics";
+      };
+      vdirsyncer.enable = true;
+      primary = true;
+      primaryCollection = "till";
+      khal.color = "light blue";
       remote = baikalRemote "default";
     };
     mitlisa = calDefaults // {
-      # khal.color = "light magenta";
+      khal.enable = true;
+      khal.color = "light magenta";
       remote = baikalRemote "867d77c5-088f-4617-aeb8-6c9a18925e30";
     };
     family = calDefaults // {
-      # khal.color = "dark magenta";
+      khal.enable = true;
+      khal.color = "dark magenta";
       remote = baikalRemote "75db196d-bc81-4de3-96dc-d4c068c1234b";
     };
     bdays = calDefaults // {
-      # khal.color = "yellow";
+      khal.enable = true;
+      khal.color = "yellow";
       remote = baikalRemote "geburtstage";
     };
     polit = calDefaults // {
-      # khal.color = "dark gray";
+      khal.enable = true;
+      khal.color = "dark gray";
       remote = baikalRemote "polit";
     };
     ihg = calDefaults // {
-       # khal.color = "dark cyan";
+      khal.enable = true;
+       khal.color = "dark cyan";
        remote = {
          type = "http";
          url  = "https://geocom.uni-frankfurt.de/radicale/ihg/5012a739-dbaf-334b-f093-8db1860bc26e/";
        };
     };
     "mittelbau" = calDefaults // {
-      # khal.color = "light cyan";
+      khal.enable = true;
+      khal.color = "light cyan";
       remote = {
         type = "http";
         url  = "https://geocom.uni-frankfurt.de/radicale/ihg/d806b31d-dd3d-9d97-d3e5-f179addeb60a/";
       };
     };
     "eintracht_m" = calDefaults // {
-      # khal.color = "light red";
+      khal.enable = true;
+      khal.color = "light red";
       remote = {
         type = "http";
         url  = "http://i.cal.to/ical/257/eintrachtfrankfurt/spielplan/28ae0d30.f781380b-e6f28bd4.ics";
       };
     };
     "eintracht_f" = calDefaults // {
-      # khal.color = "light blue";
+      khal.enable = true;
+      khal.color = "light blue";
       remote = {
         type = "http";
         url  = "http://i.cal.to/ical/5940/eintrachtfrankfurt/spielplan-frauen-profis/28ae0d30.f781380b-1763bff2.ics";