diff --git a/.gitignore b/.gitignore
index 4fccb20..7ec83c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .gitsecret/keys/random_seed
 !*.secret
 homeassistant/SERVICE_ACCOUNT.JSON
+vdirsyncer/config
diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
index 285a61f..c9b8a83 100644
--- a/.gitsecret/paths/mapping.cfg
+++ b/.gitsecret/paths/mapping.cfg
@@ -1 +1,2 @@
 homeassistant/SERVICE_ACCOUNT.JSON:5a3eabcbc53278f7713423b0ea20d0558f6334f8a1f6aed2a2e4cfb2ca9c93ab
+vdirsyncer/config:4858db17e53be276ae7dbff5492f039c316652bc624fe079891b69f6988306b0
diff --git a/homeassistant/SERVICE_ACCOUNT.JSON.secret b/homeassistant/SERVICE_ACCOUNT.JSON.secret
index 1ca858b..74fcb6a 100644
Binary files a/homeassistant/SERVICE_ACCOUNT.JSON.secret and b/homeassistant/SERVICE_ACCOUNT.JSON.secret differ
diff --git a/khal/config b/khal/config
index 034e4a6..7a99960 100644
--- a/khal/config
+++ b/khal/config
@@ -1,6 +1,6 @@
 [default]
 
-default_calendar = purelymail
+default_calendar = henrik@hjarl.com
 highlight_event_days = true
 
 [view]
@@ -16,18 +16,18 @@ longdateformat = %d.%m.%Y
 
 [calendars]
 
-[[purelymail]]
-  path = ~/.config/vdirsyncer/calendars/purelymail/
+[[henrik@hjarl.com]]
+  path = ~/Calendars/henrik@hjarl.com/
   color = yellow
   priority = 10
 
-[[google]]
-  path = ~/.config/vdirsyncer/calendars/google/bakken.henrik@gmail.com
+[[bakken.henrik@gmail.com]]
+  path = ~/Calendars/google/bakken.henrik@gmail.com
   color = light magenta
   priority = 5
 
 [[holidays]]
-  path = ~/.config/vdirsyncer/calendars/holidays/
+  path = ~/Calendars/holidays/
   color = dark cyan
   readonly = True
   priority = 0
diff --git a/khard/khard.conf b/khard/khard.conf
index b387f81..fce82df 100644
--- a/khard/khard.conf
+++ b/khard/khard.conf
@@ -1,6 +1,6 @@
 [addressbooks]
-[[bakken.henrik@gmail.com]]
-path = ~/.config/vdirsyncer/contacts/google/default/
+[[henrik@hjarl.com]]
+path = ~/Contacts/henrik@hjarl.com/default/
 
 [general]
 debug = no
@@ -40,9 +40,9 @@ preferred_email_address_type = pref, work, home
 # example:
 #   private_objects = Jabber, Skype, Twitter
 # default: ,  (the empty list)
-private_objects = Jabber, Skype, Twitter
+private_objects = ,
 # preferred vcard version: 3.0 / 4.0
-preferred_version = 3.0
+preferred_version = 4.0
 # Look into source vcf files to speed up search queries: yes / no
 search_in_source_files = no
 # skip unparsable vcard files: yes / no
diff --git a/vdirsyncer/config b/vdirsyncer/config
deleted file mode 100644
index 92e34f5..0000000
--- a/vdirsyncer/config
+++ /dev/null
@@ -1,73 +0,0 @@
-[general]
-status_path = "~/.config/vdirsyncer/status/"
-
-[pair purelymail_calendar]
-a = "purelymail_calendar_local"
-b = "purelymail_calendar_remote"
-collections = null
-conflict_resolution = "b wins"
-metadata = ["displayname", "color"]
-
-[storage purelymail_calendar_local]
-type = "filesystem"
-path = "~/.config/vdirsyncer/calendars/purelymail/"
-fileext = ".ics"
-
-[storage purelymail_calendar_remote]
-type = "caldav"
-url = "https://purelymail.com/webdav/22216/caldav/A44F971C-BC2A-46F0-9992-4B490A8DB7FD/"
-username = "henrik@hjarl.com"
-password.fetch = ["command", "pass", "show", "henrik@hjarl.com"]
-
-[pair google_calendar]
-a = "google_calendar_local"
-b = "google_calendar_remote"
-collections = ["from a", "from b"]
-conflict_resolution = "b wins"
-metadata = ["color"]
-
-[storage google_calendar_local]
-type = "filesystem"
-path = "~/.config/vdirsyncer/calendars/google/"
-fileext = ".ics"
-
-[storage google_calendar_remote]
-type = "google_calendar"
-token_file = "~/.config/vdirsyncer/google_calendar_token"
-client_id = "46299105873-hli2csm2rdgmtdnobmbsdcquajceli76.apps.googleusercontent.com"
-client_secret = "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"
-
-[pair google_contacts]
-a = "google_contacts_local"
-b = "google_contacts_remote"
-collections = ["from a", "from b"]
-conflict_resolution = "b wins"
-metadata = ["color"]
-
-[storage google_contacts_local]
-type = "filesystem"
-path = "~/.config/vdirsyncer/contacts/google/"
-fileext = ".vcf"
-
-[storage google_contacts_remote]
-type = "google_contacts"
-token_file = "~/.config/vdirsyncer/google_contacts_token"
-client_id = "46299105873-2do84a5do8bc9j6imuerte8u6m1bsath.apps.googleusercontent.com"
-client_secret = "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"
-
-[pair holidays]
-a = "holidays_local"
-b = "holidays_remote"
-collections = null
-conflict_resolution = "b wins"
-metadata = ["color"]
-
-[storage holidays_local]
-type = "filesystem"
-path = "~/.config/vdirsyncer/calendars/holidays/"
-fileext = ".ics"
-
-[storage holidays_remote]
-type = "http"
-url = "https://calendar.google.com/calendar/ical/en.norwegian%23holiday%40group.v.calendar.google.com/public/basic.ics"
-read_only = "true"
diff --git a/vdirsyncer/config.secret b/vdirsyncer/config.secret
new file mode 100644
index 0000000..83fec2a
Binary files /dev/null and b/vdirsyncer/config.secret differ