diff --git a/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json b/.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json
similarity index 82%
rename from .sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
rename to .sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json
index fc86b2b..31abf0f 100644
--- a/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
+++ b/.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NULL",
+  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
   "describe": {
     "columns": [
       {
@@ -14,68 +14,63 @@
         "type_info": "Text"
       },
       {
-        "name": "synctoken",
+        "name": "displayname",
         "ordinal": 2,
-        "type_info": "Integer"
+        "type_info": "Text"
       },
       {
-        "name": "displayname",
+        "name": "order",
         "ordinal": 3,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
         "name": "description",
         "ordinal": 4,
         "type_info": "Text"
       },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
       {
         "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
+        "ordinal": 5,
         "type_info": "Text"
       },
       {
         "name": "timezone_id",
-        "ordinal": 8,
+        "ordinal": 6,
         "type_info": "Text"
       },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 7,
         "type_info": "Datetime"
       },
+      {
+        "name": "synctoken",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -85,14 +80,13 @@
     "nullable": [
       false,
       false,
-      false,
-      true,
       true,
       false,
       true,
       true,
       true,
       true,
+      false,
       true,
       false,
       false,
@@ -100,5 +94,5 @@
       false
     ]
   },
-  "hash": "cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1"
+  "hash": "27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd"
 }
diff --git a/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json b/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json
new file mode 100644
index 0000000..63adacb
--- /dev/null
+++ b/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3"
+}
diff --git a/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json b/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
deleted file mode 100644
index 603a2e2..0000000
--- a/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9"
-}
diff --git a/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json b/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json
new file mode 100644
index 0000000..c84fc58
--- /dev/null
+++ b/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113"
+}
diff --git a/.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json b/.sqlx/query-751fbac9c965451b8a43ad51986cfc710ca757573ffdb90160a04041de28ae28.json
similarity index 82%
rename from .sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json
rename to .sqlx/query-751fbac9c965451b8a43ad51986cfc710ca757573ffdb90160a04041de28ae28.json
index 8a66a46..691a375 100644
--- a/.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json
+++ b/.sqlx/query-751fbac9c965451b8a43ad51986cfc710ca757573ffdb90160a04041de28ae28.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
+  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NULL",
   "describe": {
     "columns": [
       {
@@ -14,68 +14,63 @@
         "type_info": "Text"
       },
       {
-        "name": "synctoken",
+        "name": "displayname",
         "ordinal": 2,
-        "type_info": "Integer"
+        "type_info": "Text"
       },
       {
-        "name": "displayname",
+        "name": "order",
         "ordinal": 3,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
         "name": "description",
         "ordinal": 4,
         "type_info": "Text"
       },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
       {
         "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
+        "ordinal": 5,
         "type_info": "Text"
       },
       {
         "name": "timezone_id",
-        "ordinal": 8,
+        "ordinal": 6,
         "type_info": "Text"
       },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 7,
         "type_info": "Datetime"
       },
+      {
+        "name": "synctoken",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -85,14 +80,13 @@
     "nullable": [
       false,
       false,
-      false,
-      true,
       true,
       false,
       true,
       true,
       true,
       true,
+      false,
       true,
       false,
       false,
@@ -100,5 +94,5 @@
       false
     ]
   },
-  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
+  "hash": "751fbac9c965451b8a43ad51986cfc710ca757573ffdb90160a04041de28ae28"
 }
diff --git a/.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json b/.sqlx/query-936e869631f569f2215b9fcc84dfdd188b7918f805c27970983623155aa781aa.json
similarity index 81%
rename from .sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json
rename to .sqlx/query-936e869631f569f2215b9fcc84dfdd188b7918f805c27970983623155aa781aa.json
index 4c94dd4..1e56786 100644
--- a/.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json
+++ b/.sqlx/query-936e869631f569f2215b9fcc84dfdd188b7918f805c27970983623155aa781aa.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE (principal, id) = (?, ?)\n                AND ((deleted_at IS NULL) OR ?) ",
+  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE (principal, id) = (?, ?)\n                AND ((deleted_at IS NULL) OR ?) ",
   "describe": {
     "columns": [
       {
@@ -14,68 +14,63 @@
         "type_info": "Text"
       },
       {
-        "name": "synctoken",
+        "name": "displayname",
         "ordinal": 2,
-        "type_info": "Integer"
+        "type_info": "Text"
       },
       {
-        "name": "displayname",
+        "name": "order",
         "ordinal": 3,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
         "name": "description",
         "ordinal": 4,
         "type_info": "Text"
       },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
       {
         "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
+        "ordinal": 5,
         "type_info": "Text"
       },
       {
         "name": "timezone_id",
-        "ordinal": 8,
+        "ordinal": 6,
         "type_info": "Text"
       },
       {
         "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 7,
         "type_info": "Datetime"
       },
+      {
+        "name": "synctoken",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
       {
         "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
         "type_info": "Text"
       },
       {
         "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
         "type_info": "Text"
       },
       {
         "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
         "type_info": "Bool"
       },
       {
         "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
         "type_info": "Bool"
       },
       {
         "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
         "type_info": "Bool"
       }
     ],
@@ -85,14 +80,13 @@
     "nullable": [
       false,
       false,
-      false,
-      true,
       true,
       false,
       true,
       true,
       true,
       true,
+      false,
       true,
       false,
       false,
@@ -100,5 +94,5 @@
       false
     ]
   },
-  "hash": "bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553"
+  "hash": "936e869631f569f2215b9fcc84dfdd188b7918f805c27970983623155aa781aa"
 }
diff --git a/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json b/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
deleted file mode 100644
index dcf96f9..0000000
--- a/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7"
-}