diff --git a/vdirsyncer/config b/vdirsyncer/config
index 54ed630..d1ba7c3 100644
--- a/vdirsyncer/config
+++ b/vdirsyncer/config
@@ -1,6 +1,12 @@
 [general]
 status_path = "~/.local/share/vdirsyncer/status/"
 
+[pair gubal_contacts_xandikos_to_baikal]
+a = "gubal_contacts_xandikos"
+b = "gubal_contacts_baikal"
+collections = null
+conflict_resolution = "a wins"
+
 [pair gubal_contacts_local_to_xandikos]
 a = "gubal_contacts_local"
 b = "gubal_contacts_xandikos"
@@ -13,15 +19,27 @@ fileext = ".vcf"
 
 [storage gubal_contacts_xandikos]
 type = "carddav"
-url = "https://calendar.reya.zone/xandikos/reya/"
+url = "https://calendar.reya.zone/xandikos/reya/contacts/addressbook/"
 username = "reya"
 password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/xandikos/reya", "protocol", "WebDAV"]
 
+[storage gubal_contacts_baikal]
+type = "carddav"
+url = "https://calendar.reya.zone/dav.php/addressbooks/reya/addressbook/"
+username = "reya"
+password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/baikal/reya", "protocol", "WebDAV"]
+
 [pair gubal_calendars_local_to_xandikos]
 a = "gubal_calendars_local"
 b = "gubal_calendars_xandikos"
 collections = ["from a", "from b"]
 
+[pair gubal_calendars_xandikos_to_baikal]
+a = "gubal_calendars_xandikos"
+b = "gubal_calendars_baikal"
+collections = null
+conflict_resolution = "a wins"
+
 [storage gubal_calendars_local]
 type = "filesystem"
 path = "~/.local/share/calendars/gubal"
@@ -29,6 +47,12 @@ fileext = ".ics"
 
 [storage gubal_calendars_xandikos]
 type = "caldav"
-url = "https://calendar.reya.zone/xandikos/reya/"
+url = "https://calendar.reya.zone/xandikos/reya/calendars/calendar/"
 username = "reya"
 password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/xandikos/reya", "protocol", "WebDAV"]
+
+[storage gubal_calendars_baikal]
+type = "caldav"
+url = "https://calendar.reya.zone/dav.php/calendars/reya/calendar/"
+username = "reya"
+password.fetch = ["command", "secret-tool", "lookup", "url", "https://calendar.reya.zone/baikal/reya", "protocol", "WebDAV"]
diff --git a/zsh/ohmyzsh b/zsh/ohmyzsh
index 0f2715b..d41ca84 160000
--- a/zsh/ohmyzsh
+++ b/zsh/ohmyzsh
@@ -1 +1 @@
-Subproject commit 0f2715bb45ef025b48469817712a4cd3e23839b6
+Subproject commit d41ca84af1271e8bfbe26f581cebe3b86521d0db