diff --git a/symlinks/config/aerc/binds.conf b/symlinks/config/aerc/binds.conf
index 4f67bbe..f5e0393 100644
--- a/symlinks/config/aerc/binds.conf
+++ b/symlinks/config/aerc/binds.conf
@@ -63,6 +63,7 @@ S = :save<space>
 | = :pipe<space>
 D = :delete<Enter>
 A = :archive flat<Enter>
+cs = :pipe khal import -a personal --batch
 
 f = :forward<Enter>
 rr = :reply -a<Enter>
diff --git a/symlinks/config/khal/config b/symlinks/config/khal/config
index 1576647..8fa0c14 100644
--- a/symlinks/config/khal/config
+++ b/symlinks/config/khal/config
@@ -1,7 +1,15 @@
 [calendars]
 
-[[default]]
-path = ~/.local/share/khal/calendars/default
+[[personal]]
+path = ~/.local/share/khal/calendars/personal
+type = discover
+
+[[todo]]
+path = ~/.local/share/khal/calendars/todo
+type = discover
+
+[[contact_birthdays]]
+path = ~/.local/share/khal/calendars/contact_birthdays
 type = discover
 
 [locale]
@@ -12,4 +20,4 @@ datetimeformat = %Y-%m-%d %H:%M
 longdatetimeformat = %Y-%m-%d %H:%M
 
 [default]
-default_calendar = default
+default_calendar = personal
diff --git a/symlinks/config/khard/khard.conf b/symlinks/config/khard/khard.conf
index f834e6c..4e4001e 100644
--- a/symlinks/config/khard/khard.conf
+++ b/symlinks/config/khard/khard.conf
@@ -1,6 +1,6 @@
 [addressbooks]
 [[default]]
-path = ~/.local/share/khard/contacts/default/
+path = ~/.local/share/khard/contacts/contacts/
 
 [general]
 debug = no