diff --git a/client/js/components/config-manager.component.js b/client/js/components/config-manager.component.js
index 18c38143..a6cea82c 100644
--- a/client/js/components/config-manager.component.js
+++ b/client/js/components/config-manager.component.js
@@ -27,6 +27,7 @@ export default {
         results: []
       },
       conf: {
+        telemetry: true,
         upgrade: false,
         title: siteConfig.title || 'Wiki',
         host: siteConfig.host || 'http://',
diff --git a/server/configure.js b/server/configure.js
index 290a3dee..78c00c3c 100644
--- a/server/configure.js
+++ b/server/configure.js
@@ -3,6 +3,11 @@ const path = require('path')
 /* global wiki */
 
 module.exports = () => {
+  wiki.config.site = {
+    path: '',
+    title: 'Wiki.js'
+  }
+
   // ----------------------------------------
   // Load modules
   // ----------------------------------------
@@ -354,7 +359,6 @@ module.exports = () => {
       error: wiki.IS_DEBUG ? err : {}
     })
     wiki.logger.error(err.message)
-    process.exit(1)
   })
 
   // ----------------------------------------
diff --git a/server/views/configure/index.pug b/server/views/configure/index.pug
index 9de80c12..aa268c77 100644
--- a/server/views/configure/index.pug
+++ b/server/views/configure/index.pug
@@ -22,11 +22,15 @@ block body
                   i(v-if='loading')
                 .panel-content.is-text
                   p This installation wizard will guide you through the steps needed to get your wiki up and running in no time!
-                  p Detailed information about installation and usage can be found on the #[a(href='https://docs.wiki.requarks.io/') official documentation site]. #[br] Should you have any question or would like to report something that doesn't look right, feel free to create a new issue on the #[a(href='https://github.com/Requarks/wiki/issues') GitHub project].
+                  p Detailed information about installation and usage can be found on the #[a(href='https://wiki.requarks.io/docs') official documentation site]. #[br] Should you have any question or would like to report something that doesn't look right, feel free to create a new issue on the #[a(href='https://github.com/Requarks/wiki/issues') GitHub project].
                 .panel-content.form-sections
                   section
                     p #[i.nc-icon-outline.tech_cd-reader] You are about to install Wiki.js #[strong= packageObj.version].
                   section
+                    p.control.is-fullwidth
+                      input#ipt-telemetry(type='checkbox', v-model='conf.telemetry', name='ipt-telemetry')
+                      label.label(for='ipt-telemetry') Enable telemetry
+                      span.desc Help Wiki.js developers improve this app with anonymized #[a(href='https://wiki.requarks.io/docs/telemetry') telemetry].
                     p.control.is-fullwidth
                       input#ipt-upgrade(type='checkbox', v-model='conf.upgrade', name='ipt-upgrade')
                       label.label(for='ipt-upgrade') Upgrade from Wiki.js 1.x
diff --git a/themes/default/theme.yml b/themes/default/theme.yml
new file mode 100644
index 00000000..e5c0a6d8
--- /dev/null
+++ b/themes/default/theme.yml
@@ -0,0 +1,28 @@
+name: Default
+author: Nicolas Giard
+site: https://wiki.requarks.io/
+version: 1.0.0
+requirements:
+  minimum: '>= 2.0.0'
+  maximum: '< 3.0.0'
+fields:
+  primary:
+    title: Primary Color
+    description: Used for top navigation bar, headers, links, etc.
+    type: color
+    default: indigo
+  alt:
+    title: Alternate Color
+    description: Used for the sidebar (in a darker tone)
+    type: color
+    default: blue-grey
+  codeDark:
+    title: Code Blocks - Use Dark Theme
+    description: todo
+    type: boolean
+    default: true
+  codeColorize:
+    title: Code Blocks - Colorize syntax
+    description: todo
+    type: boolean
+    default: true
\ No newline at end of file
diff --git a/themes/default/thumbnail.png b/themes/default/thumbnail.png
new file mode 100644
index 00000000..489e3f83
Binary files /dev/null and b/themes/default/thumbnail.png differ