diff --git a/demodata/accounting.db b/demodata/accounting.db
new file mode 100644
index 00000000..bf091a9e
Binary files /dev/null and b/demodata/accounting.db differ
diff --git a/demodata/bookmark.db b/demodata/bookmark.db
index 2e63d854..7accbf32 100644
Binary files a/demodata/bookmark.db and b/demodata/bookmark.db differ
diff --git a/demodata/company.db b/demodata/company.db
index 7f5a3c46..81c7e4e1 100644
Binary files a/demodata/company.db and b/demodata/company.db differ
diff --git a/demodata/config.json b/demodata/config.json
index 57e81e25..f43bc87a 100644
--- a/demodata/config.json
+++ b/demodata/config.json
@@ -9,59 +9,65 @@
     },
     "threads": 16,
     "modules": {
-      "notes": {
-        "database": "demodata/notes.db"
+      "accounting": {
+        "database": "demodata/accounting.db"
+      },
+      "bookmark": {
+        "database": "demodata/bookmark.db"
+      },
+      "company": {
+        "database": "demodata/company.db"
+      },
+      "contact": {
+        "database": "demodata/contacts.db"
       },
       "document": {
         "database": "demodata/documents.db",
         "templates": "demodata/templates"
       },
-      "wiki": {
-        "database": "demodata/wiki.db"
-      },
-      "project": {
-        "database": "demodata/projects.db"
-      },
-      "message": {
-        "database": "demodata/message.db",
-        "smtp": {
-          "pass": "none",
-          "port": 587,
-          "host": "none",
-          "user": "none"
-        }
-      },
-      "tags": {
-        "database": "demodata/tags.db"
-      },
-      "bookmark": {
-        "database": "demodata/bookmark.db"
-      },
-      "task": {
-        "database": "demodata/tasks.db"
-      },
-      "journal": {
-        "database": "demodata/journal.db"
-      },
-      "contact": {
-        "database": "demodata/contacts.db"
-      },
       "files": {
         "database": "demodata/files.db",
         "base_dir": "demodata/filestore"
       },
-      "company": {
-        "database": "demodata/company.db"
+      "journal": {
+        "database": "demodata/journal.db"
       },
-      "time": {
-        "database": "demodata/times.db"
+      "message": {
+        "database": "demodata/message.db",
+        "smtp": {
+          "from": "umbrella@example.com",
+          "host": "none",
+          "pass": "none",
+          "port": 587,
+          "user": "none"
+        }
+      },
+      "notes": {
+        "database": "demodata/notes.db"
+      },
+      "poll": {
+        "database": "demodata/poll.db"
+      },
+      "project": {
+        "database": "demodata/projects.db"
       },
       "stock": {
         "database": "demodata/stock.db"
       },
-      "items": {},
+      "tags": {
+        "database": "demodata/tags.db"
+      },
+      "task": {
+        "database": "demodata/tasks.db"
+      },
+      "time": {
+        "database": "demodata/times.db"
+      },
       "user": {
         "database": "demodata/users.db"
+      },
+      "wiki": {
+        "database": "demodata/wiki.db"
       }
     }
   }
diff --git a/demodata/contacts.db b/demodata/contacts.db
index 479e28e1..1b56e1f8 100644
Binary files a/demodata/contacts.db and b/demodata/contacts.db differ
diff --git a/demodata/documents.db b/demodata/documents.db
index 6ad0010f..6aedc866 100644
Binary files a/demodata/documents.db and b/demodata/documents.db differ
diff --git a/demodata/files.db b/demodata/files.db
index 55757c27..37241473 100644
Binary files a/demodata/files.db and b/demodata/files.db differ
diff --git a/demodata/journal.db b/demodata/journal.db
new file mode 100644
index 00000000..46e36a53
Binary files /dev/null and b/demodata/journal.db differ
diff --git a/demodata/message.db b/demodata/message.db
index 6b389c90..1d36030c 100644
Binary files a/demodata/message.db and b/demodata/message.db differ
diff --git a/demodata/notes.db b/demodata/notes.db
index 71489293..f5e4d110 100644
Binary files a/demodata/notes.db and b/demodata/notes.db differ
diff --git a/demodata/poll.db b/demodata/poll.db
new file mode 100644
index 00000000..0f3bdf03
Binary files /dev/null and b/demodata/poll.db differ
diff --git a/demodata/projects.db b/demodata/projects.db
index 9574cf10..6f85d96b 100644
Binary files a/demodata/projects.db and b/demodata/projects.db differ
diff --git a/demodata/stock.db b/demodata/stock.db
index c82aab7d..18886d8d 100644
Binary files a/demodata/stock.db and b/demodata/stock.db differ
diff --git a/demodata/tags.db b/demodata/tags.db
index e59d6120..6ea6cb76 100644
Binary files a/demodata/tags.db and b/demodata/tags.db differ
diff --git a/demodata/tasks.db b/demodata/tasks.db
index 335b594a..132bf9be 100644
Binary files a/demodata/tasks.db and b/demodata/tasks.db differ
diff --git a/demodata/times.db b/demodata/times.db
index 3b3dfeeb..d15144c6 100644
Binary files a/demodata/times.db and b/demodata/times.db differ
diff --git a/demodata/users.db b/demodata/users.db
index 220c0830..48e874bf 100644
Binary files a/demodata/users.db and b/demodata/users.db differ
diff --git a/demodata/wiki.db b/demodata/wiki.db
index a33c8ed2..f5cb910f 100644
Binary files a/demodata/wiki.db and b/demodata/wiki.db differ