From 53ccee0d84ee83c8a88e5b4fb7595dfbd1aa5826 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Fri, 27 Apr 2018 15:37:05 +0100
Subject: [PATCH 01/19] Github workspace (part 1)

---
 README.md                                     |   9 +-
 src/components/Modal.vue                      |  17 +-
 src/components/menus/HistoryMenu.vue          |   4 +-
 src/components/menus/ImportMenu.vue           |   6 +-
 src/components/menus/WorkspacesMenu.vue       |  30 +-
 src/components/modals/AboutModal.vue          |   4 +-
 src/components/modals/FilePropertiesModal.vue |   2 +-
 .../providers/BloggerPagePublishModal.vue     |   2 +-
 .../modals/providers/BloggerPublishModal.vue  |   2 +-
 .../providers/CouchdbWorkspaceModal.vue       |   2 +-
 .../modals/providers/DropboxAccountModal.vue  |   2 +-
 .../modals/providers/DropboxPublishModal.vue  |   4 +-
 .../modals/providers/DropboxSaveModal.vue     |   4 +-
 .../modals/providers/GistPublishModal.vue     |   4 +-
 .../modals/providers/GistSyncModal.vue        |   4 +-
 .../modals/providers/GithubAccountModal.vue   |   2 +-
 .../modals/providers/GithubOpenModal.vue      |   6 +-
 .../modals/providers/GithubPublishModal.vue   |   8 +-
 .../modals/providers/GithubSaveModal.vue      |  25 +-
 .../modals/providers/GithubWorkspaceModal.vue |  66 +++
 .../providers/GoogleDriveAccountModal.vue     |   2 +-
 .../providers/GoogleDrivePublishModal.vue     |   2 +-
 .../modals/providers/GoogleDriveSaveModal.vue |   2 +-
 .../providers/GoogleDriveWorkspaceModal.vue   |   2 +-
 .../providers/WordpressPublishModal.vue       |   2 +-
 .../modals/providers/ZendeskAccountModal.vue  |   2 +-
 .../modals/providers/ZendeskPublishModal.vue  |   2 +-
 src/data/defaultLocalSettings.js              |   1 +
 src/data/defaultSettings.yml                  |  11 +-
 src/data/emptySyncedContent.js                |   1 +
 src/data/welcomeFile.md                       |   2 +-
 src/icons/Provider.vue                        |   4 +-
 src/services/providers/bloggerPageProvider.js |   4 +-
 src/services/providers/bloggerProvider.js     |   4 +-
 .../{providerUtils.js => common/Provider.js}  |  68 ++-
 .../{ => common}/providerRegistry.js          |   0
 .../providers/couchdbWorkspaceProvider.js     |  33 +-
 src/services/providers/dropboxProvider.js     |  11 +-
 src/services/providers/gistProvider.js        |   9 +-
 src/services/providers/githubProvider.js      |  15 +-
 .../providers/githubWorkspaceProvider.js      | 500 ++++++++++++++++++
 .../providers/googleDriveAppDataProvider.js   |  20 +-
 src/services/providers/googleDriveProvider.js |  11 +-
 .../providers/googleDriveWorkspaceProvider.js |  36 +-
 .../providers/helpers/githubHelper.js         |  61 ++-
 .../providers/helpers/googleHelper.js         |   7 +-
 src/services/providers/wordpressProvider.js   |   4 +-
 src/services/providers/zendeskProvider.js     |   4 +-
 src/services/publishSvc.js                    |   4 +-
 src/services/syncSvc.js                       | 138 +++--
 src/services/userSvc.js                       |   4 +
 src/services/utils.js                         |  48 +-
 src/store/explorer.js                         |   4 +-
 src/store/index.js                            |  44 +-
 src/store/locationTemplate.js                 |  43 ++
 src/store/moduleTemplate.js                   |   7 +-
 src/store/publishLocation.js                  |  35 --
 src/store/syncLocation.js                     |  35 --
 src/store/workspace.js                        |   4 +
 59 files changed, 1056 insertions(+), 333 deletions(-)
 create mode 100644 src/components/modals/providers/GithubWorkspaceModal.vue
 rename src/services/providers/{providerUtils.js => common/Provider.js} (60%)
 rename src/services/providers/{ => common}/providerRegistry.js (100%)
 create mode 100644 src/services/providers/githubWorkspaceProvider.js
 create mode 100644 src/store/locationTemplate.js
 delete mode 100644 src/store/publishLocation.js
 delete mode 100644 src/store/syncLocation.js

diff --git a/README.md b/README.md
index 20147b69..b8446267 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,12 @@
 
 https://stackedit.io/
 
-### NEW!!! Embed StackEdit in any website!
+### Ecosystem
 
-See https://github.com/benweet/stackedit.js
-
-Chrome extension: https://chrome.google.com/webstore/detail/ajehldoplanpchfokmeempkekhnhmoha
+- [Chrome app](https://chrome.google.com/webstore/detail/iiooodelglhkcpgbajoejffhijaclcdg)
+- NEW! Embed StackEdit in any website with [stackedit.js](https://github.com/benweet/stackedit.js)
+- NEW! [Chrome extension](https://chrome.google.com/webstore/detail/ajehldoplanpchfokmeempkekhnhmoha) that uses stackedit.js
+- [Community](https://community.stackedit.io/)
 
 ### Build Setup
 
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index f26b9277..dac6a7be 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -41,6 +41,7 @@ import DropboxPublishModal from './modals/providers/DropboxPublishModal';
 import GithubAccountModal from './modals/providers/GithubAccountModal';
 import GithubOpenModal from './modals/providers/GithubOpenModal';
 import GithubSaveModal from './modals/providers/GithubSaveModal';
+import GithubWorkspaceModal from './modals/providers/GithubWorkspaceModal';
 import GithubPublishModal from './modals/providers/GithubPublishModal';
 import GistSyncModal from './modals/providers/GistSyncModal';
 import GistPublishModal from './modals/providers/GistPublishModal';
@@ -84,6 +85,7 @@ export default {
     GithubAccountModal,
     GithubOpenModal,
     GithubSaveModal,
+    GithubWorkspaceModal,
     GithubPublishModal,
     GistSyncModal,
     GistPublishModal,
@@ -176,6 +178,10 @@ export default {
   hr {
     margin: 0.5em 0;
   }
+
+  p {
+    line-height: 1.5;
+  }
 }
 
 .modal__inner-1 {
@@ -221,9 +227,9 @@ export default {
 
 .modal__image {
   float: left;
-  width: 64px;
-  height: 64px;
-  margin: 1.5em 1.5em 0.5em 0;
+  width: 60px;
+  height: 60px;
+  margin: 1.5em 1.2em 0.5em 0;
 
   & + *::after {
     content: '';
@@ -262,6 +268,11 @@ export default {
   }
 }
 
+.modal__info--multiline {
+  padding-top: 0.1em;
+  padding-bottom: 0.1em;
+}
+
 .modal__button-bar {
   margin-top: 1.75rem;
   text-align: right;
diff --git a/src/components/menus/HistoryMenu.vue b/src/components/menus/HistoryMenu.vue
index 94508a91..2481be94 100644
--- a/src/components/menus/HistoryMenu.vue
+++ b/src/components/menus/HistoryMenu.vue
@@ -31,7 +31,7 @@
 
 <script>
 import { mapMutations, mapGetters } from 'vuex';
-import providerRegistry from '../../services/providers/providerRegistry';
+import providerRegistry from '../../services/providers/common/providerRegistry';
 import MenuEntry from './common/MenuEntry';
 import UserImage from '../UserImage';
 import UserName from '../UserName';
@@ -48,7 +48,7 @@ let cachedFileId;
 let revisionsPromise;
 let revisionContentPromises;
 const pageSize = 30;
-const spacerThreshold = 12 * 60 * 60 * 1000; // 12h
+const spacerThreshold = 60 * 60 * 1000; // 1h
 
 export default {
   components: {
diff --git a/src/components/menus/ImportMenu.vue b/src/components/menus/ImportMenu.vue
index c6d8f3c9..a8892e54 100644
--- a/src/components/menus/ImportMenu.vue
+++ b/src/components/menus/ImportMenu.vue
@@ -27,7 +27,7 @@
 import TurndownService from 'turndown/lib/turndown.browser.umd';
 import htmlSanitizer from '../../libs/htmlSanitizer';
 import MenuEntry from './common/MenuEntry';
-import providerUtils from '../../services/providers/providerUtils';
+import Provider from '../../services/providers/common/Provider';
 import store from '../../store';
 
 const turndownService = new TurndownService(store.getters['data/computedSettings'].turndown);
@@ -56,7 +56,7 @@ export default {
       const file = evt.target.files[0];
       readFile(file)
         .then(content => this.$store.dispatch('createFile', {
-          ...providerUtils.parseContent(content),
+          ...Provider.parseContent(content),
           name: file.name,
         })
           .then(item => this.$store.commit('file/setCurrentId', item.id)));
@@ -65,7 +65,7 @@ export default {
       const file = evt.target.files[0];
       readFile(file)
         .then(content => this.$store.dispatch('createFile', {
-          ...providerUtils.parseContent(
+          ...Provider.parseContent(
             turndownService.turndown(
               htmlSanitizer.sanitizeHtml(content)
                 .replace(/&#160;/g, ' '), // Replace non-breaking spaces with classic spaces
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index 957dbbf4..527ff2d4 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -7,14 +7,18 @@
       </menu-entry>
     </div>
     <hr>
-    <menu-entry @click.native="addGoogleDriveWorkspace">
-      <icon-provider slot="icon" provider-id="googleDriveWorkspace"></icon-provider>
-      <span>Add Google Drive workspace</span>
-    </menu-entry>
     <menu-entry @click.native="addCouchdbWorkspace">
       <icon-provider slot="icon" provider-id="couchdbWorkspace"></icon-provider>
       <span>Add CouchDB workspace</span>
     </menu-entry>
+    <menu-entry @click.native="addGithubWorkspace">
+      <icon-provider slot="icon" provider-id="githubWorkspace"></icon-provider>
+      <span>Add GitHub workspace</span>
+    </menu-entry>
+    <menu-entry @click.native="addGoogleDriveWorkspace">
+      <icon-provider slot="icon" provider-id="googleDriveWorkspace"></icon-provider>
+      <span>Add Google Drive workspace</span>
+    </menu-entry>
     <menu-entry @click.native="manageWorkspaces">
       <icon-database slot="icon"></icon-database>
       <span>Manage workspaces</span>
@@ -40,6 +44,18 @@ export default {
     ]),
   },
   methods: {
+    addCouchdbWorkspace() {
+      return this.$store.dispatch('modal/open', {
+        type: 'couchdbWorkspace',
+      })
+        .catch(() => {}); // Cancel
+    },
+    addGithubWorkspace() {
+      return this.$store.dispatch('modal/open', {
+        type: 'githubWorkspace',
+      })
+        .catch(() => {}); // Cancel
+    },
     addGoogleDriveWorkspace() {
       return googleHelper.addDriveAccount(true)
         .then(token => this.$store.dispatch('modal/open', {
@@ -48,12 +64,6 @@ export default {
         }))
         .catch(() => {}); // Cancel
     },
-    addCouchdbWorkspace() {
-      return this.$store.dispatch('modal/open', {
-        type: 'couchdbWorkspace',
-      })
-        .catch(() => {}); // Cancel
-    },
     manageWorkspaces() {
       return this.$store.dispatch('modal/open', 'workspaceManagement');
     },
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index 0704522c..83f07783 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -10,9 +10,9 @@
       <br>
       <a target="_blank" href="https://chrome.google.com/webstore/detail/iiooodelglhkcpgbajoejffhijaclcdg">Chrome app</a> — <a target="_blank" href="https://chrome.google.com/webstore/detail/ajehldoplanpchfokmeempkekhnhmoha">Chrome extension</a>
       <br>
-      StackEdit on <a target="_blank" href="https://twitter.com/stackedit/">Twitter</a>
+      <a target="_blank" href="https://community.stackedit.io/">Community</a> — <a target="_blank" href="https://community.stackedit.io/c/how-to">Tutos and How To</a>
       <br>
-      <a target="_blank" href="https://community.stackedit.io/">Community</a>
+      StackEdit on <a target="_blank" href="https://twitter.com/stackedit/">Twitter</a>
       <div class="modal__info">
       For commercial support or custom development, please <a href="mailto:stackedit.project@gmail.com">send us an email</a>.
       </div>
diff --git a/src/components/modals/FilePropertiesModal.vue b/src/components/modals/FilePropertiesModal.vue
index 881851ae..50776321 100644
--- a/src/components/modals/FilePropertiesModal.vue
+++ b/src/components/modals/FilePropertiesModal.vue
@@ -54,7 +54,7 @@
           </div>
         </div>
         <div class="modal__error modal__error--file-properties">{{error}}</div>
-        <div class="modal__info">
+        <div class="modal__info modal__info--multiline">
           <p><strong>ProTip:</strong> You can manually toggle extensions:</p>
           <pre class=" language-yaml"><code class="prism  language-yaml"><span class="token key atrule">extensions</span><span class="token punctuation">:</span>
   <span class="token key atrule">emoji</span><span class="token punctuation">:</span>
diff --git a/src/components/modals/providers/BloggerPagePublishModal.vue b/src/components/modals/providers/BloggerPagePublishModal.vue
index 012e7d23..ef86d4f9 100644
--- a/src/components/modals/providers/BloggerPagePublishModal.vue
+++ b/src/components/modals/providers/BloggerPagePublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="bloggerPage"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>Blogger Page</b>.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>Blogger Page</b>.</p>
       <form-entry label="Blog URL" error="blogUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="blogUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/BloggerPublishModal.vue b/src/components/modals/providers/BloggerPublishModal.vue
index b999a16d..c248bf93 100644
--- a/src/components/modals/providers/BloggerPublishModal.vue
+++ b/src/components/modals/providers/BloggerPublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="blogger"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>Blogger</b> site.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>Blogger</b> site.</p>
       <form-entry label="Blog URL" error="blogUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="blogUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/CouchdbWorkspaceModal.vue b/src/components/modals/providers/CouchdbWorkspaceModal.vue
index b0662546..8172316d 100644
--- a/src/components/modals/providers/CouchdbWorkspaceModal.vue
+++ b/src/components/modals/providers/CouchdbWorkspaceModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="couchdb"></icon-provider>
       </div>
-      <p>This will create a workspace synchronized with a <b>CouchDB</b> database.</p>
+      <p>Create a workspace synchronized with a <b>CouchDB</b> database.</p>
       <form-entry label="Database URL" error="dbUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="dbUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/DropboxAccountModal.vue b/src/components/modals/providers/DropboxAccountModal.vue
index 864d15c4..a1d0babf 100644
--- a/src/components/modals/providers/DropboxAccountModal.vue
+++ b/src/components/modals/providers/DropboxAccountModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="dropbox"></icon-provider>
       </div>
-      <p>This will link your <b>Dropbox</b> account to <b>StackEdit</b>.</p>
+      <p>Link your <b>Dropbox</b> account to <b>StackEdit</b>.</p>
       <div class="form-entry">
         <div class="form-entry__checkbox">
           <label>
diff --git a/src/components/modals/providers/DropboxPublishModal.vue b/src/components/modals/providers/DropboxPublishModal.vue
index b5423a1e..d79137bd 100644
--- a/src/components/modals/providers/DropboxPublishModal.vue
+++ b/src/components/modals/providers/DropboxPublishModal.vue
@@ -4,12 +4,12 @@
       <div class="modal__image">
         <icon-provider provider-id="dropbox"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>Dropbox</b>.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>Dropbox</b>.</p>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
           <b>Example:</b> {{config.token.fullAccess ? '' : '/Applications/StackEdit (restricted)'}}/path/to/My Document.html<br>
-          If the file exists, it will be replaced.
+          If the file exists, it will be overwritten.
         </div>
       </form-entry>
       <form-entry label="Template">
diff --git a/src/components/modals/providers/DropboxSaveModal.vue b/src/components/modals/providers/DropboxSaveModal.vue
index cf02c70e..39eb2f81 100644
--- a/src/components/modals/providers/DropboxSaveModal.vue
+++ b/src/components/modals/providers/DropboxSaveModal.vue
@@ -4,12 +4,12 @@
       <div class="modal__image">
         <icon-provider provider-id="dropbox"></icon-provider>
       </div>
-      <p>This will save <b>{{currentFileName}}</b> to your <b>Dropbox</b> and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to your <b>Dropbox</b> and keep it synchronized.</p>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
           <b>Example:</b> {{config.token.fullAccess ? '' : '/Applications/StackEdit (restricted)'}}/path/to/My Document.md<br>
-          If the file exists, it will be replaced.
+          If the file exists, it will be overwritten.
         </div>
       </form-entry>
     </div>
diff --git a/src/components/modals/providers/GistPublishModal.vue b/src/components/modals/providers/GistPublishModal.vue
index 6a464ab0..6c8b00a0 100644
--- a/src/components/modals/providers/GistPublishModal.vue
+++ b/src/components/modals/providers/GistPublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="gist"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to a <b>Gist</b>.</p>
+      <p>Publish <b>{{currentFileName}}</b> to a <b>Gist</b>.</p>
       <form-entry label="Filename" error="filename">
         <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
       </form-entry>
@@ -18,7 +18,7 @@
       <form-entry label="Existing Gist ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If the file exists in the Gist, it will be replaced.
+          If the file exists in the Gist, it will be overwritten.
         </div>
       </form-entry>
       <form-entry label="Template">
diff --git a/src/components/modals/providers/GistSyncModal.vue b/src/components/modals/providers/GistSyncModal.vue
index ef4de502..c06d973d 100644
--- a/src/components/modals/providers/GistSyncModal.vue
+++ b/src/components/modals/providers/GistSyncModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="gist"></icon-provider>
       </div>
-      <p>This will save <b>{{currentFileName}}</b> to a <b>Gist</b> and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to a <b>Gist</b> and keep it synchronized.</p>
       <form-entry label="Filename" error="filename">
         <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
       </form-entry>
@@ -18,7 +18,7 @@
       <form-entry label="Existing Gist ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If the file exists in the Gist, it will be replaced.
+          If the file exists in the Gist, it will be overwritten.
         </div>
       </form-entry>
     </div>
diff --git a/src/components/modals/providers/GithubAccountModal.vue b/src/components/modals/providers/GithubAccountModal.vue
index eab65dfc..661db086 100644
--- a/src/components/modals/providers/GithubAccountModal.vue
+++ b/src/components/modals/providers/GithubAccountModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>This will link your <b>GitHub</b> account to <b>StackEdit</b>.</p>
+      <p>Link your <b>GitHub</b> account to <b>StackEdit</b>.</p>
       <div class="form-entry">
         <div class="form-entry__checkbox">
           <label>
diff --git a/src/components/modals/providers/GithubOpenModal.vue b/src/components/modals/providers/GithubOpenModal.vue
index 4c016130..5c5e8892 100644
--- a/src/components/modals/providers/GithubOpenModal.vue
+++ b/src/components/modals/providers/GithubOpenModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>This will open a file from your <b>GitHub</b> repository and keep it synchronized.</p>
+      <p>Open a file from your <b>GitHub</b> repository and keep it synchronized.</p>
       <form-entry label="Repository URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -14,13 +14,13 @@
       <form-entry label="Branch" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If not provided, the <code>master</code> branch will be used.
+          If not supplied, the <code>master</code> branch will be used.
         </div>
       </form-entry>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          <b>Example:</b> docs/README.md
+          <b>Example:</b> path/to/README.md
         </div>
       </form-entry>
     </div>
diff --git a/src/components/modals/providers/GithubPublishModal.vue b/src/components/modals/providers/GithubPublishModal.vue
index b69ee87c..f54f5bb4 100644
--- a/src/components/modals/providers/GithubPublishModal.vue
+++ b/src/components/modals/providers/GithubPublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>GitHub</b> repository.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>GitHub</b> repository.</p>
       <form-entry label="Repository URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -14,14 +14,14 @@
       <form-entry label="Branch" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If not provided, the master branch will be used.
+          If not supplied, the <code>master</code> branch will be used.
         </div>
       </form-entry>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          <b>Example:</b> docs/README.md<br>
-          If the file exists, it will be replaced.
+          <b>Example:</b> path/to/README.md<br>
+          If the file exists, it will be overwritten.
         </div>
       </form-entry>
       <form-entry label="Template">
diff --git a/src/components/modals/providers/GithubSaveModal.vue b/src/components/modals/providers/GithubSaveModal.vue
index b9669429..3e131c5c 100644
--- a/src/components/modals/providers/GithubSaveModal.vue
+++ b/src/components/modals/providers/GithubSaveModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>This will save <b>{{currentFileName}}</b> to your <b>GitHub</b> repository and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to your <b>GitHub</b> repository and keep it synchronized.</p>
       <form-entry label="Repository URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -14,14 +14,14 @@
       <form-entry label="Branch" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If not provided, the <code>master</code> branch will be used.
+          If not supplied, the <code>master</code> branch will be used.
         </div>
       </form-entry>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          <b>Example:</b> docs/README.md<br>
-          If the file exists, it will be replaced.
+          <b>Example:</b> path/to/README.md<br>
+          If the file exists, it will be overwritten.
         </div>
       </form-entry>
     </div>
@@ -49,22 +49,17 @@ export default modalTemplate({
   },
   methods: {
     resolve() {
-      if (!this.repoUrl) {
+      const parsedRepo = githubProvider.parseRepoUrl(this.repoUrl);
+      if (!parsedRepo) {
         this.setError('repoUrl');
       }
       if (!this.path) {
         this.setError('path');
       }
-      if (this.repoUrl && this.path) {
-        const parsedRepo = githubProvider.parseRepoUrl(this.repoUrl);
-        if (!parsedRepo) {
-          this.setError('repoUrl');
-        } else {
-          // Return new location
-          const location = githubProvider.makeLocation(
-            this.config.token, parsedRepo.owner, parsedRepo.repo, this.branch || 'master', this.path);
-          this.config.resolve(location);
-        }
+      if (parsedRepo && this.path) {
+        const location = githubProvider.makeLocation(
+          this.config.token, parsedRepo.owner, parsedRepo.repo, this.branch || 'master', this.path);
+        this.config.resolve(location);
       }
     },
   },
diff --git a/src/components/modals/providers/GithubWorkspaceModal.vue b/src/components/modals/providers/GithubWorkspaceModal.vue
new file mode 100644
index 00000000..0ec143ff
--- /dev/null
+++ b/src/components/modals/providers/GithubWorkspaceModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <modal-inner aria-label="Synchronize with GitHub">
+    <div class="modal__content">
+      <div class="modal__image">
+        <icon-provider provider-id="github"></icon-provider>
+      </div>
+      <p>Create a workspace synchronized with a <b>GitHub</b> repository folder.</p>
+      <form-entry label="Repository URL" error="repoUrl">
+        <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          <b>Example:</b> https://github.com/benweet/stackedit
+        </div>
+      </form-entry>
+      <form-entry label="Branch" info="optional">
+        <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          If not supplied, the <code>master</code> branch will be used.
+        </div>
+      </form-entry>
+      <form-entry label="Folder path" info="optional">
+        <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          If not supplied, the root folder will be used.
+        </div>
+      </form-entry>
+    </div>
+    <div class="modal__button-bar">
+      <button class="button" @click="config.reject()">Cancel</button>
+      <button class="button" @click="resolve()">Ok</button>
+    </div>
+  </modal-inner>
+</template>
+
+<script>
+import githubProvider from '../../../services/providers/githubProvider';
+import utils from '../../../services/utils';
+import modalTemplate from '../common/modalTemplate';
+
+export default modalTemplate({
+  data: () => ({
+    branch: '',
+    path: '',
+  }),
+  computedLocalSettings: {
+    repoUrl: 'githubWorkspaceRepoUrl',
+  },
+  methods: {
+    resolve() {
+      const parsedRepo = githubProvider.parseRepoUrl(this.repoUrl);
+      if (!parsedRepo) {
+        this.setError('repoUrl');
+      } else {
+        const path = this.path && this.path.replace(/^\//, '');
+        const url = utils.addQueryParams('app', {
+          providerId: 'githubWorkspace',
+          repo: `${parsedRepo.owner}/${parsedRepo.repo}`,
+          branch: this.branch || 'master',
+          path: path || undefined,
+        }, true);
+        this.config.resolve();
+        window.open(url);
+      }
+    },
+  },
+});
+</script>
diff --git a/src/components/modals/providers/GoogleDriveAccountModal.vue b/src/components/modals/providers/GoogleDriveAccountModal.vue
index ec948fdb..7d695540 100644
--- a/src/components/modals/providers/GoogleDriveAccountModal.vue
+++ b/src/components/modals/providers/GoogleDriveAccountModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="googleDrive"></icon-provider>
       </div>
-      <p>This will link your <b>Google Drive</b> account to <b>StackEdit</b>.</p>
+      <p>Link your <b>Google Drive</b> account to <b>StackEdit</b>.</p>
       <div class="form-entry">
         <div class="form-entry__checkbox">
           <label>
diff --git a/src/components/modals/providers/GoogleDrivePublishModal.vue b/src/components/modals/providers/GoogleDrivePublishModal.vue
index 453bafdc..7d043111 100644
--- a/src/components/modals/providers/GoogleDrivePublishModal.vue
+++ b/src/components/modals/providers/GoogleDrivePublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="googleDrive"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>Google Drive</b> account.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>Google Drive</b> account.</p>
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/GoogleDriveSaveModal.vue b/src/components/modals/providers/GoogleDriveSaveModal.vue
index 6ee576d2..577e06c7 100644
--- a/src/components/modals/providers/GoogleDriveSaveModal.vue
+++ b/src/components/modals/providers/GoogleDriveSaveModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="googleDrive"></icon-provider>
       </div>
-      <p>This will save <b>{{currentFileName}}</b> to your <b>Google Drive</b> account and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to your <b>Google Drive</b> account and keep it synchronized.</p>
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/GoogleDriveWorkspaceModal.vue b/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
index 89c5539e..511fec15 100644
--- a/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
+++ b/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="googleDrive"></icon-provider>
       </div>
-      <p>This will create a workspace synchronized with a <b>Google Drive</b> folder.</p>
+      <p>Create a workspace synchronized with a <b>Google Drive</b> folder.</p>
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/WordpressPublishModal.vue b/src/components/modals/providers/WordpressPublishModal.vue
index 5cfda13e..33e26617 100644
--- a/src/components/modals/providers/WordpressPublishModal.vue
+++ b/src/components/modals/providers/WordpressPublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="wordpress"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>WordPress</b> site.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>WordPress</b> site.</p>
       <form-entry label="Site domain" error="domain">
         <input slot="field" class="textfield" type="text" v-model.trim="domain" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/ZendeskAccountModal.vue b/src/components/modals/providers/ZendeskAccountModal.vue
index 2db53020..0516c6ac 100644
--- a/src/components/modals/providers/ZendeskAccountModal.vue
+++ b/src/components/modals/providers/ZendeskAccountModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="zendesk"></icon-provider>
       </div>
-      <p>This will link your <b>Zendesk</b> account to <b>StackEdit</b>.</p>
+      <p>Link your <b>Zendesk</b> account to <b>StackEdit</b>.</p>
       <form-entry label="Site URL" error="siteUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="siteUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/components/modals/providers/ZendeskPublishModal.vue b/src/components/modals/providers/ZendeskPublishModal.vue
index d1f61632..6dbcf81d 100644
--- a/src/components/modals/providers/ZendeskPublishModal.vue
+++ b/src/components/modals/providers/ZendeskPublishModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="zendesk"></icon-provider>
       </div>
-      <p>This will publish <b>{{currentFileName}}</b> to your <b>Zendesk Help Center</b>.</p>
+      <p>Publish <b>{{currentFileName}}</b> to your <b>Zendesk Help Center</b>.</p>
       <form-entry label="Section ID" error="sectionId">
         <input slot="field" class="textfield" type="text" v-model.trim="sectionId" @keydown.enter="resolve()">
         <div class="form-entry__info">
diff --git a/src/data/defaultLocalSettings.js b/src/data/defaultLocalSettings.js
index fa4d2d48..7ca075f3 100644
--- a/src/data/defaultLocalSettings.js
+++ b/src/data/defaultLocalSettings.js
@@ -15,6 +15,7 @@ export default () => ({
   dropboxPublishTemplate: 'styledHtml',
   githubRepoFullAccess: false,
   githubRepoUrl: '',
+  githubWorkspaceRepoUrl: '',
   githubPublishTemplate: 'jekyllSite',
   gistIsPublic: false,
   gistPublishTemplate: 'plainText',
diff --git a/src/data/defaultSettings.yml b/src/data/defaultSettings.yml
index ffd80772..64797b17 100644
--- a/src/data/defaultSettings.yml
+++ b/src/data/defaultSettings.yml
@@ -1,11 +1,11 @@
 # light or dark
 colorTheme: light
-# Auto-sync frequency (in ms). Minimum is 60000.
-autoSyncEvery: 60000
 # Adjust font size in editor and preview
 fontSizeFactor: 1
 # Adjust maximum text width in editor and preview
 maxWidthFactor: 1
+# Auto-sync frequency (in ms). Minimum is 60000.
+autoSyncEvery: 60000
 
 # Editor settings
 editor:
@@ -54,7 +54,7 @@ wkhtmltopdf:
   marginRight: 25
   marginBottom: 25
   marginLeft: 25
-  # `A3`, `A4`, `Legal` or `Letter`
+  # A3, A4, Legal or Letter
   pageSize: A4
 
 # Options passed to pandoc
@@ -77,6 +77,11 @@ turndown:
   linkStyle: inlined
   linkReferenceStyle: full
 
+github:
+  createFileMessage: Create {{path}} from https://stackedit.io/
+  updateFileMessage: Update {{path}} from https://stackedit.io/
+  deleteFileMessage: Delete {{path}} from https://stackedit.io/
+
 # Default content for new files
 newFileContent: |
 
diff --git a/src/data/emptySyncedContent.js b/src/data/emptySyncedContent.js
index cf25fa94..20891404 100644
--- a/src/data/emptySyncedContent.js
+++ b/src/data/emptySyncedContent.js
@@ -3,5 +3,6 @@ export default (id = null) => ({
   type: 'syncedContent',
   historyData: {},
   syncHistory: {},
+  v: 0,
   hash: 0,
 });
diff --git a/src/data/welcomeFile.md b/src/data/welcomeFile.md
index 0f8d76ee..1a2b147e 100644
--- a/src/data/welcomeFile.md
+++ b/src/data/welcomeFile.md
@@ -1,6 +1,6 @@
 # Welcome to StackEdit!
 
-Hi! I'm your first Markdown file in **StackEdit**. If you want to learn about StackEdit, you can read me. If you want to play with Markdown, you can edit me. If you have finished with me, you can just create new files by opening the **file explorer** on the left corner of the navigation bar.
+Hi! I'm your first Markdown file in **StackEdit**. If you want to learn about StackEdit, you can read me. If you want to play with Markdown, you can edit me. Once you have finished with me, you can create new files by opening the **file explorer** on the left corner of the navigation bar.
 
 
 # Files
diff --git a/src/icons/Provider.vue b/src/icons/Provider.vue
index aaa51bfb..5ba1dce4 100644
--- a/src/icons/Provider.vue
+++ b/src/icons/Provider.vue
@@ -16,8 +16,8 @@ export default {
           return 'google-drive';
         case 'googlePhotos':
           return 'google-photos';
-        case 'dropboxRestricted':
-          return 'dropbox';
+        case 'githubWorkspace':
+          return 'github';
         case 'gist':
           return 'github';
         case 'bloggerPage':
diff --git a/src/services/providers/bloggerPageProvider.js b/src/services/providers/bloggerPageProvider.js
index 83231525..4b317589 100644
--- a/src/services/providers/bloggerPageProvider.js
+++ b/src/services/providers/bloggerPageProvider.js
@@ -1,8 +1,8 @@
 import store from '../../store';
 import googleHelper from './helpers/googleHelper';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'bloggerPage',
   getToken(location) {
     const token = store.getters['data/googleTokens'][location.sub];
diff --git a/src/services/providers/bloggerProvider.js b/src/services/providers/bloggerProvider.js
index f43fc1bb..df87d688 100644
--- a/src/services/providers/bloggerProvider.js
+++ b/src/services/providers/bloggerProvider.js
@@ -1,8 +1,8 @@
 import store from '../../store';
 import googleHelper from './helpers/googleHelper';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'blogger',
   getToken(location) {
     const token = store.getters['data/googleTokens'][location.sub];
diff --git a/src/services/providers/providerUtils.js b/src/services/providers/common/Provider.js
similarity index 60%
rename from src/services/providers/providerUtils.js
rename to src/services/providers/common/Provider.js
index 52301ce4..13c32a1c 100644
--- a/src/services/providers/providerUtils.js
+++ b/src/services/providers/common/Provider.js
@@ -1,11 +1,20 @@
-import emptyContent from '../../data/emptyContent';
-import store from '../../store';
-import utils from '../utils';
+import providerRegistry from './providerRegistry';
+import emptyContent from '../../../data/emptyContent';
+import utils from '../../utils';
+import store from '../../../store';
 
 const dataExtractor = /<!--stackedit_data:([A-Za-z0-9+/=\s]+)-->$/;
 
-export default {
-  serializeContent(content) {
+export default class Provider {
+  constructor(props) {
+    Object.assign(this, props);
+    providerRegistry.register(this);
+  }
+
+  /**
+   * Serialize content in a self contain Markdown compatible format
+   */
+  static serializeContent(content) {
     let result = content.text;
     const data = {};
     if (content.properties.length > 1) {
@@ -25,8 +34,12 @@ export default {
       result += `<!--stackedit_data:\n${serializedData}\n-->`;
     }
     return result;
-  },
-  parseContent(serializedContent, id) {
+  }
+
+  /**
+   * Parse content serialized with serializeContent()
+   */
+  static parseContent(serializedContent, id) {
     const result = utils.deepCopy(store.state.content.itemMap[id]) || emptyContent(id);
     result.text = utils.sanitizeText(serializedContent);
     result.history = [];
@@ -51,29 +64,26 @@ export default {
       }
     }
     return utils.addItemHash(result);
-  },
+  }
+
   /**
-   * Find and open a file location that fits the criteria
+   * Find and open a file with location that meets the criteria
    */
-  openFileWithLocation(allLocations, criteria) {
-    return allLocations.some((location) => {
-      // If every field fits the criteria
-      if (Object.entries(criteria).every(([key, value]) => value === location[key])) {
-        // Found one location that fits, open it if it exists
-        const file = store.state.file.itemMap[location.fileId];
-        if (file) {
-          store.commit('file/setCurrentId', file.id);
-          // If file is in the trash, restore it
-          if (file.parentId === 'trash') {
-            store.commit('file/patchItem', {
-              ...file,
-              parentId: null,
-            });
-          }
-          return true;
+  static openFileWithLocation(allLocations, criteria) {
+    const location = utils.search(allLocations, criteria);
+    if (location) {
+      // Found one, open it if it exists
+      const file = store.state.file.itemMap[location.fileId];
+      if (file) {
+        store.commit('file/setCurrentId', file.id);
+        // If file is in the trash, restore it
+        if (file.parentId === 'trash') {
+          store.commit('file/patchItem', {
+            ...file,
+            parentId: null,
+          });
         }
       }
-      return false;
-    });
-  },
-};
+    }
+  }
+}
diff --git a/src/services/providers/providerRegistry.js b/src/services/providers/common/providerRegistry.js
similarity index 100%
rename from src/services/providers/providerRegistry.js
rename to src/services/providers/common/providerRegistry.js
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index 3b815d61..e0789f9f 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -1,7 +1,6 @@
 import store from '../../store';
 import couchdbHelper from './helpers/couchdbHelper';
-import providerRegistry from './providerRegistry';
-import providerUtils from './providerUtils';
+import Provider from './common/Provider';
 import utils from '../utils';
 
 const getSyncData = (fileId) => {
@@ -11,18 +10,20 @@ const getSyncData = (fileId) => {
     : Promise.reject(); // No need for a proper error message.
 };
 
-export default providerRegistry.register({
+let syncLastSeq;
+
+export default new Provider({
   id: 'couchdbWorkspace',
   getToken() {
     return store.getters['workspace/syncToken'];
   },
   initWorkspace() {
     const dbUrl = (utils.queryParams.dbUrl || '').replace(/\/?$/, ''); // Remove trailing /
-    const workspaceIdParams = {
+    const workspaceParams = {
       providerId: this.id,
       dbUrl,
     };
-    const workspaceId = utils.makeWorkspaceId(workspaceIdParams);
+    const workspaceId = utils.makeWorkspaceId(workspaceParams);
     const getToken = () => store.getters['data/couchdbTokens'][workspaceId];
     const getWorkspace = () => store.getters['data/sanitizedWorkspaces'][workspaceId];
 
@@ -51,7 +52,7 @@ export default providerRegistry.register({
         }))
       .then((workspace) => {
         // Fix the URL hash
-        utils.setQueryParams(workspaceIdParams);
+        utils.setQueryParams(workspaceParams);
         if (workspace.url !== location.href) {
           store.dispatch('data/patchWorkspaces', {
             [workspace.id]: {
@@ -86,13 +87,13 @@ export default providerRegistry.register({
           change.syncDataId = change.id;
           return true;
         });
-        changes.lastSeq = result.lastSeq;
+        syncLastSeq = result.lastSeq;
         return changes;
       });
   },
-  setAppliedChanges(changes) {
+  onChangesApplied() {
     store.dispatch('data/patchLocalSettings', {
-      syncLastSeq: changes.lastSeq,
+      syncLastSeq,
     });
   },
   saveSimpleItem(item, syncData) {
@@ -131,9 +132,9 @@ export default providerRegistry.register({
       .then((body) => {
         let item;
         if (body.item.type === 'content') {
-          item = providerUtils.parseContent(body.attachments.data, body.item.id);
+          item = Provider.parseContent(body.attachments.data, body.item.id);
         } else {
-          item = JSON.parse(body.attachments.data);
+          item = utils.addItemHash(JSON.parse(body.attachments.data));
         }
         const rev = body._rev; // eslint-disable-line no-underscore-dangle
         if (item.hash !== syncData.hash || rev !== syncData.rev) {
@@ -149,18 +150,18 @@ export default providerRegistry.register({
       });
   },
   uploadContent(token, content, syncLocation) {
-    return this.uploadData(content, `${syncLocation.fileId}/content`)
+    return this.uploadData(content)
       .then(() => syncLocation);
   },
-  uploadData(item, dataId) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
+  uploadData(item) {
+    const syncData = store.getters['data/syncDataByItemId'][item.id];
     if (syncData && syncData.hash === item.hash) {
       return Promise.resolve();
     }
     let data;
     let dataType;
     if (item.type === 'content') {
-      data = providerUtils.serializeContent(item);
+      data = Provider.serializeContent(item);
       dataType = 'text/plain';
     } else {
       data = JSON.stringify(item);
@@ -219,6 +220,6 @@ export default providerRegistry.register({
     return getSyncData(fileId)
       .then(syncData => couchdbHelper
         .retrieveDocumentWithAttachments(token, syncData.id, revisionId))
-      .then(body => providerUtils.parseContent(body.attachments.data, body.item.id));
+      .then(body => Provider.parseContent(body.attachments.data, body.item.id));
   },
 });
diff --git a/src/services/providers/dropboxProvider.js b/src/services/providers/dropboxProvider.js
index 4bb118bf..a95acbe7 100644
--- a/src/services/providers/dropboxProvider.js
+++ b/src/services/providers/dropboxProvider.js
@@ -1,7 +1,6 @@
 import store from '../../store';
 import dropboxHelper from './helpers/dropboxHelper';
-import providerUtils from './providerUtils';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 import utils from '../utils';
 
 const makePathAbsolute = (token, path) => {
@@ -17,7 +16,7 @@ const makePathRelative = (token, path) => {
   return path;
 };
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'dropbox',
   getToken(location) {
     return store.getters['data/dropboxTokens'][location.sub];
@@ -40,13 +39,13 @@ export default providerRegistry.register({
       makePathRelative(token, syncLocation.path),
       syncLocation.dropboxFileId,
     )
-      .then(({ content }) => providerUtils.parseContent(content, `${syncLocation.fileId}/content`));
+      .then(({ content }) => Provider.parseContent(content, `${syncLocation.fileId}/content`));
   },
   uploadContent(token, content, syncLocation) {
     return dropboxHelper.uploadFile(
       token,
       makePathRelative(token, syncLocation.path),
-      providerUtils.serializeContent(content),
+      Provider.serializeContent(content),
       syncLocation.dropboxFileId,
     )
       .then(dropboxFile => ({
@@ -74,7 +73,7 @@ export default providerRegistry.register({
       if (!path) {
         return null;
       }
-      if (providerUtils.openFileWithLocation(store.getters['syncLocation/items'], {
+      if (Provider.openFileWithLocation(store.getters['syncLocation/items'], {
         providerId: this.id,
         path,
       })) {
diff --git a/src/services/providers/gistProvider.js b/src/services/providers/gistProvider.js
index ffa3b96d..eef09bab 100644
--- a/src/services/providers/gistProvider.js
+++ b/src/services/providers/gistProvider.js
@@ -1,10 +1,9 @@
 import store from '../../store';
 import githubHelper from './helpers/githubHelper';
-import providerUtils from './providerUtils';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 import utils from '../utils';
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'gist',
   getToken(location) {
     return store.getters['data/githubTokens'][location.sub];
@@ -18,7 +17,7 @@ export default providerRegistry.register({
   },
   downloadContent(token, syncLocation) {
     return githubHelper.downloadGist(token, syncLocation.gistId, syncLocation.filename)
-      .then(content => providerUtils.parseContent(content, `${syncLocation.fileId}/content`));
+      .then(content => Provider.parseContent(content, `${syncLocation.fileId}/content`));
   },
   uploadContent(token, content, syncLocation) {
     const file = store.state.file.itemMap[syncLocation.fileId];
@@ -27,7 +26,7 @@ export default providerRegistry.register({
       token,
       description,
       syncLocation.filename,
-      providerUtils.serializeContent(content),
+      Provider.serializeContent(content),
       syncLocation.isPublic,
       syncLocation.gistId,
     )
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index 58915417..7777abba 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -1,12 +1,11 @@
 import store from '../../store';
 import githubHelper from './helpers/githubHelper';
-import providerUtils from './providerUtils';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 import utils from '../utils';
 
 const savedSha = {};
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'github',
   getToken(location) {
     return store.getters['data/githubTokens'][location.sub];
@@ -24,9 +23,9 @@ export default providerRegistry.register({
     )
       .then(({ sha, content }) => {
         savedSha[syncLocation.id] = sha;
-        return providerUtils.parseContent(content, `${syncLocation.fileId}/content`);
+        return Provider.parseContent(content, `${syncLocation.fileId}/content`);
       })
-      .catch(() => null); // Ignore error, without the sha upload is going to fail anyway
+      .catch(() => null); // Ignore error, upload is going to fail anyway
   },
   uploadContent(token, content, syncLocation) {
     let result = Promise.resolve();
@@ -43,7 +42,7 @@ export default providerRegistry.register({
           syncLocation.repo,
           syncLocation.branch,
           syncLocation.path,
-          providerUtils.serializeContent(content),
+          Provider.serializeContent(content),
           sha,
         );
       })
@@ -69,7 +68,7 @@ export default providerRegistry.register({
   openFile(token, syncLocation) {
     return Promise.resolve()
       .then(() => {
-        if (providerUtils.openFileWithLocation(store.getters['syncLocation/items'], syncLocation)) {
+        if (Provider.openFileWithLocation(store.getters['syncLocation/items'], syncLocation)) {
           // File exists and has just been opened. Next...
           return null;
         }
@@ -109,7 +108,7 @@ export default providerRegistry.register({
       });
   },
   parseRepoUrl(url) {
-    const parsedRepo = url.match(/[/:]?([^/:]+)\/([^/]+?)(?:\.git|\/)?$/);
+    const parsedRepo = url && url.match(/([^/:]+)\/([^/]+?)(?:\.git|\/)?$/);
     return parsedRepo && {
       owner: parsedRepo[1],
       repo: parsedRepo[2],
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
new file mode 100644
index 00000000..38ad18e9
--- /dev/null
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -0,0 +1,500 @@
+import store from '../../store';
+import githubHelper from './helpers/githubHelper';
+import Provider from './common/Provider';
+import utils from '../utils';
+import userSvc from '../userSvc';
+
+const getSyncData = (fileId) => {
+  const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
+  return syncData
+    ? Promise.resolve(syncData)
+    : Promise.reject(); // No need for a proper error message.
+};
+
+const getAbsolutePath = syncData =>
+  (store.getters['workspace/currentWorkspace'].path || '') + syncData.id;
+
+const getWorkspaceWithOwner = () => {
+  const workspace = store.getters['workspace/currentWorkspace'];
+  const [owner, repo] = workspace.repo.split('/');
+  return {
+    ...workspace,
+    owner,
+    repo,
+  };
+};
+
+let treeShaMap;
+let treeFolderMap;
+let treeFileMap;
+let treeDataMap;
+let treeSyncLocationMap;
+let treePublishLocationMap;
+
+const endsWith = (str, suffix) => str.slice(-suffix.length) === suffix;
+
+export default new Provider({
+  id: 'githubWorkspace',
+  getToken() {
+    return store.getters['workspace/syncToken'];
+  },
+  initWorkspace() {
+    const [owner, repo] = (utils.queryParams.repo || '').split('/');
+    const branch = utils.queryParams.branch;
+    const workspaceParams = {
+      providerId: this.id,
+      repo: `${owner}/${repo}`,
+      branch,
+    };
+    const path = (utils.queryParams.path || '')
+      .replace(/^\/*/, '') // Remove leading `/`
+      .replace(/\/*$/, '/'); // Add trailing `/`
+    if (path !== '/') {
+      workspaceParams.path = path;
+    }
+    const workspaceId = utils.makeWorkspaceId(workspaceParams);
+    let workspace = store.getters['data/sanitizedWorkspaces'][workspaceId];
+
+    return Promise.resolve()
+      .then(() => {
+        // See if we already have a token
+        if (workspace) {
+          // Token sub is in the workspace
+          const token = store.getters['data/githubTokens'][workspace.sub];
+          if (token) {
+            return token;
+          }
+        }
+        // If no token has been found, popup an authorize window and get one
+        return store.dispatch('modal/open', {
+          type: 'githubAccount',
+          onResolve: () => githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess),
+        });
+      })
+      .then((token) => {
+        if (!workspace) {
+          const pathEntries = (path || '').split('/');
+          const name = pathEntries[pathEntries.length - 2] || repo; // path ends with `/`
+          workspace = {
+            ...workspaceParams,
+            id: workspaceId,
+            sub: token.sub,
+            name,
+          };
+        }
+        // Fix the URL hash
+        utils.setQueryParams(workspaceParams);
+        if (workspace.url !== location.href) {
+          store.dispatch('data/patchWorkspaces', {
+            [workspaceId]: {
+              ...workspace,
+              url: location.href,
+            },
+          });
+        }
+        return store.getters['data/sanitizedWorkspaces'][workspaceId];
+      });
+  },
+  getChanges() {
+    const syncToken = store.getters['workspace/syncToken'];
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return githubHelper.getHeadTree(syncToken, owner, repo, branch)
+      .then((tree) => {
+        const workspacePath = store.getters['workspace/currentWorkspace'].path || '';
+        const syncDataByPath = store.getters['data/syncData'];
+        const syncDataByItemId = store.getters['data/syncDataByItemId'];
+
+        // Store all blobs sha
+        treeShaMap = Object.create(null);
+        // Store interesting paths
+        treeFolderMap = Object.create(null);
+        treeFileMap = Object.create(null);
+        treeDataMap = Object.create(null);
+        treeSyncLocationMap = Object.create(null);
+        treePublishLocationMap = Object.create(null);
+
+        tree.filter(({ type, path }) => type === 'blob' && path.indexOf(workspacePath) === 0)
+          .forEach((blobEntry) => {
+            // Make path relative
+            const path = blobEntry.path.slice(workspacePath.length);
+            // Collect blob sha
+            treeShaMap[path] = blobEntry.sha;
+            // Collect parents path
+            let parentPath = '';
+            path.split('/').slice(0, -1).forEach((folderName) => {
+              const folderPath = `${parentPath}${folderName}/`;
+              treeFolderMap[folderPath] = parentPath;
+              parentPath = folderPath;
+            });
+            // Collect file path
+            if (path.indexOf('.stackedit-data/') === 0) {
+              treeDataMap[path] = true;
+            } else if (endsWith(path, '.md')) {
+              treeFileMap[path] = parentPath;
+            } else if (endsWith(path, '.sync')) {
+              treeSyncLocationMap[path] = true;
+            } else if (endsWith(path, '.publish')) {
+              treePublishLocationMap[path] = true;
+            }
+          });
+
+        // Collect changes
+        const changes = [];
+        const pathIds = {};
+        const syncDataToIgnore = Object.create(null);
+        const getId = (path) => {
+          const syncData = syncDataByPath[path];
+          const id = syncData ? syncData.itemId : utils.uid();
+          pathIds[path] = id;
+          return id;
+        };
+
+        // Folder creations/updates
+        // Assume map entries are sorted from top to bottom
+        Object.entries(treeFolderMap).forEach(([path, parentPath]) => {
+          const id = getId(path);
+          const item = utils.addItemHash({
+            id,
+            type: 'folder',
+            name: path.slice(parentPath.length, -1),
+            parentId: pathIds[parentPath] || null,
+          });
+          changes.push({
+            syncDataId: path,
+            item,
+            syncData: {
+              id: path,
+              itemId: id,
+              type: item.type,
+              hash: item.hash,
+            },
+          });
+        });
+
+        // File creations/updates
+        Object.entries(treeFileMap).forEach(([path, parentPath]) => {
+          const id = getId(path);
+          const item = utils.addItemHash({
+            id,
+            type: 'file',
+            name: path.slice(parentPath.length, -'.md'.length),
+            parentId: pathIds[parentPath] || null,
+          });
+          changes.push({
+            syncDataId: path,
+            item,
+            syncData: {
+              id: path,
+              itemId: id,
+              type: item.type,
+              hash: item.hash,
+            },
+          });
+
+          // Content creations/updates
+          const contentSyncData = syncDataByItemId[`${id}/content`];
+          if (contentSyncData) {
+            syncDataToIgnore[contentSyncData.id] = true;
+          }
+          if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
+            // Use `/` as a prefix to get a unique syncData id
+            changes.push({
+              syncDataId: `/${path}`,
+              item: {
+                id: `${id}/content`,
+                type: 'content',
+                // Need a truthy value to force saving sync data
+                hash: 1,
+              },
+              syncData: {
+                id: `/${path}`,
+                itemId: `${id}/content`,
+                type: 'content',
+                // Need a truthy value to force downloading the content
+                hash: 1,
+              },
+            });
+          }
+        });
+
+        // Data creations/updates
+        Object.keys(treeDataMap).forEach((path) => {
+          try {
+            const [, id] = path.match(/^\.stackedit-data\/([\s\S]+)\.json$/);
+            pathIds[path] = id;
+            const syncData = syncDataByItemId[id];
+            if (syncData) {
+              syncDataToIgnore[syncData.id] = true;
+            }
+            if (!syncData || syncData.sha !== treeShaMap[path]) {
+              changes.push({
+                syncDataId: path,
+                item: {
+                  id,
+                  type: 'data',
+                  // Need a truthy value to force saving sync data
+                  hash: 1,
+                },
+                syncData: {
+                  id: path,
+                  itemId: id,
+                  type: 'data',
+                  // Need a truthy value to force downloading the content
+                  hash: 1,
+                },
+              });
+            }
+          } catch (e) {
+            // Ignore parsing errors
+          }
+        });
+
+        // Location creations/updates
+        [{
+          type: 'syncLocation',
+          map: treeSyncLocationMap,
+          pathMatcher: /^([\s\S]+)\.([\w-]+)\.sync$/,
+        }, {
+          type: 'publishLocation',
+          map: treePublishLocationMap,
+          pathMatcher: /^([\s\S]+)\.([\w-]+)\.publish$/,
+        }]
+          .forEach(({ type, map, pathMatcher }) => Object.keys(map).forEach((path) => {
+            try {
+              const [, filePath, data] = path.match(pathMatcher);
+              // If there is a corresponding md file in the tree
+              const fileId = pathIds[`${filePath}.md`];
+              if (fileId) {
+                const id = getId(path);
+                const item = utils.addItemHash({
+                  ...JSON.parse(utils.decodeBase64(data)),
+                  id,
+                  type,
+                  fileId,
+                });
+                changes.push({
+                  syncDataId: path,
+                  item,
+                  syncData: {
+                    id: path,
+                    itemId: id,
+                    type: item.type,
+                    hash: item.hash,
+                  },
+                });
+              }
+            } catch (e) {
+              // Ignore parsing errors
+            }
+          }));
+
+        // Deletions
+        Object.keys(syncDataByPath).forEach((path) => {
+          if (!pathIds[path] && !syncDataToIgnore[path]) {
+            changes.push({ syncDataId: path });
+          }
+        });
+
+        return changes;
+      });
+  },
+  saveSimpleItem(item) {
+    const path = store.getters.itemPaths[item.fileId || item.id];
+    return Promise.resolve()
+      .then(() => {
+        const syncToken = store.getters['workspace/syncToken'];
+        const { owner, repo, branch } = getWorkspaceWithOwner();
+        const syncData = {
+          itemId: item.id,
+          type: item.type,
+          hash: item.hash,
+        };
+
+        if (item.type === 'file') {
+          syncData.id = `${path}.md`;
+        } else if (item.type === 'folder') {
+          syncData.id = path;
+        }
+        if (syncData.id) {
+          return syncData;
+        }
+
+        // locations are stored as paths, so we upload an empty file
+        const data = utils.encodeBase64(utils.serializeObject({
+          ...item,
+          id: undefined,
+          type: undefined,
+          fileId: undefined,
+        }), true);
+        const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
+        syncData.id = `${path}.${data}.${extension}`;
+        return githubHelper.uploadFile(
+          syncToken,
+          owner,
+          repo,
+          branch,
+          getAbsolutePath(syncData),
+          '',
+          treeShaMap[syncData.id],
+        ).then(() => syncData);
+      });
+  },
+  removeItem(syncData) {
+    // Ignore content deletion
+    if (syncData.type === 'content') {
+      return Promise.resolve();
+    }
+    const syncToken = store.getters['workspace/syncToken'];
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return githubHelper.removeFile(
+      syncToken,
+      owner,
+      repo,
+      branch,
+      getAbsolutePath(syncData),
+      treeShaMap[syncData.id],
+    );
+  },
+  downloadContent(token, syncLocation) {
+    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
+    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
+    if (!syncData || !contentSyncData) {
+      return Promise.resolve();
+    }
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return githubHelper.downloadFile(token, owner, repo, branch, getAbsolutePath(syncData))
+      .then(({ sha, content }) => {
+        const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
+        if (item.hash !== contentSyncData.hash) {
+          store.dispatch('data/patchSyncData', {
+            [contentSyncData.id]: {
+              ...contentSyncData,
+              hash: item.hash,
+              sha,
+            },
+          });
+        }
+        return item;
+      });
+  },
+  downloadData(dataId) {
+    const syncData = store.getters['data/syncDataByItemId'][dataId];
+    if (!syncData) {
+      return Promise.resolve();
+    }
+    const syncToken = store.getters['workspace/syncToken'];
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return githubHelper.downloadFile(syncToken, owner, repo, branch, getAbsolutePath(syncData))
+      .then(({ sha, content }) => {
+        const item = JSON.parse(content);
+        if (item.hash !== syncData.hash) {
+          store.dispatch('data/patchSyncData', {
+            [syncData.id]: {
+              ...syncData,
+              hash: item.hash,
+              sha,
+            },
+          });
+        }
+        return item;
+      });
+  },
+  uploadContent(token, content, syncLocation) {
+    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
+    if (contentSyncData && contentSyncData.hash === content.hash) {
+      return Promise.resolve(syncLocation);
+    }
+    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return githubHelper.uploadFile(
+      token,
+      owner,
+      repo,
+      branch,
+      getAbsolutePath(syncData),
+      Provider.serializeContent(content),
+      treeShaMap[syncData.id],
+    )
+      .then((res) => {
+        const id = `/${syncData.id}`;
+        store.dispatch('data/patchSyncData', {
+          [id]: {
+            // Build sync data
+            id,
+            itemId: content.id,
+            type: content.type,
+            hash: content.hash,
+            sha: res.content.sha,
+          },
+        });
+        return syncLocation;
+      });
+  },
+  uploadData(item) {
+    const oldSyncData = store.getters['data/syncDataByItemId'][item.id];
+    if (oldSyncData && oldSyncData.hash === item.hash) {
+      return Promise.resolve();
+    }
+    const syncData = {
+      id: `.stackedit-data/${item.id}.json`,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
+    const syncToken = store.getters['workspace/syncToken'];
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return githubHelper.uploadFile(
+      syncToken,
+      owner,
+      repo,
+      branch,
+      getAbsolutePath(syncData),
+      JSON.stringify(item),
+      oldSyncData && oldSyncData.sha,
+    )
+      .then(res => store.dispatch('data/patchSyncData', {
+        [syncData.id]: {
+          ...syncData,
+          sha: res.content.sha,
+        },
+      }));
+  },
+  onSyncEnd() {
+    // Clean up
+    treeShaMap = null;
+    treeFolderMap = null;
+    treeFileMap = null;
+    treeDataMap = null;
+    treeSyncLocationMap = null;
+    treePublishLocationMap = null;
+  },
+  listRevisions(token, fileId) {
+    const { owner, repo, branch } = getWorkspaceWithOwner();
+    return getSyncData(fileId)
+      .then(syncData => githubHelper.getCommits(token, owner, repo, branch, syncData.id))
+      .then(entries => entries.map((entry) => {
+        let user;
+        if (entry.author && entry.author.login) {
+          user = entry.author;
+        } else if (entry.committer && entry.committer.login) {
+          user = entry.committer;
+        }
+        userSvc.addInfo({ id: user.login, name: user.login, imageUrl: user.avatar_url });
+        const date = (entry.commit.author && entry.commit.author.date)
+          || (entry.commit.committer && entry.commit.committer.date);
+        return {
+          id: entry.sha,
+          sub: user.login,
+          created: date ? new Date(date).getTime() : 1,
+        };
+      })
+        .sort((revision1, revision2) => revision2.created - revision1.created));
+  },
+  getRevisionContent(token, fileId, revisionId) {
+    const { owner, repo } = getWorkspaceWithOwner();
+    return getSyncData(fileId)
+      .then(syncData => githubHelper.downloadFile(
+        token, owner, repo, revisionId, getAbsolutePath(syncData)))
+      .then(({ content }) => Provider.parseContent(content, `${fileId}/content`));
+  },
+});
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index ff3017b3..fca5b53d 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -1,9 +1,11 @@
 import store from '../../store';
 import googleHelper from './helpers/googleHelper';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 import utils from '../utils';
 
-export default providerRegistry.register({
+let syncStartPageToken;
+
+export default new Provider({
   id: 'googleDriveAppData',
   getToken() {
     return store.getters['workspace/syncToken'];
@@ -42,13 +44,13 @@ export default providerRegistry.register({
           change.syncDataId = change.fileId;
           return true;
         });
-        changes.startPageToken = result.startPageToken;
+        syncStartPageToken = result.startPageToken;
         return changes;
       });
   },
-  setAppliedChanges(changes) {
+  onChangesApplied() {
     store.dispatch('data/patchLocalSettings', {
-      syncStartPageToken: changes.startPageToken,
+      syncStartPageToken,
     });
   },
   saveSimpleItem(item, syncData, ifNotTooLate) {
@@ -83,7 +85,7 @@ export default providerRegistry.register({
     const syncToken = store.getters['workspace/syncToken'];
     return googleHelper.downloadAppDataFile(syncToken, syncData.id)
       .then((data) => {
-        const item = JSON.parse(data);
+        const item = utils.addItemHash(JSON.parse(data));
         if (item.hash !== syncData.hash) {
           store.dispatch('data/patchSyncData', {
             [syncData.id]: {
@@ -96,11 +98,11 @@ export default providerRegistry.register({
       });
   },
   uploadContent(token, content, syncLocation, ifNotTooLate) {
-    return this.uploadData(content, `${syncLocation.fileId}/content`, ifNotTooLate)
+    return this.uploadData(content, ifNotTooLate)
       .then(() => syncLocation);
   },
-  uploadData(item, dataId, ifNotTooLate) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
+  uploadData(item, ifNotTooLate) {
+    const syncData = store.getters['data/syncDataByItemId'][item.id];
     if (syncData && syncData.hash === item.hash) {
       return Promise.resolve();
     }
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index c747bfb0..e0fc988a 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -1,10 +1,9 @@
 import store from '../../store';
 import googleHelper from './helpers/googleHelper';
-import providerUtils from './providerUtils';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 import utils from '../utils';
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'googleDrive',
   getToken(location) {
     const token = store.getters['data/googleTokens'][location.sub];
@@ -110,7 +109,7 @@ export default providerRegistry.register({
   },
   downloadContent(token, syncLocation) {
     return googleHelper.downloadFile(token, syncLocation.driveFileId)
-      .then(content => providerUtils.parseContent(content, `${syncLocation.fileId}/content`));
+      .then(content => Provider.parseContent(content, `${syncLocation.fileId}/content`));
   },
   uploadContent(token, content, syncLocation, ifNotTooLate) {
     const file = store.state.file.itemMap[syncLocation.fileId];
@@ -124,7 +123,7 @@ export default providerRegistry.register({
       name,
       parents,
       undefined,
-      providerUtils.serializeContent(content),
+      Provider.serializeContent(content),
       undefined,
       syncLocation.driveFileId,
       undefined,
@@ -156,7 +155,7 @@ export default providerRegistry.register({
       if (!driveFile) {
         return null;
       }
-      if (providerUtils.openFileWithLocation(store.getters['syncLocation/items'], {
+      if (Provider.openFileWithLocation(store.getters['syncLocation/items'], {
         providerId: this.id,
         driveFileId: driveFile.id,
       })) {
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index 622975b5..6b56b00b 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -1,11 +1,8 @@
 import store from '../../store';
 import googleHelper from './helpers/googleHelper';
-import providerRegistry from './providerRegistry';
-import providerUtils from './providerUtils';
+import Provider from './common/Provider';
 import utils from '../utils';
 
-let fileIdToOpen;
-
 const getSyncData = (fileId) => {
   const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
   return syncData
@@ -13,19 +10,22 @@ const getSyncData = (fileId) => {
     : Promise.reject(); // No need for a proper error message.
 };
 
-export default providerRegistry.register({
+let fileIdToOpen;
+let syncStartPageToken;
+
+export default new Provider({
   id: 'googleDriveWorkspace',
   getToken() {
     return store.getters['workspace/syncToken'];
   },
   initWorkspace() {
-    const makeWorkspaceIdParams = folderId => ({
+    const makeWorkspaceParams = folderId => ({
       providerId: this.id,
       folderId,
     });
 
     const makeWorkspaceId = folderId => folderId && utils.makeWorkspaceId(
-      makeWorkspaceIdParams(folderId));
+      makeWorkspaceParams(folderId));
 
     const getWorkspace = folderId =>
       store.getters['data/sanitizedWorkspaces'][makeWorkspaceId(folderId)];
@@ -155,7 +155,7 @@ export default providerRegistry.register({
           }))
         .then((workspace) => {
           // Fix the URL hash
-          utils.setQueryParams(makeWorkspaceIdParams(workspace.folderId));
+          utils.setQueryParams(makeWorkspaceParams(workspace.folderId));
           if (workspace.url !== location.href) {
             store.dispatch('data/patchWorkspaces', {
               [workspace.id]: {
@@ -339,13 +339,13 @@ export default providerRegistry.register({
             changes.push(contentChange);
           }
         });
-        changes.startPageToken = result.startPageToken;
+        syncStartPageToken = result.startPageToken;
         return changes;
       });
   },
-  setAppliedChanges(changes) {
+  onChangesApplied() {
     store.dispatch('data/patchLocalSettings', {
-      syncStartPageToken: changes.startPageToken,
+      syncStartPageToken,
     });
   },
   saveSimpleItem(item, syncData, ifNotTooLate) {
@@ -419,7 +419,7 @@ export default providerRegistry.register({
     }
     return googleHelper.downloadFile(token, syncData.id)
       .then((content) => {
-        const item = providerUtils.parseContent(content, `${syncLocation.fileId}/content`);
+        const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
         if (item.hash !== contentSyncData.hash) {
           store.dispatch('data/patchSyncData', {
             [contentSyncData.id]: {
@@ -428,7 +428,7 @@ export default providerRegistry.register({
             },
           });
         }
-        // Open the file requested by action if it was to synced yet
+        // Open the file requested by action if it wasn't synced yet
         if (fileIdToOpen && fileIdToOpen === syncData.id) {
           fileIdToOpen = null;
           // Open the file once downloaded content has been stored
@@ -474,7 +474,7 @@ export default providerRegistry.register({
             undefined,
             undefined,
             undefined,
-            providerUtils.serializeContent(content),
+            Provider.serializeContent(content),
             undefined,
             syncData.id,
             undefined,
@@ -494,7 +494,7 @@ export default providerRegistry.register({
             id: item.id,
             folderId: workspace.folderId,
           },
-          providerUtils.serializeContent(content),
+          Provider.serializeContent(content),
           undefined,
           undefined,
           undefined,
@@ -523,8 +523,8 @@ export default providerRegistry.register({
       }))
       .then(() => syncLocation);
   },
-  uploadData(item, dataId, ifNotTooLate) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
+  uploadData(item, ifNotTooLate) {
+    const syncData = store.getters['data/syncDataByItemId'][item.id];
     if (syncData && syncData.hash === item.hash) {
       return Promise.resolve();
     }
@@ -570,6 +570,6 @@ export default providerRegistry.register({
   getRevisionContent(token, fileId, revisionId) {
     return getSyncData(fileId)
       .then(syncData => googleHelper.downloadFileRevision(token, syncData.id, revisionId))
-      .then(content => providerUtils.parseContent(content, `${fileId}/content`));
+      .then(content => Provider.parseContent(content, `${fileId}/content`));
   },
 });
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index cc2bf6c6..4ec99841 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -17,6 +17,16 @@ const request = (token, options) => networkSvc.request({
   },
 });
 
+const repoRequest = (token, owner, repo, options) => request(token, {
+  ...options,
+  url: `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/${options.url}`,
+});
+
+const getCommitMessage = (name, path) => {
+  const message = store.getters['data/computedSettings'].github[name];
+  return message.replace(/{{path}}/g, path);
+};
+
 export default {
   startOauth2(scopes, sub = null, silent = false) {
     return networkSvc.startOauth2(
@@ -51,7 +61,7 @@ export default {
           const token = {
             scopes,
             accessToken,
-            name: res.body.name,
+            name: res.body.login,
             sub: `${res.body.id}`,
             repoFullAccess: scopes.indexOf('repo') !== -1,
           };
@@ -63,21 +73,58 @@ export default {
   addAccount(repoFullAccess = false) {
     return this.startOauth2(getScopes({ repoFullAccess }));
   },
+  getTree(token, owner, repo, sha) {
+    return repoRequest(token, owner, repo, {
+      url: `git/trees/${encodeURIComponent(sha)}?recursive=1`,
+    })
+      .then((res) => {
+        if (res.body.truncated) {
+          throw new Error('Git tree too big. Please remove some files in the repository.');
+        }
+        return res.body.tree;
+      });
+  },
+  getHeadTree(token, owner, repo, branch) {
+    return repoRequest(token, owner, repo, {
+      url: `branches/${encodeURIComponent(branch)}`,
+    })
+      .then(res => this.getTree(token, owner, repo, res.body.commit.commit.tree.sha));
+  },
+  getCommits(token, owner, repo, sha, path) {
+    return repoRequest(token, owner, repo, {
+      url: 'commits',
+      params: { sha, path },
+    })
+      .then(res => res.body);
+  },
   uploadFile(token, owner, repo, branch, path, content, sha) {
-    return request(token, {
+    return repoRequest(token, owner, repo, {
       method: 'PUT',
-      url: `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/contents/${encodeURIComponent(path)}`,
+      url: `contents/${encodeURIComponent(path)}`,
       body: {
-        message: 'Uploaded by https://stackedit.io/',
+        message: getCommitMessage(sha ? 'updateFileMessage' : 'createFileMessage', path),
         content: utils.encodeBase64(content),
         sha,
         branch,
       },
-    });
+    })
+      .then(res => res.body);
+  },
+  removeFile(token, owner, repo, branch, path, sha) {
+    return repoRequest(token, owner, repo, {
+      method: 'DELETE',
+      url: `contents/${encodeURIComponent(path)}`,
+      body: {
+        message: getCommitMessage('deleteFileMessage', path),
+        sha,
+        branch,
+      },
+    })
+      .then(res => res.body);
   },
   downloadFile(token, owner, repo, branch, path) {
-    return request(token, {
-      url: `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/contents/${encodeURIComponent(path)}`,
+    return repoRequest(token, owner, repo, {
+      url: `contents/${encodeURIComponent(path)}`,
       params: { ref: branch },
     })
       .then(res => ({
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 83119d91..4748eb66 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -614,11 +614,8 @@ export default {
             break;
           }
           case 'img': {
-            let view = new google.picker.PhotosView();
-            view.setType('flat');
-            pickerBuilder.addView(view);
-            view = new google.picker.PhotosView();
-            view.setType('ofuser');
+            const view = new google.picker.PhotosView();
+            view.setType('highlights');
             pickerBuilder.addView(view);
             pickerBuilder.addView(google.picker.ViewId.PHOTO_UPLOAD);
             break;
diff --git a/src/services/providers/wordpressProvider.js b/src/services/providers/wordpressProvider.js
index 30780df1..f6374774 100644
--- a/src/services/providers/wordpressProvider.js
+++ b/src/services/providers/wordpressProvider.js
@@ -1,8 +1,8 @@
 import store from '../../store';
 import wordpressHelper from './helpers/wordpressHelper';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'wordpress',
   getToken(location) {
     return store.getters['data/wordpressTokens'][location.sub];
diff --git a/src/services/providers/zendeskProvider.js b/src/services/providers/zendeskProvider.js
index aadf05db..633cd393 100644
--- a/src/services/providers/zendeskProvider.js
+++ b/src/services/providers/zendeskProvider.js
@@ -1,8 +1,8 @@
 import store from '../../store';
 import zendeskHelper from './helpers/zendeskHelper';
-import providerRegistry from './providerRegistry';
+import Provider from './common/Provider';
 
-export default providerRegistry.register({
+export default new Provider({
   id: 'zendesk',
   getToken(location) {
     return store.getters['data/zendeskTokens'][location.sub];
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index 1042e722..de0dcd47 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -3,7 +3,7 @@ import store from '../store';
 import utils from './utils';
 import networkSvc from './networkSvc';
 import exportSvc from './exportSvc';
-import providerRegistry from './providers/providerRegistry';
+import providerRegistry from './providers/common/providerRegistry';
 
 const hasCurrentFilePublishLocations = () => !!store.getters['publishLocation/current'].length;
 
@@ -67,7 +67,7 @@ function publishFile(fileId) {
   return loadContent(fileId)
     .then(() => {
       const publishLocations = [
-        ...store.getters['publishLocation/groupedByFileId'][fileId] || [],
+        ...store.getters['publishLocation/filteredGroupedByFileId'][fileId] || [],
       ];
       const publishOneContentLocation = () => {
         const publishLocation = publishLocations.shift();
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index badd1430..15462c97 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -3,17 +3,23 @@ import store from '../store';
 import utils from './utils';
 import diffUtils from './diffUtils';
 import networkSvc from './networkSvc';
-import providerRegistry from './providers/providerRegistry';
+import providerRegistry from './providers/common/providerRegistry';
 import googleDriveAppDataProvider from './providers/googleDriveAppDataProvider';
-import './providers/googleDriveWorkspaceProvider';
 import './providers/couchdbWorkspaceProvider';
+import './providers/githubWorkspaceProvider';
+import './providers/googleDriveWorkspaceProvider';
 import tempFileSvc from './tempFileSvc';
 
+const minAutoSyncEvery = 60 * 1000; // 60 sec
 const inactivityThreshold = 3 * 1000; // 3 sec
 const restartSyncAfter = 30 * 1000; // 30 sec
-const minAutoSyncEvery = 60 * 1000; // 60 sec
+const restartContentSyncAfter = 500; // Restart if an authorize window pops up
 const maxContentHistory = 20;
 
+const LAST_SEEN = 0;
+const LAST_MERGED = 1;
+const LAST_SENT = 2;
+
 let actionProvider;
 let workspaceProvider;
 
@@ -69,6 +75,32 @@ function setLastSyncActivity() {
   localStorage.setItem(store.getters['workspace/lastSyncActivityKey'], currentDate);
 }
 
+/**
+ * Upgrade hashes if syncedContent is from an old version
+ */
+function upgradeSyncedContent(syncedContent) {
+  if (syncedContent.v) {
+    return syncedContent;
+  }
+  const hashUpgrades = {};
+  const historyData = {};
+  const syncHistory = {};
+  Object.entries(syncedContent.historyData).forEach(([hash, content]) => {
+    const newContent = utils.addItemHash(content);
+    historyData[newContent.hash] = newContent;
+    hashUpgrades[hash] = newContent.hash;
+  });
+  Object.entries(syncedContent.syncHistory).forEach(([id, hashEntries]) => {
+    syncHistory[id] = hashEntries.map(hash => hashUpgrades[hash]);
+  });
+  return {
+    ...syncedContent,
+    historyData,
+    syncHistory,
+    v: 1,
+  };
+}
+
 /**
  * Clean a syncedContent.
  */
@@ -103,8 +135,10 @@ function applyChanges(changes) {
     const existingItem = existingSyncData && storeItemMap[existingSyncData.itemId];
     if (!change.item && existingSyncData) {
       // Item was removed
-      delete syncData[change.syncDataId];
-      saveSyncData = true;
+      if (syncData[change.syncDataId]) {
+        delete syncData[change.syncDataId];
+        saveSyncData = true;
+      }
       if (existingItem) {
         // Remove object from the store
         store.commit(`${existingItem.type}/deleteItem`, existingItem.id);
@@ -112,8 +146,10 @@ function applyChanges(changes) {
       }
     } else if (change.item && change.item.hash) {
       // Item was modifed
-      syncData[change.syncDataId] = change.syncData;
-      saveSyncData = true;
+      if ((existingSyncData || {}).hash !== change.syncData.hash) {
+        syncData[change.syncDataId] = change.syncData;
+        saveSyncData = true;
+      }
       if (
         // If no sync data or existing one is different
         (existingSyncData || {}).hash !== change.item.hash
@@ -133,10 +169,6 @@ function applyChanges(changes) {
   }
 }
 
-const LAST_SEEN = 0;
-const LAST_MERGED = 1;
-const LAST_SENT = 2;
-
 /**
  * Create a sync location by uploading the current file content.
  */
@@ -157,8 +189,8 @@ function createSyncLocation(syncLocation) {
       }, syncLocation)
         .then(syncLocationToStore => localDbSvc.loadSyncedContent(fileId)
           .then(() => {
-            const newSyncedContent = utils.deepCopy(
-              store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
+            const newSyncedContent = utils.deepCopy(upgradeSyncedContent(
+              store.state.syncedContent.itemMap[`${fileId}/syncedContent`]));
             const newSyncHistoryItem = [];
             newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
             newSyncHistoryItem[LAST_SEEN] = content.hash;
@@ -172,12 +204,23 @@ function createSyncLocation(syncLocation) {
     });
 }
 
+// Prevent from sending new data too long after old data has been fetched
+const tooLateChecker = (timeout) => {
+  const tooLateAfter = Date.now() + timeout;
+  return cb => (res) => {
+    if (tooLateAfter < Date.now()) {
+      throw new Error('TOO_LATE');
+    }
+    return cb(res);
+  };
+};
+
 class SyncContext {
   restart = false;
   attempted = {};
 }
 
-/**
+ /**
  * Sync one file with all its locations.
  */
 function syncFile(fileId, syncContext = new SyncContext()) {
@@ -189,7 +232,8 @@ function syncFile(fileId, syncContext = new SyncContext()) {
     .then(() => {
       const getFile = () => store.state.file.itemMap[fileId];
       const getContent = () => store.state.content.itemMap[`${fileId}/content`];
-      const getSyncedContent = () => store.state.syncedContent.itemMap[`${fileId}/syncedContent`];
+      const getSyncedContent = () => upgradeSyncedContent(
+        store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
       const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
 
       const isTempFile = () => {
@@ -206,8 +250,8 @@ function syncFile(fileId, syncContext = new SyncContext()) {
           return true;
         }
         const locations = [
-          ...store.getters['syncLocation/groupedByFileId'][fileId] || [],
-          ...store.getters['publishLocation/groupedByFileId'][fileId] || [],
+          ...store.getters['syncLocation/filteredGroupedByFileId'][fileId] || [],
+          ...store.getters['publishLocation/filteredGroupedByFileId'][fileId] || [],
         ];
         if (locations.length) {
           // If file has explicit sync/publish locations, it's not a temp file
@@ -227,7 +271,7 @@ function syncFile(fileId, syncContext = new SyncContext()) {
       const attemptedLocations = {};
       const syncOneContentLocation = () => {
         const syncLocations = [
-          ...store.getters['syncLocation/groupedByFileId'][fileId] || [],
+          ...store.getters['syncLocation/filteredGroupedByFileId'][fileId] || [],
         ];
         if (isWorkspaceSyncPossible()) {
           syncLocations.unshift({ id: 'main', providerId: workspaceProvider.id, fileId });
@@ -289,7 +333,6 @@ function syncFile(fileId, syncContext = new SyncContext()) {
                     properties: utils.sanitizeText(mergedContent.properties),
                     discussions: mergedContent.discussions,
                     comments: mergedContent.comments,
-                    hash: 0,
                   });
 
                   // Retrieve content with new `hash` and freeze it
@@ -342,21 +385,11 @@ function syncFile(fileId, syncContext = new SyncContext()) {
                     return null;
                   }
 
-                  // Prevent from sending new content too long after old content has been fetched
-                  const syncStartTime = Date.now();
-                  const ifNotTooLate = cb => (res) => {
-                    // No time to refresh a token...
-                    if (syncStartTime + 500 < Date.now()) {
-                      throw new Error('TOO_LATE');
-                    }
-                    return cb(res);
-                  };
-
                   // Upload merged content
                   return provider.uploadContent(token, {
                     ...mergedContent,
                     history: mergedContentHistory.slice(0, maxContentHistory),
-                  }, syncLocation, ifNotTooLate)
+                  }, syncLocation, tooLateChecker(restartContentSyncAfter))
                     .then((syncLocationToStore) => {
                       // Replace sync location if modified
                       if (utils.serializeObject(syncLocation) !==
@@ -465,13 +498,11 @@ function syncDataItem(dataId) {
           if (serverItem && serverItem.hash === mergedItem.hash) {
             return null;
           }
-          return workspaceProvider.uploadData(mergedItem, dataId);
+          return workspaceProvider.uploadData(mergedItem, tooLateChecker(restartContentSyncAfter));
         })
-        .then(() => {
-          store.dispatch('data/patchDataSyncData', {
-            [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
-          });
-        });
+        .then(() => store.dispatch('data/patchDataSyncData', {
+          [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
+        }));
     });
 }
 
@@ -499,16 +530,12 @@ function syncWorkspace() {
     .then((changes) => {
       // Apply changes
       applyChanges(changes);
-      workspaceProvider.setAppliedChanges(changes);
+      if (workspaceProvider.onChangesApplied) {
+        workspaceProvider.onChangesApplied();
+      }
 
       // Prevent from sending items too long after changes have been retrieved
-      const syncStartTime = Date.now();
-      const ifNotTooLate = cb => (res) => {
-        if (syncStartTime + restartSyncAfter < Date.now()) {
-          throw new Error('TOO_LATE');
-        }
-        return cb(res);
-      };
+      const ifNotTooLate = tooLateChecker(restartSyncAfter);
 
       // Called until no item to save
       const saveNextItem = ifNotTooLate(() => {
@@ -529,12 +556,13 @@ function syncWorkspace() {
             // Add file if content has been added
             && (item.type !== 'file' || syncDataByItemId[`${id}/content`])
           ) {
-            promise = workspaceProvider.saveSimpleItem(
-              // Use deepCopy to freeze objects
-              utils.deepCopy(item),
-              utils.deepCopy(existingSyncData),
-              ifNotTooLate,
-            )
+            promise = workspaceProvider
+              .saveSimpleItem(
+                // Use deepCopy to freeze objects
+                utils.deepCopy(item),
+                utils.deepCopy(existingSyncData),
+                ifNotTooLate,
+              )
               .then(resultSyncData => store.dispatch('data/patchSyncData', {
                 [resultSyncData.id]: resultSyncData,
               }))
@@ -612,6 +640,9 @@ function syncWorkspace() {
           .then(() => syncNextFile());
       };
 
+      const onSyncEnd = () => Promise.resolve(
+        workspaceProvider.onSyncEnd && workspaceProvider.onSyncEnd());
+
       return Promise.resolve()
         .then(() => saveNextItem())
         .then(() => removeNextItem())
@@ -629,6 +660,13 @@ function syncWorkspace() {
           }
           return syncNextFile();
         })
+        .then(
+          () => onSyncEnd(),
+          err => onSyncEnd().then(() => {
+            throw err;
+          }, () => {
+            throw err;
+          }))
         .then(
           () => {
             if (syncContext.restart) {
diff --git a/src/services/userSvc.js b/src/services/userSvc.js
index ae7aa0cb..d0566d48 100644
--- a/src/services/userSvc.js
+++ b/src/services/userSvc.js
@@ -4,6 +4,10 @@ import store from '../store';
 const promised = {};
 
 export default {
+  addInfo({ id, name, imageUrl }) {
+    promised[id] = true;
+    store.commit('userInfo/addItem', { id, name, imageUrl });
+  },
   getInfo(userId) {
     if (!promised[userId]) {
       // Try to find a token with this sub
diff --git a/src/services/utils.js b/src/services/utils.js
index a0ffda71..7e405fec 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -118,6 +118,18 @@ export default {
       }, {});
     });
   },
+  search(items, criteria) {
+    let result;
+    items.some((item) => {
+      // If every field fits the criteria
+      if (Object.entries(criteria).every(([key, value]) => value === item[key])) {
+        result = item;
+        return true;
+      }
+      return false;
+    });
+    return result;
+  },
   uid() {
     crypto.getRandomValues(array);
     return array.cl_map(value => alphabet[value % radix]).join('');
@@ -132,26 +144,39 @@ export default {
     }
     return hash;
   },
+  getItemHash(item) {
+    return this.hash(this.serializeObject({
+      ...item,
+      // These properties must not be part of the hash
+      id: undefined,
+      hash: undefined,
+      history: undefined,
+    }));
+  },
   addItemHash(item) {
     return {
       ...item,
-      hash: this.hash(this.serializeObject({
-        ...item,
-        // These properties must not be part of the hash
-        history: undefined,
-        hash: undefined,
-      })),
+      hash: this.getItemHash(item),
     };
   },
   makeWorkspaceId(params) {
     return Math.abs(this.hash(this.serializeObject(params))).toString(36);
   },
-  encodeBase64(str) {
-    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
+  encodeBase64(str, urlSafe = false) {
+    const result = btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
       (match, p1) => String.fromCharCode(`0x${p1}`)));
+    if (!urlSafe) {
+      return result;
+    }
+    return result
+      .replace(/\//g, '_') // Replace `/` with `_`
+      .replace(/\+/g, '-') // Replace `+` with `-`
+      .replace(/=+$/, ''); // Remove trailing `=`
   },
   decodeBase64(str) {
-    return decodeURIComponent(atob(str).split('').map(
+    // In case of URL safe base64
+    const sanitizedStr = str.replace(/_/g, '/').replace(/-/g, '+');
+    return decodeURIComponent(atob(sanitizedStr).split('').map(
       c => `%${`00${c.charCodeAt(0).toString(16)}`.slice(-2)}`).join(''));
   },
   computeProperties(yamlProperties) {
@@ -214,6 +239,9 @@ export default {
     }
     return result;
   },
+  concatPaths(...paths) {
+    return paths.join('/').replace(/\/+/g, '/');
+  },
   getHostname(url) {
     urlParser.href = url;
     return urlParser.hostname;
@@ -221,7 +249,7 @@ export default {
   createHiddenIframe(url) {
     const iframeElt = document.createElement('iframe');
     iframeElt.style.position = 'absolute';
-    iframeElt.style.left = '-9999px';
+    iframeElt.style.left = '-99px';
     iframeElt.style.width = '1px';
     iframeElt.style.height = '1px';
     iframeElt.src = url;
diff --git a/src/store/explorer.js b/src/store/explorer.js
index c67bc8bb..ea2066ef 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -96,8 +96,8 @@ export default {
       rootGetters['folder/items'].forEach((item) => {
         nodeMap[item.id] = new Node(item, [], true);
       });
-      const syncLocationsByFileId = rootGetters['syncLocation/groupedByFileId'];
-      const publishLocationsByFileId = rootGetters['publishLocation/groupedByFileId'];
+      const syncLocationsByFileId = rootGetters['syncLocation/filteredGroupedByFileId'];
+      const publishLocationsByFileId = rootGetters['publishLocation/filteredGroupedByFileId'];
       rootGetters['file/items'].forEach((item) => {
         const locations = [
           ...syncLocationsByFileId[item.id] || [],
diff --git a/src/store/index.js b/src/store/index.js
index c9d05079..9bb536b2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,12 +14,13 @@ import folder from './folder';
 import layout from './layout';
 import modal from './modal';
 import notification from './notification';
-import publishLocation from './publishLocation';
 import queue from './queue';
 import syncedContent from './syncedContent';
-import syncLocation from './syncLocation';
 import userInfo from './userInfo';
 import workspace from './workspace';
+import locationTemplate from './locationTemplate';
+import emptyPublishLocation from '../data/emptyPublishLocation';
+import emptySyncLocation from '../data/emptySyncLocation';
 
 Vue.use(Vuex);
 
@@ -39,10 +40,10 @@ const store = new Vuex.Store({
     layout,
     modal,
     notification,
-    publishLocation,
+    publishLocation: locationTemplate(emptyPublishLocation),
     queue,
     syncedContent,
-    syncLocation,
+    syncLocation: locationTemplate(emptySyncLocation),
     userInfo,
     workspace,
   },
@@ -59,6 +60,41 @@ const store = new Vuex.Store({
       utils.types.forEach(type => Object.assign(result, state[type].itemMap));
       return result;
     },
+    itemPaths: (state) => {
+      const result = {};
+      const getPath = (item) => {
+        let itemPath = result[item.id];
+        if (!itemPath) {
+          if (item.parendId === 'trash') {
+            itemPath = `.stackedit-trash/${item.name}`;
+          } else {
+            let name = item.name;
+            if (item.type === 'folder') {
+              name += '/';
+            }
+            const parent = state.folder.itemMap[item.parentId];
+            if (!parent) {
+              itemPath = name;
+            } else {
+              itemPath = getPath(parent) + name;
+            }
+          }
+        }
+        result[item.id] = itemPath;
+        return itemPath;
+      };
+      [...state.folder.items, ...state.file.items].forEach(item => getPath(item));
+      return result;
+    },
+    pathItems: (state, getters) => {
+      const result = {};
+      const itemPaths = getters.itemPaths;
+      const allItemMap = getters.allItemMap;
+      Object.entries(itemPaths).forEach(([id, path]) => {
+        result[path] = allItemMap[id];
+      });
+      return result;
+    },
     isSponsor: (state, getters) => {
       const sponsorToken = getters['workspace/sponsorToken'];
       return state.light || state.monetizeSponsor || (sponsorToken && sponsorToken.isSponsor);
diff --git a/src/store/locationTemplate.js b/src/store/locationTemplate.js
new file mode 100644
index 00000000..f4932791
--- /dev/null
+++ b/src/store/locationTemplate.js
@@ -0,0 +1,43 @@
+import moduleTemplate from './moduleTemplate';
+import providerRegistry from '../services/providers/common/providerRegistry';
+
+const addToGroup = (groups, item) => {
+  const list = groups[item.fileId] || [];
+  list.push(item);
+  groups[item.fileId] = list;
+};
+
+export default (empty) => {
+  const module = moduleTemplate(empty);
+
+  module.getters = {
+    ...module.getters,
+    groupedByFileId: (state, getters) => {
+      const groups = {};
+      getters.items.forEach(item => addToGroup(groups, item));
+      return groups;
+    },
+    filteredGroupedByFileId: (state, getters) => {
+      const groups = {};
+      getters.items.filter((item) => {
+        // Filter items that we can't use
+        const provider = providerRegistry.providers[item.providerId];
+        return provider && provider.getToken(item);
+      }).forEach(item => addToGroup(groups, item));
+      return groups;
+    },
+    current: (state, getters, rootState, rootGetters) => {
+      const locations = getters.filteredGroupedByFileId[rootGetters['file/current'].id] || [];
+      return locations.map((location) => {
+        const provider = providerRegistry.providers[location.providerId];
+        return {
+          ...location,
+          description: provider.getDescription(location),
+          url: provider.getUrl(location),
+        };
+      });
+    },
+  };
+
+  return module;
+};
diff --git a/src/store/moduleTemplate.js b/src/store/moduleTemplate.js
index 58423519..68524c03 100644
--- a/src/store/moduleTemplate.js
+++ b/src/store/moduleTemplate.js
@@ -3,10 +3,7 @@ import utils from '../services/utils';
 
 export default (empty, simpleHash = false) => {
   // Use Date.now() as a simple hash function, which is ok for not-synced types
-  const hashFunc = simpleHash ? Date.now : item => utils.hash(utils.serializeObject({
-    ...item,
-    hash: undefined,
-  }));
+  const hashFunc = simpleHash ? Date.now : item => utils.getItemHash(item);
 
   return {
     namespaced: true,
@@ -19,7 +16,7 @@ export default (empty, simpleHash = false) => {
     mutations: {
       setItem(state, value) {
         const item = Object.assign(empty(value.id), value);
-        if (!item.hash) {
+        if (!item.hash || !simpleHash) {
           item.hash = hashFunc(item);
         }
         Vue.set(state.itemMap, item.id, item);
diff --git a/src/store/publishLocation.js b/src/store/publishLocation.js
deleted file mode 100644
index 931503e7..00000000
--- a/src/store/publishLocation.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptyPublishLocation';
-import providerRegistry from '../services/providers/providerRegistry';
-
-const module = moduleTemplate(empty);
-
-module.getters = {
-  ...module.getters,
-  groupedByFileId: (state, getters) => {
-    const result = {};
-    getters.items.forEach((item) => {
-      // Filter items that we can't use
-      const provider = providerRegistry.providers[item.providerId];
-      if (provider && provider.getToken(item)) {
-        const list = result[item.fileId] || [];
-        list.push(item);
-        result[item.fileId] = list;
-      }
-    });
-    return result;
-  },
-  current: (state, getters, rootState, rootGetters) => {
-    const locations = getters.groupedByFileId[rootGetters['file/current'].id] || [];
-    return locations.map((location) => {
-      const provider = providerRegistry.providers[location.providerId];
-      return {
-        ...location,
-        description: provider.getDescription(location),
-        url: provider.getUrl(location),
-      };
-    });
-  },
-};
-
-export default module;
diff --git a/src/store/syncLocation.js b/src/store/syncLocation.js
deleted file mode 100644
index c1277c97..00000000
--- a/src/store/syncLocation.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptySyncLocation';
-import providerRegistry from '../services/providers/providerRegistry';
-
-const module = moduleTemplate(empty);
-
-module.getters = {
-  ...module.getters,
-  groupedByFileId: (state, getters) => {
-    const result = {};
-    getters.items.forEach((item) => {
-      // Filter items that we can't use
-      const provider = providerRegistry.providers[item.providerId];
-      if (provider && provider.getToken(item)) {
-        const list = result[item.fileId] || [];
-        list.push(item);
-        result[item.fileId] = list;
-      }
-    });
-    return result;
-  },
-  current: (state, getters, rootState, rootGetters) => {
-    const locations = getters.groupedByFileId[rootGetters['file/current'].id] || [];
-    return locations.map((location) => {
-      const provider = providerRegistry.providers[location.providerId];
-      return {
-        ...location,
-        description: provider.getDescription(location),
-        url: provider.getUrl(location),
-      };
-    });
-  },
-};
-
-export default module;
diff --git a/src/store/workspace.js b/src/store/workspace.js
index 9facee00..4d647b7f 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -36,6 +36,10 @@ export default {
           const googleTokens = rootGetters['data/googleTokens'];
           return googleTokens[workspace.sub];
         }
+        case 'githubWorkspace': {
+          const githubTokens = rootGetters['data/githubTokens'];
+          return githubTokens[workspace.sub];
+        }
         case 'couchdbWorkspace': {
           const couchdbTokens = rootGetters['data/couchdbTokens'];
           return couchdbTokens[workspace.id];

From b896a2e086995836a262ea75a3881539a4efef86 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Fri, 4 May 2018 19:07:28 +0100
Subject: [PATCH 02/19] Github workspace (part 2)

---
 package-lock.json                             |  12 +-
 package.json                                  |   4 +-
 src/components/Explorer.vue                   |   7 +-
 src/components/ExplorerNode.vue               |  40 ++---
 src/components/NavigationBar.vue              |  26 ++-
 src/components/ProviderName.vue               |   5 -
 src/components/gutters/Comment.vue            |   2 +-
 src/components/gutters/CurrentDiscussion.vue  |   2 +-
 src/components/gutters/NewComment.vue         |  13 +-
 src/components/menus/ExportMenu.vue           |   8 +-
 src/components/menus/HistoryMenu.vue          |   2 +-
 src/components/menus/ImportMenu.vue           |  13 +-
 src/components/menus/MainMenu.vue             |   7 +-
 src/components/menus/MoreMenu.vue             |   4 +-
 src/components/menus/PublishMenu.vue          |  30 ++--
 src/components/menus/SyncMenu.vue             |  16 +-
 src/components/menus/WorkspacesMenu.vue       |   8 +-
 src/components/modals/AboutModal.vue          |   2 +-
 src/components/modals/PandocExportModal.vue   |   3 +-
 src/components/modals/PdfExportModal.vue      |   3 +-
 .../modals/WorkspaceManagementModal.vue       |   2 +-
 src/components/modals/common/ModalInner.vue   |   2 +-
 src/services/backupSvc.js                     |  37 ++--
 src/services/explorerSvc.js                   |  85 +++++++++
 src/services/fileSvc.js                       | 162 ++++++++++++++++++
 src/services/localDbSvc.js                    |  21 ++-
 src/services/providers/common/Provider.js     |   2 +
 src/services/providers/dropboxProvider.js     |  30 ++--
 src/services/providers/githubProvider.js      |  27 +--
 .../providers/githubWorkspaceProvider.js      |   5 +-
 .../providers/googleDriveAppDataProvider.js   |   2 +-
 src/services/providers/googleDriveProvider.js |  34 ++--
 .../providers/googleDriveWorkspaceProvider.js |   5 +-
 .../providers/helpers/couchdbHelper.js        |   6 +-
 .../providers/helpers/githubHelper.js         |  20 ++-
 .../providers/helpers/googleHelper.js         |   2 +-
 src/services/syncSvc.js                       |   3 +-
 src/services/tempFileSvc.js                   |   7 +-
 src/services/userSvc.js                       |  41 ++++-
 src/services/utils.js                         |  30 +++-
 src/store/discussion.js                       |   2 +-
 src/store/explorer.js                         |  80 ---------
 src/store/index.js                            |  46 ++---
 src/store/modal.js                            |  20 ++-
 src/store/moduleTemplate.js                   |   5 +-
 src/store/workspace.js                        |  24 +++
 46 files changed, 588 insertions(+), 319 deletions(-)
 create mode 100644 src/services/explorerSvc.js
 create mode 100644 src/services/fileSvc.js

diff --git a/package-lock.json b/package-lock.json
index b0d751ed..2384fa89 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14498,9 +14498,9 @@
       }
     },
     "vue": {
-      "version": "2.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz",
-      "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw=="
+      "version": "2.5.16",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
+      "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
     "vue-hot-reload-api": {
       "version": "2.2.4",
@@ -14588,9 +14588,9 @@
       "dev": true
     },
     "vuex": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-2.5.0.tgz",
-      "integrity": "sha512-5oJPOJySBgSgSzoeO+gZB/BbN/XsapgIF6tz34UwJqnGZMQurzIO3B4KIBf862gfc9ya+oduY5sSkq+5/oOilQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
+      "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
     },
     "w3c-hr-time": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index dcd24257..ee9f15ac 100644
--- a/package.json
+++ b/package.json
@@ -52,8 +52,8 @@
     "serve-static": "^1.12.6",
     "tmp": "^0.0.33",
     "turndown": "^4.0.1",
-    "vue": "^2.3.3",
-    "vuex": "^2.3.1"
+    "vue": "^2.5.16",
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
diff --git a/src/components/Explorer.vue b/src/components/Explorer.vue
index ec8ff0d5..f412f4c0 100644
--- a/src/components/Explorer.vue
+++ b/src/components/Explorer.vue
@@ -28,6 +28,7 @@
 <script>
 import { mapState, mapGetters, mapActions } from 'vuex';
 import ExplorerNode from './ExplorerNode';
+import explorerSvc from '../services/explorerSvc';
 
 export default {
   components: {
@@ -49,10 +50,8 @@ export default {
     ...mapActions('data', [
       'toggleExplorer',
     ]),
-    ...mapActions('explorer', [
-      'newItem',
-      'deleteItem',
-    ]),
+    newItem: isFolder => explorerSvc.newItem(isFolder),
+    deleteItem: () => explorerSvc.deleteItem(),
     editItem() {
       const node = this.selectedNode;
       if (!node.isTrash && !node.isTemp) {
diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index 2a1c18dd..e45f0bd1 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -19,7 +19,8 @@
 
 <script>
 import { mapMutations, mapActions } from 'vuex';
-import utils from '../services/utils';
+import fileSvc from '../services/fileSvc';
+import explorerSvc from '../services/explorerSvc';
 
 export default {
   name: 'explorer-node', // Required for recursivity
@@ -77,8 +78,6 @@ export default {
     ]),
     ...mapActions('explorer', [
       'setDragTarget',
-      'newItem',
-      'deleteItem',
     ]),
     select(id = this.node.item.id, doOpen = true) {
       const node = this.$store.getters['explorer/nodeMap'][id];
@@ -102,31 +101,26 @@ export default {
       const newChildNode = this.$store.state.explorer.newChildNode;
       if (!cancel && !newChildNode.isNil && newChildNode.item.name) {
         if (newChildNode.isFolder) {
-          const id = utils.uid();
-          this.$store.commit('folder/setItem', {
-            ...newChildNode.item,
-            id,
-            name: utils.sanitizeName(newChildNode.item.name),
-          });
-          this.select(id);
+          fileSvc.storeItem(newChildNode.item)
+            .then(item => this.select(item.id), () => { /* cancel */ });
         } else {
-          this.$store.dispatch('createFile', newChildNode.item)
-            .then(file => this.select(file.id));
+          fileSvc.createFile(newChildNode.item)
+            .then(item => this.select(item.id), () => { /* cancel */ });
         }
       }
       this.$store.commit('explorer/setNewItem', null);
     },
     submitEdit(cancel) {
-      const editingNode = this.$store.getters['explorer/editingNode'];
-      const id = editingNode.item.id;
+      const item = this.$store.getters['explorer/editingNode'].item;
       const value = this.editingValue;
-      if (!cancel && id && value) {
-        this.$store.commit(editingNode.isFolder ? 'folder/patchItem' : 'file/patchItem', {
-          id,
-          name: utils.sanitizeName(value),
-        });
-      }
       this.setEditingId(null);
+      if (!cancel && item.id && value) {
+        fileSvc.storeItem({
+          ...item,
+          name: value,
+        })
+          .catch(() => { /* cancel */ });
+      }
     },
     setDragSourceId(evt) {
       if (this.node.noDrag) {
@@ -169,11 +163,11 @@ export default {
           items: [{
             name: 'New file',
             disabled: !this.node.isFolder || this.node.isTrash,
-            perform: () => this.newItem(false),
+            perform: () => explorerSvc.newItem(false),
           }, {
             name: 'New folder',
             disabled: !this.node.isFolder || this.node.isTrash || this.node.isTemp,
-            perform: () => this.newItem(true),
+            perform: () => explorerSvc.newItem(true),
           }, {
             type: 'separator',
           }, {
@@ -182,7 +176,7 @@ export default {
             perform: () => this.setEditingId(this.node.item.id),
           }, {
             name: 'Delete',
-            perform: () => this.deleteItem(),
+            perform: () => explorerSvc.deleteItem(),
           }],
         })
           .then(item => item.perform());
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
index 3168d2a1..30ca4117 100644
--- a/src/components/NavigationBar.vue
+++ b/src/components/NavigationBar.vue
@@ -19,7 +19,7 @@
       <!-- Title -->
       <div class="navigation-bar__title navigation-bar__title--fake text-input"></div>
       <div class="navigation-bar__title navigation-bar__title--text text-input" :style="{width: titleWidth + 'px'}">{{title}}</div>
-      <input class="navigation-bar__title navigation-bar__title--input text-input" :class="{'navigation-bar__title--focus': titleFocus, 'navigation-bar__title--scrolling': titleScrolling}" :style="{width: titleWidth + 'px'}" @focus="editTitle(true)" @blur="editTitle(false)" @keydown.enter="submitTitle()" @keydown.esc="submitTitle(true)" @mouseenter="titleHover = true" @mouseleave="titleHover = false" v-model="title">
+      <input class="navigation-bar__title navigation-bar__title--input text-input" :class="{'navigation-bar__title--focus': titleFocus, 'navigation-bar__title--scrolling': titleScrolling}" :style="{width: titleWidth + 'px'}" @focus="editTitle(true)" @blur="editTitle(false)" @keydown.enter="submitTitle(false)" @keydown.esc="submitTitle(true)" @mouseenter="titleHover = true" @mouseleave="titleHover = false" v-model="title">
       <!-- Sync/Publish -->
       <div class="flex flex--row" :class="{'navigation-bar__hidden': styles.hideLocations}">
         <a class="navigation-bar__button navigation-bar__button--location button" :class="{'navigation-bar__button--blink': location.id === currentLocation.id}" v-for="location in syncLocations" :key="location.id" :href="location.url" target="_blank" v-title="'Synchronized location'"><icon-provider :provider-id="location.providerId"></icon-provider></a>
@@ -56,6 +56,7 @@ import tempFileSvc from '../services/tempFileSvc';
 import utils from '../services/utils';
 import pagedownButtons from '../data/pagedownButtons';
 import store from '../store';
+import fileSvc from '../services/fileSvc';
 
 // According to mousetrap
 const mod = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Meta' : 'Ctrl';
@@ -151,6 +152,13 @@ export default {
       }
       return result;
     },
+    editCancelTrigger() {
+      const current = this.$store.getters['file/current'];
+      return utils.serializeObject([
+        current.id,
+        current.name,
+      ]);
+    },
   },
   methods: {
     ...mapMutations('content', [
@@ -190,10 +198,13 @@ export default {
         this.titleInputElt.setSelectionRange(0, this.titleInputElt.value.length);
       } else {
         const title = this.title.trim();
+        this.title = this.$store.getters['file/current'].name;
         if (title) {
-          this.$store.dispatch('file/patchCurrent', { name: utils.sanitizeName(title) });
-        } else {
-          this.title = this.$store.getters['file/current'].name;
+          fileSvc.storeItem({
+            ...this.$store.getters['file/current'],
+            name: title,
+          })
+            .catch(() => { /* Cancel */ });
         }
       }
     },
@@ -209,9 +220,10 @@ export default {
   },
   created() {
     this.$watch(
-      () => this.$store.getters['file/current'].name,
-      (name) => {
-        this.title = name;
+      () => this.editCancelTrigger,
+      () => {
+        this.title = '';
+        this.editTitle(false);
       }, { immediate: true });
   },
   mounted() {
diff --git a/src/components/ProviderName.vue b/src/components/ProviderName.vue
index 7d2c1172..79e7c2d1 100644
--- a/src/components/ProviderName.vue
+++ b/src/components/ProviderName.vue
@@ -3,8 +3,6 @@
 </template>
 
 <script>
-import userSvc from '../services/userSvc';
-
 export default {
   props: ['providerId'],
   computed: {
@@ -15,8 +13,5 @@ export default {
       }
     },
   },
-  created() {
-    userSvc.getInfo(this.userId);
-  },
 };
 </script>
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index 594020ce..df554595 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -51,7 +51,7 @@ export default {
       this.$store.dispatch('modal/commentDeletion')
         .then(
           () => this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment }),
-          () => {}); // Cancel
+          () => { /* Cancel */ });
     },
   },
   mounted() {
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index 8fa8df66..53671090 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -99,7 +99,7 @@ export default {
           () => this.$store.dispatch('discussion/cleanCurrentFile', {
             filterDiscussion: this.currentDiscussion,
           }),
-          () => {}); // Cancel
+          () => { /* Cancel */ });
     },
   },
 };
diff --git a/src/components/gutters/NewComment.vue b/src/components/gutters/NewComment.vue
index 127c7161..48e9887b 100644
--- a/src/components/gutters/NewComment.vue
+++ b/src/components/gutters/NewComment.vue
@@ -3,7 +3,7 @@
     <div class="comment__header flex flex--row flex--space-between flex--align-center">
       <div class="comment__user flex flex--row flex--align-center">
         <div class="comment__user-image">
-          <user-image :user-id="loginToken.sub"></user-image>
+          <user-image :user-id="userId"></user-image>
         </div>
         <span class="user-name">{{loginToken.name}}</span>
       </div>
@@ -33,9 +33,12 @@ export default {
   components: {
     UserImage,
   },
-  computed: mapGetters('workspace', [
-    'loginToken',
-  ]),
+  computed: {
+    ...mapGetters('workspace', [
+      'loginToken',
+      'userId',
+    ]),
+  },
   methods: {
     ...mapMutations('discussion', [
       'setNewCommentFocus',
@@ -53,7 +56,7 @@ export default {
           const discussionId = this.$store.state.discussion.currentDiscussionId;
           const comment = {
             discussionId,
-            sub: this.loginToken.sub,
+            sub: this.userId,
             text,
             created: Date.now(),
           };
diff --git a/src/components/menus/ExportMenu.vue b/src/components/menus/ExportMenu.vue
index 585daa8f..5a9f8d95 100644
--- a/src/components/menus/ExportMenu.vue
+++ b/src/components/menus/ExportMenu.vue
@@ -35,19 +35,19 @@ export default {
     exportMarkdown() {
       const currentFile = this.$store.getters['file/current'];
       return exportSvc.exportToDisk(currentFile.id, 'md')
-        .catch(() => {}); // Cancel
+        .catch(() => { /* Cancel */ });
     },
     exportHtml() {
       return this.$store.dispatch('modal/open', 'htmlExport')
-        .catch(() => {}); // Cancel
+        .catch(() => { /* Cancel */ });
     },
     exportPdf() {
       return this.$store.dispatch('modal/open', 'pdfExport')
-        .catch(() => {}); // Cancel
+        .catch(() => { /* Cancel */ });
     },
     exportPandoc() {
       return this.$store.dispatch('modal/open', 'pandocExport')
-        .catch(() => {}); // Cancel
+        .catch(() => { /* Cancel */ });
     },
   },
 };
diff --git a/src/components/menus/HistoryMenu.vue b/src/components/menus/HistoryMenu.vue
index 2481be94..cb6d31f0 100644
--- a/src/components/menus/HistoryMenu.vue
+++ b/src/components/menus/HistoryMenu.vue
@@ -100,7 +100,7 @@ export default {
       return googleHelper.signin()
         .then(
           () => syncSvc.requestSync(),
-          () => {}, // Cancel
+          () => { /* Cancel */ },
         );
     },
     close() {
diff --git a/src/components/menus/ImportMenu.vue b/src/components/menus/ImportMenu.vue
index a8892e54..2ae25382 100644
--- a/src/components/menus/ImportMenu.vue
+++ b/src/components/menus/ImportMenu.vue
@@ -29,6 +29,7 @@ import htmlSanitizer from '../../libs/htmlSanitizer';
 import MenuEntry from './common/MenuEntry';
 import Provider from '../../services/providers/common/Provider';
 import store from '../../store';
+import fileSvc from '../../services/fileSvc';
 
 const turndownService = new TurndownService(store.getters['data/computedSettings'].turndown);
 
@@ -55,16 +56,18 @@ export default {
     onImportMarkdown(evt) {
       const file = evt.target.files[0];
       readFile(file)
-        .then(content => this.$store.dispatch('createFile', {
+        .then(content => fileSvc.createFile({
           ...Provider.parseContent(content),
           name: file.name,
         })
-          .then(item => this.$store.commit('file/setCurrentId', item.id)));
+        .then(
+          item => this.$store.commit('file/setCurrentId', item.id)),
+          () => { /* Cancel */ });
     },
     onImportHtml(evt) {
       const file = evt.target.files[0];
       readFile(file)
-        .then(content => this.$store.dispatch('createFile', {
+        .then(content => fileSvc.createFile({
           ...Provider.parseContent(
             turndownService.turndown(
               htmlSanitizer.sanitizeHtml(content)
@@ -72,7 +75,9 @@ export default {
               )),
           name: file.name,
         }))
-        .then(item => this.$store.commit('file/setCurrentId', item.id));
+        .then(
+          item => this.$store.commit('file/setCurrentId', item.id),
+          () => { /* Cancel */ });
     },
   },
 };
diff --git a/src/components/menus/MainMenu.vue b/src/components/menus/MainMenu.vue
index fab1b4da..3994ad70 100644
--- a/src/components/menus/MainMenu.vue
+++ b/src/components/menus/MainMenu.vue
@@ -3,7 +3,7 @@
     <div class="menu-info-entries">
       <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-if="loginToken">
         <div class="menu-entry__icon menu-entry__icon--image">
-          <user-image :user-id="loginToken.sub"></user-image>
+          <user-image :user-id="userId"></user-image>
         </div>
         <span>Signed in as <b>{{loginToken.name}}</b>.</span>
       </div>
@@ -97,6 +97,7 @@ export default {
       'currentWorkspace',
       'syncToken',
       'loginToken',
+      'userId',
     ]),
   },
   methods: {
@@ -107,12 +108,12 @@ export default {
       return googleHelper.signin()
         .then(
           () => syncSvc.requestSync(),
-          () => {}, // Cancel
+          () => { /* Cancel */ },
         );
     },
     fileProperties() {
       return this.$store.dispatch('modal/open', 'fileProperties')
-        .catch(() => {}); // Cancel
+        .catch(() => { /* Cancel */ });
     },
     print() {
       print();
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 1140b06b..8f91dbee 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -82,14 +82,14 @@ export default {
       return this.$store.dispatch('modal/open', 'settings')
         .then(
           settings => this.$store.dispatch('data/setSettings', settings),
-          () => {}, // Cancel
+          () => { /* Cancel */ },
         );
     },
     templates() {
       return this.$store.dispatch('modal/open', 'templates')
         .then(
           ({ templates }) => this.$store.dispatch('data/setTemplates', templates),
-          () => {}, // Cancel
+          () => { /* Cancel */ },
         );
     },
     reset() {
diff --git a/src/components/menus/PublishMenu.vue b/src/components/menus/PublishMenu.vue
index 3b542762..6995ecf1 100644
--- a/src/components/menus/PublishMenu.vue
+++ b/src/components/menus/PublishMenu.vue
@@ -123,6 +123,8 @@ const openPublishModal = (token, type) => store.dispatch('modal/open', {
   token,
 }).then(publishLocation => publishSvc.createPublishLocation(publishLocation));
 
+const onCancel = () => {};
+
 export default {
   components: {
     MenuEntry,
@@ -181,68 +183,68 @@ export default {
         type: 'googleDriveAccount',
         onResolve: () => googleHelper.addDriveAccount(!store.getters['data/localSettings'].googleDriveRestrictedAccess),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addDropboxAccount() {
       return this.$store.dispatch('modal/open', {
         type: 'dropboxAccount',
         onResolve: () => dropboxHelper.addAccount(!store.getters['data/localSettings'].dropboxRestrictedAccess),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addGithubAccount() {
       return this.$store.dispatch('modal/open', {
         type: 'githubAccount',
         onResolve: () => githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addWordpressAccount() {
       return wordpressHelper.addAccount()
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addBloggerAccount() {
       return googleHelper.addBloggerAccount()
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addZendeskAccount() {
       return this.$store.dispatch('modal/open', {
         type: 'zendeskAccount',
         onResolve: ({ subdomain, clientId }) => zendeskHelper.addAccount(subdomain, clientId),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishGoogleDrive(token) {
       return openPublishModal(token, 'googleDrivePublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishDropbox(token) {
       return openPublishModal(token, 'dropboxPublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishGithub(token) {
       return openPublishModal(token, 'githubPublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishGist(token) {
       return openPublishModal(token, 'gistPublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishWordpress(token) {
       return openPublishModal(token, 'wordpressPublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishBlogger(token) {
       return openPublishModal(token, 'bloggerPublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishBloggerPage(token) {
       return openPublishModal(token, 'bloggerPagePublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     publishZendesk(token) {
       return openPublishModal(token, 'zendeskPublish')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
   },
 };
diff --git a/src/components/menus/SyncMenu.vue b/src/components/menus/SyncMenu.vue
index b78d1b2b..1721f5e2 100644
--- a/src/components/menus/SyncMenu.vue
+++ b/src/components/menus/SyncMenu.vue
@@ -101,6 +101,8 @@ const openSyncModal = (token, type) => store.dispatch('modal/open', {
   token,
 }).then(syncLocation => syncSvc.createSyncLocation(syncLocation));
 
+const onCancel = () => {};
+
 export default {
   components: {
     MenuEntry,
@@ -150,21 +152,21 @@ export default {
         type: 'googleDriveAccount',
         onResolve: () => googleHelper.addDriveAccount(!store.getters['data/localSettings'].googleDriveRestrictedAccess),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addDropboxAccount() {
       return this.$store.dispatch('modal/open', {
         type: 'dropboxAccount',
         onResolve: () => dropboxHelper.addAccount(!store.getters['data/localSettings'].dropboxRestrictedAccess),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addGithubAccount() {
       return this.$store.dispatch('modal/open', {
         type: 'githubAccount',
         onResolve: () => githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess),
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     openGoogleDrive(token) {
       return googleHelper.openPicker(token, 'doc')
@@ -178,11 +180,11 @@ export default {
     },
     saveGoogleDrive(token) {
       return openSyncModal(token, 'googleDriveSave')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     saveDropbox(token) {
       return openSyncModal(token, 'dropboxSave')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     openGithub(token) {
       return store.dispatch('modal/open', {
@@ -194,11 +196,11 @@ export default {
     },
     saveGithub(token) {
       return openSyncModal(token, 'githubSave')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     saveGist(token) {
       return openSyncModal(token, 'gistSync')
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
   },
 };
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index 527ff2d4..f7af5494 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -31,6 +31,8 @@ import { mapGetters } from 'vuex';
 import MenuEntry from './common/MenuEntry';
 import googleHelper from '../../services/providers/helpers/googleHelper';
 
+const onCancel = () => {};
+
 export default {
   components: {
     MenuEntry,
@@ -48,13 +50,13 @@ export default {
       return this.$store.dispatch('modal/open', {
         type: 'couchdbWorkspace',
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addGithubWorkspace() {
       return this.$store.dispatch('modal/open', {
         type: 'githubWorkspace',
       })
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     addGoogleDriveWorkspace() {
       return googleHelper.addDriveAccount(true)
@@ -62,7 +64,7 @@ export default {
           type: 'googleDriveWorkspace',
           token,
         }))
-        .catch(() => {}); // Cancel
+        .catch(onCancel);
     },
     manageWorkspaces() {
       return this.$store.dispatch('modal/open', 'workspaceManagement');
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index 83f07783..0e7be875 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -2,7 +2,7 @@
   <modal-inner class="modal__inner-1--about-modal" aria-label="About">
     <div class="modal__content">
       <div class="logo-background"></div>
-      <small>v{{version}} — © 2018 Dock5 Software</small>
+      <small>v{{version}}<br>© 2013-2018 Dock5 Software</small>
       <hr>
       StackEdit on <a target="_blank" href="https://github.com/benweet/stackedit/">GitHub</a>
       <br>
diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue
index 068a1699..6c315c8b 100644
--- a/src/components/modals/PandocExportModal.vue
+++ b/src/components/modals/PandocExportModal.vue
@@ -70,7 +70,8 @@ export default modalTemplate({
           if (err.status !== 401) {
             throw err;
           }
-          this.$store.dispatch('modal/sponsorOnly');
+          this.$store.dispatch('modal/sponsorOnly')
+            .catch(() => { /* Cancel */ });
         }))
         .catch((err) => {
           console.error(err); // eslint-disable-line no-console
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index 6d4b9380..e5188732 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -63,7 +63,8 @@ export default modalTemplate({
           if (err.status !== 401) {
             throw err;
           }
-          this.$store.dispatch('modal/sponsorOnly');
+          this.$store.dispatch('modal/sponsorOnly')
+            .catch(() => { /* Cancel */ });
         }))
         .catch((err) => {
           console.error(err); // eslint-disable-line no-console
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 494ca035..44106651 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -79,7 +79,7 @@ export default {
       return this.$store.dispatch('modal/removeWorkspace')
         .then(
           () => localDbSvc.removeWorkspace(id),
-          () => {}, // Cancel
+          () => { /* Cancel */ },
         );
     },
   },
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index bde7012b..82643793 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -42,7 +42,7 @@ export default {
             this.$store.dispatch('modal/open', 'sponsor');
           }
         })
-        .catch(() => {}); // Cancel
+        .catch(() => { /* Cancel */ });
     },
   },
 };
diff --git a/src/services/backupSvc.js b/src/services/backupSvc.js
index 0141b124..a2be99bc 100644
--- a/src/services/backupSvc.js
+++ b/src/services/backupSvc.js
@@ -1,9 +1,10 @@
-import store from '../store';
+import fileSvc from './fileSvc';
 import utils from './utils';
 
 export default {
-  importBackup(jsonValue) {
-    const nameMap = {};
+  async importBackup(jsonValue) {
+    const fileNameMap = {};
+    const folderNameMap = {};
     const parentIdMap = {};
     const textMap = {};
     const propertiesMap = {};
@@ -22,24 +23,18 @@ export default {
           // StackEdit v4 format
           const [, v4Id, type] = v4Match;
           if (type === 'title') {
-            nameMap[v4Id] = value;
+            fileNameMap[v4Id] = value;
           } else if (type === 'content') {
             textMap[v4Id] = value;
           }
         } else if (value.type === 'folder') {
           // StackEdit v5 folder
-          const folderId = utils.uid();
-          const name = utils.sanitizeName(value.name);
-          const parentId = `${value.parentId || ''}` || null;
-          store.commit('folder/setItem', {
-            id: folderId,
-            name,
-            parentId,
-          });
-          folderIdMap[id] = folderId;
+          folderIdMap[id] = utils.uid();
+          folderNameMap[id] = value.name;
+          parentIdMap[id] = `${value.parentId || ''}`;
         } else if (value.type === 'file') {
           // StackEdit v5 file
-          nameMap[id] = utils.sanitizeName(value.name);
+          fileNameMap[id] = value.name;
           parentIdMap[id] = `${value.parentId || ''}`;
         } else if (value.type === 'content') {
           // StackEdit v5 content
@@ -54,14 +49,20 @@ export default {
       }
     });
 
-    // Go through the maps
-    Object.entries(nameMap).forEach(([externalId, name]) => store.dispatch('createFile', {
-      name,
+    await utils.awaitSequence(Object.keys(folderNameMap), async externalId => fileSvc.storeItem({
+      id: folderIdMap[externalId],
+      type: 'folder',
+      name: folderNameMap[externalId],
+      parentId: folderIdMap[parentIdMap[externalId]],
+    }, true));
+
+    await utils.awaitSequence(Object.keys(fileNameMap), async externalId => fileSvc.createFile({
+      name: fileNameMap[externalId],
       parentId: folderIdMap[parentIdMap[externalId]],
       text: textMap[externalId],
       properties: propertiesMap[externalId],
       discussions: discussionsMap[externalId],
       comments: commentsMap[externalId],
-    }));
+    }, true));
   },
 };
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
new file mode 100644
index 00000000..b89963b2
--- /dev/null
+++ b/src/services/explorerSvc.js
@@ -0,0 +1,85 @@
+import store from '../store';
+import fileSvc from './fileSvc';
+
+export default {
+  newItem(isFolder = false) {
+    let parentId = store.getters['explorer/selectedNodeFolder'].item.id;
+    if (parentId === 'trash' // Not allowed to create new items in the trash
+      || (isFolder && parentId === 'temp') // Not allowed to create new folders in the temp folder
+    ) {
+      parentId = null;
+    }
+    store.dispatch('explorer/openNode', parentId);
+    store.commit('explorer/setNewItem', {
+      type: isFolder ? 'folder' : 'file',
+      parentId,
+    });
+  },
+  deleteItem() {
+    const selectedNode = store.getters['explorer/selectedNode'];
+    if (selectedNode.isNil) {
+      return Promise.resolve();
+    }
+    if (selectedNode.isTrash || selectedNode.item.parentId === 'trash') {
+      return store.dispatch('modal/trashDeletion').catch(() => { /* Cancel */ });
+    }
+
+    // See if we have a dialog to show
+    let modalAction;
+    let moveToTrash = true;
+    if (selectedNode.isTemp) {
+      modalAction = 'modal/tempFolderDeletion';
+      moveToTrash = false;
+    } else if (selectedNode.item.parentId === 'temp') {
+      modalAction = 'modal/tempFileDeletion';
+      moveToTrash = false;
+    } else if (selectedNode.isFolder) {
+      modalAction = 'modal/folderDeletion';
+    }
+
+    return (modalAction
+      ? store.dispatch(modalAction, selectedNode.item)
+      : Promise.resolve())
+      .then(() => {
+        const deleteFile = (id) => {
+          if (moveToTrash) {
+            store.commit('file/patchItem', {
+              id,
+              parentId: 'trash',
+            });
+          } else {
+            fileSvc.deleteFile(id);
+          }
+        };
+
+        if (selectedNode === store.getters['explorer/selectedNode']) {
+          const currentFileId = store.getters['file/current'].id;
+          let doClose = selectedNode.item.id === currentFileId;
+          if (selectedNode.isFolder) {
+            const recursiveDelete = (folderNode) => {
+              folderNode.folders.forEach(recursiveDelete);
+              folderNode.files.forEach((fileNode) => {
+                doClose = doClose || fileNode.item.id === currentFileId;
+                deleteFile(fileNode.item.id);
+              });
+              store.commit('folder/deleteItem', folderNode.item.id);
+            };
+            recursiveDelete(selectedNode);
+          } else {
+            deleteFile(selectedNode.item.id);
+          }
+          if (doClose) {
+            // Close the current file by opening the last opened, not deleted one
+            store.getters['data/lastOpenedIds'].some((id) => {
+              const file = store.state.file.itemMap[id];
+              if (file.parentId === 'trash') {
+                return false;
+              }
+              store.commit('file/setCurrentId', id);
+              return true;
+            });
+          }
+        }
+      }, () => { /* Cancel */ });
+  },
+};
diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js
new file mode 100644
index 00000000..20a30471
--- /dev/null
+++ b/src/services/fileSvc.js
@@ -0,0 +1,162 @@
+import store from '../store';
+import utils from './utils';
+
+const forbiddenFolderNameMatcher = /^\.stackedit-data$|^\.stackedit-trash$|\.md$|\.sync$|\.publish$/;
+
+export default {
+  /**
+   * Create a file in the store with the specified fields.
+   */
+  createFile(fields = {}, background = false) {
+    const id = utils.uid();
+    const file = {
+      id,
+      name: utils.sanitizeName(fields.name),
+      parentId: fields.parentId || null,
+    };
+    const content = {
+      id: `${id}/content`,
+      text: utils.sanitizeText(fields.text || store.getters['data/computedSettings'].newFileContent),
+      properties: utils.sanitizeText(
+        fields.properties || store.getters['data/computedSettings'].newFileProperties),
+      discussions: fields.discussions || {},
+      comments: fields.comments || {},
+    };
+    const nameStripped = file.name !== utils.defaultName && file.name !== fields.name;
+
+    // Check if there is a path conflict
+    const workspaceUniquePaths = store.getters['workspace/hasUniquePaths'];
+    let pathConflict;
+    if (workspaceUniquePaths) {
+      const parentPath = store.getters.itemPaths[file.parentId] || '';
+      const path = parentPath + file.name;
+      pathConflict = !!store.getters.pathItems[path];
+    }
+
+    // Show warning dialogs and then save in the store
+    return Promise.resolve()
+      .then(() => !background && nameStripped && store.dispatch('modal/stripName', fields.name))
+      .then(() => !background && pathConflict && store.dispatch('modal/pathConflict', fields.name))
+      .then(() => {
+        store.commit('content/setItem', content);
+        store.commit('file/setItem', file);
+        if (workspaceUniquePaths) {
+          this.makePathUnique(id);
+        }
+        return store.state.file.itemMap[id];
+      });
+  },
+
+  /**
+   * Make sanity checks and then create/update the folder/file in the store.
+   */
+  async storeItem(item, background = false) {
+    const id = item.id || utils.uid();
+    const sanitizedName = utils.sanitizeName(item.name);
+
+    if (item.type === 'folder' && forbiddenFolderNameMatcher.exec(sanitizedName)) {
+      if (background) {
+        return null;
+      }
+      await store.dispatch('modal/unauthorizedName', item.name);
+      throw new Error('Unauthorized name.');
+    }
+
+    const workspaceUniquePaths = store.getters['workspace/hasUniquePaths'];
+
+    // Show warning dialogs
+    if (!background) {
+      // If name has been stripped
+      if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) {
+        await store.dispatch('modal/stripName', item.name);
+      }
+      // Check if there is a path conflict
+      if (workspaceUniquePaths) {
+        const parentPath = store.getters.itemPaths[item.parentId] || '';
+        const path = parentPath + sanitizedName;
+        const pathItems = store.getters.pathItems[path] || [];
+        if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) {
+          await store.dispatch('modal/pathConflict', item.name);
+        }
+      }
+    }
+
+    // Save item in the store
+    store.commit(`${item.type}/setItem`, {
+      id,
+      parentId: item.parentId || null,
+      name: sanitizedName,
+    });
+
+    // Ensure path uniqueness
+    if (workspaceUniquePaths) {
+      this.makePathUnique(id);
+    }
+    return store.getters.allItemMap[id];
+  },
+
+  /**
+   * Delete a file in the store and all its related items.
+   */
+  deleteFile(fileId) {
+    // Delete the file
+    store.commit('file/deleteItem', fileId);
+    // Delete the content
+    store.commit('content/deleteItem', `${fileId}/content`);
+    // Delete the syncedContent
+    store.commit('syncedContent/deleteItem', `${fileId}/syncedContent`);
+    // Delete the contentState
+    store.commit('contentState/deleteItem', `${fileId}/contentState`);
+    // Delete sync locations
+    (store.getters['syncLocation/groupedByFileId'][fileId] || [])
+      .forEach(item => store.commit('syncLocation/deleteItem', item.id));
+    // Delete publish locations
+    (store.getters['publishLocation/groupedByFileId'][fileId] || [])
+      .forEach(item => store.commit('publishLocation/deleteItem', item.id));
+  },
+
+  /**
+   * Ensure two files/folders don't have the same path if the workspace doesn't support it.
+   */
+  ensureUniquePaths() {
+    if (store.getters['workspace/hasUniquePaths']) {
+      if (Object.keys(store.getters.itemPaths).some(id => this.makePathUnique(id))) {
+        this.ensureUniquePaths();
+      }
+    }
+  },
+
+  /**
+   * Return false if the file/folder path is unique.
+   * Add a prefix to its name and return true otherwise.
+   */
+  makePathUnique(id) {
+    const item = store.getters.allItemMap[id];
+    if (!item) {
+      return false;
+    }
+    let path = store.getters.itemPaths[id];
+    const pathItems = store.getters.pathItems;
+    if (pathItems[path].length === 1) {
+      return false;
+    }
+    const isFolder = item.type === 'folder';
+    if (isFolder) {
+      // Remove trailing slash
+      path = path.slice(0, -1);
+    }
+    for (let suffix = 1; ; suffix += 1) {
+      let pathWithPrefix = `${path}.${suffix}`;
+      if (isFolder) {
+        pathWithPrefix += '/';
+      }
+      if (!pathItems[pathWithPrefix]) {
+        store.commit(`${item.type}/patchItem`, {
+          id: item.id,
+          name: `${item.name}.${suffix}`,
+        });
+        return true;
+      }
+    }
+  },
+};
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index 36af63b5..453c13da 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -2,6 +2,7 @@ import FileSaver from 'file-saver';
 import utils from './utils';
 import store from '../store';
 import welcomeFile from '../data/welcomeFile.md';
+import fileSvc from './fileSvc';
 
 const dbVersion = 1;
 const dbStoreName = 'objects';
@@ -186,6 +187,7 @@ const localDbSvc = {
             dbStore.delete(item.id);
           }
         });
+        fileSvc.ensureUniquePaths();
         this.lastTx = lastTx;
         cb(storeItemMap);
       }
@@ -249,20 +251,20 @@ const localDbSvc = {
    * Read and apply one DB change.
    */
   readDbItem(dbItem, storeItemMap) {
-    const existingStoreItem = storeItemMap[dbItem.id];
+    const storeItem = storeItemMap[dbItem.id];
     if (!dbItem.hash) {
       // DB item is a delete marker
       delete this.hashMap[dbItem.type][dbItem.id];
-      if (existingStoreItem) {
+      if (storeItem) {
         // Remove item from the store
-        store.commit(`${existingStoreItem.type}/deleteItem`, existingStoreItem.id);
-        delete storeItemMap[existingStoreItem.id];
+        store.commit(`${storeItem.type}/deleteItem`, storeItem.id);
+        delete storeItemMap[storeItem.id];
       }
     } else if (this.hashMap[dbItem.type][dbItem.id] !== dbItem.hash) {
       // DB item is different from the corresponding store item
       this.hashMap[dbItem.type][dbItem.id] = dbItem.hash;
       // Update content only if it exists in the store
-      if (existingStoreItem || !contentTypes[dbItem.type] || exportWorkspace) {
+      if (storeItem || !contentTypes[dbItem.type] || exportWorkspace) {
         // Put item in the store
         dbItem.tx = undefined;
         store.commit(`${dbItem.type}/setItem`, dbItem);
@@ -403,13 +405,14 @@ const localDbSvc = {
           // Clean files
           store.getters['file/items']
             .filter(file => file.parentId === 'trash') // If file is in the trash
-            .forEach(file => store.dispatch('deleteFile', file.id));
+            .forEach(file => fileSvc.deleteFile(file.id));
         }
 
         // Enable sponsorship
         if (utils.queryParams.paymentSuccess) {
           location.hash = ''; // PaymentSuccess param is always on its own
-          store.dispatch('modal/paymentSuccess');
+          store.dispatch('modal/paymentSuccess')
+            .catch(() => { /* Cancel */ });
           const sponsorToken = store.getters['workspace/sponsorToken'];
           // Force check sponsorship after a few seconds
           const currentDate = Date.now();
@@ -438,10 +441,10 @@ const localDbSvc = {
                 store.commit('file/setCurrentId', recentFile.id);
               } else {
                 // If still no ID, create a new file
-                store.dispatch('createFile', {
+                fileSvc.createFile({
                   name: 'Welcome file',
                   text: welcomeFile,
-                })
+                }, true)
                   // Set it as the current file
                   .then(newFile => store.commit('file/setCurrentId', newFile.id));
               }
diff --git a/src/services/providers/common/Provider.js b/src/services/providers/common/Provider.js
index 13c32a1c..1dab5605 100644
--- a/src/services/providers/common/Provider.js
+++ b/src/services/providers/common/Provider.js
@@ -83,7 +83,9 @@ export default class Provider {
             parentId: null,
           });
         }
+        return true;
       }
     }
+    return false;
   }
 }
diff --git a/src/services/providers/dropboxProvider.js b/src/services/providers/dropboxProvider.js
index a95acbe7..f386fddd 100644
--- a/src/services/providers/dropboxProvider.js
+++ b/src/services/providers/dropboxProvider.js
@@ -2,6 +2,7 @@ import store from '../../store';
 import dropboxHelper from './helpers/dropboxHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
+import fileSvc from '../fileSvc';
 
 const makePathAbsolute = (token, path) => {
   if (!token.fullAccess) {
@@ -88,12 +89,6 @@ export default new Provider({
       };
       return this.downloadContent(token, syncLocation)
         .then((content) => {
-          const id = utils.uid();
-          delete content.history;
-          store.commit('content/setItem', {
-            ...content,
-            id: `${id}/content`,
-          });
           let name = path;
           const slashPos = name.lastIndexOf('/');
           if (slashPos > -1 && slashPos < name.length - 1) {
@@ -103,25 +98,30 @@ export default new Provider({
           if (dotPos > 0 && slashPos < name.length) {
             name = name.slice(0, dotPos);
           }
-          store.commit('file/setItem', {
-            id,
-            name: utils.sanitizeName(name),
+          return fileSvc.createFile({
+            name,
             parentId: store.getters['file/current'].parentId,
-          });
+            text: content.text,
+            properties: content.properties,
+            discussions: content.discussions,
+            comments: content.comments,
+          }, true);
+        })
+        .then((item) => {
+          store.commit('file/setCurrentId', item.id);
           store.commit('syncLocation/setItem', {
             ...syncLocation,
             id: utils.uid(),
-            fileId: id,
+            fileId: item.id,
           });
-          store.commit('file/setCurrentId', id);
           store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Dropbox.`);
-        }, () => {
+        })
+        .catch(() => {
           store.dispatch('notification/error', `Could not open file ${path}.`);
         })
         .then(() => openOneFile());
     };
-    return Promise.resolve()
-      .then(() => openOneFile());
+    return Promise.resolve(openOneFile());
   },
   makeLocation(token, path) {
     return {
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index 7777abba..5552abef 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -2,6 +2,7 @@ import store from '../../store';
 import githubHelper from './helpers/githubHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
+import fileSvc from '../fileSvc';
 
 const savedSha = {};
 
@@ -75,12 +76,6 @@ export default new Provider({
         // Download content from GitHub and create the file
         return this.downloadContent(token, syncLocation)
           .then((content) => {
-            const id = utils.uid();
-            delete content.history;
-            store.commit('content/setItem', {
-              ...content,
-              id: `${id}/content`,
-            });
             let name = syncLocation.path;
             const slashPos = name.lastIndexOf('/');
             if (slashPos > -1 && slashPos < name.length - 1) {
@@ -90,19 +85,25 @@ export default new Provider({
             if (dotPos > 0 && slashPos < name.length) {
               name = name.slice(0, dotPos);
             }
-            store.commit('file/setItem', {
-              id,
-              name: utils.sanitizeName(name),
+            return fileSvc.createFile({
+              name,
               parentId: store.getters['file/current'].parentId,
-            });
+              text: content.text,
+              properties: content.properties,
+              discussions: content.discussions,
+              comments: content.comments,
+            }, true);
+          })
+          .then((item) => {
+            store.commit('file/setCurrentId', item.id);
             store.commit('syncLocation/setItem', {
               ...syncLocation,
               id: utils.uid(),
-              fileId: id,
+              fileId: item.id,
             });
-            store.commit('file/setCurrentId', id);
             store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from GitHub.`);
-          }, () => {
+          })
+          .catch(() => {
             store.dispatch('notification/error', `Could not open file ${syncLocation.path}.`);
           });
       });
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 38ad18e9..13967254 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -479,12 +479,13 @@ export default new Provider({
         } else if (entry.committer && entry.committer.login) {
           user = entry.committer;
         }
-        userSvc.addInfo({ id: user.login, name: user.login, imageUrl: user.avatar_url });
+        const sub = `gh:${user.id}`;
+        userSvc.addInfo({ id: sub, name: user.login, imageUrl: user.avatar_url });
         const date = (entry.commit.author && entry.commit.author.date)
           || (entry.commit.committer && entry.commit.committer.date);
         return {
           id: entry.sha,
-          sub: user.login,
+          sub,
           created: date ? new Date(date).getTime() : 1,
         };
       })
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index fca5b53d..7c9498bc 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -136,7 +136,7 @@ export default new Provider({
     return googleHelper.getAppDataFileRevisions(token, syncData.id)
       .then(revisions => revisions.map(revision => ({
         id: revision.id,
-        sub: revision.lastModifyingUser && revision.lastModifyingUser.permissionId,
+        sub: revision.lastModifyingUser && `go:${revision.lastModifyingUser.permissionId}`,
         created: new Date(revision.modifiedTime).getTime(),
       }))
         .sort((revision1, revision2) => revision2.created - revision1.created));
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index e0fc988a..3f9a4893 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -2,6 +2,7 @@ import store from '../../store';
 import googleHelper from './helpers/googleHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
+import fileSvc from '../fileSvc';
 
 export default new Provider({
   id: 'googleDrive',
@@ -93,7 +94,7 @@ export default new Provider({
         const token = store.getters['data/googleTokens'][state.userId];
         switch (token && state.action) {
           case 'create':
-            return store.dispatch('createFile')
+            return fileSvc.createFile({}, true)
               .then((file) => {
                 store.commit('file/setCurrentId', file.id);
                 // Return a new syncLocation
@@ -169,32 +170,29 @@ export default new Provider({
         sub: token.sub,
       };
       return this.downloadContent(token, syncLocation)
-        .then((content) => {
-          const id = utils.uid();
-          delete content.history;
-          store.commit('content/setItem', {
-            ...content,
-            id: `${id}/content`,
-          });
-          store.commit('file/setItem', {
-            id,
-            name: utils.sanitizeName(driveFile.name),
-            parentId: store.getters['file/current'].parentId,
-          });
+        .then(content => fileSvc.createFile({
+          name,
+          parentId: store.getters['file/current'].parentId,
+          text: content.text,
+          properties: content.properties,
+          discussions: content.discussions,
+          comments: content.comments,
+        }, true))
+        .then((item) => {
+          store.commit('file/setCurrentId', item.id);
           store.commit('syncLocation/setItem', {
             ...syncLocation,
             id: utils.uid(),
-            fileId: id,
+            fileId: item.id,
           });
-          store.commit('file/setCurrentId', id);
           store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Google Drive.`);
-        }, () => {
+        })
+        .catch(() => {
           store.dispatch('notification/error', `Could not open file ${driveFile.id}.`);
         })
         .then(() => openOneFile());
     };
-    return Promise.resolve()
-      .then(() => openOneFile());
+    return Promise.resolve(openOneFile());
   },
   makeLocation(token, fileId, folderId) {
     const location = {
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index 6b56b00b..a1696ac9 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -2,6 +2,7 @@ import store from '../../store';
 import googleHelper from './helpers/googleHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
+import fileSvc from '../fileSvc';
 
 const getSyncData = (fileId) => {
   const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
@@ -195,9 +196,9 @@ export default new Provider({
                     [syncData.id]: syncData,
                   });
                 }
-                return store.dispatch('createFile', {
+                return fileSvc.createFile({
                   parentId: syncData && syncData.itemId,
-                })
+                }, true)
                   .then((file) => {
                     store.commit('file/setCurrentId', file.id);
                     // File will be created on next workspace sync
diff --git a/src/services/providers/helpers/couchdbHelper.js b/src/services/providers/helpers/couchdbHelper.js
index 50ea4e81..a681f418 100644
--- a/src/services/providers/helpers/couchdbHelper.js
+++ b/src/services/providers/helpers/couchdbHelper.js
@@ -91,9 +91,9 @@ export default {
       method: 'POST',
       body: { item, time: Date.now() },
     };
-    const loginToken = store.getters['workspace/loginToken'];
-    if (loginToken) {
-      options.body.sub = loginToken.sub;
+    const userId = store.getters['workspace/userId'];
+    if (userId) {
+      options.body.sub = userId;
     }
     if (documentId) {
       options.method = 'PUT';
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index 4ec99841..1423fc19 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -73,6 +73,22 @@ export default {
   addAccount(repoFullAccess = false) {
     return this.startOauth2(getScopes({ repoFullAccess }));
   },
+  getUser(userId) {
+    return networkSvc.request({
+      url: `https://api.github.com/user/${userId}`,
+      params: {
+        t: Date.now(), // Prevent from caching
+      },
+    })
+      .then((res) => {
+        store.commit('userInfo/addItem', {
+          id: `gh:${res.body.id}`,
+          name: res.body.login,
+          imageUrl: res.body.avatar_url || '',
+        });
+        return res.body;
+      });
+  },
   getTree(token, owner, repo, sha) {
     return repoRequest(token, owner, repo, {
       url: `git/trees/${encodeURIComponent(sha)}?recursive=1`,
@@ -86,9 +102,9 @@ export default {
   },
   getHeadTree(token, owner, repo, branch) {
     return repoRequest(token, owner, repo, {
-      url: `branches/${encodeURIComponent(branch)}`,
+      url: `commits/${encodeURIComponent(branch)}`,
     })
-      .then(res => this.getTree(token, owner, repo, res.body.commit.commit.tree.sha));
+      .then(res => this.getTree(token, owner, repo, res.body.commit.tree.sha));
   },
   getCommits(token, owner, repo, sha, path) {
     return repoRequest(token, owner, repo, {
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 4748eb66..f579fb6a 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -203,7 +203,7 @@ export default {
     }, true)
       .then((res) => {
         store.commit('userInfo/addItem', {
-          id: res.body.id,
+          id: `go:${res.body.id}`,
           name: res.body.displayName,
           imageUrl: (res.body.image.url || '').replace(/\bsz?=\d+$/, 'sz=40'),
         });
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 15462c97..e37aae35 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -9,6 +9,7 @@ import './providers/couchdbWorkspaceProvider';
 import './providers/githubWorkspaceProvider';
 import './providers/googleDriveWorkspaceProvider';
 import tempFileSvc from './tempFileSvc';
+import fileSvc from './fileSvc';
 
 const minAutoSyncEvery = 60 * 1000; // 60 sec
 const inactivityThreshold = 3 * 1000; // 3 sec
@@ -746,7 +747,7 @@ function requestSync() {
             Object.entries(fileHashesToClean).forEach(([fileId, fileHash]) => {
               const file = store.state.file.itemMap[fileId];
               if (file && file.hash === fileHash) {
-                store.dispatch('deleteFile', fileId);
+                fileSvc.deleteFile(fileId);
               }
             });
           })
diff --git a/src/services/tempFileSvc.js b/src/services/tempFileSvc.js
index e24e075f..d2ea5098 100644
--- a/src/services/tempFileSvc.js
+++ b/src/services/tempFileSvc.js
@@ -2,6 +2,7 @@ import cledit from './cledit';
 import store from '../store';
 import utils from './utils';
 import editorSvc from './editorSvc';
+import fileSvc from './fileSvc';
 
 const origin = utils.queryParams.origin;
 const fileName = utils.queryParams.fileName;
@@ -29,12 +30,12 @@ export default {
 
     store.commit('setLight', true);
 
-    return store.dispatch('createFile', {
+    return fileSvc.createFile({
       name: fileName || utils.getHostname(origin),
       text: contentText || '\n',
       properties: contentProperties,
       parentId: 'temp',
-    })
+    }, true)
       .then((file) => {
         const fileItemMap = store.state.file.itemMap;
 
@@ -57,7 +58,7 @@ export default {
           .splice(10)
           .forEach(([id]) => {
             delete lastCreated[id];
-            store.dispatch('deleteFile', id);
+            fileSvc.deleteFile(id);
           });
 
         // Store file creations and open the file
diff --git a/src/services/userSvc.js b/src/services/userSvc.js
index d0566d48..d9f41a24 100644
--- a/src/services/userSvc.js
+++ b/src/services/userSvc.js
@@ -1,8 +1,16 @@
 import googleHelper from './providers/helpers/googleHelper';
+import githubHelper from './providers/helpers/githubHelper';
+import utils from './utils';
 import store from '../store';
 
 const promised = {};
 
+const parseUserId = (userId) => {
+  const prefix = userId[2] === ':' && userId.slice(0, 2);
+  const type = prefix && utils.userIdPrefixes[prefix];
+  return type ? [type, userId.slice(3)] : ['google', userId];
+};
+
 export default {
   addInfo({ id, name, imageUrl }) {
     promised[id] = true;
@@ -10,8 +18,10 @@ export default {
   },
   getInfo(userId) {
     if (!promised[userId]) {
+      const [type, sub] = parseUserId(userId);
+
       // Try to find a token with this sub
-      const token = store.getters['data/googleTokens'][userId];
+      const token = store.getters[`data/${type}Tokens`][sub];
       if (token) {
         store.commit('userInfo/addItem', {
           id: userId,
@@ -19,16 +29,31 @@ export default {
         });
       }
 
-      // Get user info from Google
+      // Get user info from provider
       if (!store.state.offline) {
         promised[userId] = true;
-        googleHelper.getUser(userId)
-          .catch((err) => {
-            if (err.status !== 404) {
-              promised[userId] = false;
-            }
-          });
+        switch (type) {
+          case 'github': {
+            return githubHelper.getUser(sub)
+              .catch((err) => {
+                if (err.status !== 404) {
+                  promised[userId] = false;
+                }
+              });
+          }
+          case 'google':
+          default: {
+            return googleHelper.getUser(sub)
+              .catch((err) => {
+                if (err.status !== 404) {
+                  promised[userId] = false;
+                }
+              });
+          }
+        }
       }
     }
+
+    return null;
   },
 };
diff --git a/src/services/utils.js b/src/services/utils.js
index 7e405fec..7ae94411 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -23,6 +23,7 @@ const parseQueryParams = (params) => {
   return result;
 };
 
+
 // For utils.computeProperties()
 const deepOverride = (obj, opt) => {
   if (obj === undefined) {
@@ -96,14 +97,23 @@ export default {
     'layoutSettings',
     'tokens',
   ],
+  userIdPrefixes: {
+    go: 'google',
+    gh: 'github',
+  },
   textMaxLength: 250000,
   sanitizeText(text) {
     const result = `${text || ''}`.slice(0, this.textMaxLength);
     // last char must be a `\n`.
     return `${result}\n`.replace(/\n\n$/, '\n');
   },
+  defaultName: 'Untitled',
   sanitizeName(name) {
-    return `${name || ''}`.slice(0, 250) || 'Untitled';
+    return `${name || ''}`
+      // Replace `/`, control characters and other kind of spaces with a space
+      .replace(/[/\x00-\x1F\x7f-\xa0\s]+/g, ' ').trim()
+      // Keep only 250 characters
+      .slice(0, 250) || this.defaultName;
   },
   deepCopy,
   serializeObject(obj) {
@@ -124,9 +134,8 @@ export default {
       // If every field fits the criteria
       if (Object.entries(criteria).every(([key, value]) => value === item[key])) {
         result = item;
-        return true;
       }
-      return false;
+      return result;
     });
     return result;
   },
@@ -199,6 +208,18 @@ export default {
   setInterval(func, interval) {
     return setInterval(() => func(), this.randomize(interval));
   },
+  async awaitSequence(values, asyncFunc) {
+    const results = [];
+    const valuesLeft = values.slice().reverse();
+    const runWithNextValue = async () => {
+      if (!valuesLeft.length) {
+        return results;
+      }
+      results.push(await asyncFunc(valuesLeft.pop()));
+      return runWithNextValue();
+    };
+    return runWithNextValue();
+  },
   parseQueryParams,
   addQueryParams(url = '', params = {}, hash = false) {
     const keys = Object.keys(params).filter(key => params[key] != null);
@@ -239,9 +260,6 @@ export default {
     }
     return result;
   },
-  concatPaths(...paths) {
-    return paths.join('/').replace(/\/+/g, '/');
-  },
   getHostname(url) {
     urlParser.href = url;
     return urlParser.hostname;
diff --git a/src/store/discussion.js b/src/store/discussion.js
index 063613f1..da9d06d2 100644
--- a/src/store/discussion.js
+++ b/src/store/discussion.js
@@ -130,7 +130,7 @@ export default {
             .then(() => syncSvc.requestSync())
             .then(() => dispatch('createNewDiscussion', selection)),
         }, { root: true })
-          .catch(() => { }); // Cancel
+          .catch(() => { /* Cancel */ });
       } else if (selection) {
         let text = rootGetters['content/current'].text.slice(selection.start, selection.end).trim();
         const maxLength = 80;
diff --git a/src/store/explorer.js b/src/store/explorer.js
index ea2066ef..651aabb5 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -190,85 +190,5 @@ export default {
       commit('setDragTargetId', id);
       dispatch('openDragTarget');
     },
-    newItem({ getters, commit, dispatch }, isFolder) {
-      let parentId = getters.selectedNodeFolder.item.id;
-      if (parentId === 'trash' // Not allowed to create new items in the trash
-        || (isFolder && parentId === 'temp') // Not allowed to create new folders in the temp folder
-      ) {
-        parentId = null;
-      }
-      dispatch('openNode', parentId);
-      commit('setNewItem', {
-        type: isFolder ? 'folder' : 'file',
-        parentId,
-      });
-    },
-    deleteItem({ rootState, getters, rootGetters, commit, dispatch }) {
-      const selectedNode = getters.selectedNode;
-      if (selectedNode.isNil) {
-        return Promise.resolve();
-      }
-      if (selectedNode.isTrash || selectedNode.item.parentId === 'trash') {
-        return dispatch('modal/trashDeletion', null, { root: true });
-      }
-
-      // See if we have a dialog to show
-      let modalAction;
-      let moveToTrash = true;
-      if (selectedNode.isTemp) {
-        modalAction = 'modal/tempFolderDeletion';
-        moveToTrash = false;
-      } else if (selectedNode.item.parentId === 'temp') {
-        modalAction = 'modal/tempFileDeletion';
-        moveToTrash = false;
-      } else if (selectedNode.isFolder) {
-        modalAction = 'modal/folderDeletion';
-      }
-
-      return (modalAction
-        ? dispatch(modalAction, selectedNode.item, { root: true })
-        : Promise.resolve())
-        .then(() => {
-          const deleteFile = (id) => {
-            if (moveToTrash) {
-              commit('file/patchItem', {
-                id,
-                parentId: 'trash',
-              }, { root: true });
-            } else {
-              dispatch('deleteFile', id, { root: true });
-            }
-          };
-
-          if (selectedNode === getters.selectedNode) {
-            const currentFileId = rootGetters['file/current'].id;
-            let doClose = selectedNode.item.id === currentFileId;
-            if (selectedNode.isFolder) {
-              const recursiveDelete = (folderNode) => {
-                folderNode.folders.forEach(recursiveDelete);
-                folderNode.files.forEach((fileNode) => {
-                  doClose = doClose || fileNode.item.id === currentFileId;
-                  deleteFile(fileNode.item.id);
-                });
-                commit('folder/deleteItem', folderNode.item.id, { root: true });
-              };
-              recursiveDelete(selectedNode);
-            } else {
-              deleteFile(selectedNode.item.id);
-            }
-            if (doClose) {
-              // Close the current file by opening the last opened, not deleted one
-              rootGetters['data/lastOpenedIds'].some((id) => {
-                const file = rootState.file.itemMap[id];
-                if (file.parentId === 'trash') {
-                  return false;
-                }
-                commit('file/setCurrentId', id, { root: true });
-                return true;
-              });
-            }
-          }
-        }, () => {}); // Cancel
-    },
   },
 };
diff --git a/src/store/index.js b/src/store/index.js
index 9bb536b2..52221774 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -62,6 +62,7 @@ const store = new Vuex.Store({
     },
     itemPaths: (state) => {
       const result = {};
+      const folderMap = state.folder.itemMap;
       const getPath = (item) => {
         let itemPath = result[item.id];
         if (!itemPath) {
@@ -69,29 +70,31 @@ const store = new Vuex.Store({
             itemPath = `.stackedit-trash/${item.name}`;
           } else {
             let name = item.name;
-            if (item.type === 'folder') {
+            if (folderMap[item.id]) {
               name += '/';
             }
-            const parent = state.folder.itemMap[item.parentId];
-            if (!parent) {
-              itemPath = name;
+            const parentFolder = folderMap[item.parentId];
+            if (parentFolder) {
+              itemPath = getPath(parentFolder) + name;
             } else {
-              itemPath = getPath(parent) + name;
+              itemPath = name;
             }
           }
         }
         result[item.id] = itemPath;
         return itemPath;
       };
+
       [...state.folder.items, ...state.file.items].forEach(item => getPath(item));
       return result;
     },
     pathItems: (state, getters) => {
       const result = {};
-      const itemPaths = getters.itemPaths;
       const allItemMap = getters.allItemMap;
-      Object.entries(itemPaths).forEach(([id, path]) => {
-        result[path] = allItemMap[id];
+      Object.entries(getters.itemPaths).forEach(([id, path]) => {
+        const items = result[path] || [];
+        items.push(allItemMap[id]);
+        result[path] = items;
       });
       return result;
     },
@@ -131,33 +134,6 @@ const store = new Vuex.Store({
       }
       return Promise.resolve();
     },
-    createFile({ state, getters, commit }, desc = {}) {
-      const id = utils.uid();
-      commit('content/setItem', {
-        id: `${id}/content`,
-        text: utils.sanitizeText(desc.text || getters['data/computedSettings'].newFileContent),
-        properties: utils.sanitizeText(
-          desc.properties || getters['data/computedSettings'].newFileProperties),
-        discussions: desc.discussions || {},
-        comments: desc.comments || {},
-      });
-      commit('file/setItem', {
-        id,
-        name: utils.sanitizeName(desc.name),
-        parentId: desc.parentId || null,
-      });
-      return Promise.resolve(state.file.itemMap[id]);
-    },
-    deleteFile({ getters, commit }, fileId) {
-      (getters['syncLocation/groupedByFileId'][fileId] || [])
-        .forEach(item => commit('syncLocation/deleteItem', item.id));
-      (getters['publishLocation/groupedByFileId'][fileId] || [])
-        .forEach(item => commit('publishLocation/deleteItem', item.id));
-      commit('file/deleteItem', fileId);
-      commit('content/deleteItem', `${fileId}/content`);
-      commit('syncedContent/deleteItem', `${fileId}/syncedContent`);
-      commit('contentState/deleteItem', `${fileId}/contentState`);
-    },
   },
   strict: debug,
   plugins: debug ? [createLogger()] : [],
diff --git a/src/store/modal.js b/src/store/modal.js
index ffcf989e..9814225f 100644
--- a/src/store/modal.js
+++ b/src/store/modal.js
@@ -74,13 +74,27 @@ export default {
     }),
     trashDeletion: ({ dispatch }) => dispatch('open', {
       content: '<p>Files in the trash are automatically deleted after 7 days of inactivity.</p>',
-      resolveText: 'Ok',
+      rejectText: 'Ok',
     }),
     fileRestoration: ({ dispatch }) => dispatch('open', {
       content: '<p>You are about to revert some changes. Are you sure?</p>',
       resolveText: 'Yes, revert',
       rejectText: 'No',
     }),
+    unauthorizedName: ({ dispatch }, name) => dispatch('open', {
+      content: `<p><b>${name}</b> is not an authorized name.</p>`,
+      rejectText: 'Ok',
+    }),
+    stripName: ({ dispatch }, name) => dispatch('open', {
+      content: `<p><b>${name}</b> contains illegal characters. Do you want to strip them?</p>`,
+      resolveText: 'Yes, strip',
+      rejectText: 'No',
+    }),
+    pathConflict: ({ dispatch }, name) => dispatch('open', {
+      content: `<p><b>${name}</b> already exists. Do you want to add a suffix?</p>`,
+      resolveText: 'Yes, add suffix',
+      rejectText: 'No',
+    }),
     removeWorkspace: ({ dispatch }) => dispatch('open', {
       content: '<p>You are about to remove a workspace locally. Are you sure?</p>',
       resolveText: 'Yes, remove',
@@ -127,11 +141,11 @@ export default {
     }),
     sponsorOnly: ({ dispatch }) => dispatch('open', {
       content: '<p>This feature is restricted to sponsors as it relies on server resources.</p>',
-      resolveText: 'Ok, I understand',
+      rejectText: 'Ok, I understand',
     }),
     paymentSuccess: ({ dispatch }) => dispatch('open', {
       content: '<p>Thank you for your payment! Your sponsorship will be active in a minute.</p>',
-      resolveText: 'Ok',
+      rejectText: 'Ok',
     }),
   },
 };
diff --git a/src/store/moduleTemplate.js b/src/store/moduleTemplate.js
index 68524c03..b82cdcc2 100644
--- a/src/store/moduleTemplate.js
+++ b/src/store/moduleTemplate.js
@@ -11,7 +11,10 @@ export default (empty, simpleHash = false) => {
       itemMap: {},
     },
     getters: {
-      items: state => Object.entries(state.itemMap).map(([, item]) => item),
+      items: (state) => {
+        console.log(state.itemMap);
+        return Object.values(state.itemMap);
+      },
     },
     mutations: {
       setItem(state, value) {
diff --git a/src/store/workspace.js b/src/store/workspace.js
index 4d647b7f..8be204fd 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -1,3 +1,5 @@
+import utils from '../services/utils';
+
 export default {
   namespaced: true,
   state: {
@@ -21,6 +23,10 @@ export default {
       const workspaces = rootGetters['data/sanitizedWorkspaces'];
       return workspaces[state.currentWorkspaceId] || getters.mainWorkspace;
     },
+    hasUniquePaths: (state, getters) => {
+      const workspace = getters.currentWorkspace;
+      return workspace.providerId === 'githubWorkspace';
+    },
     lastSyncActivityKey: (state, getters) => `${getters.currentWorkspace.id}/lastSyncActivity`,
     lastFocusKey: (state, getters) => `${getters.currentWorkspace.id}/lastWindowFocus`,
     mainWorkspaceToken: (state, getters, rootState, rootGetters) => {
@@ -55,10 +61,28 @@ export default {
           const googleTokens = rootGetters['data/googleTokens'];
           return googleTokens[workspace.sub];
         }
+        case 'githubWorkspace': {
+          const githubTokens = rootGetters['data/githubTokens'];
+          return githubTokens[workspace.sub];
+        }
         default:
           return getters.mainWorkspaceToken;
       }
     },
+    userId: (state, getters, rootState, rootGetters) => {
+      const loginToken = getters.loginToken;
+      if (!loginToken) {
+        return null;
+      }
+      let prefix;
+      Object.entries(utils.userIdPrefixes).some(([key, value]) => {
+        if (rootGetters[`data/${value}Tokens`][loginToken.sub]) {
+          prefix = key;
+        }
+        return prefix;
+      });
+      return prefix ? `${prefix}:${loginToken.sub}` : loginToken.sub;
+    },
     sponsorToken: (state, getters) => getters.mainWorkspaceToken,
   },
   actions: {

From 1d8b67c321d02b0b7a8e4877d707463e43884cd7 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Sun, 6 May 2018 01:46:33 +0100
Subject: [PATCH 03/19] Upgraded eslint

---
 build/webpack.base.conf.js                    |    2 +
 build/webpack.prod.conf.js                    |    1 +
 build/webpack.style.conf.js                   |    2 +-
 package-lock.json                             | 5741 ++++++++++++-----
 package.json                                  |   79 +-
 server/github.js                              |    5 +-
 server/pandoc.js                              |    4 +-
 server/pdf.js                                 |   10 +-
 server/user.js                                |   45 +-
 src/components/App.vue                        |    9 +-
 src/components/ButtonBar.vue                  |    2 +-
 src/components/CodeEditor.vue                 |    2 +-
 src/components/Editor.vue                     |    5 +-
 src/components/Explorer.vue                   |    3 +-
 src/components/ExplorerNode.vue               |    4 +-
 src/components/FindReplace.vue                |   23 +-
 src/components/Layout.vue                     |    2 +-
 src/components/Modal.vue                      |    4 +-
 src/components/NavigationBar.vue              |    6 +-
 src/components/Notification.vue               |    2 +-
 src/components/Preview.vue                    |    7 +-
 src/components/SideBar.vue                    |    2 +-
 src/components/StatusBar.vue                  |    2 +-
 src/components/Tour.vue                       |    2 +-
 src/components/common/EditorClassApplier.js   |    4 +-
 src/components/common/PreviewClassApplier.js  |   16 +-
 src/components/gutters/Comment.vue            |    6 +-
 src/components/gutters/CommentList.vue        |   17 +-
 src/components/gutters/CurrentDiscussion.vue  |    5 +-
 src/components/gutters/NewComment.vue         |   16 +-
 .../gutters/PreviewNewDiscussionButton.vue    |    5 +-
 src/components/gutters/StickyComment.vue      |    2 +-
 src/components/menus/HistoryMenu.vue          |   51 +-
 src/components/menus/ImportMenu.vue           |   38 +-
 src/components/menus/MainMenu.vue             |    2 +-
 src/components/menus/MoreMenu.vue             |    4 +-
 src/components/menus/SyncMenu.vue             |   18 +-
 src/components/menus/WorkspacesMenu.vue       |    2 +-
 src/components/menus/common/MenuEntry.vue     |    2 +-
 src/components/modals/FilePropertiesModal.vue |    2 +-
 src/components/modals/HtmlExportModal.vue     |    2 +-
 src/components/modals/ImageModal.vue          |    6 +-
 src/components/modals/LinkModal.vue           |    4 +-
 src/components/modals/PandocExportModal.vue   |   20 +-
 src/components/modals/PdfExportModal.vue      |   23 +-
 .../modals/PublishManagementModal.vue         |    2 +-
 src/components/modals/SettingsModal.vue       |    2 +-
 src/components/modals/SponsorModal.vue        |    2 +-
 src/components/modals/SyncManagementModal.vue |    2 +-
 src/components/modals/TemplatesModal.vue      |    8 +-
 .../modals/WorkspaceManagementModal.vue       |    2 +-
 src/components/modals/common/ModalInner.vue   |    4 +-
 .../providers/BloggerPagePublishModal.vue     |    5 +-
 .../modals/providers/BloggerPublishModal.vue  |    5 +-
 .../modals/providers/GistPublishModal.vue     |    6 +-
 .../modals/providers/GistSyncModal.vue        |    6 +-
 .../modals/providers/GithubOpenModal.vue      |    7 +-
 .../modals/providers/GithubPublishModal.vue   |    7 +-
 .../modals/providers/GithubSaveModal.vue      |    7 +-
 .../providers/GoogleDrivePublishModal.vue     |    6 +-
 .../modals/providers/GoogleDriveSaveModal.vue |    8 +-
 .../providers/GoogleDriveWorkspaceModal.vue   |    3 +-
 .../modals/providers/GooglePhotoModal.vue     |    8 +-
 .../providers/WordpressPublishModal.vue       |    5 +-
 .../modals/providers/ZendeskPublishModal.vue  |    6 +-
 src/components/style.scss                     |    1 -
 src/extensions/libs/markdownItTasklist.js     |    5 +-
 src/extensions/markdownExtension.js           |    4 +-
 src/extensions/mermaidExtension.js            |    4 +-
 src/index.js                                  |   34 +-
 src/services/animationSvc.js                  |    4 +-
 src/services/cledit/cleditCore.js             |   19 +-
 src/services/cledit/cleditHighlighter.js      |   10 +-
 src/services/cledit/cleditKeystroke.js        |    5 +-
 src/services/cledit/cleditSelectionMgr.js     |   27 +-
 src/services/cledit/cleditUndoMgr.js          |    4 +-
 src/services/diffUtils.js                     |    3 +-
 src/services/editorSvc.js                     |   32 +-
 src/services/editorSvcDiscussions.js          |   20 +-
 src/services/editorSvcUtils.js                |    8 +-
 src/services/exportSvc.js                     |    4 +-
 src/services/fileSvc.js                       |   35 +-
 src/services/localDbSvc.js                    |   50 +-
 src/services/markdownConversionSvc.js         |   12 +-
 src/services/networkSvc.js                    |   37 +-
 src/services/optional/keystrokes.js           |    6 +-
 src/services/optional/scrollSync.js           |    8 +-
 src/services/optional/shortcuts.js            |    5 +-
 src/services/optional/taskChange.js           |    4 +-
 .../providers/couchdbWorkspaceProvider.js     |    4 +-
 src/services/providers/githubProvider.js      |    6 +-
 .../providers/githubWorkspaceProvider.js      |   10 +-
 src/services/providers/googleDriveProvider.js |    8 +-
 .../providers/googleDriveWorkspaceProvider.js |   16 +-
 .../providers/helpers/dropboxHelper.js        |    9 +-
 .../providers/helpers/githubHelper.js         |    7 +-
 .../providers/helpers/googleHelper.js         |   47 +-
 .../providers/helpers/wordpressHelper.js      |    9 +-
 .../providers/helpers/zendeskHelper.js        |    7 +-
 src/services/publishSvc.js                    |   13 +-
 src/services/sectionUtils.js                  |   20 +-
 src/services/syncSvc.js                       |   53 +-
 src/services/tempFileSvc.js                   |   10 +-
 src/services/templateWorker.js                |    1 +
 src/services/utils.js                         |   28 +-
 src/store/content.js                          |   17 +-
 src/store/data.js                             |   13 +-
 src/store/discussion.js                       |   26 +-
 src/store/explorer.js                         |    9 +-
 src/store/findReplace.js                      |    2 +-
 src/store/index.js                            |    9 +-
 src/store/layout.js                           |   13 +-
 src/store/modal.js                            |    2 +-
 src/store/moduleTemplate.js                   |    5 +-
 src/store/queue.js                            |    2 +-
 src/store/workspace.js                        |    3 +-
 src/{components/common => styles}/app.scss    |    2 -
 src/{components/common => styles}/base.scss   |    8 +-
 src/{components/common => styles}/fonts.scss  |    0
 src/styles/index.js                           |    5 +
 .../markdownHighlighting.scss                 |    0
 .../common => styles}/mermaid.scss            |    2 +
 src/{components/common => styles}/prism.scss  |    0
 .../common => styles}/variables.scss          |    0
 124 files changed, 4730 insertions(+), 2287 deletions(-)
 delete mode 100644 src/components/style.scss
 rename src/{components/common => styles}/app.scss (99%)
 rename src/{components/common => styles}/base.scss (94%)
 rename src/{components/common => styles}/fonts.scss (100%)
 create mode 100644 src/styles/index.js
 rename src/{components/common => styles}/markdownHighlighting.scss (100%)
 rename src/{components/common => styles}/mermaid.scss (99%)
 rename src/{components/common => styles}/prism.scss (100%)
 rename src/{components/common => styles}/variables.scss (100%)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 9ba3c353..4a1ff949 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -2,6 +2,7 @@ var path = require('path')
 var webpack = require('webpack')
 var utils = require('./utils')
 var config = require('../config')
+var VueLoaderPlugin = require('vue-loader/lib/plugin')
 var vueLoaderConfig = require('./vue-loader.conf')
 var StylelintPlugin = require('stylelint-webpack-plugin')
 var FaviconsWebpackPlugin = require('favicons-webpack-plugin')
@@ -81,6 +82,7 @@ module.exports = {
     ]
   },
   plugins: [
+    new VueLoaderPlugin(),
     new StylelintPlugin({
       files: ['**/*.vue', '**/*.scss']
     }),
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 2e78e351..0118c749 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -98,6 +98,7 @@ var webpackConfig = merge(baseWebpackConfig, {
       ServiceWorker: {
         events: true
       },
+      AppCache: true,
       excludes: ['**/.*', '**/*.map', '**/index.html', '**/static/oauth2/callback.html', '**/icons-*/*.png', '**/static/fonts/KaTeX_*'],
       externals: ['/', '/app', '/oauth2/callback']
     })
diff --git a/build/webpack.style.conf.js b/build/webpack.style.conf.js
index fbccd20b..4f69e8ad 100644
--- a/build/webpack.style.conf.js
+++ b/build/webpack.style.conf.js
@@ -14,7 +14,7 @@ function resolve (dir) {
 
 module.exports = {
   entry: {
-    style: './src/components/style.scss'
+    style: './src/styles/'
   },
   module: {
     rules: [{
diff --git a/package-lock.json b/package-lock.json
index 2384fa89..361a3354 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,14 +4,708 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "JSONStream": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-      "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+    "@babel/code-frame": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz",
+      "integrity": "sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==",
       "dev": true,
       "requires": {
-        "jsonparse": "0.0.5",
-        "through": "2.3.8"
+        "@babel/highlight": "7.0.0-beta.44"
+      }
+    },
+    "@babel/core": {
+      "version": "7.0.0-beta.46",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.46.tgz",
+      "integrity": "sha512-lCDbBSAhNAt+nL98xbgWmuhgrIxKvbvFHf73zlNCuXCHJkdlo7qzTofYK0ZWb+OVce8fQ17fC7DwTIhAwowzMw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0-beta.46",
+        "@babel/generator": "7.0.0-beta.46",
+        "@babel/helpers": "7.0.0-beta.46",
+        "@babel/template": "7.0.0-beta.46",
+        "@babel/traverse": "7.0.0-beta.46",
+        "@babel/types": "7.0.0-beta.46",
+        "babylon": "7.0.0-beta.46",
+        "convert-source-map": "1.5.1",
+        "debug": "3.1.0",
+        "json5": "0.5.1",
+        "lodash": "4.17.4",
+        "micromatch": "2.3.11",
+        "resolve": "1.5.0",
+        "semver": "5.5.0",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz",
+          "integrity": "sha512-7BKRkmYaPZm3Yff5HGZJKCz7RqZ5jUjknsXT6Gz5YKG23J3uq9hAj0epncCB0rlqmnZ8Q+UUpQB2tCR5mT37vw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "7.0.0-beta.46"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.46.tgz",
+          "integrity": "sha512-5VfaEVkPG0gpNSTcf70jvV+MjbMoNn4g2iluwM7MhciedkolEtmG7PcdoUj5W1EmMfngz5cF65V7UMZXJO6y8Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "7.0.0-beta.46",
+            "jsesc": "2.5.1",
+            "lodash": "4.17.4",
+            "source-map": "0.5.7",
+            "trim-right": "1.0.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.46.tgz",
+          "integrity": "sha512-zm4Kc5XB2njGs8PkmjV1zE/g1hBuphbh+VcDyFLaQsxkxSFSUtCbKwFL8AQpL/qPIcGbvX1MBt50a/3ZZH2CQA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "7.0.0-beta.46",
+            "@babel/template": "7.0.0-beta.46",
+            "@babel/types": "7.0.0-beta.46"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.46.tgz",
+          "integrity": "sha512-dPrTb7QHVx44xJLjUl3LGAc13iS7hdXdO0fiOxdRN1suIS91yGGgeuwiQBlrw5SxbFchYtwenhlKbqHdVfGyVA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "7.0.0-beta.46"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.46.tgz",
+          "integrity": "sha512-UT7acgV7wsnBPwnqslqcnUFvsPBP4TtVaYM82xPGA7+evAa8q8HXOmFk08qsMK/pX/yy4+51gJJwyw2zofnacA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "7.0.0-beta.46"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.46.tgz",
+          "integrity": "sha512-r4snW6Q8ICL3Y8hGzYJRvyG/+sc+kvkewXNedG9tQjoHmUFMwMSv/o45GWQUQswevGnWghiGkpRPivFfOuMsOA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "esutils": "2.0.2",
+            "js-tokens": "3.0.2"
+          }
+        },
+        "@babel/template": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.46.tgz",
+          "integrity": "sha512-3/qi4m0l6G/vZbEwtqfzJk73mYtuE7nvAO1zT3/ZrTAHy4sHf2vaF9Eh1w+Tau263Yrkh0bjVQPb9zw6G+GeMQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "7.0.0-beta.46",
+            "@babel/types": "7.0.0-beta.46",
+            "babylon": "7.0.0-beta.46",
+            "lodash": "4.17.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.46.tgz",
+          "integrity": "sha512-IU7MTGbcjpfhf5tyCu3sDB7sWYainZQcT+CqOBdVZXZfq5MMr130R7aiZBI2g5dJYUaW1PS81DVNpd0/Sq/Gzg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "7.0.0-beta.46",
+            "@babel/generator": "7.0.0-beta.46",
+            "@babel/helper-function-name": "7.0.0-beta.46",
+            "@babel/helper-split-export-declaration": "7.0.0-beta.46",
+            "@babel/types": "7.0.0-beta.46",
+            "babylon": "7.0.0-beta.46",
+            "debug": "3.1.0",
+            "globals": "11.5.0",
+            "invariant": "2.2.2",
+            "lodash": "4.17.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.46.tgz",
+          "integrity": "sha512-uA5aruF2KKsJxToWdDpftsrPOIQtoGrGno2hiaeO9JRvfT9xZdK11nPoC+/RF9emNzmNbWn4HCRdCY+McT5Nbw==",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2",
+            "lodash": "4.17.4",
+            "to-fast-properties": "2.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "babylon": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.46.tgz",
+          "integrity": "sha512-WFJlg2WatdkXRFMpk7BN/Uzzkjkcjk+WaqnrSCpay+RYl4ypW9ZetZyT9kNt22IH/BQNst3M6PaaBn9IXsUNrg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "globals": {
+          "version": "11.5.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
+          "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "jsesc": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+          "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz",
+      "integrity": "sha512-5xVb7hlhjGcdkKpMXgicAVgx8syK5VJz193k0i/0sLP6DzE6lRrU1K3B/rFefgdo9LPGMAOOOAWW4jycj07ShQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.0.0-beta.44",
+        "jsesc": "2.5.1",
+        "lodash": "4.17.4",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+          "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz",
+      "integrity": "sha512-MHRG2qZMKMFaBavX0LWpfZ2e+hLloT++N7rfM3DYOMUOGCD8cVjqZpwiL8a0bOX3IYcQev1ruciT0gdFFRTxzg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "7.0.0-beta.44",
+        "@babel/template": "7.0.0-beta.44",
+        "@babel/types": "7.0.0-beta.44"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz",
+      "integrity": "sha512-w0YjWVwrM2HwP6/H3sEgrSQdkCaxppqFeJtAnB23pRiJB5E/O9Yp7JAAeWBl+gGEgmBFinnTyOv2RN7rcSmMiw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.0.0-beta.44"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz",
+      "integrity": "sha512-aQ7QowtkgKKzPGf0j6u77kBMdUFVBKNHw2p/3HX/POt5/oz8ec5cs0GwlgM8Hz7ui5EwJnzyfRmkNF1Nx1N7aA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "7.0.0-beta.44"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.0.0-beta.46",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.46.tgz",
+      "integrity": "sha512-mbpH9pM3pJzo/tBr75U+zva3pqpyivogt1aofgEoD7bWFAYSuqOudRuz+m4XP6VPxxLoxcA4SFPGkuLRt9+7nQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "7.0.0-beta.46",
+        "@babel/traverse": "7.0.0-beta.46",
+        "@babel/types": "7.0.0-beta.46"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz",
+          "integrity": "sha512-7BKRkmYaPZm3Yff5HGZJKCz7RqZ5jUjknsXT6Gz5YKG23J3uq9hAj0epncCB0rlqmnZ8Q+UUpQB2tCR5mT37vw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "7.0.0-beta.46"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.46.tgz",
+          "integrity": "sha512-5VfaEVkPG0gpNSTcf70jvV+MjbMoNn4g2iluwM7MhciedkolEtmG7PcdoUj5W1EmMfngz5cF65V7UMZXJO6y8Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "7.0.0-beta.46",
+            "jsesc": "2.5.1",
+            "lodash": "4.17.4",
+            "source-map": "0.5.7",
+            "trim-right": "1.0.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.46.tgz",
+          "integrity": "sha512-zm4Kc5XB2njGs8PkmjV1zE/g1hBuphbh+VcDyFLaQsxkxSFSUtCbKwFL8AQpL/qPIcGbvX1MBt50a/3ZZH2CQA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "7.0.0-beta.46",
+            "@babel/template": "7.0.0-beta.46",
+            "@babel/types": "7.0.0-beta.46"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.46.tgz",
+          "integrity": "sha512-dPrTb7QHVx44xJLjUl3LGAc13iS7hdXdO0fiOxdRN1suIS91yGGgeuwiQBlrw5SxbFchYtwenhlKbqHdVfGyVA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "7.0.0-beta.46"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.46.tgz",
+          "integrity": "sha512-UT7acgV7wsnBPwnqslqcnUFvsPBP4TtVaYM82xPGA7+evAa8q8HXOmFk08qsMK/pX/yy4+51gJJwyw2zofnacA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "7.0.0-beta.46"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.46.tgz",
+          "integrity": "sha512-r4snW6Q8ICL3Y8hGzYJRvyG/+sc+kvkewXNedG9tQjoHmUFMwMSv/o45GWQUQswevGnWghiGkpRPivFfOuMsOA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "esutils": "2.0.2",
+            "js-tokens": "3.0.2"
+          }
+        },
+        "@babel/template": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.46.tgz",
+          "integrity": "sha512-3/qi4m0l6G/vZbEwtqfzJk73mYtuE7nvAO1zT3/ZrTAHy4sHf2vaF9Eh1w+Tau263Yrkh0bjVQPb9zw6G+GeMQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "7.0.0-beta.46",
+            "@babel/types": "7.0.0-beta.46",
+            "babylon": "7.0.0-beta.46",
+            "lodash": "4.17.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.46.tgz",
+          "integrity": "sha512-IU7MTGbcjpfhf5tyCu3sDB7sWYainZQcT+CqOBdVZXZfq5MMr130R7aiZBI2g5dJYUaW1PS81DVNpd0/Sq/Gzg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "7.0.0-beta.46",
+            "@babel/generator": "7.0.0-beta.46",
+            "@babel/helper-function-name": "7.0.0-beta.46",
+            "@babel/helper-split-export-declaration": "7.0.0-beta.46",
+            "@babel/types": "7.0.0-beta.46",
+            "babylon": "7.0.0-beta.46",
+            "debug": "3.1.0",
+            "globals": "11.5.0",
+            "invariant": "2.2.2",
+            "lodash": "4.17.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.46.tgz",
+          "integrity": "sha512-uA5aruF2KKsJxToWdDpftsrPOIQtoGrGno2hiaeO9JRvfT9xZdK11nPoC+/RF9emNzmNbWn4HCRdCY+McT5Nbw==",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2",
+            "lodash": "4.17.4",
+            "to-fast-properties": "2.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "babylon": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.46.tgz",
+          "integrity": "sha512-WFJlg2WatdkXRFMpk7BN/Uzzkjkcjk+WaqnrSCpay+RYl4ypW9ZetZyT9kNt22IH/BQNst3M6PaaBn9IXsUNrg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "globals": {
+          "version": "11.5.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
+          "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "jsesc": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+          "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz",
+      "integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "@babel/template": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz",
+      "integrity": "sha512-w750Sloq0UNifLx1rUqwfbnC6uSUk0mfwwgGRfdLiaUzfAOiH0tHJE6ILQIUi3KYkjiCDTskoIsnfqZvWLBDng==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0-beta.44",
+        "@babel/types": "7.0.0-beta.44",
+        "babylon": "7.0.0-beta.44",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.44",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+          "integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.44.tgz",
+      "integrity": "sha512-UHuDz8ukQkJCDASKHf+oDt3FVUzFd+QYfuBIsiNu/4+/ix6pP/C+uQZJ6K1oEfbCMv/IKWbgDEh7fcsnIE5AtA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0-beta.44",
+        "@babel/generator": "7.0.0-beta.44",
+        "@babel/helper-function-name": "7.0.0-beta.44",
+        "@babel/helper-split-export-declaration": "7.0.0-beta.44",
+        "@babel/types": "7.0.0-beta.44",
+        "babylon": "7.0.0-beta.44",
+        "debug": "3.1.0",
+        "globals": "11.5.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.44",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+          "integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "globals": {
+          "version": "11.5.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
+          "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.0.0-beta.44",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz",
+      "integrity": "sha512-5eTV4WRmqbaFM3v9gHAIljEQJU4Ssc6fxL61JN+Oe2ga/BwyjzjamwkCVVAQjHGuAX8i0BWo42dshL8eO5KfLQ==",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "2.0.0"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "dev": true,
+      "requires": {
+        "call-me-maybe": "1.0.1",
+        "glob-to-regexp": "0.3.0"
+      }
+    },
+    "@vue/component-compiler-utils": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-1.2.1.tgz",
+      "integrity": "sha512-l3GdahBgXlp/SoY5KU7mqMqg/BNiJAndpw/6nMfGzFooCGUkq49CT3pCMiSYy0g/2a6iBD37cHBYlsg4nulIwQ==",
+      "dev": true,
+      "requires": {
+        "consolidate": "0.15.1",
+        "hash-sum": "1.0.2",
+        "lru-cache": "4.1.2",
+        "merge-source-map": "1.1.0",
+        "postcss": "6.0.22",
+        "postcss-selector-parser": "3.1.1",
+        "prettier": "1.12.1",
+        "source-map": "0.5.7",
+        "vue-template-es2015-compiler": "1.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "consolidate": {
+          "version": "0.15.1",
+          "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+          "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "3.5.1"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
+          "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
+          }
+        },
+        "postcss": {
+          "version": "6.0.22",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
+          "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "dev": true,
+          "requires": {
+            "dot-prop": "4.2.0",
+            "indexes-of": "1.0.1",
+            "uniq": "1.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
       }
     },
     "abab": {
@@ -119,12 +813,6 @@
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
-    "ansi-escapes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-      "dev": true
-    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -265,6 +953,12 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
       "dev": true
     },
+    "array-iterate": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
+      "integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
+      "dev": true
+    },
     "array-map": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
@@ -433,9 +1127,9 @@
       }
     },
     "babel-core": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -468,15 +1162,25 @@
       }
     },
     "babel-eslint": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz",
-      "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.3.tgz",
+      "integrity": "sha512-0HeSTtaXg/Em7FCUWxwOT+KeFSO1O7LuRuzhk7g+1BjwdlQGlHq4OyMi3GqGxrNfEq8jEi6Hmt5ylEQUhurgiQ==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0"
+        "@babel/code-frame": "7.0.0-beta.44",
+        "@babel/traverse": "7.0.0-beta.44",
+        "@babel/types": "7.0.0-beta.44",
+        "babylon": "7.0.0-beta.44",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.44",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+          "integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
+          "dev": true
+        }
       }
     },
     "babel-generator": {
@@ -664,15 +1368,56 @@
       }
     },
     "babel-loader": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.4.1.tgz",
-      "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz",
+      "integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "0.1.1",
-        "loader-utils": "0.2.17",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
+        "find-cache-dir": "1.0.0",
+        "loader-utils": "1.1.0",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+          "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+          "dev": true,
+          "requires": {
+            "commondir": "1.0.1",
+            "make-dir": "1.2.0",
+            "pkg-dir": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1"
+          }
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0"
+          }
+        }
       }
     },
     "babel-messages": {
@@ -1116,7 +1861,7 @@
         "babel-plugin-transform-regenerator": "6.26.0",
         "browserslist": "2.11.1",
         "invariant": "2.2.2",
-        "semver": "5.4.1"
+        "semver": "5.5.0"
       },
       "dependencies": {
         "browserslist": {
@@ -1162,7 +1907,7 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.0",
+        "babel-core": "6.26.3",
         "babel-runtime": "6.26.0",
         "core-js": "2.5.3",
         "home-or-tmp": "2.0.0",
@@ -1235,6 +1980,12 @@
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
+    "bail": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
+      "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
+      "dev": true
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1597,6 +2348,12 @@
         }
       }
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
     "caller-path": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
@@ -1674,6 +2431,12 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "ccount": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
+      "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
+      "dev": true
+    },
     "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
@@ -1704,6 +2467,30 @@
         }
       }
     },
+    "character-entities": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
+      "integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==",
+      "dev": true
+    },
+    "character-entities-html4": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz",
+      "integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==",
+      "dev": true
+    },
+    "character-entities-legacy": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz",
+      "integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==",
+      "dev": true
+    },
+    "character-reference-invalid": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
+      "integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==",
+      "dev": true
+    },
     "chardet": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
@@ -1962,15 +2749,6 @@
         }
       }
     },
-    "cli-cursor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "1.0.1"
-      }
-    },
     "cli-spinners": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
@@ -2022,29 +2800,6 @@
       "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
       "dev": true
     },
-    "clone-deep": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz",
-      "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=",
-      "dev": true,
-      "requires": {
-        "for-own": "1.0.0",
-        "is-plain-object": "2.0.4",
-        "kind-of": "3.2.2",
-        "shallow-clone": "0.1.2"
-      },
-      "dependencies": {
-        "for-own": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-          "dev": true,
-          "requires": {
-            "for-in": "1.0.2"
-          }
-        }
-      }
-    },
     "clone-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
@@ -2086,12 +2841,24 @@
         "q": "1.5.1"
       }
     },
+    "coalescy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/coalescy/-/coalescy-1.0.0.tgz",
+      "integrity": "sha1-SwZYRrg2NhrabEtKSr9LwcrDG/E=",
+      "dev": true
+    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
+    "collapse-white-space": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
+      "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
+      "dev": true
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -2122,12 +2889,6 @@
         "color-name": "1.1.3"
       }
     },
-    "color-diff": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
-      "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
-      "dev": true
-    },
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
@@ -2149,44 +2910,6 @@
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
-    "colorguard": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.1.tgz",
-      "integrity": "sha512-qYVKTg626qpDg4/eBnPXidEPXn5+krbYqHVfyyEFBWV5z3IF4p44HKY/eE2t1ohlcrlIkDgHmFJMfQ8qMLnSFw==",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "color-diff": "0.1.7",
-        "log-symbols": "1.0.2",
-        "object-assign": "4.1.1",
-        "pipetteur": "2.0.3",
-        "plur": "2.1.2",
-        "postcss": "5.2.18",
-        "postcss-reporter": "1.4.1",
-        "text-table": "0.2.0",
-        "yargs": "1.3.3"
-      },
-      "dependencies": {
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.4",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.18"
-          }
-        },
-        "yargs": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-          "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
-          "dev": true
-        }
-      }
-    },
     "colormin": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
@@ -2286,16 +3009,6 @@
         }
       }
     },
-    "config-chain": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
-      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
-      "dev": true,
-      "requires": {
-        "ini": "1.3.5",
-        "proto-list": "1.2.4"
-      }
-    },
     "connect-history-api-fallback": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
@@ -2317,15 +3030,6 @@
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
-    "consolidate": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz",
-      "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.5.1"
-      }
-    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -2349,11 +3053,6 @@
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
-    "content-type-parser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
-      "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ=="
-    },
     "convert-source-map": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
@@ -2460,29 +3159,6 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
-    "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-      "dev": true,
-      "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.10.0",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
     "create-ecdh": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
@@ -2571,9 +3247,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.8",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.8.tgz",
-      "integrity": "sha512-4jGj7Ag6WUZ5lQyE4te9sJLn0lgkz6HI3WDE4aw98AkW1IAKXPP4blTpPeorlLDpNsYvojo0SYgRJOdz2KbuAw==",
+      "version": "0.28.11",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz",
+      "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -2584,7 +3260,7 @@
         "lodash.camelcase": "4.3.0",
         "object-assign": "4.1.1",
         "postcss": "5.2.18",
-        "postcss-modules-extract-imports": "1.1.0",
+        "postcss-modules-extract-imports": "1.2.0",
         "postcss-modules-local-by-default": "1.2.0",
         "postcss-modules-scope": "1.1.0",
         "postcss-modules-values": "1.3.0",
@@ -2592,6 +3268,32 @@
         "source-list-map": "2.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "loader-utils": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@@ -2602,53 +3304,42 @@
             "emojis-list": "2.1.0",
             "json5": "0.5.1"
           }
-        }
-      }
-    },
-    "css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-      "dev": true,
-      "requires": {
-        "css-tokenize": "1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "1.2.1",
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
         },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+        "postcss-modules-extract-imports": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz",
+          "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "postcss": "6.0.22"
+          },
+          "dependencies": {
+            "postcss": {
+              "version": "6.0.22",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
+              "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
+              "dev": true,
+              "requires": {
+                "chalk": "2.4.1",
+                "source-map": "0.6.1",
+                "supports-color": "5.4.0"
+              }
+            }
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -2700,42 +3391,6 @@
         }
       }
     },
-    "css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "1.1.14"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
     "css-what": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
@@ -2834,15 +3489,6 @@
       "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
       "dev": true
     },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "0.10.37"
-      }
-    },
     "d3": {
       "version": "3.5.17",
       "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
@@ -2876,6 +3522,16 @@
         "assert-plus": "1.0.0"
       }
     },
+    "data-urls": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.0.0.tgz",
+      "integrity": "sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==",
+      "requires": {
+        "abab": "1.0.4",
+        "whatwg-mimetype": "2.1.0",
+        "whatwg-url": "6.4.0"
+      }
+    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -2907,6 +3563,16 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "1.2.0",
+        "map-obj": "1.0.1"
+      }
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -2933,6 +3599,16 @@
         "clone": "1.0.3"
       }
     },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
+      }
+    },
     "define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
@@ -3077,62 +3753,6 @@
         "esutils": "2.0.2"
       }
     },
-    "doiuse": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
-      "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000791",
-        "css-rule-stream": "1.1.0",
-        "duplexer2": "0.0.2",
-        "jsonfilter": "1.1.2",
-        "ldjson-stream": "1.2.1",
-        "lodash": "4.17.4",
-        "multimatch": "2.1.0",
-        "postcss": "5.2.18",
-        "source-map": "0.4.4",
-        "through2": "0.6.5",
-        "yargs": "3.10.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
     "dom-converter": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
@@ -3213,6 +3833,15 @@
         "domelementtype": "1.3.0"
       }
     },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "dev": true,
+      "requires": {
+        "is-obj": "1.0.1"
+      }
+    },
     "duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
@@ -3275,30 +3904,6 @@
         "jsbn": "0.1.1"
       }
     },
-    "editorconfig": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
-      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.5.1",
-        "commander": "2.12.2",
-        "lru-cache": "3.2.0",
-        "semver": "5.4.1",
-        "sigmund": "1.0.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2"
-          }
-        }
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -3346,11 +3951,6 @@
       "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
       "dev": true
     },
-    "encodeurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA="
-    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -3403,39 +4003,28 @@
         "stackframe": "1.0.4"
       }
     },
-    "es5-ext": {
-      "version": "0.10.37",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
-      "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=",
+    "es-abstract": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
+      "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
       }
     },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.37",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.37",
-        "es6-iterator": "2.0.3",
-        "es6-set": "0.1.5",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
       }
     },
     "es6-promise": {
@@ -3444,41 +4033,6 @@
       "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
       "dev": true
     },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.37",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.37"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.37",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
-      }
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -3515,87 +4069,367 @@
         }
       }
     },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "requires": {
-        "es6-map": "0.1.5",
-        "es6-weak-map": "2.0.2",
-        "esrecurse": "4.2.0",
-        "estraverse": "4.2.0"
-      }
-    },
     "eslint": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-      "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
       "dev": true,
       "requires": {
+        "ajv": "5.5.2",
         "babel-code-frame": "6.26.0",
-        "chalk": "1.1.3",
+        "chalk": "2.4.1",
         "concat-stream": "1.6.0",
-        "debug": "2.6.9",
+        "cross-spawn": "5.1.0",
+        "debug": "3.1.0",
         "doctrine": "2.1.0",
-        "escope": "3.6.0",
-        "espree": "3.5.2",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "3.5.4",
         "esquery": "1.0.0",
-        "estraverse": "4.2.0",
         "esutils": "2.0.2",
         "file-entry-cache": "2.0.0",
+        "functional-red-black-tree": "1.0.1",
         "glob": "7.1.2",
-        "globals": "9.18.0",
+        "globals": "11.5.0",
         "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
-        "inquirer": "0.12.0",
-        "is-my-json-valid": "2.17.1",
+        "inquirer": "3.3.0",
         "is-resolvable": "1.0.1",
-        "js-yaml": "3.10.0",
-        "json-stable-stringify": "1.0.1",
+        "js-yaml": "3.11.0",
+        "json-stable-stringify-without-jsonify": "1.0.1",
         "levn": "0.3.0",
         "lodash": "4.17.4",
+        "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "natural-compare": "1.4.0",
         "optionator": "0.8.2",
         "path-is-inside": "1.0.2",
-        "pluralize": "1.2.1",
-        "progress": "1.1.8",
+        "pluralize": "7.0.0",
+        "progress": "2.0.0",
+        "regexpp": "1.1.0",
         "require-uncached": "1.0.3",
-        "shelljs": "0.7.8",
-        "strip-bom": "3.0.0",
+        "semver": "5.5.0",
+        "strip-ansi": "4.0.0",
         "strip-json-comments": "2.0.1",
-        "table": "3.8.3",
-        "text-table": "0.2.0",
-        "user-home": "2.0.0"
+        "table": "4.0.2",
+        "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.5.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+          "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+          "dev": true
+        },
+        "ajv-keywords": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+          "dev": true
+        },
+        "ansi-escapes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+          "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "2.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "espree": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+          "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+          "dev": true,
+          "requires": {
+            "acorn": "5.5.3",
+            "acorn-jsx": "3.0.1"
+          }
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "1.0.5"
+          }
+        },
+        "globals": {
+          "version": "11.5.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
+          "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "inquirer": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+          "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "3.1.0",
+            "chalk": "2.4.1",
+            "cli-cursor": "2.1.0",
+            "cli-width": "2.2.0",
+            "external-editor": "2.1.0",
+            "figures": "2.0.0",
+            "lodash": "4.17.4",
+            "mute-stream": "0.0.7",
+            "run-async": "2.3.0",
+            "rx-lite": "4.0.8",
+            "rx-lite-aggregates": "4.0.8",
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "through": "2.3.8"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "1.1.0"
+          }
+        },
+        "pluralize": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+          "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+          "dev": true
+        },
+        "progress": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+          "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "dev": true,
+          "requires": {
+            "onetime": "2.0.1",
+            "signal-exit": "3.0.2"
+          }
+        },
+        "run-async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+          "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+          "dev": true,
+          "requires": {
+            "is-promise": "2.1.0"
+          }
+        },
+        "rx-lite": {
+          "version": "4.0.8",
+          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+          "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+          "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "table": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+          "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2",
+            "ajv-keywords": "2.1.1",
+            "chalk": "2.4.1",
+            "lodash": "4.17.4",
+            "slice-ansi": "1.0.0",
+            "string-width": "2.1.1"
+          }
+        }
       }
     },
     "eslint-config-airbnb-base": {
-      "version": "11.3.2",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.2.tgz",
-      "integrity": "sha512-/fhjt/VqzBA2SRsx7ErDtv6Ayf+XLw9LIOqmpBuHFCVwyJo2EtzGWMB9fYRFBoWWQLxmNmCpenNiH0RxyeS41w==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz",
+      "integrity": "sha512-/vjm0Px5ZCpmJqnjIzcFb9TKZrKWz0gnuG/7Gfkt0Db1ELJR51xkZth+t14rYdqWgX836XbuxtArbIHlVhbLBA==",
       "dev": true,
       "requires": {
         "eslint-restricted-globals": "0.1.1"
       }
     },
     "eslint-friendly-formatter": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/eslint-friendly-formatter/-/eslint-friendly-formatter-2.0.7.tgz",
-      "integrity": "sha1-ZX+VoZr0mJY2r+uxzJ3mzrvQiO4=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-friendly-formatter/-/eslint-friendly-formatter-4.0.1.tgz",
+      "integrity": "sha1-J9UE3IN/fK3b8gGy6EpO5zC6Pvo=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
+        "chalk": "2.4.1",
+        "coalescy": "1.0.0",
         "extend": "3.0.1",
         "minimist": "1.2.0",
+        "strip-ansi": "4.0.0",
         "text-table": "0.2.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
         }
       }
     },
@@ -3610,28 +4444,42 @@
       }
     },
     "eslint-import-resolver-webpack": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.8.4.tgz",
-      "integrity": "sha512-b6JxR57ruiMxq2tIu4T/SrYED5RKJfeBEs8u3+JWF+O2RxDmFpUH84c5uS1T5qiP0K4r0SL7CXhvd41hXdDlAg==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.9.0.tgz",
+      "integrity": "sha1-IxzhV4rVEk2leZ8Cm9M9KBN2I+M=",
       "dev": true,
       "requires": {
         "array-find": "1.0.0",
         "debug": "2.6.9",
         "enhanced-resolve": "0.9.1",
-        "find-root": "0.1.2",
+        "find-root": "1.1.0",
         "has": "1.0.1",
         "interpret": "1.1.0",
         "is-absolute": "0.2.6",
-        "lodash.get": "3.7.0",
+        "lodash.get": "4.4.2",
         "node-libs-browser": "2.1.0",
         "resolve": "1.5.0",
-        "semver": "5.4.1"
+        "semver": "5.5.0"
+      },
+      "dependencies": {
+        "find-root": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+          "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+          "dev": true
+        },
+        "lodash.get": {
+          "version": "4.4.2",
+          "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+          "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+          "dev": true
+        }
       }
     },
     "eslint-loader": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-1.9.0.tgz",
-      "integrity": "sha512-40aN976qSNPyb9ejTqjEthZITpls1SVKtwguahmH1dzGCwQU/vySE+xX33VZmD8csU0ahVNCtFlsPgKqRBiqgg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.0.0.tgz",
+      "integrity": "sha512-VxxGDI4bXzLk0+/jMt/0EkGMRKS9ox6Czx+yapMb9WJmcS/ZHhlhqcVUNgUjFBNp02j/2pZLdGOrG7EXyjoz/g==",
       "dev": true,
       "requires": {
         "loader-fs-cache": "1.0.1",
@@ -3654,41 +4502,31 @@
         }
       }
     },
-    "eslint-module-utils": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz",
-      "integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "pkg-dir": "1.0.0"
-      }
-    },
     "eslint-plugin-html": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz",
-      "integrity": "sha1-fImIOrDIX6XSi2ZqFKTpBqqQuJc=",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-4.0.3.tgz",
+      "integrity": "sha512-ArFnlfQxwYSz/CP0zvk8Cy3MUhcDpT3o6jgO8eKD/b8ezcLVBrgkYzmMv+7S/ya+Yl9pN+Cz2tsgYp/zElkQzA==",
       "dev": true,
       "requires": {
         "htmlparser2": "3.9.2"
       }
     },
     "eslint-plugin-import": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz",
-      "integrity": "sha512-Rf7dfKJxZ16QuTgVv1OYNxkZcsu/hULFnC+e+w0Gzi6jMC3guQoWQgxYxc54IDRinlb6/0v5z/PxxIKmVctN+g==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz",
+      "integrity": "sha1-Fa7qN6Z0mdhI6OmBgG1GJ7VQOBY=",
       "dev": true,
       "requires": {
-        "builtin-modules": "1.1.1",
         "contains-path": "0.1.0",
         "debug": "2.6.9",
         "doctrine": "1.5.0",
         "eslint-import-resolver-node": "0.3.2",
-        "eslint-module-utils": "2.1.1",
+        "eslint-module-utils": "2.2.0",
         "has": "1.0.1",
-        "lodash.cond": "4.5.2",
+        "lodash": "4.17.4",
         "minimatch": "3.0.4",
-        "read-pkg-up": "2.0.0"
+        "read-pkg-up": "2.0.0",
+        "resolve": "1.7.1"
       },
       "dependencies": {
         "doctrine": {
@@ -3700,6 +4538,25 @@
             "esutils": "2.0.2",
             "isarray": "1.0.0"
           }
+        },
+        "eslint-module-utils": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
+          "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "pkg-dir": "1.0.0"
+          }
+        },
+        "resolve": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
+          "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
+          "dev": true,
+          "requires": {
+            "path-parse": "1.0.5"
+          }
         }
       }
     },
@@ -3709,16 +4566,22 @@
       "integrity": "sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc=",
       "dev": true
     },
-    "espree": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
-      "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
+    "eslint-scope": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "acorn": "5.3.0",
-        "acorn-jsx": "3.0.1"
+        "esrecurse": "4.2.0",
+        "estraverse": "4.2.0"
       }
     },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
     "esprima": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
@@ -3758,16 +4621,6 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.37"
-      }
-    },
     "eventemitter3": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
@@ -3785,11 +4638,6 @@
       "integrity": "sha1-EODRh/ERsWfyj9q5GIQ859gY8Tw=",
       "dev": true
     },
-    "eventtargeter": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/eventtargeter/-/eventtargeter-0.3.1.tgz",
-      "integrity": "sha512-iJgWNy80h+T7fMhWojSfMNvZHLOa2347uyKv/uwb2LQTT4tEGz8075qrK8PiK/IvjPei24OZ9s2sY/Hd4E9Kkg=="
-    },
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@@ -3815,12 +4663,6 @@
       "integrity": "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=",
       "dev": true
     },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "dev": true
-    },
     "expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
@@ -3849,12 +4691,12 @@
       }
     },
     "express": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
-      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.4",
+        "accepts": "1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
@@ -3863,40 +4705,127 @@
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "1.1.2",
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
-        "finalhandler": "1.1.0",
+        "finalhandler": "1.1.1",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "1.1.2",
         "on-finished": "2.3.0",
         "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.2",
+        "proxy-addr": "2.0.3",
         "qs": "6.5.1",
         "range-parser": "1.2.0",
         "safe-buffer": "5.1.1",
-        "send": "0.16.1",
-        "serve-static": "1.13.1",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
         "setprototypeof": "1.1.0",
-        "statuses": "1.3.1",
-        "type-is": "1.6.15",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
         "utils-merge": "1.0.1",
         "vary": "1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+          "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.18",
+            "negotiator": "0.6.1"
+          }
+        },
+        "encodeurl": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+          "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+          "dev": true
+        },
+        "finalhandler": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+          "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.4.0",
+            "unpipe": "1.0.0"
+          }
+        },
+        "ipaddr.js": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
+          "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.33.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.18",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.33.0"
+          }
+        },
+        "proxy-addr": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
+          "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
+          "dev": true,
+          "requires": {
+            "forwarded": "0.1.2",
+            "ipaddr.js": "1.6.0"
+          }
+        },
+        "send": {
+          "version": "0.16.2",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "destroy": "1.0.4",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "etag": "1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "1.6.2",
+            "mime": "1.4.1",
+            "ms": "2.0.0",
+            "on-finished": "2.3.0",
+            "range-parser": "1.2.0",
+            "statuses": "1.4.0"
+          }
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
           "dev": true
         },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-          "dev": true
+        "type-is": {
+          "version": "1.6.16",
+          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+          "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+          "dev": true,
+          "requires": {
+            "media-typer": "0.3.0",
+            "mime-types": "2.1.18"
+          }
         }
       }
     },
@@ -4026,6 +4955,385 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
       "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
     },
+    "fast-glob": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.1.tgz",
+      "integrity": "sha512-wSyW1TBK3ia5V+te0rGPXudeMHoUQW6O5Y9oATiaGhpENmEifPDlOdhpsnlj5HoG6ttIvGiY1DdCmI9X2xGMhg==",
+      "dev": true,
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "2.2.1",
+        "glob-parent": "3.1.0",
+        "is-glob": "4.0.0",
+        "merge2": "1.2.2",
+        "micromatch": "3.1.10"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.1",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2",
+            "isobject": "3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "2.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+              "dev": true
+            }
+          }
+        },
+        "is-windows": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+          "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "to-regex": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+          "dev": true,
+          "requires": {
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "regex-not": "1.0.2",
+            "safe-regex": "1.1.0"
+          },
+          "dependencies": {
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "3.0.2",
+                "safe-regex": "1.1.0"
+              }
+            }
+          }
+        }
+      }
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -4069,195 +5377,14 @@
       }
     },
     "favicons-webpack-plugin": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/favicons-webpack-plugin/-/favicons-webpack-plugin-0.0.7.tgz",
-      "integrity": "sha1-JTpGpPk9E30QlnYod/io7xLihkg=",
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/favicons-webpack-plugin/-/favicons-webpack-plugin-0.0.9.tgz",
+      "integrity": "sha1-32PoDFVrgE5JJeyOBb7jY5FXPck=",
       "dev": true,
       "requires": {
         "favicons": "4.8.6",
         "loader-utils": "0.2.17",
-        "lodash": "4.17.4",
-        "webpack": "1.15.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        },
-        "browserify-aes": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz",
-          "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "browserify-zlib": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-          "dev": true,
-          "requires": {
-            "pako": "0.2.9"
-          }
-        },
-        "crypto-browserify": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz",
-          "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
-          "dev": true,
-          "requires": {
-            "browserify-aes": "0.4.0",
-            "pbkdf2-compat": "2.0.1",
-            "ripemd160": "0.2.0",
-            "sha.js": "2.2.6"
-          }
-        },
-        "https-browserify": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-          "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-          "dev": true
-        },
-        "interpret": {
-          "version": "0.6.6",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz",
-          "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
-          "dev": true
-        },
-        "memory-fs": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
-          "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
-          "dev": true,
-          "requires": {
-            "errno": "0.1.6",
-            "readable-stream": "2.3.3"
-          }
-        },
-        "node-libs-browser": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz",
-          "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
-          "dev": true,
-          "requires": {
-            "assert": "1.4.1",
-            "browserify-zlib": "0.1.4",
-            "buffer": "4.9.1",
-            "console-browserify": "1.1.0",
-            "constants-browserify": "1.0.0",
-            "crypto-browserify": "3.3.0",
-            "domain-browser": "1.1.7",
-            "events": "1.1.1",
-            "https-browserify": "0.0.1",
-            "os-browserify": "0.2.1",
-            "path-browserify": "0.0.0",
-            "process": "0.11.10",
-            "punycode": "1.3.2",
-            "querystring-es3": "0.2.1",
-            "readable-stream": "2.3.3",
-            "stream-browserify": "2.0.1",
-            "stream-http": "2.7.2",
-            "string_decoder": "0.10.31",
-            "timers-browserify": "2.0.4",
-            "tty-browserify": "0.0.0",
-            "url": "0.11.0",
-            "util": "0.10.3",
-            "vm-browserify": "0.0.4"
-          }
-        },
-        "os-browserify": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-          "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
-          "dev": true
-        },
-        "pako": {
-          "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-          "dev": true
-        },
-        "ripemd160": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
-          "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
-          "dev": true
-        },
-        "sha.js": {
-          "version": "2.2.6",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz",
-          "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "2.7.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
-          "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
-          "dev": true,
-          "requires": {
-            "async": "0.2.10",
-            "source-map": "0.5.7",
-            "uglify-to-browserify": "1.0.2",
-            "yargs": "3.10.0"
-          },
-          "dependencies": {
-            "async": {
-              "version": "0.2.10",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-              "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-              "dev": true
-            }
-          }
-        },
-        "url": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-          "dev": true,
-          "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          }
-        },
-        "webpack": {
-          "version": "1.15.0",
-          "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz",
-          "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
-          "dev": true,
-          "requires": {
-            "acorn": "3.3.0",
-            "async": "1.5.2",
-            "clone": "1.0.3",
-            "enhanced-resolve": "0.9.1",
-            "interpret": "0.6.6",
-            "loader-utils": "0.2.17",
-            "memory-fs": "0.3.0",
-            "mkdirp": "0.5.1",
-            "node-libs-browser": "0.7.0",
-            "optimist": "0.6.1",
-            "supports-color": "3.2.3",
-            "tapable": "0.1.10",
-            "uglify-js": "2.7.5",
-            "watchpack": "0.2.9",
-            "webpack-core": "0.6.9"
-          }
-        }
+        "lodash": "4.17.4"
       }
     },
     "fd-slicer": {
@@ -4269,16 +5396,6 @@
         "pend": "1.2.0"
       }
     },
-    "figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "1.0.5",
-        "object-assign": "4.1.1"
-      }
-    },
     "file-entry-cache": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
@@ -4290,14 +5407,33 @@
       }
     },
     "file-loader": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
-      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.4.5"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
+          "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+          "dev": true
+        },
         "loader-utils": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@@ -4308,13 +5444,23 @@
             "emojis-list": "2.1.0",
             "json5": "0.5.1"
           }
+        },
+        "schema-utils": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+          "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.4.0",
+            "ajv-keywords": "3.2.0"
+          }
         }
       }
     },
     "file-saver": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
-      "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
+      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
     },
     "file-type": {
       "version": "3.9.0",
@@ -4347,29 +5493,6 @@
         "repeat-string": "1.6.1"
       }
     },
-    "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-          "dev": true
-        }
-      }
-    },
     "find-cache-dir": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
@@ -4387,12 +5510,6 @@
       "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
       "dev": true
     },
-    "find-root": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-0.1.2.tgz",
-      "integrity": "sha1-mNImfP8ZFsyvJ0OzoO6oHXnX3NE=",
-      "dev": true
-    },
     "find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -4700,6 +5817,12 @@
         "for-in": "1.0.2"
       }
     },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -4736,14 +5859,47 @@
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "friendly-errors-webpack-plugin": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz",
-      "integrity": "sha1-4yeBxHIvVGoGqbXXp8+ihSA3XXA=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz",
+      "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
         "error-stack-parser": "2.0.1",
-        "string-length": "1.0.1"
+        "string-width": "2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
       }
     },
     "from2": {
@@ -5707,10 +6863,10 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "gather-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
     "gauge": {
@@ -5927,6 +7083,12 @@
         }
       }
     },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+      "dev": true
+    },
     "glob-watcher": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
@@ -6096,6 +7258,23 @@
         "sparkles": "1.0.0"
       }
     },
+    "gonzales-pe": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
+      "integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
+      "dev": true,
+      "requires": {
+        "minimist": "1.1.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+          "dev": true
+        }
+      }
+    },
     "good-listener": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
@@ -6109,7 +7288,7 @@
       "resolved": "https://registry.npmjs.org/google-id-token-verifier/-/google-id-token-verifier-0.2.3.tgz",
       "integrity": "sha1-nmt41FieLQUNqBYT+4kK26MKTqg=",
       "requires": {
-        "request": "2.83.0",
+        "request": "2.85.0",
         "rsa-pem-from-mod-exp": "0.8.4",
         "underscore": "1.8.3"
       }
@@ -6559,17 +7738,26 @@
       "dev": true
     },
     "html-webpack-plugin": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz",
-      "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
         "html-minifier": "3.5.8",
         "loader-utils": "0.2.17",
         "lodash": "4.17.4",
         "pretty-error": "2.1.1",
-        "toposort": "1.0.6"
+        "tapable": "1.0.0",
+        "toposort": "1.0.6",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "tapable": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+          "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
+          "dev": true
+        }
       }
     },
     "htmlparser2": {
@@ -6615,24 +7803,364 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
-      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
         "http-proxy": "1.16.2",
-        "is-glob": "3.1.0",
-        "lodash": "4.17.4",
-        "micromatch": "2.3.11"
+        "is-glob": "4.0.0",
+        "lodash": "4.17.10",
+        "micromatch": "3.1.10"
       },
       "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.1",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2",
+            "isobject": "3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+              "dev": true
+            }
+          }
+        },
+        "is-windows": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+          "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.10",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "to-regex": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+          "dev": true,
+          "requires": {
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "regex-not": "1.0.2",
+            "safe-regex": "1.1.0"
+          },
+          "dependencies": {
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "3.0.2",
+                "safe-regex": "1.1.0"
+              }
+            }
           }
         }
       }
@@ -6772,6 +8300,12 @@
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
       "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw="
     },
+    "import-lazy": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
+      "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
+      "dev": true
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -6794,17 +8328,59 @@
       }
     },
     "indexeddbshim": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/indexeddbshim/-/indexeddbshim-3.3.1.tgz",
-      "integrity": "sha512-INkhTK/MAUcfZGTtRPcu2S6COnDU0OjazUYUC3umONSfsAWdY70lDEX2tor3uEUCO6GTrbYyM6sXgmZIjQUq2w==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/indexeddbshim/-/indexeddbshim-3.6.2.tgz",
+      "integrity": "sha512-5qawPNPVw0szfenM1HL0empW/USmPXMsnKgvjhQ0dMVSFSxQVsumFb95QdR+fIoF38uc+vqj9QEFxQsb10ITgA==",
       "requires": {
         "babel-polyfill": "6.26.0",
-        "eventtargeter": "0.3.1",
+        "eventtargeter": "0.4.0",
         "sync-promise": "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a",
-        "typeson": "5.7.1",
-        "typeson-registry": "1.0.0-alpha.18",
-        "unicode-9.0.0": "0.7.4",
+        "typeson": "5.8.2",
+        "typeson-registry": "1.0.0-alpha.20",
+        "unicode-10.0.0": "0.7.5",
         "websql": "git+https://github.com/brettz9/node-websql.git#c9828a34c92eced64858fc19151ec099fd60e8dd"
+      },
+      "dependencies": {
+        "eventtargeter": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/eventtargeter/-/eventtargeter-0.4.0.tgz",
+          "integrity": "sha512-SAMC9heSSwhL2rxYF+iM0zFCQsXx3QKb3H5r5vcsYzKQVNb/jdVQ3VWxC2jpzWA3ecrLAzXVzoT7WB4D1yN59w=="
+        },
+        "sync-promise": {
+          "version": "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a"
+        },
+        "typeson": {
+          "version": "5.8.2",
+          "resolved": "https://registry.npmjs.org/typeson/-/typeson-5.8.2.tgz",
+          "integrity": "sha512-AFuyvVdHdkGlVIalOrSFjylmeLeWFtKu77uDjEilP4B9+Jk0DCM1m1A4Q2s3AwROhgiFFVPI8oARaD9S61lOkg=="
+        },
+        "typeson-registry": {
+          "version": "1.0.0-alpha.20",
+          "resolved": "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.20.tgz",
+          "integrity": "sha512-Gj4ppRuwKWXilgz2Vc13Bn7UR97MpdiUVYinmMFJuS+B1TktUhMS5Gb4cGbyDjvXNiG6TvE5DHI2ip1qiGZiYA==",
+          "requires": {
+            "base64-arraybuffer-es6": "0.3.1",
+            "typeson": "5.8.2",
+            "uuid": "3.2.1",
+            "whatwg-url": "6.4.0"
+          }
+        },
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+        },
+        "websql": {
+          "version": "git+https://github.com/brettz9/node-websql.git#c9828a34c92eced64858fc19151ec099fd60e8dd",
+          "requires": {
+            "argsarray": "0.0.1",
+            "immediate": "3.2.3",
+            "noop-fn": "1.0.0",
+            "pouchdb-collections": "1.0.1",
+            "sqlite3": "3.1.13",
+            "tiny-queue": "0.2.1"
+          }
+        }
       }
     },
     "indexes-of": {
@@ -6840,27 +8416,6 @@
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
-    "inquirer": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "1.4.0",
-        "ansi-regex": "2.1.1",
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "cli-width": "2.2.0",
-        "figures": "1.7.0",
-        "lodash": "4.17.4",
-        "readline2": "1.0.1",
-        "run-async": "0.1.0",
-        "rx-lite": "3.1.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "through": "2.3.8"
-      }
-    },
     "interpret": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
@@ -6888,18 +8443,6 @@
       "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=",
       "dev": true
     },
-    "ipaddr.js": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
-      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=",
-      "dev": true
-    },
-    "irregular-plurals": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz",
-      "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=",
-      "dev": true
-    },
     "is-absolute": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
@@ -6933,6 +8476,28 @@
         }
       }
     },
+    "is-alphabetical": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz",
+      "integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==",
+      "dev": true
+    },
+    "is-alphanumeric": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
+      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
+      "dev": true
+    },
+    "is-alphanumerical": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
+      "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
+      "dev": true,
+      "requires": {
+        "is-alphabetical": "1.0.2",
+        "is-decimal": "1.0.2"
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -6962,6 +8527,12 @@
         "builtin-modules": "1.1.1"
       }
     },
+    "is-callable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+      "dev": true
+    },
     "is-data-descriptor": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
@@ -6979,6 +8550,18 @@
         }
       }
     },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-decimal": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz",
+      "integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
+      "dev": true
+    },
     "is-descriptor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -7064,6 +8647,12 @@
         "is-extglob": "2.1.1"
       }
     },
+    "is-hexadecimal": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
+      "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
+      "dev": true
+    },
     "is-my-json-valid": {
       "version": "2.17.1",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz",
@@ -7085,6 +8674,12 @@
         "kind-of": "3.2.2"
       }
     },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
     "is-odd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz",
@@ -7176,6 +8771,15 @@
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
       "dev": true
     },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1"
+      }
+    },
     "is-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
@@ -7218,6 +8822,12 @@
         "html-comment-regex": "1.1.1"
       }
     },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -7238,12 +8848,24 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-whitespace-character": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz",
+      "integrity": "sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==",
+      "dev": true
+    },
     "is-windows": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
       "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
       "dev": true
     },
+    "is-word-character": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz",
+      "integrity": "sha512-T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA==",
+      "dev": true
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -7287,7 +8909,7 @@
         "pixelmatch": "4.0.2",
         "pngjs": "3.3.1",
         "read-chunk": "1.0.1",
-        "request": "2.83.0",
+        "request": "2.85.0",
         "stream-to-buffer": "0.1.0",
         "tinycolor2": "1.4.1",
         "url-regex": "3.2.0"
@@ -7310,18 +8932,6 @@
       "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==",
       "dev": true
     },
-    "js-beautify": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
-      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
-      "dev": true,
-      "requires": {
-        "config-chain": "1.1.11",
-        "editorconfig": "0.13.3",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6"
-      }
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -7329,9 +8939,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
       "requires": {
         "argparse": "1.0.9",
         "esprima": "4.0.0"
@@ -7343,46 +8953,6 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "optional": true
     },
-    "jsdom": {
-      "version": "11.6.2",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.6.2.tgz",
-      "integrity": "sha512-pAeZhpbSlUp5yQcS6cBQJwkbzmv4tWFaYxHbFVSxzXefqjvtRA851Z5N2P+TguVG9YeUDcgb8pdeVQRJh0XR3Q==",
-      "requires": {
-        "abab": "1.0.4",
-        "acorn": "5.3.0",
-        "acorn-globals": "4.1.0",
-        "array-equal": "1.0.0",
-        "browser-process-hrtime": "0.1.2",
-        "content-type-parser": "1.0.2",
-        "cssom": "0.3.2",
-        "cssstyle": "0.2.37",
-        "domexception": "1.0.1",
-        "escodegen": "1.9.0",
-        "html-encoding-sniffer": "1.0.2",
-        "left-pad": "1.2.0",
-        "nwmatcher": "1.4.3",
-        "parse5": "4.0.0",
-        "pn": "1.1.0",
-        "request": "2.83.0",
-        "request-promise-native": "1.0.5",
-        "sax": "1.2.4",
-        "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.3",
-        "w3c-hr-time": "1.0.1",
-        "webidl-conversions": "4.0.2",
-        "whatwg-encoding": "1.0.3",
-        "whatwg-url": "6.4.0",
-        "ws": "4.0.0",
-        "xml-name-validator": "3.0.0"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-        }
-      }
-    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -7395,6 +8965,12 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -7414,6 +8990,12 @@
         "jsonify": "0.0.0"
       }
     },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -7434,72 +9016,12 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "jsonfilter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/jsonfilter/-/jsonfilter-1.1.2.tgz",
-      "integrity": "sha1-Ie987cdRk4E8dZMulqmL4gW6WhE=",
-      "dev": true,
-      "requires": {
-        "JSONStream": "0.8.4",
-        "minimist": "1.2.0",
-        "stream-combiner": "0.2.2",
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
       "dev": true
     },
-    "jsonparse": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
-      "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
-      "dev": true
-    },
     "jsonpointer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
@@ -7524,9 +9046,9 @@
       }
     },
     "katex": {
-      "version": "0.9.0-alpha2",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.9.0-alpha2.tgz",
-      "integrity": "sha512-Hih2oCEEU3MRy+iHjA/tbvSKA+f93VliWA2jAYpGPR6MoMX1JzIy+Zc8ZnP4n45M8BC1ktDhWDCaQ/0CkJhXLg==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.9.0.tgz",
+      "integrity": "sha512-lp3x90LT1tDZBW2tjLheJ98wmRMRjUHwk4QpaswT9bhqoQZ+XA4cPcjcQBxgOQNwaOSt6ZeL/a6GKQ1of3LFxQ==",
       "requires": {
         "match-at": "0.1.1"
       }
@@ -7554,12 +9076,6 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "known-css-properties": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.2.0.tgz",
-      "integrity": "sha512-UTCzU28rRI9wkb8qSGoZa9pgWvxr4LjP2MEhi9XHb/1XMOJy0uTnIxaxzj8My/PORG+kQG6VzAcGvRw66eIOfA==",
-      "dev": true
-    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -7574,52 +9090,6 @@
         "invert-kv": "1.0.0"
       }
     },
-    "ldjson-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-      "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
-      "dev": true,
-      "requires": {
-        "split2": "0.2.1",
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
     "left-pad": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.2.0.tgz",
@@ -7750,12 +9220,6 @@
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
-    "lodash._baseget": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/lodash._baseget/-/lodash._baseget-3.7.2.tgz",
-      "integrity": "sha1-G2rh1frPPCVTI1ChPBGXy4u2dPQ=",
-      "dev": true
-    },
     "lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
@@ -7804,15 +9268,6 @@
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "lodash._topath": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/lodash._topath/-/lodash._topath-3.8.1.tgz",
-      "integrity": "sha1-PsXiYGAU9MuX91X+aRTt2L/ADqw=",
-      "dev": true,
-      "requires": {
-        "lodash.isarray": "3.0.4"
-      }
-    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -7831,12 +9286,6 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.cond": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
-      "dev": true
-    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -7846,16 +9295,6 @@
         "lodash._root": "3.0.1"
       }
     },
-    "lodash.get": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-3.7.0.tgz",
-      "integrity": "sha1-POaK4skWg7KBzFOUEoMDy/deaR8=",
-      "dev": true,
-      "requires": {
-        "lodash._baseget": "3.7.2",
-        "lodash._topath": "3.8.1"
-      }
-    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -7955,6 +9394,12 @@
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
       "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
     },
+    "longest-streak": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
+      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
+      "dev": true
+    },
     "loose-envify": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
@@ -8035,16 +9480,29 @@
         "object-visit": "1.0.1"
       }
     },
+    "markdown-escapes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
+      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
+      "dev": true
+    },
     "markdown-it": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz",
-      "integrity": "sha512-tNuOCCfunY5v5uhcO2AUMArvKAyKMygX8tfup/JrgnsDqcCATQsAExBq7o5Ml9iMmO82bk6jYNLj6khcrl0JGA==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz",
+      "integrity": "sha512-CzzqSSNkFRUf9vlWvhK1awpJreMRqdCrBvZ8DIoDWTOkESMIF741UPAhuAmbyWmdiFPA6WARNhnu2M6Nrhwa+A==",
       "requires": {
         "argparse": "1.0.9",
         "entities": "1.1.1",
         "linkify-it": "2.0.3",
         "mdurl": "1.0.1",
-        "uc.micro": "1.0.3"
+        "uc.micro": "1.0.5"
+      },
+      "dependencies": {
+        "uc.micro": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
+          "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
+        }
       }
     },
     "markdown-it-abbr": {
@@ -8092,6 +9550,12 @@
       "resolved": "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz",
       "integrity": "sha1-y5yf+RpSVawI8/09YyhuFd8KH8M="
     },
+    "markdown-table": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
+      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
+      "dev": true
+    },
     "match-at": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/match-at/-/match-at-0.1.1.tgz",
@@ -8131,6 +9595,16 @@
         }
       }
     },
+    "mdast-util-compact": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
+      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
+      "dev": true,
+      "requires": {
+        "unist-util-modify-children": "1.1.2",
+        "unist-util-visit": "1.3.1"
+      }
+    },
     "mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
@@ -8256,6 +9730,29 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
+    "merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "merge2": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
+      "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==",
+      "dev": true
+    },
     "mermaid": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-7.1.2.tgz",
@@ -8382,6 +9879,16 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
       "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
     },
+    "minimist-options": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "is-plain-obj": "1.1.0"
+      }
+    },
     "mississippi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
@@ -8485,18 +9992,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "multimatch": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-      "dev": true,
-      "requires": {
-        "array-differ": "1.0.0",
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "minimatch": "3.0.4"
-      }
-    },
     "multipipe": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
@@ -8506,12 +10001,6 @@
         "duplexer2": "0.0.2"
       }
     },
-    "mute-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-      "dev": true
-    },
     "nan": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
@@ -8582,6 +10071,12 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
+    "neo-async": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
+      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
+      "dev": true
+    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -8605,7 +10100,7 @@
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
-        "request": "2.83.0",
+        "request": "2.85.0",
         "rimraf": "2.6.2",
         "semver": "5.3.0",
         "tar": "2.2.1",
@@ -8691,9 +10186,9 @@
       }
     },
     "node-sass": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
-      "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz",
+      "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==",
       "dev": true,
       "requires": {
         "async-foreach": "0.1.3",
@@ -8708,7 +10203,7 @@
         "lodash.mergewith": "4.6.0",
         "meow": "3.7.0",
         "mkdirp": "0.5.1",
-        "nan": "2.7.0",
+        "nan": "2.10.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
         "request": "2.79.0",
@@ -8825,6 +10320,12 @@
             "sshpk": "1.13.1"
           }
         },
+        "nan": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+          "dev": true
+        },
         "qs": {
           "version": "6.3.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
@@ -8898,7 +10399,7 @@
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
+        "semver": "5.5.0",
         "validate-npm-package-license": "3.0.1"
       }
     },
@@ -8918,9 +10419,9 @@
       "dev": true
     },
     "normalize-scss": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-scss/-/normalize-scss-7.0.0.tgz",
-      "integrity": "sha1-kuqsZVTMN2M2wGaCoNaiCZu7CIk="
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-scss/-/normalize-scss-7.0.1.tgz",
+      "integrity": "sha512-qj16bWnYs+9/ac29IgGjySg4R5qQTp1lXfm7ApFOZNVBYFY8RZ3f8+XQNDDLHeDtI3Ba7Jj4+LuPgz9v/fne2A=="
     },
     "normalize-selector": {
       "version": "0.2.0",
@@ -8947,7 +10448,7 @@
       "dev": true,
       "requires": {
         "inquirer": "3.3.0",
-        "semver": "5.4.1",
+        "semver": "5.5.0",
         "shell-quote": "1.6.1"
       },
       "dependencies": {
@@ -9219,6 +10720,12 @@
       "integrity": "sha512-smRWXzkvxw72VquyZ0wggySl7PFUtoDhvhpdwgESXxUrH7vVhhp9asfup1+rVLrhsl7L45Ee1Q/l5R2Ul4MwUg==",
       "dev": true
     },
+    "object-keys": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+      "dev": true
+    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -9265,6 +10772,16 @@
         }
       }
     },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.11.0"
+      }
+    },
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -9314,9 +10831,9 @@
       }
     },
     "offline-plugin": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/offline-plugin/-/offline-plugin-4.9.0.tgz",
-      "integrity": "sha1-CHSWDAywwkn5a3z8Z0IXk0Zg7Vw=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/offline-plugin/-/offline-plugin-5.0.3.tgz",
+      "integrity": "sha1-YUiMXFhC2Fdqpnc4S1u9PmCUkok=",
       "dev": true,
       "requires": {
         "deep-extend": "0.4.2",
@@ -9348,18 +10865,6 @@
         "wrappy": "1.0.2"
       }
     },
-    "onecolor": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.5.tgz",
-      "integrity": "sha1-Nu/zIgE3nv3xGA+0ReUajiQl+fY=",
-      "dev": true
-    },
-    "onetime": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-      "dev": true
-    },
     "opener": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz",
@@ -9640,6 +11145,20 @@
         "xml2js": "0.4.17"
       }
     },
+    "parse-entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz",
+      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
+      "dev": true,
+      "requires": {
+        "character-entities": "1.2.2",
+        "character-entities-legacy": "1.1.2",
+        "character-reference-invalid": "1.1.2",
+        "is-alphanumerical": "1.0.2",
+        "is-decimal": "1.0.2",
+        "is-hexadecimal": "1.0.2"
+      }
+    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -9772,6 +11291,12 @@
       "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
       "dev": true
     },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
     "path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -9842,12 +11367,6 @@
         "sha.js": "2.4.9"
       }
     },
-    "pbkdf2-compat": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
-      "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
-      "dev": true
-    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -9871,7 +11390,7 @@
         "hasha": "2.2.0",
         "kew": "0.7.0",
         "progress": "1.1.8",
-        "request": "2.83.0",
+        "request": "2.85.0",
         "request-progress": "2.0.1",
         "which": "1.3.0"
       },
@@ -9905,16 +11424,6 @@
         "pinkie": "2.0.4"
       }
     },
-    "pipetteur": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pipetteur/-/pipetteur-2.0.3.tgz",
-      "integrity": "sha1-GVV2CVno0aEcsqUOyD7sRwYz5J8=",
-      "dev": true,
-      "requires": {
-        "onecolor": "3.0.5",
-        "synesthesia": "1.0.1"
-      }
-    },
     "pixelmatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
@@ -9933,21 +11442,6 @@
         "find-up": "1.1.2"
       }
     },
-    "plur": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-      "dev": true,
-      "requires": {
-        "irregular-plurals": "1.4.0"
-      }
-    },
-    "pluralize": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-      "dev": true
-    },
     "pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
@@ -10073,45 +11567,26 @@
         "uniqid": "4.1.1"
       }
     },
-    "postcss-less": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-0.14.0.tgz",
-      "integrity": "sha1-xjGwicbM5CK5oQ86lY0r7dOBkyQ=",
+    "postcss-html": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.18.0.tgz",
+      "integrity": "sha512-7llFZ5hlINmUu/8iUBIXCTZ4OMyGB+NBeb7jDadXrH9g+hpcUEBhZv3rjqesmOsHNC3bITqx1EkVz77RuHJygw==",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
-      }
-    },
-    "postcss-load-config": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1",
-        "postcss-load-options": "1.2.0",
-        "postcss-load-plugins": "2.3.0"
-      }
-    },
-    "postcss-load-options": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-load-plugins": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
+        "@babel/core": "7.0.0-beta.46",
+        "@babel/traverse": "7.0.0-beta.44",
+        "babylon": "7.0.0-beta.46",
+        "htmlparser2": "3.9.2",
+        "remark": "9.0.0",
+        "unist-util-find-all-after": "1.0.2"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "7.0.0-beta.46",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.46.tgz",
+          "integrity": "sha512-WFJlg2WatdkXRFMpk7BN/Uzzkjkcjk+WaqnrSCpay+RYl4ypW9ZetZyT9kNt22IH/BQNst3M6PaaBn9IXsUNrg==",
+          "dev": true
+        }
       }
     },
     "postcss-media-query-parser": {
@@ -10204,80 +11679,6 @@
         "postcss-selector-parser": "2.2.3"
       }
     },
-    "postcss-modules-extract-imports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-      "dev": true,
-      "requires": {
-        "postcss": "6.0.16"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.1"
-          }
-        },
-        "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.6.1",
-            "supports-color": "5.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
     "postcss-modules-local-by-default": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
@@ -10564,31 +11965,137 @@
         "postcss-value-parser": "3.3.0"
       }
     },
-    "postcss-reporter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-3.0.0.tgz",
-      "integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "lodash": "4.17.4",
-        "log-symbols": "1.0.2",
-        "postcss": "5.2.18"
-      }
-    },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
       "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
       "dev": true
     },
-    "postcss-scss": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.4.1.tgz",
-      "integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=",
+    "postcss-safe-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz",
+      "integrity": "sha1-t1Pv9sfArqXoN1++TN6L+QY/8UI=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "6.0.22"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.22",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
+          "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-sass": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.1.tgz",
+      "integrity": "sha512-jyrOsP3MoLv57avdbi7GEITKrM23qeoFzZi8zmbXPjcPklRt83zzoxF/CEZ/cwRAJsHSkEwHc28Qhkm+8/OoUA==",
+      "dev": true,
+      "requires": {
+        "gonzales-pe": "4.2.3",
+        "postcss": "6.0.22"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.22",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
+          "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
       }
     },
     "postcss-selector-parser": {
@@ -10664,6 +12171,12 @@
       "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
       "dev": true
     },
+    "prettier": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz",
+      "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=",
+      "dev": true
+    },
     "pretty-error": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
@@ -10718,22 +12231,6 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true
-    },
-    "proxy-addr": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
-      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
-      "dev": true,
-      "requires": {
-        "forwarded": "0.1.2",
-        "ipaddr.js": "1.5.2"
-      }
-    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -10817,10 +12314,10 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
-    "ramda": {
-      "version": "0.24.1",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz",
-      "integrity": "sha1-w7d1UZfzW43DUCIoJixMkd22uFc=",
+    "quick-lru": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
       "dev": true
     },
     "randomatic": {
@@ -10911,15 +12408,6 @@
       "integrity": "sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=",
       "dev": true
     },
-    "read-file-stdin": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz",
-      "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
-      "dev": true,
-      "requires": {
-        "gather-stream": "1.0.0"
-      }
-    },
     "read-pkg": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -10996,17 +12484,6 @@
         "set-immediate-shim": "1.0.1"
       }
     },
-    "readline2": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "mute-stream": "0.0.5"
-      }
-    },
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -11102,6 +12579,12 @@
         "extend-shallow": "2.0.1"
       }
     },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "dev": true
+    },
     "regexpu-core": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
@@ -11142,6 +12625,62 @@
       "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
       "dev": true
     },
+    "remark": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-9.0.0.tgz",
+      "integrity": "sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==",
+      "dev": true,
+      "requires": {
+        "remark-parse": "5.0.0",
+        "remark-stringify": "5.0.0",
+        "unified": "6.2.0"
+      }
+    },
+    "remark-parse": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz",
+      "integrity": "sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==",
+      "dev": true,
+      "requires": {
+        "collapse-white-space": "1.0.4",
+        "is-alphabetical": "1.0.2",
+        "is-decimal": "1.0.2",
+        "is-whitespace-character": "1.0.2",
+        "is-word-character": "1.0.2",
+        "markdown-escapes": "1.0.2",
+        "parse-entities": "1.1.2",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.1",
+        "trim": "0.0.1",
+        "trim-trailing-lines": "1.1.1",
+        "unherit": "1.1.1",
+        "unist-util-remove-position": "1.1.2",
+        "vfile-location": "2.0.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "remark-stringify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-5.0.0.tgz",
+      "integrity": "sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w==",
+      "dev": true,
+      "requires": {
+        "ccount": "1.0.3",
+        "is-alphanumeric": "1.0.0",
+        "is-decimal": "1.0.2",
+        "is-whitespace-character": "1.0.2",
+        "longest-streak": "2.0.2",
+        "markdown-escapes": "1.0.2",
+        "markdown-table": "1.1.2",
+        "mdast-util-compact": "1.0.1",
+        "parse-entities": "1.1.2",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.1",
+        "stringify-entities": "1.3.2",
+        "unherit": "1.1.1",
+        "xtend": "4.0.1"
+      }
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -11280,9 +12819,9 @@
       "dev": true
     },
     "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "version": "2.85.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
+      "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
       "requires": {
         "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
@@ -11341,12 +12880,6 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-from-string": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
-      "dev": true
-    },
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -11428,15 +12961,11 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
-    "restore-cursor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-      "dev": true,
-      "requires": {
-        "exit-hook": "1.1.1",
-        "onetime": "1.1.0"
-      }
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
     },
     "right-align": {
       "version": "0.1.3",
@@ -11469,15 +12998,6 @@
       "resolved": "https://registry.npmjs.org/rsa-pem-from-mod-exp/-/rsa-pem-from-mod-exp-0.8.4.tgz",
       "integrity": "sha1-NipCxtMEBW1JOz8SvOq7LGV2ptQ="
     },
-    "run-async": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -11507,6 +13027,15 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "0.1.15"
+      }
+    },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
@@ -11620,27 +13149,45 @@
       }
     },
     "sass-loader": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz",
-      "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz",
+      "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==",
       "dev": true,
       "requires": {
-        "async": "2.6.0",
-        "clone-deep": "0.3.0",
+        "clone-deep": "2.0.2",
         "loader-utils": "1.1.0",
         "lodash.tail": "4.1.1",
+        "neo-async": "2.5.1",
         "pify": "3.0.0"
       },
       "dependencies": {
-        "async": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+        "clone-deep": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+          "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
           "dev": true,
           "requires": {
-            "lodash": "4.17.4"
+            "for-own": "1.0.0",
+            "is-plain-object": "2.0.4",
+            "kind-of": "6.0.2",
+            "shallow-clone": "1.0.0"
           }
         },
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+          "dev": true,
+          "requires": {
+            "for-in": "1.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
         "loader-utils": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@@ -11651,6 +13198,25 @@
             "emojis-list": "2.1.0",
             "json5": "0.5.1"
           }
+        },
+        "shallow-clone": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+          "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1",
+            "kind-of": "5.1.0",
+            "mixin-object": "2.0.1"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -11684,38 +13250,11 @@
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "semver": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
       "dev": true
     },
-    "send": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
-      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.3.1"
-      },
-      "dependencies": {
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
-        }
-      }
-    },
     "sequencify": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
@@ -11729,14 +13268,41 @@
       "dev": true
     },
     "serve-static": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
-      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "requires": {
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "parseurl": "1.3.2",
-        "send": "0.16.1"
+        "send": "0.16.2"
+      },
+      "dependencies": {
+        "encodeurl": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+          "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+        },
+        "send": {
+          "version": "0.16.2",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "destroy": "1.0.4",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "etag": "1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "1.6.2",
+            "mime": "1.4.1",
+            "ms": "2.0.0",
+            "on-finished": "2.3.0",
+            "range-parser": "1.2.0",
+            "statuses": "1.4.0"
+          }
+        }
       }
     },
     "set-blocking": {
@@ -11792,35 +13358,21 @@
         "safe-buffer": "5.1.1"
       }
     },
-    "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "is-extendable": "0.1.1",
-        "kind-of": "2.0.1",
-        "lazy-cache": "0.2.7",
-        "mixin-object": "2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
-          "dev": true
-        }
+        "shebang-regex": "1.0.0"
       }
     },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
     "shell-quote": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
@@ -11834,9 +13386,9 @@
       }
     },
     "shelljs": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
+      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
       "dev": true,
       "requires": {
         "glob": "7.1.2",
@@ -11862,12 +13414,6 @@
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
-    "slice-ansi": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-      "dev": true
-    },
     "snapdragon": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz",
@@ -12116,51 +13662,6 @@
         }
       }
     },
-    "split2": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-      "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
-      "dev": true,
-      "requires": {
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -12908,6 +14409,12 @@
       "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
       "dev": true
     },
+    "state-toggle": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
+      "integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
+      "dev": true
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -13015,16 +14522,6 @@
         "readable-stream": "2.3.3"
       }
     },
-    "stream-combiner": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-      "dev": true,
-      "requires": {
-        "duplexer": "0.1.1",
-        "through": "2.3.8"
-      }
-    },
     "stream-consume": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
@@ -13081,15 +14578,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
-      "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=",
-      "dev": true,
-      "requires": {
-        "strip-ansi": "3.0.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -13110,6 +14598,18 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "stringify-entities": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
+      "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
+      "dev": true,
+      "requires": {
+        "character-entities-html4": "1.1.2",
+        "character-entities-legacy": "1.1.2",
+        "is-alphanumerical": "1.0.2",
+        "is-hexadecimal": "1.0.2"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -13151,96 +14651,71 @@
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
       "dev": true
     },
-    "stylehacks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-2.3.2.tgz",
-      "integrity": "sha1-ZMg+BDimjJ7fRJ6MVSp9mrYAmws=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "chalk": "1.1.3",
-        "log-symbols": "1.0.2",
-        "minimist": "1.2.0",
-        "plur": "2.1.2",
-        "postcss": "5.2.18",
-        "postcss-reporter": "1.4.1",
-        "postcss-selector-parser": "2.2.3",
-        "read-file-stdin": "0.2.1",
-        "text-table": "0.2.0",
-        "write-file-stdout": "0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.4",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.18"
-          }
-        }
-      }
-    },
     "stylelint": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-7.13.0.tgz",
-      "integrity": "sha1-ER+Xttpy53XICADWu29fhpmXeF0=",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-9.2.0.tgz",
+      "integrity": "sha512-aBlnuLyTvyNfIVoc+reaqx88aW41Awc9Ccu7ZXrO2fnSvv0MVSQeyL3ci/nD1H1eYvH3X+MXTwMYC3Mf5+2Ckw==",
       "dev": true,
       "requires": {
-        "autoprefixer": "6.7.7",
-        "balanced-match": "0.4.2",
-        "chalk": "2.3.0",
-        "colorguard": "1.2.1",
-        "cosmiconfig": "2.2.2",
-        "debug": "2.6.9",
-        "doiuse": "2.6.0",
+        "autoprefixer": "8.4.1",
+        "balanced-match": "1.0.0",
+        "chalk": "2.4.1",
+        "cosmiconfig": "4.0.0",
+        "debug": "3.1.0",
         "execall": "1.0.0",
         "file-entry-cache": "2.0.0",
-        "get-stdin": "5.0.1",
-        "globby": "6.1.0",
+        "get-stdin": "6.0.0",
+        "globby": "8.0.1",
         "globjoin": "0.1.4",
         "html-tags": "2.0.0",
         "ignore": "3.3.7",
+        "import-lazy": "3.1.0",
         "imurmurhash": "0.1.4",
-        "known-css-properties": "0.2.0",
+        "known-css-properties": "0.6.1",
         "lodash": "4.17.4",
-        "log-symbols": "1.0.2",
+        "log-symbols": "2.2.0",
         "mathml-tag-names": "2.0.1",
-        "meow": "3.7.0",
+        "meow": "4.0.1",
         "micromatch": "2.3.11",
         "normalize-selector": "0.2.0",
-        "pify": "2.3.0",
-        "postcss": "5.2.18",
-        "postcss-less": "0.14.0",
+        "pify": "3.0.0",
+        "postcss": "6.0.22",
+        "postcss-html": "0.18.0",
+        "postcss-less": "1.1.5",
         "postcss-media-query-parser": "0.2.3",
-        "postcss-reporter": "3.0.0",
+        "postcss-reporter": "5.0.0",
         "postcss-resolve-nested-selector": "0.1.1",
-        "postcss-scss": "0.4.1",
-        "postcss-selector-parser": "2.2.3",
+        "postcss-safe-parser": "3.0.1",
+        "postcss-sass": "0.3.1",
+        "postcss-scss": "1.0.5",
+        "postcss-selector-parser": "3.1.1",
         "postcss-value-parser": "3.3.0",
-        "resolve-from": "3.0.0",
+        "resolve-from": "4.0.0",
+        "signal-exit": "3.0.2",
         "specificity": "0.3.2",
         "string-width": "2.1.1",
         "style-search": "0.1.0",
-        "stylehacks": "2.3.2",
-        "sugarss": "0.2.0",
+        "sugarss": "1.0.1",
         "svg-tags": "1.0.0",
-        "table": "4.0.2"
+        "table": "4.0.3"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
+          "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
+          }
+        },
         "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
           "dev": true
         },
         "ansi-regex": {
@@ -13250,54 +14725,139 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
             "color-convert": "1.9.1"
           }
         },
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+        "autoprefixer": {
+          "version": "8.4.1",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.4.1.tgz",
+          "integrity": "sha512-YqUclCBDXUT9Y7aQ8Xv+ja8yhTZYJoMsOD7WS++gZIJLCpCu+gPcKGDlhk6S3WxhLkTcNVdaMZAWys2nzZCH7g==",
+          "dev": true,
+          "requires": {
+            "browserslist": "3.2.6",
+            "caniuse-lite": "1.0.30000833",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "6.0.22",
+            "postcss-value-parser": "3.3.0"
+          }
+        },
+        "browserslist": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.6.tgz",
+          "integrity": "sha512-XCsMSg9V4S1VRdcp265dJ+8kBRjfuFXcavbisY7G6T9QI0H1Z24PP53vvs0WDYWqm38Mco1ILDtafcS8ZR4xiw==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "1.0.30000833",
+            "electron-to-chromium": "1.3.45"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30000833",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000833.tgz",
+          "integrity": "sha512-tKNuKu4WLImh4NxoTgntxFpDrRiA0Q6Q1NycNhuMST0Kx+Pt8YnRDW6V8xsyH6AtO2CpAoibatEk5eaEhP3O1g==",
           "dev": true
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
+            "supports-color": "5.4.0"
+          }
+        },
+        "cosmiconfig": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+          "dev": true,
+          "requires": {
+            "is-directory": "0.3.1",
+            "js-yaml": "3.11.0",
+            "parse-json": "4.0.0",
+            "require-from-string": "2.0.2"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.45",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz",
+          "integrity": "sha1-RYrBscXHYM6IEaFtK/vZfsMLr7g=",
+          "dev": true
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
           }
         },
         "get-stdin": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+          "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
           "dev": true
         },
         "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
+          "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
           "dev": true,
           "requires": {
             "array-union": "1.0.2",
+            "dir-glob": "2.0.0",
+            "fast-glob": "2.2.1",
             "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
+            "ignore": "3.3.7",
+            "pify": "3.0.0",
+            "slash": "1.0.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -13306,16 +14866,227 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+        "known-css-properties": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.6.1.tgz",
+          "integrity": "sha512-nQRpMcHm1cQ6gmztdvLcIvxocznSMqH/y6XtERrWrHaymOYdDGroRqetJvJycxGEr1aakXiigDgn7JnzuXlk6A==",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "log-symbols": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+          "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
+          }
+        },
+        "postcss": {
+          "version": "6.0.22",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz",
+          "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
+          }
+        },
+        "postcss-less": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.5.tgz",
+          "integrity": "sha512-QQIiIqgEjNnquc0d4b6HDOSFZxbFQoy4MPpli2lSLpKhMyBkKwwca2HFqu4xzxlKID/F2fxSOowwtKpgczhF7A==",
+          "dev": true,
+          "requires": {
+            "postcss": "5.2.18"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "2.2.1",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+              "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+              "dev": true
+            },
+            "chalk": {
+              "version": "1.1.3",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "2.2.1",
+                "escape-string-regexp": "1.0.5",
+                "has-ansi": "2.0.0",
+                "strip-ansi": "3.0.1",
+                "supports-color": "2.0.0"
+              },
+              "dependencies": {
+                "supports-color": {
+                  "version": "2.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+                  "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+                  "dev": true
+                }
+              }
+            },
+            "has-flag": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+              "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+              "dev": true
+            },
+            "postcss": {
+              "version": "5.2.18",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+              "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+              "dev": true,
+              "requires": {
+                "chalk": "1.1.3",
+                "js-base64": "2.4.0",
+                "source-map": "0.5.7",
+                "supports-color": "3.2.3"
+              }
+            },
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "3.2.3",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+              "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+              "dev": true,
+              "requires": {
+                "has-flag": "1.0.0"
+              }
+            }
+          }
+        },
+        "postcss-reporter": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
+          "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.4.1",
+            "lodash": "4.17.4",
+            "log-symbols": "2.2.0",
+            "postcss": "6.0.22"
+          }
+        },
+        "postcss-scss": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.5.tgz",
+          "integrity": "sha512-gJB1tKYMkBy0MU+COt6WXA4ZiRctAKoWLa6qD7a6bbEbBMqrpa/BhfQdN80eYMV+JkKddZVEpZlOggnGShpvyg==",
+          "dev": true,
+          "requires": {
+            "postcss": "6.0.22"
+          }
+        },
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "dev": true,
+          "requires": {
+            "dot-prop": "4.2.0",
+            "indexes-of": "1.0.1",
+            "uniq": "1.0.1"
+          }
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
+          }
+        },
+        "require-from-string": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+          "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
           "dev": true
         },
         "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
         "slice-ansi": {
@@ -13327,6 +15098,12 @@
             "is-fullwidth-code-point": "2.0.0"
           }
         },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -13335,39 +15112,62 @@
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
             "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "sugarss": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.1.tgz",
+          "integrity": "sha512-3qgLZytikQQEVn1/FrhY7B68gPUUGY3R1Q1vTiD5xT+Ti1DP/8iZuwFet9ONs5+bmL8pZoDQ6JrQHVgrNlK6mA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "postcss": "6.0.22"
           }
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         },
         "table": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-          "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
+          "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
           "dev": true,
           "requires": {
-            "ajv": "5.5.2",
-            "ajv-keywords": "2.1.1",
-            "chalk": "2.3.0",
+            "ajv": "6.4.0",
+            "ajv-keywords": "3.2.0",
+            "chalk": "2.4.1",
             "lodash": "4.17.4",
             "slice-ansi": "1.0.0",
             "string-width": "2.1.1"
           }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
         }
       }
     },
@@ -13387,26 +15187,366 @@
       }
     },
     "stylelint-webpack-plugin": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.7.1.tgz",
-      "integrity": "sha512-LEdUXKhspuxoYO13ZUH5N1aCP6tWnVyk0RUoKPt7ITBu9xNZ5NKEsAsx9qwMk1s8TA6/WtP2HbEJOHQof8yDbg==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.10.4.tgz",
+      "integrity": "sha512-YMQtW49j8Bef3C5wMFunNxGR14eIlOWbv2YI8dFFY/4eHCeDFJ0F7JK9f8E0JfsS4OM4ZjVwIGRogejRjKGMvg==",
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
-        "chalk": "1.1.3",
-        "minimatch": "3.0.4",
+        "micromatch": "3.1.10",
         "object-assign": "4.1.1",
-        "ramda": "0.24.1",
-        "stylelint": "7.13.0"
-      }
-    },
-    "sugarss": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-0.2.0.tgz",
-      "integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
+        "ramda": "0.25.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.1",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2",
+            "isobject": "3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+              "dev": true
+            }
+          }
+        },
+        "is-windows": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+          "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "ramda": {
+          "version": "0.25.0",
+          "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz",
+          "integrity": "sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==",
+          "dev": true
+        },
+        "to-regex": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+          "dev": true,
+          "requires": {
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "regex-not": "1.0.2",
+            "safe-regex": "1.1.0"
+          },
+          "dependencies": {
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "3.0.2",
+                "safe-regex": "1.1.0"
+              }
+            }
+          }
+        }
       }
     },
     "supports-color": {
@@ -13513,83 +15653,6 @@
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
       "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
     },
-    "sync-promise": {
-      "version": "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a"
-    },
-    "synesthesia": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/synesthesia/-/synesthesia-1.0.1.tgz",
-      "integrity": "sha1-XvlepUjA1cbm+btLDQcx3/hkp3c=",
-      "dev": true,
-      "requires": {
-        "css-color-names": "0.0.3"
-      },
-      "dependencies": {
-        "css-color-names": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
-          "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
-          "dev": true
-        }
-      }
-    },
-    "table": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-      "dev": true,
-      "requires": {
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "chalk": "1.1.3",
-        "lodash": "4.17.4",
-        "slice-ansi": "0.0.4",
-        "string-width": "2.1.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        }
-      }
-    },
     "tapable": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
@@ -13879,6 +15942,18 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "trim-trailing-lines": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
+      "integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
+      "dev": true
+    },
+    "trough": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz",
+      "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==",
+      "dev": true
+    },
     "true-case-path": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
@@ -13918,11 +15993,51 @@
       }
     },
     "turndown": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/turndown/-/turndown-4.0.1.tgz",
-      "integrity": "sha512-xC83XzYm+yLuQWLBc87s63FLn4+ERdZOxDqlrlvKKWcyL9UFhwtR4hAqmFBKDUQyejRZWU9Fac4vMHomlFboyg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/turndown/-/turndown-4.0.2.tgz",
+      "integrity": "sha512-pqZ6WrHFGnxXC9q2xJ3Qa7EoLAwrojgFRajWZjxTKwbz9vnNnyi8lLjiD5h86UTPOcMlEyHjm6NMhjEDdlc25A==",
       "requires": {
-        "jsdom": "11.6.2"
+        "jsdom": "11.10.0"
+      },
+      "dependencies": {
+        "jsdom": {
+          "version": "11.10.0",
+          "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.10.0.tgz",
+          "integrity": "sha512-x5No5FpJgBg3j5aBwA8ka6eGuS5IxbC8FOkmyccKvObtFT0bDMict/LOxINZsZGZSfGdNomLZ/qRV9Bpq/GIBA==",
+          "requires": {
+            "abab": "1.0.4",
+            "acorn": "5.3.0",
+            "acorn-globals": "4.1.0",
+            "array-equal": "1.0.0",
+            "cssom": "0.3.2",
+            "cssstyle": "0.2.37",
+            "data-urls": "1.0.0",
+            "domexception": "1.0.1",
+            "escodegen": "1.9.0",
+            "html-encoding-sniffer": "1.0.2",
+            "left-pad": "1.2.0",
+            "nwmatcher": "1.4.3",
+            "parse5": "4.0.0",
+            "pn": "1.1.0",
+            "request": "2.85.0",
+            "request-promise-native": "1.0.5",
+            "sax": "1.2.4",
+            "symbol-tree": "3.2.2",
+            "tough-cookie": "2.3.3",
+            "w3c-hr-time": "1.0.1",
+            "webidl-conversions": "4.0.2",
+            "whatwg-encoding": "1.0.3",
+            "whatwg-mimetype": "2.1.0",
+            "whatwg-url": "6.4.0",
+            "ws": "4.0.0",
+            "xml-name-validator": "3.0.0"
+          }
+        },
+        "sax": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+        }
       }
     },
     "tweetnacl": {
@@ -13954,22 +16069,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "typeson": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/typeson/-/typeson-5.7.1.tgz",
-      "integrity": "sha512-tVC1gcpUJl9R2uPE6xWDqeZ5+bLYI9deY5MyvDnSTcQVggktcqir67PmjTaq8TWC0WHPsLTLe0vMYtKAo8NzVQ=="
-    },
-    "typeson-registry": {
-      "version": "1.0.0-alpha.18",
-      "resolved": "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.18.tgz",
-      "integrity": "sha512-/iqkwdB7DbmVHN31l6Y08m/BJHB0ZlyuyaDudmQVenU94QxSd8Bf+8UGqq0/LEWMRstnQC0Cbmn9qvcOdevIRQ==",
-      "requires": {
-        "base64-arraybuffer-es6": "0.3.1",
-        "typeson": "5.7.1",
-        "uuid": "3.1.0",
-        "whatwg-url": "6.4.0"
-      }
-    },
     "uc.micro": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",
@@ -13995,7 +16094,8 @@
     "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "optional": true
     },
     "ultron": {
       "version": "1.1.1",
@@ -14013,10 +16113,34 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
       "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
     },
-    "unicode-9.0.0": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/unicode-9.0.0/-/unicode-9.0.0-0.7.4.tgz",
-      "integrity": "sha1-bf5a3TXC6m6E3YwnK22zGKXkDp4="
+    "unherit": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
+      "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "unicode-10.0.0": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/unicode-10.0.0/-/unicode-10.0.0-0.7.5.tgz",
+      "integrity": "sha512-4JjDaIBz3GqgVSnWS+3RriWCdKDj2QH14C2K4XRpuWqhvKMgd8uWT42ZG/Xlyh7QxXSptsCEWydu41KrFYUfiw=="
+    },
+    "unified": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz",
+      "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
+      "dev": true,
+      "requires": {
+        "bail": "1.0.3",
+        "extend": "3.0.1",
+        "is-plain-obj": "1.1.0",
+        "trough": "1.0.2",
+        "vfile": "2.3.0",
+        "x-is-string": "0.1.0"
+      }
     },
     "union-value": {
       "version": "1.0.0",
@@ -14089,6 +16213,54 @@
       "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
       "dev": true
     },
+    "unist-util-find-all-after": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz",
+      "integrity": "sha512-nDl79mKpffXojLpCimVXnxhlH/jjaTnDuScznU9J4jjsaUtBdDbxmlc109XtcqxY4SDO0SwzngsxxW8DIISt1w==",
+      "dev": true,
+      "requires": {
+        "unist-util-is": "2.1.2"
+      }
+    },
+    "unist-util-is": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz",
+      "integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==",
+      "dev": true
+    },
+    "unist-util-modify-children": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz",
+      "integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
+      "dev": true,
+      "requires": {
+        "array-iterate": "1.1.2"
+      }
+    },
+    "unist-util-remove-position": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz",
+      "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
+      "dev": true,
+      "requires": {
+        "unist-util-visit": "1.3.1"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
+      "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
+      "dev": true
+    },
+    "unist-util-visit": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz",
+      "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==",
+      "dev": true,
+      "requires": {
+        "unist-util-is": "2.1.2"
+      }
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -14146,6 +16318,23 @@
       "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
       "dev": true
     },
+    "uri-js": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz",
+      "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
+      "dev": true,
+      "requires": {
+        "punycode": "2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+          "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+          "dev": true
+        }
+      }
+    },
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -14162,15 +16351,34 @@
       }
     },
     "url-loader": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
-      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.0.1.tgz",
+      "integrity": "sha512-rAonpHy7231fmweBKUFe0bYnlGDty77E+fm53NZdij7j/YOpyGzc7ttqG1nAXl3aRs0k41o0PC3TvGXQiw2Zvw==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "mime": "1.3.6"
+        "mime": "2.3.1",
+        "schema-utils": "0.4.5"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
+          "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+          "dev": true
+        },
         "loader-utils": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@@ -14183,10 +16391,20 @@
           }
         },
         "mime": {
-          "version": "1.3.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
           "dev": true
+        },
+        "schema-utils": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+          "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.4.0",
+            "ajv-keywords": "3.2.0"
+          }
         }
       }
     },
@@ -14293,15 +16511,6 @@
         }
       }
     },
-    "user-home": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "1.0.2"
-      }
-    },
     "util": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
@@ -14325,6 +16534,16 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
+      }
+    },
     "utila": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
@@ -14390,6 +16609,41 @@
         "extsprintf": "1.3.0"
       }
     },
+    "vfile": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
+      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "1.1.2",
+        "vfile-message": "1.0.1"
+      },
+      "dependencies": {
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        }
+      }
+    },
+    "vfile-location": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz",
+      "integrity": "sha512-zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==",
+      "dev": true
+    },
+    "vfile-message": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.1.tgz",
+      "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==",
+      "dev": true,
+      "requires": {
+        "unist-util-stringify-position": "1.1.2"
+      }
+    },
     "vinyl": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
@@ -14502,31 +16756,17 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
-    "vue-hot-reload-api": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz",
-      "integrity": "sha512-e+ThJMYmZg4D9UnrLcr6LQxGu6YlcxkrmZGPCyIN4malcNhdeGGKxmFuM5y6ICMJJxQywLfT8MM1rYZr4LpeLw==",
-      "dev": true
-    },
     "vue-loader": {
-      "version": "12.2.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-12.2.2.tgz",
-      "integrity": "sha512-DD+sYaWQ1esYL/tEwJpoEGE/PFUu32fp7iOuMf4Sra3dgxqr4haTOkVam2VY0/5D4LG8eAcB94ruXKeQW2/ikw==",
+      "version": "15.0.9",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.0.9.tgz",
+      "integrity": "sha512-lSJEHKdTjVpAeYndjLu81hfW4I8VQ0OQ53CcmTjO9V3UhbbYxKoALeJ7Py/7BZu3lGwluVijEBPOfAQFeVSlzQ==",
       "dev": true,
       "requires": {
-        "consolidate": "0.14.5",
+        "@vue/component-compiler-utils": "1.2.1",
         "hash-sum": "1.0.2",
-        "js-beautify": "1.7.5",
         "loader-utils": "1.1.0",
-        "lru-cache": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-load-config": "1.2.0",
-        "postcss-selector-parser": "2.2.3",
-        "resolve": "1.5.0",
-        "source-map": "0.5.7",
-        "vue-hot-reload-api": "2.2.4",
-        "vue-style-loader": "3.0.3",
-        "vue-template-es2015-compiler": "1.6.0"
+        "vue-hot-reload-api": "2.3.0",
+        "vue-style-loader": "4.1.0"
       },
       "dependencies": {
         "loader-utils": {
@@ -14540,18 +16780,18 @@
             "json5": "0.5.1"
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+        "vue-hot-reload-api": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz",
+          "integrity": "sha512-2j/t+wIbyVMP5NvctQoSUvLkYKoWAAk2QlQiilrM2a6/ulzFgdcLUJfTvs4XQ/3eZhHiBmmEojbjmM4AzZj8JA==",
           "dev": true
         }
       }
     },
     "vue-style-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.3.tgz",
-      "integrity": "sha512-P/ihpaZKU23T1kq3E0y4c+F8sbm1HQO69EFYoLoGMSGVAHroHsGir/WQ9qUavP8dyFYHmXenzHaJ/nqd8vfaxw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.0.tgz",
+      "integrity": "sha512-IsSiXDrLW2QIjyBsCqa35e45l5AceMbJ2jO8DxoEQv75xu/UmtXkSC0ybESq/LpbmmIW47MAWDQvErUw+Hrz/A==",
       "dev": true,
       "requires": {
         "hash-sum": "1.0.2",
@@ -14572,9 +16812,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.5.13",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz",
-      "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==",
+      "version": "2.5.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz",
+      "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==",
       "dev": true,
       "requires": {
         "de-indent": "1.0.2",
@@ -14600,25 +16840,6 @@
         "browser-process-hrtime": "0.1.2"
       }
     },
-    "watchpack": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
-      "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
-      "dev": true,
-      "requires": {
-        "async": "0.9.2",
-        "chokidar": "1.7.0",
-        "graceful-fs": "4.1.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-          "dev": true
-        }
-      }
-    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -14836,7 +17057,7 @@
         "chalk": "1.1.3",
         "commander": "2.12.2",
         "ejs": "2.5.7",
-        "express": "4.16.2",
+        "express": "4.16.3",
         "filesize": "3.5.11",
         "gzip-size": "3.0.0",
         "lodash": "4.17.4",
@@ -14845,24 +17066,6 @@
         "ws": "4.0.0"
       }
     },
-    "webpack-core": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
-      "dev": true,
-      "requires": {
-        "source-list-map": "0.1.8",
-        "source-map": "0.4.4"
-      },
-      "dependencies": {
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-          "dev": true
-        }
-      }
-    },
     "webpack-dev-middleware": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz",
@@ -14913,12 +17116,20 @@
       }
     },
     "webpack-merge": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz",
-      "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
+      "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4"
+        "lodash": "4.17.10"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.10",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+          "dev": true
+        }
       }
     },
     "webpack-sources": {
@@ -14939,17 +17150,6 @@
         }
       }
     },
-    "websql": {
-      "version": "git+https://github.com/brettz9/node-websql.git#c9828a34c92eced64858fc19151ec099fd60e8dd",
-      "requires": {
-        "argsarray": "0.0.1",
-        "immediate": "3.2.3",
-        "noop-fn": "1.0.0",
-        "pouchdb-collections": "1.0.1",
-        "sqlite3": "3.1.13",
-        "tiny-queue": "0.2.1"
-      }
-    },
     "whatwg-encoding": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",
@@ -14958,6 +17158,11 @@
         "iconv-lite": "0.4.19"
       }
     },
+    "whatwg-mimetype": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz",
+      "integrity": "sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew=="
+    },
     "whatwg-url": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.0.tgz",
@@ -15009,15 +17214,33 @@
       "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
     },
     "worker-loader": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-0.8.1.tgz",
-      "integrity": "sha1-6OmVMx6jTfW/aCloJL+38K1XjUM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-1.1.1.tgz",
+      "integrity": "sha512-qJZLVS/jMCBITDzPo/RuweYSIG8VJP5P67mP/71alGyTZRe1LYJFdwLjLalY3T5ifx0bMDRD3OB6P2p1escvlg==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0"
+        "schema-utils": "0.4.5"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
+          "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1",
+            "uri-js": "3.0.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+          "dev": true
+        },
         "loader-utils": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
@@ -15028,6 +17251,16 @@
             "emojis-list": "2.1.0",
             "json5": "0.5.1"
           }
+        },
+        "schema-utils": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+          "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.4.0",
+            "ajv-keywords": "3.2.0"
+          }
         }
       }
     },
@@ -15056,12 +17289,6 @@
         "mkdirp": "0.5.1"
       }
     },
-    "write-file-stdout": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz",
-      "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
-      "dev": true
-    },
     "ws": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-4.0.0.tgz",
@@ -15072,6 +17299,12 @@
         "ultron": "1.1.1"
       }
     },
+    "x-is-string": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
+      "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
+      "dev": true
+    },
     "xhr": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz",
diff --git a/package.json b/package.json
index ee9f15ac..005e076b 100644
--- a/package.json
+++ b/package.json
@@ -28,13 +28,13 @@
     "clipboard": "^1.7.1",
     "compression": "^1.7.0",
     "diff-match-patch": "^1.0.0",
-    "file-saver": "^1.3.3",
+    "file-saver": "^1.3.8",
     "google-id-token-verifier": "^0.2.3",
     "handlebars": "^4.0.10",
-    "indexeddbshim": "^3.0.4",
-    "js-yaml": "^3.9.1",
-    "katex": "^0.9.0-alpha1",
-    "markdown-it": "^8.3.1",
+    "indexeddbshim": "^3.6.2",
+    "js-yaml": "^3.11.0",
+    "katex": "^0.9.0",
+    "markdown-it": "^8.4.1",
     "markdown-it-abbr": "^1.0.4",
     "markdown-it-deflist": "^2.0.2",
     "markdown-it-emoji": "^1.3.0",
@@ -46,20 +46,20 @@
     "markdown-it-sup": "^1.0.0",
     "mermaid": "^7.1.0",
     "mousetrap": "^1.6.1",
-    "normalize-scss": "^7.0.0",
+    "normalize-scss": "^7.0.1",
     "prismjs": "^1.6.0",
-    "request": "^2.82.0",
-    "serve-static": "^1.12.6",
+    "request": "^2.85.0",
+    "serve-static": "^1.13.2",
     "tmp": "^0.0.33",
-    "turndown": "^4.0.1",
+    "turndown": "^4.0.2",
     "vue": "^2.5.16",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.1.1",
-    "babel-loader": "^6.2.10",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
+    "babel-loader": "^7.1.4",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.3.2",
@@ -68,49 +68,50 @@
     "chalk": "^1.1.3",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.5.1",
-    "css-loader": "^0.28.7",
-    "eslint": "^3.19.0",
-    "eslint-config-airbnb-base": "^11.1.3",
-    "eslint-friendly-formatter": "^2.0.7",
-    "eslint-import-resolver-webpack": "^0.8.1",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^2.0.0",
-    "eslint-plugin-import": "^2.2.0",
+    "css-loader": "^0.28.11",
+    "eslint": "^4.19.1",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-friendly-formatter": "^4.0.1",
+    "eslint-import-resolver-webpack": "^0.9.0",
+    "eslint-loader": "^2.0.0",
+    "eslint-plugin-html": "^4.0.3",
+    "eslint-plugin-import": "^2.11.0",
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.15.5",
+    "express": "^4.16.3",
     "extract-text-webpack-plugin": "^2.0.0",
-    "favicons-webpack-plugin": "^0.0.7",
-    "file-loader": "^0.11.1",
-    "friendly-errors-webpack-plugin": "^1.1.3",
+    "favicons-webpack-plugin": "^0.0.9",
+    "file-loader": "^1.1.11",
+    "friendly-errors-webpack-plugin": "^1.7.0",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.1",
-    "html-webpack-plugin": "^2.28.0",
-    "http-proxy-middleware": "^0.17.3",
+    "html-webpack-plugin": "^3.2.0",
+    "http-proxy-middleware": "^0.18.0",
     "ignore-loader": "^0.1.2",
-    "node-sass": "^4.5.3",
+    "node-sass": "^4.9.0",
     "npm-bump": "^0.0.23",
-    "offline-plugin": "^4.8.4",
+    "offline-plugin": "^5.0.3",
     "opn": "^4.0.2",
-    "optimize-css-assets-webpack-plugin": "^1.3.0",
+    "optimize-css-assets-webpack-plugin": "^1.3.2",
     "ora": "^1.2.0",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.6.0",
-    "sass-loader": "^6.0.5",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
+    "sass-loader": "^7.0.1",
+    "semver": "^5.5.0",
+    "shelljs": "^0.8.1",
+    "stylelint": "^9.2.0",
     "stylelint-config-standard": "^16.0.0",
     "stylelint-processor-html": "^1.0.0",
-    "stylelint-webpack-plugin": "^0.7.0",
-    "url-loader": "^0.5.8",
-    "vue-loader": "^12.1.0",
-    "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.3.3",
+    "stylelint-webpack-plugin": "^0.10.4",
+    "url-loader": "^1.0.1",
+    "vue-loader": "^15.0.9",
+    "vue-style-loader": "^4.1.0",
+    "vue-template-compiler": "^2.5.16",
     "webpack": "^2.6.1",
     "webpack-bundle-analyzer": "^2.2.1",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.18.0",
-    "webpack-merge": "^4.1.0",
-    "worker-loader": "^0.8.1"
+    "webpack-merge": "^4.1.2",
+    "worker-loader": "^1.1.1"
   },
   "engines": {
     "node": ">= 4.0.0",
diff --git a/server/github.js b/server/github.js
index 5c93ff55..eadb340c 100644
--- a/server/github.js
+++ b/server/github.js
@@ -29,5 +29,8 @@ exports.githubToken = (req, res) => {
   githubToken(req.query.clientId, req.query.code)
     .then(
       token => res.send(token),
-      err => res.status(400).send(err ? err.message || err.toString() : 'bad_code'));
+      err => res
+        .status(400)
+        .send(err ? err.message || err.toString() : 'bad_code'),
+    );
 };
diff --git a/server/pandoc.js b/server/pandoc.js
index a1285e05..c5af214b 100644
--- a/server/pandoc.js
+++ b/server/pandoc.js
@@ -1,5 +1,5 @@
 /* global window */
-const spawn = require('child_process').spawn;
+const { spawn } = require('child_process');
 const fs = require('fs');
 const tmp = require('tmp');
 const user = require('./user');
@@ -76,7 +76,7 @@ exports.generate = (req, res) => {
         params.push('--toc');
       }
       options.tocDepth = parseInt(options.tocDepth, 10);
-      if (!isNaN(options.tocDepth)) {
+      if (!Number.isNaN(options.tocDepth)) {
         params.push('--toc-depth', options.tocDepth);
       }
       options.highlightStyle = highlightStyles.indexOf(options.highlightStyle) !== -1 ? options.highlightStyle : 'kate';
diff --git a/server/pdf.js b/server/pdf.js
index 6912e63d..dba38b39 100644
--- a/server/pdf.js
+++ b/server/pdf.js
@@ -1,5 +1,5 @@
 /* global window,MathJax */
-const spawn = require('child_process').spawn;
+const { spawn } = require('child_process');
 const fs = require('fs');
 const tmp = require('tmp');
 const user = require('./user');
@@ -84,13 +84,13 @@ exports.generate = (req, res) => {
 
       // Margins
       const marginTop = parseInt(`${options.marginTop}`, 10);
-      params.push('-T', isNaN(marginTop) ? 25 : marginTop);
+      params.push('-T', Number.isNaN(marginTop) ? 25 : marginTop);
       const marginRight = parseInt(`${options.marginRight}`, 10);
-      params.push('-R', isNaN(marginRight) ? 25 : marginRight);
+      params.push('-R', Number.isNaN(marginRight) ? 25 : marginRight);
       const marginBottom = parseInt(`${options.marginBottom}`, 10);
-      params.push('-B', isNaN(marginBottom) ? 25 : marginBottom);
+      params.push('-B', Number.isNaN(marginBottom) ? 25 : marginBottom);
       const marginLeft = parseInt(`${options.marginLeft}`, 10);
-      params.push('-L', isNaN(marginLeft) ? 25 : marginLeft);
+      params.push('-L', Number.isNaN(marginLeft) ? 25 : marginLeft);
 
       // Header
       if (options.headerCenter) {
diff --git a/server/user.js b/server/user.js
index f1782c71..470c740a 100644
--- a/server/user.js
+++ b/server/user.js
@@ -2,10 +2,12 @@ const request = require('request');
 const AWS = require('aws-sdk');
 const verifier = require('google-id-token-verifier');
 
-const BUCKET_NAME = process.env.USER_BUCKET_NAME || 'stackedit-users';
-const PAYPAL_URI = process.env.PAYPAL_URI || 'https://www.paypal.com/cgi-bin/webscr';
-const PAYPAL_RECEIVER_EMAIL = process.env.PAYPAL_RECEIVER_EMAIL || 'stackedit.sales@gmail.com';
-const GOOGLE_CLIENT_ID = process.env.GOOGLE_CLIENT_ID;
+const {
+  USER_BUCKET_NAME = 'stackedit-users',
+  PAYPAL_URI = 'https://www.paypal.com/cgi-bin/webscr',
+  PAYPAL_RECEIVER_EMAIL = 'stackedit.sales@gmail.com',
+  GOOGLE_CLIENT_ID,
+} = process.env;
 const s3Client = new AWS.S3();
 
 const cb = (resolve, reject) => (err, res) => {
@@ -18,21 +20,22 @@ const cb = (resolve, reject) => (err, res) => {
 
 exports.getUser = id => new Promise((resolve, reject) => {
   s3Client.getObject({
-    Bucket: BUCKET_NAME,
+    Bucket: USER_BUCKET_NAME,
     Key: id,
   }, cb(resolve, reject));
 })
   .then(
-  res => JSON.parse(`${res.Body}`),
-  (err) => {
-    if (err.code !== 'NoSuchKey') {
-      throw err;
-    }
-  });
+    res => JSON.parse(`${res.Body}`),
+    (err) => {
+      if (err.code !== 'NoSuchKey') {
+        throw err;
+      }
+    },
+  );
 
 exports.putUser = (id, user) => new Promise((resolve, reject) => {
   s3Client.putObject({
-    Bucket: BUCKET_NAME,
+    Bucket: USER_BUCKET_NAME,
     Key: id,
     Body: JSON.stringify(user),
   }, cb(resolve, reject));
@@ -40,20 +43,24 @@ exports.putUser = (id, user) => new Promise((resolve, reject) => {
 
 exports.removeUser = id => new Promise((resolve, reject) => {
   s3Client.deleteObject({
-    Bucket: BUCKET_NAME,
+    Bucket: USER_BUCKET_NAME,
     Key: id,
   }, cb(resolve, reject));
 });
 
-exports.getUserFromToken = idToken => new Promise(
-  (resolve, reject) => verifier.verify(idToken, GOOGLE_CLIENT_ID, cb(resolve, reject)))
+exports.getUserFromToken = idToken => new Promise((resolve, reject) => verifier
+  .verify(idToken, GOOGLE_CLIENT_ID, cb(resolve, reject)))
   .then(tokenInfo => exports.getUser(tokenInfo.sub));
 
 exports.userInfo = (req, res) => exports.getUserFromToken(req.query.idToken)
-  .then(user => res.send(Object.assign({
-    sponsorUntil: 0,
-  }, user)),
-  err => res.status(400).send(err ? err.message || err.toString() : 'invalid_token'));
+  .then(
+    user => res.send(Object.assign({
+      sponsorUntil: 0,
+    }, user)),
+    err => res
+      .status(400)
+      .send(err ? err.message || err.toString() : 'invalid_token'),
+  );
 
 exports.paypalIpn = (req, res, next) => Promise.resolve()
   .then(() => {
diff --git a/src/components/App.vue b/src/components/App.vue
index 447177bb..936a999f 100644
--- a/src/components/App.vue
+++ b/src/components/App.vue
@@ -10,6 +10,9 @@
 
 <script>
 import Vue from 'vue';
+import '../styles';
+import '../styles/markdownHighlighting.scss';
+import '../styles/app.scss';
 import Layout from './Layout';
 import Modal from './Modal';
 import Notification from './Notification';
@@ -26,7 +29,7 @@ import store from '../store';
 Vue.directive('focus', {
   inserted(el) {
     el.focus();
-    const value = el.value;
+    const { value } = el;
     if (value && el.setSelectionRange) {
       el.setSelectionRange(0, value.length);
     }
@@ -106,7 +109,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss">
-@import 'common/app';
-</style>
diff --git a/src/components/ButtonBar.vue b/src/components/ButtonBar.vue
index b5ff5ae2..0fdf288e 100644
--- a/src/components/ButtonBar.vue
+++ b/src/components/ButtonBar.vue
@@ -49,7 +49,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .button-bar {
   position: absolute;
diff --git a/src/components/CodeEditor.vue b/src/components/CodeEditor.vue
index 308a5c75..33370470 100644
--- a/src/components/CodeEditor.vue
+++ b/src/components/CodeEditor.vue
@@ -28,7 +28,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .code-editor {
   margin: 0;
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 86ea3b37..a067d072 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -66,13 +66,14 @@ export default {
           editorElt.querySelectorAll(`.discussion-editor-highlighting--${discussionId}`)
             .cl_each(elt => elt.classList.add('discussion-editor-highlighting--selected'));
         }
-      });
+      },
+    );
   },
 };
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .editor {
   position: absolute;
diff --git a/src/components/Explorer.vue b/src/components/Explorer.vue
index f412f4c0..e3671af4 100644
--- a/src/components/Explorer.vue
+++ b/src/components/Explorer.vue
@@ -67,7 +67,8 @@ export default {
         this.$store.dispatch('explorer/openNode', currentFileId);
       }, {
         immediate: true,
-      });
+      },
+    );
   },
 };
 </script>
diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index e45f0bd1..428e2eb2 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -98,7 +98,7 @@ export default {
       return true;
     },
     submitNewChild(cancel) {
-      const newChildNode = this.$store.state.explorer.newChildNode;
+      const { newChildNode } = this.$store.state.explorer;
       if (!cancel && !newChildNode.isNil && newChildNode.item.name) {
         if (newChildNode.isFolder) {
           fileSvc.storeItem(newChildNode.item)
@@ -111,7 +111,7 @@ export default {
       this.$store.commit('explorer/setNewItem', null);
     },
     submitEdit(cancel) {
-      const item = this.$store.getters['explorer/editingNode'].item;
+      const { item } = this.$store.getters['explorer/editingNode'];
       const value = this.editingValue;
       this.setEditingId(null);
       if (!cancel && item.id && value) {
diff --git a/src/components/FindReplace.vue b/src/components/FindReplace.vue
index 5b328dad..8e3eb0e6 100644
--- a/src/components/FindReplace.vue
+++ b/src/components/FindReplace.vue
@@ -70,7 +70,8 @@ class DynamicClassApplier {
         () => ({
           start: this.startMarker.offset,
           end: this.endMarker.offset,
-        }));
+        }),
+      );
     }
   }
 
@@ -126,7 +127,10 @@ export default {
           offsetList.forEach((offset, i) => {
             const key = `${offset.start}:${offset.end}`;
             this.classAppliers[key] = oldClassAppliers[key] || new DynamicClassApplier(
-              'find-replace-highlighting', offset, i > 200);
+              'find-replace-highlighting',
+              offset,
+              i > 200,
+            );
           });
         } catch (e) {
           // Ignore
@@ -156,9 +160,9 @@ export default {
       this.findPosition = 0;
     },
     find(mode = 'forward') {
-      const selectedClassApplier = this.selectedClassApplier;
+      const { selectedClassApplier } = this;
       this.unselectClassApplier();
-      const selectionMgr = editorSvc.clEditor.selectionMgr;
+      const { selectionMgr } = editorSvc.clEditor;
       const startOffset = Math.min(selectionMgr.selectionStart, selectionMgr.selectionEnd);
       const endOffset = Math.max(selectionMgr.selectionStart, selectionMgr.selectionEnd);
       const keys = Object.keys(this.classAppliers);
@@ -206,7 +210,10 @@ export default {
           return;
         }
         editorSvc.clEditor.replaceAll(
-          this.replaceRegex, this.replaceText, this.selectedClassApplier.startMarker.offset);
+          this.replaceRegex,
+          this.replaceText,
+          this.selectedClassApplier.startMarker.offset,
+        );
         this.$nextTick(() => this.find());
       }
     },
@@ -227,7 +234,9 @@ export default {
 
     // Highlight occurences
     this.debouncedHighlightOccurrences = cledit.Utils.debounce(
-      () => this.highlightOccurrences(), 25);
+      () => this.highlightOccurrences(),
+      25,
+    );
     // Refresh highlighting when find text changes or changing options
     this.$watch(() => this.findText, this.debouncedHighlightOccurrences);
     this.$watch(() => this.findCaseSensitive, this.debouncedHighlightOccurrences);
@@ -273,7 +282,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .find-replace {
   padding: 0 35px 0 25px;
diff --git a/src/components/Layout.vue b/src/components/Layout.vue
index e3bcf1e0..dd4ad131 100644
--- a/src/components/Layout.vue
+++ b/src/components/Layout.vue
@@ -140,7 +140,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .layout {
   position: absolute;
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index dac6a7be..91d84182 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -141,7 +141,7 @@ export default {
       }
       if (isFocusIn && this.config) {
         const modalInner = this.$el.querySelector('.modal__inner-2');
-        let target = evt.target;
+        let { target } = evt;
         while (target) {
           if (target === modalInner) {
             return;
@@ -166,7 +166,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .modal {
   position: absolute;
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
index 30ca4117..bbf77c10 100644
--- a/src/components/NavigationBar.vue
+++ b/src/components/NavigationBar.vue
@@ -224,7 +224,9 @@ export default {
       () => {
         this.title = '';
         this.editTitle(false);
-      }, { immediate: true });
+      },
+      { immediate: true },
+    );
   },
   mounted() {
     this.titleFakeElt = this.$el.querySelector('.navigation-bar__title--fake');
@@ -235,7 +237,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .navigation-bar {
   position: absolute;
diff --git a/src/components/Notification.vue b/src/components/Notification.vue
index dca4a2ed..e2a94b46 100644
--- a/src/components/Notification.vue
+++ b/src/components/Notification.vue
@@ -23,7 +23,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .notification {
   position: absolute;
diff --git a/src/components/Preview.vue b/src/components/Preview.vue
index d0833ad0..eed13713 100644
--- a/src/components/Preview.vue
+++ b/src/components/Preview.vue
@@ -22,7 +22,7 @@ import { mapGetters, mapActions } from 'vuex';
 import CommentList from './gutters/CommentList';
 import PreviewNewDiscussionButton from './gutters/PreviewNewDiscussionButton';
 
-const appUri = `${location.protocol}//${location.host}`;
+const appUri = `${window.location.protocol}//${window.location.host}`;
 
 export default {
   components: {
@@ -98,13 +98,14 @@ export default {
           previewElt.querySelectorAll(`.discussion-preview-highlighting--${discussionId}`)
             .cl_each(elt => elt.classList.add('discussion-preview-highlighting--selected'));
         }
-      });
+      },
+    );
   },
 };
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .preview,
 .preview__inner-1 {
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
index 4b790ca3..f0015f4c 100644
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -93,7 +93,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .side-bar {
   overflow: hidden;
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index 9224ad13..e959b140 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -92,7 +92,7 @@ export default {
         this.htmlSelection = true;
         if (!text) {
           this.htmlSelection = false;
-          text = editorSvc.previewCtx.text;
+          ({ text } = editorSvc.previewCtx);
         }
         if (text != null) {
           this.htmlStats.forEach((stat) => {
diff --git a/src/components/Tour.vue b/src/components/Tour.vue
index e29a8ca4..874528f2 100644
--- a/src/components/Tour.vue
+++ b/src/components/Tour.vue
@@ -126,7 +126,7 @@ export default {
 
 
 <style lang="scss">
-@import 'common/variables.scss';
+@import '../styles/variables.scss';
 
 .tour {
   position: absolute;
diff --git a/src/components/common/EditorClassApplier.js b/src/components/common/EditorClassApplier.js
index 98b0032a..a5a9e1fb 100644
--- a/src/components/common/EditorClassApplier.js
+++ b/src/components/common/EditorClassApplier.js
@@ -10,7 +10,9 @@ const nextTickExecCbs = cledit.Utils.debounce(() => {
   }
   if (savedSelection) {
     editorSvc.clEditor.selectionMgr.setSelectionStartEnd(
-      savedSelection.start, savedSelection.end);
+      savedSelection.start,
+      savedSelection.end,
+    );
   }
   savedSelection = null;
 });
diff --git a/src/components/common/PreviewClassApplier.js b/src/components/common/PreviewClassApplier.js
index acbe7403..4530ceff 100644
--- a/src/components/common/PreviewClassApplier.js
+++ b/src/components/common/PreviewClassApplier.js
@@ -40,14 +40,22 @@ export default class PreviewClassApplier {
       const offset = this.offsetGetter();
       if (offset) {
         const offsetStart = editorSvc.getPreviewOffset(
-          offset.start, editorSvc.previewCtx.sectionDescList);
+          offset.start,
+          editorSvc.previewCtx.sectionDescList,
+        );
         const offsetEnd = editorSvc.getPreviewOffset(
-          offset.end, editorSvc.previewCtx.sectionDescList);
+          offset.end,
+          editorSvc.previewCtx.sectionDescList,
+        );
         if (offsetStart != null && offsetEnd != null && offsetStart !== offsetEnd) {
           const start = cledit.Utils.findContainer(
-            editorSvc.previewElt, Math.min(offsetStart, offsetEnd));
+            editorSvc.previewElt,
+            Math.min(offsetStart, offsetEnd),
+          );
           const end = cledit.Utils.findContainer(
-            editorSvc.previewElt, Math.max(offsetStart, offsetEnd));
+            editorSvc.previewElt,
+            Math.max(offsetStart, offsetEnd),
+          );
           const range = document.createRange();
           range.setStart(start.container, start.offsetInContainer);
           range.setEnd(end.container, end.offsetInContainer);
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index df554595..21588430 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -51,7 +51,8 @@ export default {
       this.$store.dispatch('modal/commentDeletion')
         .then(
           () => this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment }),
-          () => { /* Cancel */ });
+          () => { /* Cancel */ },
+        );
     },
   },
   mounted() {
@@ -63,8 +64,7 @@ export default {
       let scrollerMirrorElt;
       const getScrollerMirrorElt = () => {
         if (!scrollerMirrorElt) {
-          scrollerMirrorElt = document.querySelector(
-            `.comment-list .comment--${commentId} .comment__text-inner`);
+          scrollerMirrorElt = document.querySelector(`.comment-list .comment--${commentId} .comment__text-inner`);
         }
         return scrollerMirrorElt || { scrollTop: 0 };
       };
diff --git a/src/components/gutters/CommentList.vue b/src/components/gutters/CommentList.vue
index 525b2f04..2f3ec2f5 100644
--- a/src/components/gutters/CommentList.vue
+++ b/src/components/gutters/CommentList.vue
@@ -107,10 +107,13 @@ export default {
               this.currentDiscussionLastCommentId
                 && this.$el.querySelector(`.comment--${this.currentDiscussionLastCommentId}`),
               this.$el.querySelector('.comment--new'),
-              true);
+              true,
+            );
           } else {
-            tops[discussionId] = getTop(discussion,
-              this.$el.querySelector(`.comment--discussion-${discussionId}`));
+            tops[discussionId] = getTop(
+              discussion,
+              this.$el.querySelector(`.comment--discussion-${discussionId}`),
+            );
           }
         });
       this.tops = tops;
@@ -120,7 +123,8 @@ export default {
     this.$watch(
       () => this.updateTopsTrigger,
       () => this.updateTops(),
-      { immediate: true });
+      { immediate: true },
+    );
 
     const layoutSettings = this.$store.getters['data/layoutSettings'];
     this.scrollerElt = layoutSettings.showEditor
@@ -161,7 +165,8 @@ export default {
     this.$watch(
       () => this.updateStickyTrigger,
       () => this.updateSticky(),
-      { immediate: true });
+      { immediate: true },
+    );
 
     // Move preview discussions once previewCtxWithDiffs has been calculated
     if (!editorSvc.previewCtxWithDiffs) {
@@ -178,7 +183,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .comment-list {
   position: absolute;
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index 53671090..36262d4c 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -99,14 +99,15 @@ export default {
           () => this.$store.dispatch('discussion/cleanCurrentFile', {
             filterDiscussion: this.currentDiscussion,
           }),
-          () => { /* Cancel */ });
+          () => { /* Cancel */ },
+        );
     },
   },
 };
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .current-discussion {
   position: absolute;
diff --git a/src/components/gutters/NewComment.vue b/src/components/gutters/NewComment.vue
index 48e9887b..1f143d89 100644
--- a/src/components/gutters/NewComment.vue
+++ b/src/components/gutters/NewComment.vue
@@ -86,9 +86,11 @@ export default {
     const clEditor = cledit(preElt, scrollerElt, true);
     clEditor.init({
       sectionHighlighter: section => Prism.highlight(
-        section.text, editorSvc.prismGrammars[section.data]),
-      sectionParser: text => markdownConversionSvc.parseSections(
-        editorSvc.converter, text).sections,
+        section.text,
+        editorSvc.prismGrammars[section.data],
+      ),
+      sectionParser: text => markdownConversionSvc
+        .parseSections(editorSvc.converter, text).sections,
       content: this.$store.state.discussion.newCommentText,
       selectionStart: this.$store.state.discussion.newCommentSelection.start,
       selectionEnd: this.$store.state.discussion.newCommentSelection.end,
@@ -114,14 +116,14 @@ export default {
           clEditor.focus();
         }
       }),
-      { immediate: true });
+      { immediate: true },
+    );
 
     if (isSticky) {
       let scrollerMirrorElt;
       const getScrollerMirrorElt = () => {
         if (!scrollerMirrorElt) {
-          scrollerMirrorElt = document.querySelector(
-            '.comment-list .comment--new .comment__text-inner');
+          scrollerMirrorElt = document.querySelector('.comment-list .comment--new .comment__text-inner');
         }
         return scrollerMirrorElt || { scrollTop: 0 };
       };
@@ -150,7 +152,7 @@ export default {
       );
       this.$watch(
         () => this.$store.state.discussion.newCommentText,
-          newCommentText => clEditor.setContent(newCommentText),
+        newCommentText => clEditor.setContent(newCommentText),
       );
     }
   },
diff --git a/src/components/gutters/PreviewNewDiscussionButton.vue b/src/components/gutters/PreviewNewDiscussionButton.vue
index b41f0921..7bd4b3b9 100644
--- a/src/components/gutters/PreviewNewDiscussionButton.vue
+++ b/src/components/gutters/PreviewNewDiscussionButton.vue
@@ -28,7 +28,7 @@ export default {
         ) {
           this.selection = editorSvc.getTrimmedSelection();
           if (this.selection) {
-            const text = editorSvc.previewCtxWithDiffs.text;
+            const { text } = editorSvc.previewCtxWithDiffs;
             offset = editorSvc.getPreviewOffset(this.selection.end);
             while (offset && text[offset - 1] === '\n') {
               offset -= 1;
@@ -46,7 +46,8 @@ export default {
       editorSvc.$on('previewSelectionRange', () => this.checkSelection());
       this.$watch(
         () => this.$store.getters['layout/styles'].previewWidth,
-        () => this.checkSelection());
+        () => this.checkSelection(),
+      );
       this.checkSelection();
     });
   },
diff --git a/src/components/gutters/StickyComment.vue b/src/components/gutters/StickyComment.vue
index f4c761c0..12232fb1 100644
--- a/src/components/gutters/StickyComment.vue
+++ b/src/components/gutters/StickyComment.vue
@@ -33,7 +33,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .sticky-comment {
   position: absolute;
diff --git a/src/components/menus/HistoryMenu.vue b/src/components/menus/HistoryMenu.vue
index cb6d31f0..329aa22d 100644
--- a/src/components/menus/HistoryMenu.vue
+++ b/src/components/menus/HistoryMenu.vue
@@ -113,13 +113,15 @@ export default {
       let revisionContentPromise = revisionContentPromises[revision.id];
       if (!revisionContentPromise) {
         revisionContentPromise = new Promise((resolve, reject) => {
-          const syncToken = this.syncToken;
+          const { syncToken } = this;
           const currentFile = this.$store.getters['file/current'];
-          this.$store.dispatch('queue/enqueue',
+          this.$store.dispatch(
+            'queue/enqueue',
             () => Promise.resolve()
-              .then(() => this.workspaceProvider.getRevisionContent(
-                syncToken, currentFile.id, revision.id))
-              .then(resolve, reject));
+              .then(() => this.workspaceProvider
+                .getRevisionContent(syncToken, currentFile.id, revision.id))
+              .then(resolve, reject),
+          );
         });
         revisionContentPromises[revision.id] = revisionContentPromise;
         revisionContentPromise.catch(() => {
@@ -130,7 +132,7 @@ export default {
         this.$store.dispatch('content/setRevisionContent', revisionContent));
     },
     refreshHighlighters() {
-      const revisionContent = this.$store.state.content.revisionContent;
+      const { revisionContent } = this.$store.state.content;
       editorClassAppliers.forEach(editorClassApplier => editorClassApplier.stop());
       editorClassAppliers = [];
       previewClassAppliers.forEach(previewClassApplier => previewClassApplier.stop());
@@ -145,9 +147,13 @@ export default {
               end: offset + text.length,
             };
             editorClassAppliers.push(new EditorClassApplier(
-              [`revision-diff--${utils.uid()}`, ...classes], offsets));
+              [`revision-diff--${utils.uid()}`, ...classes],
+              offsets,
+            ));
             previewClassAppliers.push(new PreviewClassApplier(
-              [`revision-diff--${utils.uid()}`, ...classes], offsets));
+              [`revision-diff--${utils.uid()}`, ...classes],
+              offsets,
+            ));
           }
           offset += text.length;
         });
@@ -164,8 +170,8 @@ export default {
       () => this.refreshTrigger,
       () => {
         this.allRevisions = [];
-        const id = this.$store.getters['file/current'].id;
-        const syncToken = this.syncToken;
+        const { id } = this.$store.getters['file/current'];
+        const { syncToken } = this;
         if (id && syncToken) {
           if (id !== cachedFileId) {
             this.setRevisionContent();
@@ -173,10 +179,12 @@ export default {
             revisionContentPromises = {};
             const currentFile = this.$store.getters['file/current'];
             revisionsPromise = new Promise((resolve, reject) => {
-              this.$store.dispatch('queue/enqueue',
+              this.$store.dispatch(
+                'queue/enqueue',
                 () => Promise.resolve()
                   .then(() => this.workspaceProvider.listRevisions(syncToken, currentFile.id))
-                  .then(resolve, reject));
+                  .then(resolve, reject),
+              );
             })
               .catch(() => {
                 cachedFileId = null;
@@ -191,16 +199,18 @@ export default {
             });
           }
         }
-      }, { immediate: true });
+      }, { immediate: true },
+    );
 
     const loadOne = () => {
       if (!this.destroyed) {
-        this.$store.dispatch('queue/enqueue',
+        this.$store.dispatch(
+          'queue/enqueue',
           () => {
             let loadPromise;
             this.revisions.some((revision) => {
               if (!revision.created) {
-                const syncToken = this.syncToken;
+                const { syncToken } = this;
                 const currentFile = this.$store.getters['file/current'];
                 loadPromise = this.workspaceProvider
                   .loadRevision(syncToken, currentFile.id, revision)
@@ -209,19 +219,22 @@ export default {
               return loadPromise;
             });
             return loadPromise;
-          });
+          },
+        );
       }
     };
 
     this.$watch(
       () => this.revisions,
       () => loadOne(),
-      { immediate: true });
+      { immediate: true },
+    );
 
     // Watch diffs changes
     this.$watch(
       () => this.$store.state.content.revisionContent,
-      () => this.refreshHighlighters());
+      () => this.refreshHighlighters(),
+    );
 
     // Close revision
     this.onKeyup = (evt) => {
@@ -246,7 +259,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .history {
   padding: 5px 5px 50px;
diff --git a/src/components/menus/ImportMenu.vue b/src/components/menus/ImportMenu.vue
index 2ae25382..b6060753 100644
--- a/src/components/menus/ImportMenu.vue
+++ b/src/components/menus/ImportMenu.vue
@@ -53,31 +53,25 @@ export default {
     MenuEntry,
   },
   methods: {
-    onImportMarkdown(evt) {
+    async onImportMarkdown(evt) {
       const file = evt.target.files[0];
-      readFile(file)
-        .then(content => fileSvc.createFile({
-          ...Provider.parseContent(content),
-          name: file.name,
-        })
-        .then(
-          item => this.$store.commit('file/setCurrentId', item.id)),
-          () => { /* Cancel */ });
+      const content = await readFile(file);
+      const item = await fileSvc.createFile({
+        ...Provider.parseContent(content),
+        name: file.name,
+      });
+      this.$store.commit('file/setCurrentId', item.id);
     },
-    onImportHtml(evt) {
+    async onImportHtml(evt) {
       const file = evt.target.files[0];
-      readFile(file)
-        .then(content => fileSvc.createFile({
-          ...Provider.parseContent(
-            turndownService.turndown(
-              htmlSanitizer.sanitizeHtml(content)
-                .replace(/&#160;/g, ' '), // Replace non-breaking spaces with classic spaces
-              )),
-          name: file.name,
-        }))
-        .then(
-          item => this.$store.commit('file/setCurrentId', item.id),
-          () => { /* Cancel */ });
+      const content = await readFile(file);
+      const sanitizedContent = htmlSanitizer.sanitizeHtml(content)
+        .replace(/&#160;/g, ' '); // Replace non-breaking spaces with classic spaces
+      const item = await fileSvc.createFile({
+        ...Provider.parseContent(turndownService.turndown(sanitizedContent)),
+        name: file.name,
+      });
+      this.$store.commit('file/setCurrentId', item.id);
     },
   },
 };
diff --git a/src/components/menus/MainMenu.vue b/src/components/menus/MainMenu.vue
index 3994ad70..3eaf751f 100644
--- a/src/components/menus/MainMenu.vue
+++ b/src/components/menus/MainMenu.vue
@@ -116,7 +116,7 @@ export default {
         .catch(() => { /* Cancel */ });
     },
     print() {
-      print();
+      window.print();
     },
   },
 };
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 8f91dbee..f1ebb76f 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -95,8 +95,8 @@ export default {
     reset() {
       return this.$store.dispatch('modal/reset')
         .then(() => {
-          location.href = '#reset=true';
-          location.reload();
+          window.location.href = '#reset=true';
+          window.location.reload();
         });
     },
     about() {
diff --git a/src/components/menus/SyncMenu.vue b/src/components/menus/SyncMenu.vue
index 1721f5e2..f30dcd1e 100644
--- a/src/components/menus/SyncMenu.vue
+++ b/src/components/menus/SyncMenu.vue
@@ -170,13 +170,17 @@ export default {
     },
     openGoogleDrive(token) {
       return googleHelper.openPicker(token, 'doc')
-        .then(files => this.$store.dispatch('queue/enqueue',
-          () => googleDriveProvider.openFiles(token, files)));
+        .then(files => this.$store.dispatch(
+          'queue/enqueue',
+          () => googleDriveProvider.openFiles(token, files),
+        ));
     },
     openDropbox(token) {
       return dropboxHelper.openChooser(token)
-        .then(paths => this.$store.dispatch('queue/enqueue',
-          () => dropboxProvider.openFiles(token, paths)));
+        .then(paths => this.$store.dispatch(
+          'queue/enqueue',
+          () => dropboxProvider.openFiles(token, paths),
+        ));
     },
     saveGoogleDrive(token) {
       return openSyncModal(token, 'googleDriveSave')
@@ -191,8 +195,10 @@ export default {
         type: 'githubOpen',
         token,
       })
-        .then(syncLocation => this.$store.dispatch('queue/enqueue',
-          () => githubProvider.openFile(token, syncLocation)));
+        .then(syncLocation => this.$store.dispatch(
+          'queue/enqueue',
+          () => githubProvider.openFile(token, syncLocation),
+        ));
     },
     saveGithub(token) {
       return openSyncModal(token, 'githubSave')
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index f7af5494..7254ef2c 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -74,7 +74,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .workspace .menu-entry {
   padding-top: 12px;
diff --git a/src/components/menus/common/MenuEntry.vue b/src/components/menus/common/MenuEntry.vue
index 3bc805c3..8b5d44ce 100644
--- a/src/components/menus/common/MenuEntry.vue
+++ b/src/components/menus/common/MenuEntry.vue
@@ -10,7 +10,7 @@
 </template>
 
 <style lang="scss">
-@import '../../common/variables.scss';
+@import '../../../styles/variables.scss';
 
 .menu-entry {
   text-align: left;
diff --git a/src/components/modals/FilePropertiesModal.vue b/src/components/modals/FilePropertiesModal.vue
index 50776321..34e0a863 100644
--- a/src/components/modals/FilePropertiesModal.vue
+++ b/src/components/modals/FilePropertiesModal.vue
@@ -223,7 +223,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .modal__inner-1--file-properties {
   max-width: 540px;
diff --git a/src/components/modals/HtmlExportModal.vue b/src/components/modals/HtmlExportModal.vue
index f7fa533e..2e7890c0 100644
--- a/src/components/modals/HtmlExportModal.vue
+++ b/src/components/modals/HtmlExportModal.vue
@@ -56,7 +56,7 @@ export default modalTemplate({
   },
   methods: {
     resolve() {
-      const config = this.config;
+      const { config } = this;
       const currentFile = this.$store.getters['file/current'];
       config.resolve();
       exportSvc.exportToDisk(currentFile.id, 'html', this.allTemplates[this.selectedTemplate]);
diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue
index 4f9602ac..18305607 100644
--- a/src/components/modals/ImageModal.vue
+++ b/src/components/modals/ImageModal.vue
@@ -48,13 +48,13 @@ export default modalTemplate({
       if (!this.url) {
         this.setError('url');
       } else {
-        const callback = this.config.callback;
+        const { callback } = this.config;
         this.config.resolve();
         callback(this.url);
       }
     },
     reject() {
-      const callback = this.config.callback;
+      const { callback } = this.config;
       this.config.reject();
       callback(null);
     },
@@ -62,7 +62,7 @@ export default modalTemplate({
       return googleHelper.addPhotosAccount();
     },
     openGooglePhotos(token) {
-      const callback = this.config.callback;
+      const { callback } = this.config;
       this.config.reject();
       googleHelper.openPicker(token, 'img')
         .then(res => res[0] && this.$store.dispatch('modal/open', {
diff --git a/src/components/modals/LinkModal.vue b/src/components/modals/LinkModal.vue
index f1616049..c12ba23e 100644
--- a/src/components/modals/LinkModal.vue
+++ b/src/components/modals/LinkModal.vue
@@ -25,13 +25,13 @@ export default modalTemplate({
       if (!this.url) {
         this.setError('url');
       } else {
-        const callback = this.config.callback;
+        const { callback } = this.config;
         this.config.resolve();
         callback(this.url);
       }
     },
     reject() {
-      const callback = this.config.callback;
+      const { callback } = this.config;
       this.config.reject();
       callback(null);
     },
diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue
index 6c315c8b..4251d1cc 100644
--- a/src/components/modals/PandocExportModal.vue
+++ b/src/components/modals/PandocExportModal.vue
@@ -42,7 +42,7 @@ export default modalTemplate({
       this.config.resolve();
       const currentFile = this.$store.getters['file/current'];
       const currentContent = this.$store.getters['content/current'];
-      const selectedFormat = this.selectedFormat;
+      const { selectedFormat } = this;
       this.$store.dispatch('queue/enqueue', () => Promise.all([
         Promise.resolve().then(() => {
           const sponsorToken = this.$store.getters['workspace/sponsorToken'];
@@ -64,15 +64,15 @@ export default modalTemplate({
           blob: true,
           timeout: 60000,
         })
-        .then((res) => {
-          FileSaver.saveAs(res.body, `${currentFile.name}.${selectedFormat}`);
-        }, (err) => {
-          if (err.status !== 401) {
-            throw err;
-          }
-          this.$store.dispatch('modal/sponsorOnly')
-            .catch(() => { /* Cancel */ });
-        }))
+          .then((res) => {
+            FileSaver.saveAs(res.body, `${currentFile.name}.${selectedFormat}`);
+          }, (err) => {
+            if (err.status !== 401) {
+              throw err;
+            }
+            this.$store.dispatch('modal/sponsorOnly')
+              .catch(() => { /* Cancel */ });
+          }))
         .catch((err) => {
           console.error(err); // eslint-disable-line no-console
           this.$store.dispatch('notification/error', err);
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index e5188732..3c086387 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -43,7 +43,10 @@ export default modalTemplate({
         }),
         sponsorSvc.getToken(),
         exportSvc.applyTemplate(
-          currentFile.id, this.allTemplates[this.selectedTemplate], true),
+          currentFile.id,
+          this.allTemplates[this.selectedTemplate],
+          true,
+        ),
       ])
         .then(([sponsorToken, token, html]) => networkSvc.request({
           method: 'POST',
@@ -57,15 +60,15 @@ export default modalTemplate({
           blob: true,
           timeout: 60000,
         })
-        .then((res) => {
-          FileSaver.saveAs(res.body, `${currentFile.name}.pdf`);
-        }, (err) => {
-          if (err.status !== 401) {
-            throw err;
-          }
-          this.$store.dispatch('modal/sponsorOnly')
-            .catch(() => { /* Cancel */ });
-        }))
+          .then((res) => {
+            FileSaver.saveAs(res.body, `${currentFile.name}.pdf`);
+          }, (err) => {
+            if (err.status !== 401) {
+              throw err;
+            }
+            this.$store.dispatch('modal/sponsorOnly')
+              .catch(() => { /* Cancel */ });
+          }))
         .catch((err) => {
           console.error(err); // eslint-disable-line no-console
           this.$store.dispatch('notification/error', err);
diff --git a/src/components/modals/PublishManagementModal.vue b/src/components/modals/PublishManagementModal.vue
index 7ac3f56c..5641a987 100644
--- a/src/components/modals/PublishManagementModal.vue
+++ b/src/components/modals/PublishManagementModal.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .modal__inner-1--publish-management {
   max-width: 560px;
diff --git a/src/components/modals/SettingsModal.vue b/src/components/modals/SettingsModal.vue
index d0f911e3..86540718 100644
--- a/src/components/modals/SettingsModal.vue
+++ b/src/components/modals/SettingsModal.vue
@@ -81,7 +81,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .modal__inner-1--settings {
   max-width: 600px;
diff --git a/src/components/modals/SponsorModal.vue b/src/components/modals/SponsorModal.vue
index 2175347c..0075d5b7 100644
--- a/src/components/modals/SponsorModal.vue
+++ b/src/components/modals/SponsorModal.vue
@@ -63,7 +63,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .modal__inner-1--sponsor {
   max-width: 380px;
diff --git a/src/components/modals/SyncManagementModal.vue b/src/components/modals/SyncManagementModal.vue
index 4d9f3638..8ff6f077 100644
--- a/src/components/modals/SyncManagementModal.vue
+++ b/src/components/modals/SyncManagementModal.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .modal__inner-1--sync-management {
   max-width: 560px;
diff --git a/src/components/modals/TemplatesModal.vue b/src/components/modals/TemplatesModal.vue
index 1048e398..bc9af75d 100644
--- a/src/components/modals/TemplatesModal.vue
+++ b/src/components/modals/TemplatesModal.vue
@@ -105,10 +105,12 @@ export default {
         this.templates = templates;
         this.selectedId = this.config.selectedId;
         if (!templates[this.selectedId]) {
-          this.selectedId = Object.keys(templates)[0];
+          [this.selectedId] = Object.keys(templates);
         }
         this.isEditing = false;
-      }, { immediate: true });
+      },
+      { immediate: true },
+    );
     this.$watch('selectedId', (selectedId) => {
       const template = this.templates[selectedId];
       this.showHelpers = template.helpers !== emptyTemplateHelpers;
@@ -137,7 +139,7 @@ export default {
     },
     remove() {
       delete this.templates[this.selectedId];
-      this.selectedId = Object.keys(this.templates)[0];
+      [this.selectedId] = Object.keys(this.templates);
     },
     submitEdit(cancel) {
       const template = this.templates[this.selectedId];
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 44106651..66293a99 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -87,7 +87,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../common/variables.scss';
+@import '../../styles/variables.scss';
 
 .modal__inner-1--workspace-management {
   max-width: 560px;
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index 82643793..c5012111 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -24,7 +24,7 @@ export default {
       'config',
     ]),
     showSponsorButton() {
-      const type = this.$store.getters['modal/config'].type;
+      const { type } = this.$store.getters['modal/config'];
       return !this.$store.getters.isSponsor && type !== 'sponsor' && type !== 'signInForSponsorship';
     },
   },
@@ -49,7 +49,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../../common/variables.scss';
+@import '../../../styles/variables.scss';
 
 .modal__close-button {
   position: absolute;
diff --git a/src/components/modals/providers/BloggerPagePublishModal.vue b/src/components/modals/providers/BloggerPagePublishModal.vue
index ef86d4f9..4ddea0e2 100644
--- a/src/components/modals/providers/BloggerPagePublishModal.vue
+++ b/src/components/modals/providers/BloggerPagePublishModal.vue
@@ -54,7 +54,10 @@ export default modalTemplate({
       } else {
         // Return new location
         const location = bloggerPageProvider.makeLocation(
-          this.config.token, this.blogUrl, this.pageId);
+          this.config.token,
+          this.blogUrl,
+          this.pageId,
+        );
         location.templateId = this.selectedTemplate;
         this.config.resolve(location);
       }
diff --git a/src/components/modals/providers/BloggerPublishModal.vue b/src/components/modals/providers/BloggerPublishModal.vue
index c248bf93..749db92f 100644
--- a/src/components/modals/providers/BloggerPublishModal.vue
+++ b/src/components/modals/providers/BloggerPublishModal.vue
@@ -55,7 +55,10 @@ export default modalTemplate({
       } else {
         // Return new location
         const location = bloggerProvider.makeLocation(
-          this.config.token, this.blogUrl, this.postId);
+          this.config.token,
+          this.blogUrl,
+          this.postId,
+        );
         location.templateId = this.selectedTemplate;
         this.config.resolve(location);
       }
diff --git a/src/components/modals/providers/GistPublishModal.vue b/src/components/modals/providers/GistPublishModal.vue
index 6c8b00a0..2bcf5a92 100644
--- a/src/components/modals/providers/GistPublishModal.vue
+++ b/src/components/modals/providers/GistPublishModal.vue
@@ -65,7 +65,11 @@ export default modalTemplate({
       } else {
         // Return new location
         const location = gistProvider.makeLocation(
-          this.config.token, this.filename, this.isPublic, this.gistId);
+          this.config.token,
+          this.filename,
+          this.isPublic,
+          this.gistId,
+        );
         location.templateId = this.selectedTemplate;
         this.config.resolve(location);
       }
diff --git a/src/components/modals/providers/GistSyncModal.vue b/src/components/modals/providers/GistSyncModal.vue
index c06d973d..86ebaa48 100644
--- a/src/components/modals/providers/GistSyncModal.vue
+++ b/src/components/modals/providers/GistSyncModal.vue
@@ -51,7 +51,11 @@ export default modalTemplate({
       } else {
         // Return new location
         const location = gistProvider.makeLocation(
-          this.config.token, this.filename, this.isPublic, this.gistId);
+          this.config.token,
+          this.filename,
+          this.isPublic,
+          this.gistId,
+        );
         this.config.resolve(location);
       }
     },
diff --git a/src/components/modals/providers/GithubOpenModal.vue b/src/components/modals/providers/GithubOpenModal.vue
index 5c5e8892..138f5eb1 100644
--- a/src/components/modals/providers/GithubOpenModal.vue
+++ b/src/components/modals/providers/GithubOpenModal.vue
@@ -58,7 +58,12 @@ export default modalTemplate({
         } else {
           // Return new location
           const location = githubProvider.makeLocation(
-            this.config.token, parsedRepo.owner, parsedRepo.repo, this.branch || 'master', this.path);
+            this.config.token,
+            parsedRepo.owner,
+            parsedRepo.repo,
+            this.branch || 'master',
+            this.path,
+          );
           this.config.resolve(location);
         }
       }
diff --git a/src/components/modals/providers/GithubPublishModal.vue b/src/components/modals/providers/GithubPublishModal.vue
index f54f5bb4..4b8b609c 100644
--- a/src/components/modals/providers/GithubPublishModal.vue
+++ b/src/components/modals/providers/GithubPublishModal.vue
@@ -73,7 +73,12 @@ export default modalTemplate({
         } else {
           // Return new location
           const location = githubProvider.makeLocation(
-            this.config.token, parsedRepo[1], parsedRepo[2], this.branch || 'master', this.path);
+            this.config.token,
+            parsedRepo[1],
+            parsedRepo[2],
+            this.branch || 'master',
+            this.path,
+          );
           location.templateId = this.selectedTemplate;
           this.config.resolve(location);
         }
diff --git a/src/components/modals/providers/GithubSaveModal.vue b/src/components/modals/providers/GithubSaveModal.vue
index 3e131c5c..993913f6 100644
--- a/src/components/modals/providers/GithubSaveModal.vue
+++ b/src/components/modals/providers/GithubSaveModal.vue
@@ -58,7 +58,12 @@ export default modalTemplate({
       }
       if (parsedRepo && this.path) {
         const location = githubProvider.makeLocation(
-          this.config.token, parsedRepo.owner, parsedRepo.repo, this.branch || 'master', this.path);
+          this.config.token,
+          parsedRepo.owner,
+          parsedRepo.repo,
+          this.branch || 'master',
+          this.path,
+        );
         this.config.resolve(location);
       }
     },
diff --git a/src/components/modals/providers/GoogleDrivePublishModal.vue b/src/components/modals/providers/GoogleDrivePublishModal.vue
index 7d043111..2e793104 100644
--- a/src/components/modals/providers/GoogleDrivePublishModal.vue
+++ b/src/components/modals/providers/GoogleDrivePublishModal.vue
@@ -76,12 +76,12 @@ export default modalTemplate({
             this.$store.dispatch('data/patchLocalSettings', {
               googleDriveFolderId: folders[0].id,
             });
-          }));
+          }),
+      );
     },
     resolve() {
       // Return new location
-      const location = googleDriveProvider.makeLocation(
-        this.config.token, this.fileId);
+      const location = googleDriveProvider.makeLocation(this.config.token, this.fileId);
       if (this.format) {
         location.templateId = this.selectedTemplate;
       }
diff --git a/src/components/modals/providers/GoogleDriveSaveModal.vue b/src/components/modals/providers/GoogleDriveSaveModal.vue
index 577e06c7..992bf835 100644
--- a/src/components/modals/providers/GoogleDriveSaveModal.vue
+++ b/src/components/modals/providers/GoogleDriveSaveModal.vue
@@ -49,12 +49,16 @@ export default modalTemplate({
             this.$store.dispatch('data/patchLocalSettings', {
               googleDriveFolderId: folders[0].id,
             });
-          }));
+          }),
+      );
     },
     resolve() {
       // Return new location
       const location = googleDriveProvider.makeLocation(
-        this.config.token, this.fileId, this.folderId);
+        this.config.token,
+        this.fileId,
+        this.folderId,
+      );
       this.config.resolve(location);
     },
   },
diff --git a/src/components/modals/providers/GoogleDriveWorkspaceModal.vue b/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
index 511fec15..3ebc85d3 100644
--- a/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
+++ b/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
@@ -40,7 +40,8 @@ export default modalTemplate({
             this.$store.dispatch('data/patchLocalSettings', {
               googleDriveWorkspaceFolderId: folders[0].id,
             });
-          }));
+          }),
+      );
     },
     resolve() {
       const url = utils.addQueryParams('app', {
diff --git a/src/components/modals/providers/GooglePhotoModal.vue b/src/components/modals/providers/GooglePhotoModal.vue
index 157ffb5b..205547fc 100644
--- a/src/components/modals/providers/GooglePhotoModal.vue
+++ b/src/components/modals/providers/GooglePhotoModal.vue
@@ -42,20 +42,20 @@ export default {
   },
   methods: {
     resolve() {
-      let url = this.config.url;
+      let { url } = this.config;
       const size = parseInt(this.size, 10);
-      if (!isNaN(size)) {
+      if (!Number.isNaN(size)) {
         url = makeThumbnail(url, size);
       }
       if (this.title) {
         url += ` "${this.title}"`;
       }
-      const callback = this.config.callback;
+      const { callback } = this.config;
       this.config.resolve();
       callback(url);
     },
     reject() {
-      const callback = this.config.callback;
+      const { callback } = this.config;
       this.config.reject();
       callback(null);
     },
diff --git a/src/components/modals/providers/WordpressPublishModal.vue b/src/components/modals/providers/WordpressPublishModal.vue
index 33e26617..732310cb 100644
--- a/src/components/modals/providers/WordpressPublishModal.vue
+++ b/src/components/modals/providers/WordpressPublishModal.vue
@@ -57,7 +57,10 @@ export default modalTemplate({
       } else {
         // Return new location
         const location = wordpressProvider.makeLocation(
-          this.config.token, this.domain, this.postId);
+          this.config.token,
+          this.domain,
+          this.postId,
+        );
         location.templateId = this.selectedTemplate;
         this.config.resolve(location);
       }
diff --git a/src/components/modals/providers/ZendeskPublishModal.vue b/src/components/modals/providers/ZendeskPublishModal.vue
index 6dbcf81d..f9b875a9 100644
--- a/src/components/modals/providers/ZendeskPublishModal.vue
+++ b/src/components/modals/providers/ZendeskPublishModal.vue
@@ -62,7 +62,11 @@ export default modalTemplate({
       } else {
         // Return new location
         const location = zendeskProvider.makeLocation(
-          this.config.token, this.sectionId, this.locale || 'en-us', this.articleId);
+          this.config.token,
+          this.sectionId,
+          this.locale || 'en-us',
+          this.articleId,
+        );
         location.templateId = this.selectedTemplate;
         this.config.resolve(location);
       }
diff --git a/src/components/style.scss b/src/components/style.scss
deleted file mode 100644
index 4ffda6b5..00000000
--- a/src/components/style.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './common/base';
diff --git a/src/extensions/libs/markdownItTasklist.js b/src/extensions/libs/markdownItTasklist.js
index 93540f4a..45fccc2b 100644
--- a/src/extensions/libs/markdownItTasklist.js
+++ b/src/extensions/libs/markdownItTasklist.js
@@ -10,8 +10,7 @@ function attrSet(token, name, value) {
 }
 
 module.exports = (md) => {
-  md.core.ruler.after('inline', 'tasklist', (state) => {
-    const tokens = state.tokens;
+  md.core.ruler.after('inline', 'tasklist', ({ tokens, Token }) => {
     for (let i = 2; i < tokens.length; i += 1) {
       const token = tokens[i];
       if (token.content
@@ -24,7 +23,7 @@ module.exports = (md) => {
       ) {
         const cross = token.content[1].toLowerCase();
         if (cross === ' ' || cross === 'x') {
-          const checkbox = new state.Token('html_inline', '', 0);
+          const checkbox = new Token('html_inline', '', 0);
           if (cross === ' ') {
             checkbox.content = '<span class="task-list-item-checkbox" type="checkbox">&#9744;</span>';
           } else {
diff --git a/src/extensions/markdownExtension.js b/src/extensions/markdownExtension.js
index 30cd0a7c..8a5ffd0d 100644
--- a/src/extensions/markdownExtension.js
+++ b/src/extensions/markdownExtension.js
@@ -51,8 +51,8 @@ const inlineBaseRules2 = [
   'text_collapse',
 ];
 
-extensionSvc.onGetOptions(
-  (options, properties) => Object.assign(options, properties.extensions.markdown));
+extensionSvc.onGetOptions((options, properties) => Object
+  .assign(options, properties.extensions.markdown));
 
 extensionSvc.onInitConverter(0, (markdown, options) => {
   markdown.set({
diff --git a/src/extensions/mermaidExtension.js b/src/extensions/mermaidExtension.js
index 5a06bd02..20a6df31 100644
--- a/src/extensions/mermaidExtension.js
+++ b/src/extensions/mermaidExtension.js
@@ -117,6 +117,6 @@ extensionSvc.onGetOptions((options, properties) => {
 });
 
 extensionSvc.onSectionPreview((elt) => {
-  elt.querySelectorAll('.prism.language-mermaid').cl_each(
-    diagramElt => render(diagramElt.parentNode));
+  elt.querySelectorAll('.prism.language-mermaid')
+    .cl_each(diagramElt => render(diagramElt.parentNode));
 });
diff --git a/src/index.js b/src/index.js
index b4a85022..769c0b7b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,24 +13,22 @@ if (!indexedDB) {
   throw new Error('Your browser is not supported. Please upgrade to the latest version.');
 }
 
-if (NODE_ENV === 'production') {
-  OfflinePluginRuntime.install({
-    onUpdateReady: () => {
-      // Tells to new SW to take control immediately
-      OfflinePluginRuntime.applyUpdate();
-    },
-    onUpdated: () => {
-      if (!store.state.light) {
-        localDbSvc.sync()
-          .then(() => {
-            localStorage.updated = true;
-            // Reload the webpage to load into the new version
-            location.reload();
-          });
-      }
-    },
-  });
-}
+OfflinePluginRuntime.install({
+  onUpdateReady: () => {
+    // Tells to new SW to take control immediately
+    OfflinePluginRuntime.applyUpdate();
+  },
+  onUpdated: () => {
+    if (!store.state.light) {
+      localDbSvc.sync()
+        .then(() => {
+          localStorage.updated = true;
+          // Reload the webpage to load into the new version
+          window.location.reload();
+        });
+    }
+  },
+});
 
 if (localStorage.updated) {
   store.dispatch('notification/info', 'StackEdit has just updated itself!');
diff --git a/src/services/animationSvc.js b/src/services/animationSvc.js
index 44f9187d..49ae61b4 100644
--- a/src/services/animationSvc.js
+++ b/src/services/animationSvc.js
@@ -63,7 +63,7 @@ function StyleAttribute(name, unit, defaultValue, wrap = identity) {
   this.name = name;
   this.setStart = (animation) => {
     let value = parseFloat(animation.elt.style[name]);
-    if (isNaN(value)) {
+    if (Number.isNaN(value)) {
       value = animation.$current[name] || defaultValue;
     }
     animation.$start[name] = value;
@@ -157,7 +157,7 @@ class Animation {
     const onTransitionEnd = (evt) => {
       if (evt.target === this.elt) {
         this.elt.removeEventListener(transitionEndEvent, onTransitionEnd);
-        const endCb = this.$end.endCb;
+        const { endCb } = this.$end;
         this.$end.endCb = undefined;
         if (endCb) {
           endCb();
diff --git a/src/services/cledit/cleditCore.js b/src/services/cledit/cleditCore.js
index 44b9b265..8c501af1 100644
--- a/src/services/cledit/cleditCore.js
+++ b/src/services/cledit/cleditCore.js
@@ -12,7 +12,7 @@ function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
     $markers: {},
   };
   cledit.Utils.createEventHooks(editor);
-  const debounce = cledit.Utils.debounce;
+  const { debounce } = cledit.Utils;
 
   contentElt.setAttribute('tabindex', '0'); // To have focus even when disabled
   editor.toggleEditable = (isEditable) => {
@@ -21,7 +21,7 @@ function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
   editor.toggleEditable(true);
 
   function getTextContent() {
-     // Markdown-it sanitization (Mac/DOS to Unix)
+    // Markdown-it sanitization (Mac/DOS to Unix)
     let textContent = contentElt.textContent.replace(/\r[\n\u0085]?|[\u2424\u2028\u0085]/g, '\n');
     if (textContent.slice(-1) !== '\n') {
       textContent += '\n';
@@ -258,8 +258,10 @@ function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
   window.addEventListener('resize', windowResizeListener);
 
   // Provokes selection changes and does not fire mouseup event on Chrome/OSX
-  contentElt.addEventListener('contextmenu',
-    selectionMgr.saveSelectionState.cl_bind(selectionMgr, true, false));
+  contentElt.addEventListener(
+    'contextmenu',
+    selectionMgr.saveSelectionState.cl_bind(selectionMgr, true, false),
+  );
 
   contentElt.addEventListener('keydown', keydownHandler((evt) => {
     selectionMgr.saveSelectionState();
@@ -344,7 +346,7 @@ function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
     undoMgr.setCurrentMode('single');
     evt.preventDefault();
     let data;
-    let clipboardData = evt.clipboardData;
+    let { clipboardData } = evt;
     if (clipboardData) {
       data = clipboardData.getData('text/plain');
       if (turndownService) {
@@ -362,7 +364,7 @@ function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
         }
       }
     } else {
-      clipboardData = window.clipboardData;
+      ({ clipboardData } = window.clipboardData);
       data = clipboardData && clipboardData.getData('Text');
     }
     if (!data) {
@@ -382,8 +384,9 @@ function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
 
   function addKeystroke(keystroke) {
     const keystrokes = Array.isArray(keystroke) ? keystroke : [keystroke];
-    editor.$keystrokes = editor.$keystrokes.concat(keystrokes).sort(
-      (keystroke1, keystroke2) => keystroke1.priority - keystroke2.priority);
+    editor.$keystrokes = editor.$keystrokes
+      .concat(keystrokes)
+      .sort((keystroke1, keystroke2) => keystroke1.priority - keystroke2.priority);
   }
   addKeystroke(cledit.defaultKeystrokes);
 
diff --git a/src/services/cledit/cleditHighlighter.js b/src/services/cledit/cleditHighlighter.js
index dc685b19..3d8bb199 100644
--- a/src/services/cledit/cleditHighlighter.js
+++ b/src/services/cledit/cleditHighlighter.js
@@ -33,10 +33,10 @@ function Highlighter(editor) {
       section.forceHighlighting = true;
       if (!noContentFix) {
         if (useBr) {
-          section.elt.getElementsByClassName('hd-lf').cl_each(
-            lfElt => lfElt.parentNode.removeChild(lfElt));
-          section.elt.getElementsByTagName('br').cl_each(
-            brElt => brElt.parentNode.replaceChild(document.createTextNode('\n'), brElt));
+          section.elt.getElementsByClassName('hd-lf')
+            .cl_each(lfElt => lfElt.parentNode.removeChild(lfElt));
+          section.elt.getElementsByTagName('br')
+            .cl_each(brElt => brElt.parentNode.replaceChild(document.createTextNode('\n'), brElt));
         }
         if (section.elt.textContent.slice(-1) !== '\n') {
           section.elt.appendChild(document.createTextNode('\n'));
@@ -127,7 +127,7 @@ function Highlighter(editor) {
       const leftSections = sectionList.slice(0, leftIndex);
       modifiedSections = newSectionList.slice(leftIndex, newSectionList.length + rightIndex);
       const rightSections = sectionList.slice(sectionList.length + rightIndex, sectionList.length);
-      insertBeforeSection = rightSections[0];
+      [insertBeforeSection] = rightSections;
       sectionsToRemove = sectionList.slice(leftIndex, sectionList.length + rightIndex);
       sectionList = leftSections.concat(modifiedSections).concat(rightSections);
     }
diff --git a/src/services/cledit/cleditKeystroke.js b/src/services/cledit/cleditKeystroke.js
index 9c11f3b7..b2d63874 100644
--- a/src/services/cledit/cleditKeystroke.js
+++ b/src/services/cledit/cleditKeystroke.js
@@ -165,7 +165,10 @@ cledit.defaultKeystrokes = [
     // Custom jump behavior
     const textContent = editor.getContent();
     const offset = getNextWordOffset(
-      textContent, editor.selectionMgr.selectionEnd, evt.which === 37);
+      textContent,
+      editor.selectionMgr.selectionEnd,
+      evt.which === 37,
+    );
     if (evt.shiftKey) {
       // rebuild the state completely
       const min = Math.min(editor.selectionMgr.selectionStart, offset);
diff --git a/src/services/cledit/cleditSelectionMgr.js b/src/services/cledit/cleditSelectionMgr.js
index b8cb0609..202e49ff 100644
--- a/src/services/cledit/cleditSelectionMgr.js
+++ b/src/services/cledit/cleditSelectionMgr.js
@@ -1,7 +1,7 @@
 import cledit from './cleditCore';
 
 function SelectionMgr(editor) {
-  const debounce = cledit.Utils.debounce;
+  const { debounce } = cledit.Utils;
   const contentElt = editor.$contentElt;
   const scrollElt = editor.$scrollElt;
   cledit.Utils.createEventHooks(this);
@@ -29,10 +29,10 @@ function SelectionMgr(editor) {
 
   this.createRange = (start, end) => {
     const range = document.createRange();
-    const startContainer = isNaN(start) ? start : this.findContainer(start < 0 ? 0 : start);
+    const startContainer = Number.isNaN(start) ? start : this.findContainer(start < 0 ? 0 : start);
     let endContainer = startContainer;
     if (start !== end) {
-      endContainer = isNaN(end) ? end : this.findContainer(end < 0 ? 0 : end);
+      endContainer = Number.isNaN(end) ? end : this.findContainer(end < 0 ? 0 : end);
     }
     range.setStart(startContainer.container, startContainer.offsetInContainer);
     range.setEnd(endContainer.container, endContainer.offsetInContainer);
@@ -42,7 +42,10 @@ function SelectionMgr(editor) {
   let adjustScroll;
   const debouncedUpdateCursorCoordinates = debounce(() => {
     const coordinates = this.getCoordinates(
-      this.selectionEnd, this.selectionEndContainer, this.selectionEndOffset);
+      this.selectionEnd,
+      this.selectionEndContainer,
+      this.selectionEndOffset,
+    );
     if (this.cursorCoordinates.top !== coordinates.top ||
       this.cursorCoordinates.height !== coordinates.height ||
       this.cursorCoordinates.left !== coordinates.left
@@ -163,10 +166,10 @@ function SelectionMgr(editor) {
 
     function getNodeIndex(node) {
       let i = 0;
-      let previousSibling = node.previousSibling;
+      let { previousSibling } = node;
       while (previousSibling) {
         i += 1;
-        previousSibling = previousSibling.previousSibling;
+        ({ previousSibling } = previousSibling);
       }
       return i;
     }
@@ -235,8 +238,8 @@ function SelectionMgr(editor) {
     const save = () => {
       let result;
       if (this.hasFocus()) {
-        let selectionStart = this.selectionStart;
-        let selectionEnd = this.selectionEnd;
+        let { selectionStart } = this;
+        let { selectionEnd } = this;
         const selection = window.getSelection();
         if (selection.rangeCount > 0) {
           const selectionRange = selection.getRangeAt(0);
@@ -271,8 +274,8 @@ function SelectionMgr(editor) {
               selection.anchorNode,
               selection.anchorOffset,
               selection.focusNode,
-              selection.focusOffset) === 1
-            ) {
+              selection.focusOffset,
+            ) === 1) {
               selectionStart = offset + selectionText.length;
               selectionEnd = offset;
             } else {
@@ -337,8 +340,8 @@ function SelectionMgr(editor) {
     let offsetInContainer = offsetInContainerParam;
     if (!container) {
       const offset = this.findContainer(inputOffset);
-      container = offset.container;
-      offsetInContainer = offset.offsetInContainer;
+      ({ container } = offset);
+      ({ offsetInContainer } = offset);
     }
     let containerElt = container;
     if (!containerElt.hasChildNodes() && container.parentNode) {
diff --git a/src/services/cledit/cleditUndoMgr.js b/src/services/cledit/cleditUndoMgr.js
index 3c7abc78..70adf6e0 100644
--- a/src/services/cledit/cleditUndoMgr.js
+++ b/src/services/cledit/cleditUndoMgr.js
@@ -15,7 +15,7 @@ function UndoMgr(editor) {
   let currentState;
   let previousPatches = [];
   let currentPatches = [];
-  const debounce = cledit.Utils.debounce;
+  const { debounce } = cledit.Utils;
 
   this.options = {
     undoStackMaxSize: 200,
@@ -166,7 +166,7 @@ function UndoMgr(editor) {
 
   this.init = (options) => {
     this.options.cl_extend(options || {});
-    selectionMgr = editor.selectionMgr;
+    ({ selectionMgr } = editor);
     if (!currentState) {
       currentState = new State();
     }
diff --git a/src/services/diffUtils.js b/src/services/diffUtils.js
index bac2a0f3..082faad3 100644
--- a/src/services/diffUtils.js
+++ b/src/services/diffUtils.js
@@ -78,7 +78,8 @@ function restoreDiscussionOffsets(content, markerKeys) {
         }
         count += 1;
         return '';
-      });
+      },
+    );
     // Sanitize offsets
     Object.keys(content.discussions).forEach((discussionId) => {
       const discussion = content.discussions[discussionId];
diff --git a/src/services/editorSvc.js b/src/services/editorSvc.js
index b4002a6b..b7ab29f4 100644
--- a/src/services/editorSvc.js
+++ b/src/services/editorSvc.js
@@ -91,8 +91,8 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
     this.previewCtxWithDiffs = null;
     editorSvc.$emit('previewCtxWithDiffs', null);
     const options = {
-      sectionHighlighter: section => Prism.highlight(
-        section.text, this.prismGrammars[section.data]),
+      sectionHighlighter: section => Prism
+        .highlight(section.text, this.prismGrammars[section.data]),
       sectionParser: (text) => {
         this.parsingCtx = markdownConversionSvc.parseSections(this.converter, text);
         return this.parsingCtx.sections;
@@ -114,7 +114,7 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
   convert() {
     this.conversionCtx = markdownConversionSvc.convert(this.parsingCtx, this.conversionCtx);
     this.$emit('conversionCtx', this.conversionCtx);
-    tokens = this.parsingCtx.markdownState.tokens;
+    ({ tokens } = this.parsingCtx.markdownState);
   },
 
   /**
@@ -139,7 +139,11 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
           if (sectionDesc.editorElt !== section.elt) {
             // Force textToPreviewDiffs computation
             sectionDesc = new SectionDesc(
-              section, sectionDesc.previewElt, sectionDesc.tocElt, sectionDesc.html);
+              section,
+              sectionDesc.previewElt,
+              sectionDesc.tocElt,
+              sectionDesc.html,
+            );
           }
           sectionDescList.push(sectionDesc);
           previewHtml += sectionDesc.html;
@@ -256,7 +260,9 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
                 sectionDesc.previewText = sectionDesc.previewElt.textContent;
               }
               sectionDesc.textToPreviewDiffs = diffMatchPatch.diff_main(
-                sectionDesc.section.text, sectionDesc.previewText);
+                sectionDesc.section.text,
+                sectionDesc.previewText,
+              );
               hasOne = true;
             }
             return false;
@@ -316,7 +322,9 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
         const editorEndOffset = editorSvc.getEditorOffset(previewSelectionEndOffset);
         if (editorStartOffset != null && editorEndOffset != null) {
           editorSvc.clEditor.selectionMgr.setSelectionStartEnd(
-            editorStartOffset, editorEndOffset);
+            editorStartOffset,
+            editorEndOffset,
+          );
         }
       }
       editorSvc.previewSelectionRange = range;
@@ -559,17 +567,21 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
         this.applyContent();
       }, {
         immediate: true,
-      });
+      },
+    );
 
     // Disable editor if hidden or if no content is loaded
     store.watch(
       () => store.getters['content/isCurrentEditable'],
       editable => this.clEditor.toggleEditable(!!editable), {
         immediate: true,
-      });
+      },
+    );
 
-    store.watch(() => utils.serializeObject(store.getters['layout/styles']),
-      () => this.measureSectionDimensions(false, true, true));
+    store.watch(
+      () => utils.serializeObject(store.getters['layout/styles']),
+      () => this.measureSectionDimensions(false, true, true),
+    );
 
     this.initHighlighters();
     this.$emit('inited');
diff --git a/src/services/editorSvcDiscussions.js b/src/services/editorSvcDiscussions.js
index 91bab96a..9f4948c2 100644
--- a/src/services/editorSvcDiscussions.js
+++ b/src/services/editorSvcDiscussions.js
@@ -65,8 +65,10 @@ function syncDiscussionMarkers(content, writeOffsets) {
   });
 
   if (writeOffsets && newDiscussion) {
-    store.commit('discussion/patchNewDiscussion',
-      discussions[store.state.discussion.newDiscussionId]);
+    store.commit(
+      'discussion/patchNewDiscussion',
+      discussions[store.state.discussion.newDiscussionId],
+    );
   }
 }
 
@@ -115,7 +117,7 @@ function reversePatches(patches) {
 export default {
   createClEditor(editorElt) {
     this.clEditor = cledit(editorElt, editorElt.parentNode, true);
-    clEditor = this.clEditor;
+    ({ clEditor } = this);
     clEditor.on('contentChanged', (text) => {
       const oldContent = store.getters['content/current'];
       const newContent = {
@@ -175,7 +177,7 @@ export default {
     }
   },
   getTrimmedSelection() {
-    const selectionMgr = clEditor.selectionMgr;
+    const { selectionMgr } = clEditor;
     let start = Math.min(selectionMgr.selectionStart, selectionMgr.selectionEnd);
     let end = Math.max(selectionMgr.selectionStart, selectionMgr.selectionEnd);
     const text = clEditor.getContent();
@@ -217,7 +219,10 @@ export default {
         editorClassAppliers = {};
         Object.keys(discussions).forEach((discussionId) => {
           const classApplier = oldEditorClassAppliers[discussionId] || new EditorClassApplier(
-            classGetter('editor', discussionId), offsetGetter(discussionId), { discussionId });
+            classGetter('editor', discussionId),
+            offsetGetter(discussionId),
+            { discussionId },
+          );
           editorClassAppliers[discussionId] = classApplier;
         });
         // Clean unused class appliers
@@ -232,7 +237,10 @@ export default {
         previewClassAppliers = {};
         Object.keys(discussions).forEach((discussionId) => {
           const classApplier = oldPreviewClassAppliers[discussionId] || new PreviewClassApplier(
-            classGetter('preview', discussionId), offsetGetter(discussionId), { discussionId });
+            classGetter('preview', discussionId),
+            offsetGetter(discussionId),
+            { discussionId },
+          );
           previewClassAppliers[discussionId] = classApplier;
         });
         // Clean unused class appliers
diff --git a/src/services/editorSvcUtils.js b/src/services/editorSvcUtils.js
index baea2f12..e17da493 100644
--- a/src/services/editorSvcUtils.js
+++ b/src/services/editorSvcUtils.js
@@ -10,13 +10,11 @@ export default {
    * Get an object describing the position of the scroll bar in the file.
    */
   getScrollPosition(elt = store.getters['layout/styles'].showEditor
-    ? this.editorElt
-    : this.previewElt,
-  ) {
+    ? this.editorElt : this.previewElt) {
     const dimensionKey = elt === this.editorElt
       ? 'editorDimension'
       : 'previewDimension';
-    const scrollTop = elt.parentNode.scrollTop;
+    const { scrollTop } = elt.parentNode;
     let result;
     if (this.previewCtxMeasured) {
       this.previewCtxMeasured.sectionDescList.some((sectionDesc, sectionIdx) => {
@@ -39,7 +37,7 @@ export default {
    * Restore the scroll position from the current file content state.
    */
   restoreScrollPosition() {
-    const scrollPosition = store.getters['contentState/current'].scrollPosition;
+    const { scrollPosition } = store.getters['contentState/current'];
     if (scrollPosition && this.previewCtxMeasured) {
       const sectionDesc = this.previewCtxMeasured.sectionDescList[scrollPosition.sectionIdx];
       if (sectionDesc) {
diff --git a/src/services/exportSvc.js b/src/services/exportSvc.js
index ba5e2d01..b62f57f3 100644
--- a/src/services/exportSvc.js
+++ b/src/services/exportSvc.js
@@ -94,7 +94,7 @@ export default {
         return new Promise((resolve, reject) => {
           const timeoutId = setTimeout(() => {
             worker.terminate();
-            reject('Template generation timeout.');
+            reject(new Error('Template generation timeout.'));
           }, 10000);
           worker.addEventListener('message', (e) => {
             clearTimeout(timeoutId);
@@ -102,7 +102,7 @@ export default {
             // e.data can contain unsafe data if helpers attempts to call postMessage
             const [err, result] = e.data;
             if (err) {
-              reject(`${err}`);
+              reject(new Error(`${err}`));
             } else {
               resolve(`${result}`);
             }
diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js
index 20a30471..97689512 100644
--- a/src/services/fileSvc.js
+++ b/src/services/fileSvc.js
@@ -7,22 +7,29 @@ export default {
   /**
    * Create a file in the store with the specified fields.
    */
-  createFile(fields = {}, background = false) {
+  createFile({
+    name,
+    parentId,
+    text,
+    properties,
+    discussions,
+    comments,
+  } = {}, background = false) {
     const id = utils.uid();
     const file = {
       id,
-      name: utils.sanitizeName(fields.name),
-      parentId: fields.parentId || null,
+      name: utils.sanitizeName(name),
+      parentId: parentId || null,
     };
     const content = {
       id: `${id}/content`,
-      text: utils.sanitizeText(fields.text || store.getters['data/computedSettings'].newFileContent),
-      properties: utils.sanitizeText(
-        fields.properties || store.getters['data/computedSettings'].newFileProperties),
-      discussions: fields.discussions || {},
-      comments: fields.comments || {},
+      text: utils.sanitizeText(text || store.getters['data/computedSettings'].newFileContent),
+      properties: utils
+        .sanitizeText(properties || store.getters['data/computedSettings'].newFileProperties),
+      discussions: discussions || {},
+      comments: comments || {},
     };
-    const nameStripped = file.name !== utils.defaultName && file.name !== fields.name;
+    const nameStripped = file.name !== utils.defaultName && file.name !== name;
 
     // Check if there is a path conflict
     const workspaceUniquePaths = store.getters['workspace/hasUniquePaths'];
@@ -35,8 +42,8 @@ export default {
 
     // Show warning dialogs and then save in the store
     return Promise.resolve()
-      .then(() => !background && nameStripped && store.dispatch('modal/stripName', fields.name))
-      .then(() => !background && pathConflict && store.dispatch('modal/pathConflict', fields.name))
+      .then(() => !background && nameStripped && store.dispatch('modal/stripName', name))
+      .then(() => !background && pathConflict && store.dispatch('modal/pathConflict', name))
       .then(() => {
         store.commit('content/setItem', content);
         store.commit('file/setItem', file);
@@ -131,12 +138,12 @@ export default {
    * Add a prefix to its name and return true otherwise.
    */
   makePathUnique(id) {
-    const item = store.getters.allItemMap[id];
+    const { pathItems, allItemMap, itemPaths } = store.getters;
+    const item = allItemMap[id];
     if (!item) {
       return false;
     }
-    let path = store.getters.itemPaths[id];
-    const pathItems = store.getters.pathItems;
+    let path = itemPaths[id];
     if (pathItems[path].length === 1) {
       return false;
     }
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index 453c13da..b5051ff6 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -6,8 +6,8 @@ import fileSvc from './fileSvc';
 
 const dbVersion = 1;
 const dbStoreName = 'objects';
-const exportWorkspace = utils.queryParams.exportWorkspace;
-const silent = utils.queryParams.silent;
+const { exportWorkspace } = utils.queryParams;
+const { silent } = utils.queryParams;
 const resetApp = utils.queryParams.reset;
 const deleteMarkerMaxAge = 1000;
 const checkSponsorshipAfter = (5 * 60 * 1000) + (30 * 1000); // tokenExpirationMargin + 30 sec
@@ -37,7 +37,7 @@ class Connection {
 
     request.onsuccess = (event) => {
       this.db = event.target.result;
-      this.db.onversionchange = () => location.reload();
+      this.db.onversionchange = () => window.location.reload();
 
       this.getTxCbs.forEach(({ onTx, onError }) => this.createTx(onTx, onError));
       this.getTxCbs = null;
@@ -51,16 +51,15 @@ class Connection {
       // the fall-through behavior is what we want.
       /* eslint-disable no-fallthrough */
       switch (oldVersion) {
-        case 0:
-          {
-            // Create store
-            const dbStore = eventDb.createObjectStore(dbStoreName, {
-              keyPath: 'id',
-            });
-            dbStore.createIndex('tx', 'tx', {
-              unique: false,
-            });
-          }
+        case 0: {
+          // Create store
+          const dbStore = eventDb.createObjectStore(dbStoreName, {
+            keyPath: 'id',
+          });
+          dbStore.createIndex('tx', 'tx', {
+            unique: false,
+          });
+        }
         default:
       }
       /* eslint-enable no-fallthrough */
@@ -158,7 +157,7 @@ const localDbSvc = {
    * Read and apply all changes from the DB since previous transaction.
    */
   readAll(tx, cb) {
-    let lastTx = this.lastTx;
+    let { lastTx } = this;
     const dbStore = tx.objectStore(dbStoreName);
     const index = dbStore.index('tx');
     const range = window.IDBKeyRange.lowerBound(this.lastTx, true);
@@ -171,7 +170,7 @@ const localDbSvc = {
           lastTx = item.tx;
           if (this.lastTx && item.tx - this.lastTx > deleteMarkerMaxAge) {
             // We may have missed some delete markers
-            location.reload();
+            window.location.reload();
             return;
           }
         }
@@ -355,16 +354,14 @@ const localDbSvc = {
       .then(() => {
         // Reset the app if reset flag was passed
         if (resetApp) {
-          return Promise.all(
-            Object.keys(store.getters['data/workspaces'])
-              .map(workspaceId => localDbSvc.removeWorkspace(workspaceId)),
-          )
+          return Promise.all(Object.keys(store.getters['data/workspaces'])
+            .map(workspaceId => localDbSvc.removeWorkspace(workspaceId)))
             .then(() => utils.localStorageDataIds.forEach((id) => {
               // Clean data stored in localStorage
               localStorage.removeItem(`data/${id}`);
             }))
             .then(() => {
-              location.reload();
+              window.location.reload();
               throw new Error('reload');
             });
         }
@@ -388,7 +385,7 @@ const localDbSvc = {
 
         // Save welcome file content hash if not done already
         const hash = utils.hash(welcomeFile);
-        const welcomeFileHashes = store.getters['data/localSettings'].welcomeFileHashes;
+        const { welcomeFileHashes } = store.getters['data/localSettings'];
         if (!welcomeFileHashes[hash]) {
           store.dispatch('data/patchLocalSettings', {
             welcomeFileHashes: {
@@ -410,7 +407,7 @@ const localDbSvc = {
 
         // Enable sponsorship
         if (utils.queryParams.paymentSuccess) {
-          location.hash = ''; // PaymentSuccess param is always on its own
+          window.location.hash = ''; // PaymentSuccess param is always on its own
           store.dispatch('modal/paymentSuccess')
             .catch(() => { /* Cancel */ });
           const sponsorToken = store.getters['workspace/sponsorToken'];
@@ -463,8 +460,10 @@ const localDbSvc = {
                     // Cancel new discussion
                     store.commit('discussion/setCurrentDiscussionId');
                     // Open the gutter if file contains discussions
-                    store.commit('discussion/setCurrentDiscussionId',
-                      store.getters['discussion/nextDiscussionId']);
+                    store.commit(
+                      'discussion/setCurrentDiscussionId',
+                      store.getters['discussion/nextDiscussionId'],
+                    );
                   },
                   (err) => {
                     // Failure (content is not available), go back to previous file
@@ -480,7 +479,8 @@ const localDbSvc = {
             }
           }, {
             immediate: true,
-          });
+          },
+        );
       });
   },
 };
diff --git a/src/services/markdownConversionSvc.js b/src/services/markdownConversionSvc.js
index 01c16c34..5664c50b 100644
--- a/src/services/markdownConversionSvc.js
+++ b/src/services/markdownConversionSvc.js
@@ -224,7 +224,7 @@ export default {
       parsingCtx.markdownCoreRules.slice(2).forEach(rule => rule(parsingCtx.markdownState));
       parsingCtx.markdownState.isConverted = true;
     }
-    const tokens = parsingCtx.markdownState.tokens;
+    const { tokens } = parsingCtx.markdownState;
     const html = parsingCtx.converter.renderer.render(
       tokens,
       parsingCtx.converter.options,
@@ -240,7 +240,10 @@ export default {
     let htmlSectionDiff;
     if (previousConversionCtx) {
       const oldSectionHash = hashArray(
-        previousConversionCtx.htmlSectionList, valueHash, valueArray);
+        previousConversionCtx.htmlSectionList,
+        valueHash,
+        valueArray,
+      );
       htmlSectionDiff = diffMatchPatch.diff_main(oldSectionHash, newSectionHash, false);
     } else {
       htmlSectionDiff = [
@@ -264,8 +267,7 @@ export default {
    */
   highlight(markdown, converter = this.defaultConverter, grammars = this.defaultPrismGrammars) {
     const parsingCtx = this.parseSections(converter, markdown);
-    return parsingCtx.sections.map(
-      section => Prism.highlight(section.text, grammars[section.data]),
-    ).join('');
+    return parsingCtx.sections
+      .map(section => Prism.highlight(section.text, grammars[section.data])).join('');
   },
 };
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index a453aa17..1747f3c3 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -121,7 +121,7 @@ export default {
       // Open a tab otherwise
       wnd = window.open(authorizeUrl);
       if (!wnd) {
-        return Promise.reject('The authorize window was blocked.');
+        return Promise.reject(new Error('The authorize window was blocked.'));
       }
     }
 
@@ -145,21 +145,23 @@ export default {
 
       if (silent) {
         iframeElt.onerror = () => clean()
-          .then(() => reject('Unknown error.'));
+          .then(() => reject(new Error('Unknown error.')));
         closeTimeout = setTimeout(
           () => clean()
             .then(() => {
               isConnectionDown = true;
               store.commit('setOffline', true);
               store.commit('updateLastOfflineCheck');
-              reject('You are offline.');
+              reject(new Error('You are offline.'));
             }),
-          networkTimeout);
+          networkTimeout,
+        );
       } else {
         closeTimeout = setTimeout(
           () => clean()
-            .then(() => reject('Timeout.')),
-          oauth2AuthorizationTimeout);
+            .then(() => reject(new Error('Timeout.'))),
+          oauth2AuthorizationTimeout,
+        );
       }
 
       msgHandler = event => event.source === wnd && event.origin === utils.origin && clean()
@@ -167,7 +169,7 @@ export default {
           const data = utils.parseQueryParams(`${event.data}`.slice(1));
           if (data.error || data.state !== state) {
             console.error(data); // eslint-disable-line no-console
-            reject('Could not get required authorization.');
+            reject(new Error('Could not get required authorization.'));
           } else {
             resolve({
               accessToken: data.access_token,
@@ -181,7 +183,7 @@ export default {
       window.addEventListener('message', msgHandler);
       if (!silent) {
         checkClosedInterval = setInterval(() => wnd.closed && clean()
-          .then(() => reject('Authorize window was closed.')), 250);
+          .then(() => reject(new Error('Authorize window was closed.'))), 250);
       }
     });
   },
@@ -253,9 +255,9 @@ export default {
           if (offlineCheck) {
             isConnectionDown = true;
             store.commit('setOffline', true);
-            reject('You are offline.');
+            reject(new Error('You are offline.'));
           } else {
-            reject('Network request failed.');
+            reject(new Error('Network request failed.'));
           }
         };
 
@@ -264,9 +266,9 @@ export default {
           if (offlineCheck) {
             isConnectionDown = true;
             store.commit('setOffline', true);
-            reject('You are offline.');
+            reject(new Error('You are offline.'));
           } else {
-            reject('Network request timeout.');
+            reject(new Error('Network request timeout.'));
           }
         }, config.timeout);
 
@@ -282,12 +284,11 @@ export default {
         .catch((err) => {
           // Try again later in case of retriable error
           if (isRetriable(err) && retryAfter < maxRetryAfter) {
-            return new Promise(
-              (resolve) => {
-                setTimeout(resolve, retryAfter);
-                // Exponential backoff
-                retryAfter *= 2;
-              })
+            return new Promise((resolve) => {
+              setTimeout(resolve, retryAfter);
+              // Exponential backoff
+              retryAfter *= 2;
+            })
               .then(attempt);
           }
           throw err;
diff --git a/src/services/optional/keystrokes.js b/src/services/optional/keystrokes.js
index 3f696da3..6368886a 100644
--- a/src/services/optional/keystrokes.js
+++ b/src/services/optional/keystrokes.js
@@ -2,7 +2,7 @@ import cledit from '../cledit';
 import editorSvc from '../editorSvc';
 import store from '../../store';
 
-const Keystroke = cledit.Keystroke;
+const { Keystroke } = cledit;
 const indentRegexp = /^ {0,3}>[ ]*|^[ \t]*[*+-][ \t](?:\[[ xX]\][ \t])?|^([ \t]*)\d+\.[ \t](?:\[[ xX]\][ \t])?|^\s+/;
 let clearNewline;
 let lastSelection;
@@ -32,7 +32,9 @@ function fixNumberedList(state, indent) {
 
     lines.some((line) => {
       const match = line.replace(
-        /^[ \t]*/, wholeMatch => wholeMatch.replace(/\t/g, '    ')).match(indentRegex);
+        /^[ \t]*/,
+        wholeMatch => wholeMatch.replace(/\t/g, '    '),
+      ).match(indentRegex);
       if (!match || line.match(/^#+ /)) { // Line not empty, not indented, or title
         flush();
         return true;
diff --git a/src/services/optional/scrollSync.js b/src/services/optional/scrollSync.js
index 4a4a324e..d9975385 100644
--- a/src/services/optional/scrollSync.js
+++ b/src/services/optional/scrollSync.js
@@ -162,17 +162,19 @@ store.watch(
     isScrollEditor = showEditor;
     isScrollPreview = !showEditor;
     skipAnimation = true;
-  });
+  },
+);
 
 store.watch(
   () => store.getters['file/current'].id,
   () => {
     skipAnimation = true;
-  });
+  },
+);
 
 editorSvc.$on('previewCtxMeasured', (previewCtxMeasured) => {
   if (previewCtxMeasured) {
-    sectionDescList = previewCtxMeasured.sectionDescList;
+    ({ sectionDescList } = previewCtxMeasured);
     forceScrollSync();
   }
 });
diff --git a/src/services/optional/shortcuts.js b/src/services/optional/shortcuts.js
index 2afe1d88..4b428ace 100644
--- a/src/services/optional/shortcuts.js
+++ b/src/services/optional/shortcuts.js
@@ -45,7 +45,7 @@ const methods = {
     const replacement = `${param2 || ''}`;
     if (text && replacement) {
       setTimeout(() => {
-        const selectionMgr = editorSvc.clEditor.selectionMgr;
+        const { selectionMgr } = editorSvc.clEditor;
         let offset = selectionMgr.selectionStart;
         if (offset === selectionMgr.selectionEnd) {
           const range = selectionMgr.createRange(offset - text.length, offset);
@@ -85,4 +85,5 @@ store.watch(
     });
   }, {
     immediate: true,
-  });
+  },
+);
diff --git a/src/services/optional/taskChange.js b/src/services/optional/taskChange.js
index 178a280a..a575d3bd 100644
--- a/src/services/optional/taskChange.js
+++ b/src/services/optional/taskChange.js
@@ -7,10 +7,10 @@ editorSvc.$on('inited', () => {
     if (!elt || elt === editorSvc.previewElt) {
       return offset;
     }
-    let previousSibling = elt.previousSibling;
+    let { previousSibling } = elt;
     while (previousSibling) {
       offset += previousSibling.textContent.length;
-      previousSibling = previousSibling.previousSibling;
+      ({ previousSibling } = previousSibling);
     }
     return offset + getPreviewOffset(elt.parentNode);
   };
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index e0789f9f..b89b098e 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -53,11 +53,11 @@ export default new Provider({
       .then((workspace) => {
         // Fix the URL hash
         utils.setQueryParams(workspaceParams);
-        if (workspace.url !== location.href) {
+        if (workspace.url !== window.location.href) {
           store.dispatch('data/patchWorkspaces', {
             [workspace.id]: {
               ...workspace,
-              url: location.href,
+              url: window.location.href,
             },
           });
         }
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index 5552abef..a88c5165 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -20,7 +20,11 @@ export default new Provider({
   },
   downloadContent(token, syncLocation) {
     return githubHelper.downloadFile(
-      token, syncLocation.owner, syncLocation.repo, syncLocation.branch, syncLocation.path,
+      token,
+      syncLocation.owner,
+      syncLocation.repo,
+      syncLocation.branch,
+      syncLocation.path,
     )
       .then(({ sha, content }) => {
         savedSha[syncLocation.id] = sha;
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 13967254..898fb85d 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -40,7 +40,7 @@ export default new Provider({
   },
   initWorkspace() {
     const [owner, repo] = (utils.queryParams.repo || '').split('/');
-    const branch = utils.queryParams.branch;
+    const { branch } = utils.queryParams;
     const workspaceParams = {
       providerId: this.id,
       repo: `${owner}/${repo}`,
@@ -84,11 +84,11 @@ export default new Provider({
         }
         // Fix the URL hash
         utils.setQueryParams(workspaceParams);
-        if (workspace.url !== location.href) {
+        if (workspace.url !== window.location.href) {
           store.dispatch('data/patchWorkspaces', {
             [workspaceId]: {
               ...workspace,
-              url: location.href,
+              url: window.location.href,
             },
           });
         }
@@ -494,8 +494,8 @@ export default new Provider({
   getRevisionContent(token, fileId, revisionId) {
     const { owner, repo } = getWorkspaceWithOwner();
     return getSyncData(fileId)
-      .then(syncData => githubHelper.downloadFile(
-        token, owner, repo, revisionId, getAbsolutePath(syncData)))
+      .then(syncData => githubHelper
+        .downloadFile(token, owner, repo, revisionId, getAbsolutePath(syncData)))
       .then(({ content }) => Provider.parseContent(content, `${fileId}/content`));
   },
 });
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index 3f9a4893..97d9e5c1 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -101,8 +101,10 @@ export default new Provider({
                 return this.makeLocation(token, null, googleHelper.driveActionFolder.id);
               });
           case 'open':
-            return store.dispatch('queue/enqueue',
-              () => this.openFiles(token, googleHelper.driveActionFiles));
+            return store.dispatch(
+              'queue/enqueue',
+              () => this.openFiles(token, googleHelper.driveActionFiles),
+            );
           default:
             return null;
         }
@@ -171,7 +173,7 @@ export default new Provider({
       };
       return this.downloadContent(token, syncLocation)
         .then(content => fileSvc.createFile({
-          name,
+          name: driveFile.name,
           parentId: store.getters['file/current'].parentId,
           text: content.text,
           properties: content.properties,
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index a1696ac9..b11aff52 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -25,8 +25,8 @@ export default new Provider({
       folderId,
     });
 
-    const makeWorkspaceId = folderId => folderId && utils.makeWorkspaceId(
-      makeWorkspaceParams(folderId));
+    const makeWorkspaceId = folderId => folderId
+      && utils.makeWorkspaceId(makeWorkspaceParams(folderId));
 
     const getWorkspace = folderId =>
       store.getters['data/sanitizedWorkspaces'][makeWorkspaceId(folderId)];
@@ -100,7 +100,7 @@ export default new Provider({
             sub: token.sub,
             name: folder.name,
             providerId: this.id,
-            url: location.href,
+            url: window.location.href,
             folderId: folder.id,
             teamDriveId: folder.teamDriveId,
             dataFolderId: properties.dataFolderId,
@@ -141,7 +141,7 @@ export default new Provider({
             ...folder,
             appProperties: {},
           })
-          .then(() => folder.id)))
+            .then(() => folder.id)))
         // If workspace does not exist, initialize one
         .then(folderId => getWorkspace(folderId) || googleHelper.getFile(token, folderId)
           .then((folder) => {
@@ -157,11 +157,11 @@ export default new Provider({
         .then((workspace) => {
           // Fix the URL hash
           utils.setQueryParams(makeWorkspaceParams(workspace.folderId));
-          if (workspace.url !== location.href) {
+          if (workspace.url !== window.location.href) {
             store.dispatch('data/patchWorkspaces', {
               [workspace.id]: {
                 ...workspace,
-                url: location.href,
+                url: window.location.href,
               },
             });
           }
@@ -233,7 +233,7 @@ export default new Provider({
           parentIds[syncData.id] = id;
         });
         result.changes.forEach((change) => {
-          const id = ((change.file || {}).appProperties || {}).id;
+          const { id } = (change.file || {}).appProperties || {};
           if (id) {
             parentIds[change.fileId] = id;
           }
@@ -253,7 +253,7 @@ export default new Provider({
           let contentChange;
           if (change.file) {
             // Ignore changes in files that are not in the workspace
-            const appProperties = change.file.appProperties;
+            const { appProperties } = change.file;
             if (!appProperties || appProperties.folderId !== workspace.folderId
             ) {
               return;
diff --git a/src/services/providers/helpers/dropboxHelper.js b/src/services/providers/helpers/dropboxHelper.js
index 09eba63d..5c33bd22 100644
--- a/src/services/providers/helpers/dropboxHelper.js
+++ b/src/services/providers/helpers/dropboxHelper.js
@@ -24,10 +24,13 @@ const request = (token, options, args) => networkSvc.request({
 export default {
   startOauth2(fullAccess, sub = null, silent = false) {
     return networkSvc.startOauth2(
-      'https://www.dropbox.com/oauth2/authorize', {
+      'https://www.dropbox.com/oauth2/authorize',
+      {
         client_id: getAppKey(fullAccess),
         response_type: 'token',
-      }, silent)
+      },
+      silent,
+    )
       // Call the user info endpoint
       .then(({ accessToken }) => request({ accessToken }, {
         method: 'POST',
@@ -56,7 +59,7 @@ export default {
     }
     return networkSvc.loadScript('https://www.dropbox.com/static/api/2/dropins.js')
       .then(() => {
-        Dropbox = window.Dropbox;
+        ({ Dropbox } = window);
       });
   },
   addAccount(fullAccess = false) {
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index 1423fc19..cbb4733f 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -30,10 +30,13 @@ const getCommitMessage = (name, path) => {
 export default {
   startOauth2(scopes, sub = null, silent = false) {
     return networkSvc.startOauth2(
-      'https://github.com/login/oauth/authorize', {
+      'https://github.com/login/oauth/authorize',
+      {
         client_id: clientId,
         scope: scopes.join(' '),
-      }, silent)
+      },
+      silent,
+    )
       // Exchange code with token
       .then(data => networkSvc.request({
         method: 'GET',
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index f579fb6a..16181bbb 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -13,7 +13,7 @@ const driveAppDataScopes = ['https://www.googleapis.com/auth/drive.appdata'];
 const getDriveScopes = token => [token.driveFullAccess
   ? 'https://www.googleapis.com/auth/drive'
   : 'https://www.googleapis.com/auth/drive.file',
-  'https://www.googleapis.com/auth/drive.install'];
+'https://www.googleapis.com/auth/drive.install'];
 const bloggerScopes = ['https://www.googleapis.com/auth/blogger'];
 const photosScopes = ['https://www.googleapis.com/auth/photos'];
 
@@ -52,7 +52,7 @@ export default {
       },
     }, true)
       .catch((err) => {
-        const reason = ((((err.body || {}).error || {}).errors || [])[0] || {}).reason;
+        const { reason } = (((err.body || {}).error || {}).errors || [])[0] || {};
         if (reason === 'authError') {
           // Mark the token as revoked and get a new one
           store.dispatch('data/setGoogleToken', {
@@ -116,7 +116,8 @@ export default {
           multipartRequestBody += closeDelimiter;
           options.url = options.url.replace(
             'https://www.googleapis.com/',
-            'https://www.googleapis.com/upload/');
+            'https://www.googleapis.com/upload/',
+          );
           return this.request(refreshedToken, {
             ...options,
             params: {
@@ -212,7 +213,8 @@ export default {
   },
   startOauth2(scopes, sub = null, silent = false) {
     return networkSvc.startOauth2(
-      'https://accounts.google.com/o/oauth2/v2/auth', {
+      'https://accounts.google.com/o/oauth2/v2/auth',
+      {
         client_id: clientId,
         response_type: 'token id_token',
         scope: ['openid', ...scopes].join(' '),
@@ -220,7 +222,9 @@ export default {
         login_hint: sub,
         prompt: silent ? 'none' : null,
         nonce: utils.uid(),
-      }, silent)
+      },
+      silent,
+    )
       // Call the token info endpoint
       .then(data => networkSvc.request({
         method: 'POST',
@@ -300,7 +304,7 @@ export default {
         }));
   },
   refreshToken(token, scopes = []) {
-    const sub = token.sub;
+    const { sub } = token;
     const lastToken = store.getters['data/googleTokens'][sub];
     const mergedScopes = [...new Set([
       ...scopes,
@@ -339,16 +343,16 @@ export default {
       return Promise.resolve();
     }
     return networkSvc.loadScript('https://apis.google.com/js/api.js')
-      .then(() => Promise.all(libraries.map(
-        library => new Promise((resolve, reject) => window.gapi.load(library, {
+      .then(() => Promise.all(libraries
+        .map(library => new Promise((resolve, reject) => window.gapi.load(library, {
           callback: resolve,
           onerror: reject,
           timeout: 30000,
           ontimeout: reject,
         })))))
       .then(() => {
-        gapi = window.gapi;
-        google = window.google;
+        ({ gapi } = window);
+        ({ google } = window);
       });
   },
   getSponsorship(token) {
@@ -455,8 +459,8 @@ export default {
           fields: 'id,name,mimeType,appProperties,teamDriveId',
           supportsTeamDrives: true,
         },
-      })
-      .then(res => res.body));
+      }))
+      .then(res => res.body);
   },
   downloadFile(token, id) {
     return this.refreshToken(token, getDriveScopes(token))
@@ -484,16 +488,25 @@ export default {
   },
   downloadFileRevision(token, fileId, revisionId) {
     return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this.downloadFileRevisionInternal(
-        refreshedToken, fileId, revisionId));
+      .then(refreshedToken => this
+        .downloadFileRevisionInternal(refreshedToken, fileId, revisionId));
   },
   downloadAppDataFileRevision(token, fileId, revisionId) {
     return this.refreshToken(token, driveAppDataScopes)
-      .then(refreshedToken => this.downloadFileRevisionInternal(
-        refreshedToken, fileId, revisionId));
+      .then(refreshedToken => this
+        .downloadFileRevisionInternal(refreshedToken, fileId, revisionId));
   },
   uploadBlogger(
-    token, blogUrl, blogId, postId, title, content, labels, isDraft, published, isPage,
+    token,
+    blogUrl,
+    blogId,
+    postId,
+    title,
+    content,
+    labels,
+    isDraft,
+    published,
+    isPage,
   ) {
     return this.refreshToken(token, bloggerScopes)
       .then(refreshedToken => Promise.resolve()
diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js
index 9b04a579..c58b7bb1 100644
--- a/src/services/providers/helpers/wordpressHelper.js
+++ b/src/services/providers/helpers/wordpressHelper.js
@@ -15,11 +15,14 @@ const request = (token, options) => networkSvc.request({
 export default {
   startOauth2(sub = null, silent = false) {
     return networkSvc.startOauth2(
-      'https://public-api.wordpress.com/oauth2/authorize', {
+      'https://public-api.wordpress.com/oauth2/authorize',
+      {
         client_id: clientId,
         response_type: 'token',
         scope: 'global',
-      }, silent)
+      },
+      silent,
+    )
       // Call the user info endpoint
       .then(data => request({ accessToken: data.accessToken }, {
         url: 'https://public-api.wordpress.com/rest/v1.1/me',
@@ -42,7 +45,7 @@ export default {
         }));
   },
   refreshToken(token) {
-    const sub = token.sub;
+    const { sub } = token;
     const lastToken = store.getters['data/wordpressTokens'][sub];
 
     return Promise.resolve()
diff --git a/src/services/providers/helpers/zendeskHelper.js b/src/services/providers/helpers/zendeskHelper.js
index 9bb6a6d1..6ed07f8f 100644
--- a/src/services/providers/helpers/zendeskHelper.js
+++ b/src/services/providers/helpers/zendeskHelper.js
@@ -12,11 +12,14 @@ const request = (token, options) => networkSvc.request({
 export default {
   startOauth2(subdomain, clientId, sub = null, silent = false) {
     return networkSvc.startOauth2(
-      `https://${subdomain}.zendesk.com/oauth/authorizations/new`, {
+      `https://${subdomain}.zendesk.com/oauth/authorizations/new`,
+      {
         client_id: clientId,
         response_type: 'token',
         scope: 'read hc:write',
-      }, silent)
+      },
+      silent,
+    )
       // Call the user info endpoint
       .then(({ accessToken }) => request({ accessToken }, {
         url: `https://${subdomain}.zendesk.com/api/v2/users/me.json`,
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index de0dcd47..91748b99 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -39,7 +39,7 @@ const ensureDate = (value, defaultValue) => {
 };
 
 function publish(publishLocation) {
-  const fileId = publishLocation.fileId;
+  const { fileId } = publishLocation;
   const template = store.getters['data/allTemplates'][publishLocation.templateId];
   return exportSvc.applyTemplate(fileId, template)
     .then(html => localDbSvc.loadItem(`${fileId}/content`)
@@ -107,7 +107,8 @@ function publishFile(fileId) {
       err => localDbSvc.unloadContents()
         .then(() => {
           throw err;
-        }));
+        }),
+    );
 }
 
 function requestPublish() {
@@ -124,7 +125,7 @@ function requestPublish() {
         clearInterval(intervalId);
         if (!hasCurrentFilePublishLocations()) {
           // Cancel sync
-          reject('Publish not possible.');
+          reject(new Error('Publish not possible.'));
           return;
         }
         publishFile(store.getters['file/current'].id)
@@ -140,12 +141,14 @@ function createPublishLocation(publishLocation) {
   publishLocation.id = utils.uid();
   const currentFile = store.getters['file/current'];
   publishLocation.fileId = currentFile.id;
-  store.dispatch('queue/enqueue',
+  store.dispatch(
+    'queue/enqueue',
     () => publish(publishLocation)
       .then((publishLocationToStore) => {
         store.commit('publishLocation/setItem', publishLocationToStore);
         store.dispatch('notification/info', `A new publication location was added to "${currentFile.name}".`);
-      }));
+      }),
+  );
 }
 
 export default {
diff --git a/src/services/sectionUtils.js b/src/services/sectionUtils.js
index 28cc188c..9bbe1321 100644
--- a/src/services/sectionUtils.js
+++ b/src/services/sectionUtils.js
@@ -6,8 +6,8 @@ function SectionDimension(startOffset, endOffset) {
 
 function dimensionNormalizer(dimensionName) {
   return (editorSvc) => {
-    const dimensionList = editorSvc.previewCtx.sectionDescList.map(
-      sectionDesc => sectionDesc[dimensionName]);
+    const dimensionList = editorSvc.previewCtx.sectionDescList
+      .map(sectionDesc => sectionDesc[dimensionName]);
     let dimension;
     let i;
     let j;
@@ -68,7 +68,9 @@ function measureSectionDimensions(editorSvc) {
       ? newPreviewSectionOffset
       : previewSectionOffset;
     sectionDesc.previewDimension = new SectionDimension(
-      previewSectionOffset, newPreviewSectionOffset);
+      previewSectionOffset,
+      newPreviewSectionOffset,
+    );
     previewSectionOffset = newPreviewSectionOffset;
 
     // Measure TOC section
@@ -88,11 +90,17 @@ function measureSectionDimensions(editorSvc) {
   sectionDesc = editorSvc.previewCtx.sectionDescList[i - 1];
   if (sectionDesc) {
     sectionDesc.editorDimension = new SectionDimension(
-      editorSectionOffset, editorSvc.editorElt.scrollHeight);
+      editorSectionOffset,
+      editorSvc.editorElt.scrollHeight,
+    );
     sectionDesc.previewDimension = new SectionDimension(
-      previewSectionOffset, editorSvc.previewElt.scrollHeight);
+      previewSectionOffset,
+      editorSvc.previewElt.scrollHeight,
+    );
     sectionDesc.tocDimension = new SectionDimension(
-      tocSectionOffset, editorSvc.tocElt.scrollHeight);
+      tocSectionOffset,
+      editorSvc.tocElt.scrollHeight,
+    );
   }
 
   normalizeEditorDimensions(editorSvc);
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index e37aae35..343329ad 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -60,7 +60,7 @@ function isSyncWindow() {
  * Return true if auto sync can start, ie if lastSyncActivity is old enough.
  */
 function isAutoSyncReady() {
-  let autoSyncEvery = store.getters['data/computedSettings'].autoSyncEvery;
+  let { autoSyncEvery } = store.getters['data/computedSettings'];
   if (autoSyncEvery < minAutoSyncEvery) {
     autoSyncEvery = minAutoSyncEvery;
   }
@@ -112,15 +112,17 @@ function cleanSyncedContent(syncedContent) {
       delete syncedContent.syncHistory[syncLocationId];
     }
   });
-  const allSyncLocationHashSet = new Set([].concat(
-    ...Object.keys(syncedContent.syncHistory).map(
-      id => syncedContent.syncHistory[id])));
+  const allSyncLocationHashSet = new Set([]
+    .concat(...Object.keys(syncedContent.syncHistory)
+      .map(id => syncedContent.syncHistory[id])));
   // Clean historyData from unused contents
-  Object.keys(syncedContent.historyData).map(hash => parseInt(hash, 10)).forEach((hash) => {
-    if (!allSyncLocationHashSet.has(hash)) {
-      delete syncedContent.historyData[hash];
-    }
-  });
+  Object.keys(syncedContent.historyData)
+    .map(hash => parseInt(hash, 10))
+    .forEach((hash) => {
+      if (!allSyncLocationHashSet.has(hash)) {
+        delete syncedContent.historyData[hash];
+      }
+    });
 }
 
 /**
@@ -180,7 +182,8 @@ function createSyncLocation(syncLocation) {
   syncLocation.fileId = fileId;
   // Use deepCopy to freeze item
   const content = utils.deepCopy(store.getters['content/current']);
-  store.dispatch('queue/enqueue',
+  store.dispatch(
+    'queue/enqueue',
     () => {
       const provider = providerRegistry.providers[syncLocation.providerId];
       const token = provider.getToken(syncLocation);
@@ -190,8 +193,7 @@ function createSyncLocation(syncLocation) {
       }, syncLocation)
         .then(syncLocationToStore => localDbSvc.loadSyncedContent(fileId)
           .then(() => {
-            const newSyncedContent = utils.deepCopy(upgradeSyncedContent(
-              store.state.syncedContent.itemMap[`${fileId}/syncedContent`]));
+            const newSyncedContent = utils.deepCopy(upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]));
             const newSyncHistoryItem = [];
             newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
             newSyncHistoryItem[LAST_SEEN] = content.hash;
@@ -202,7 +204,8 @@ function createSyncLocation(syncLocation) {
             store.commit('syncLocation/setItem', syncLocationToStore);
             store.dispatch('notification/info', `A new synchronized location was added to "${currentFile.name}".`);
           }));
-    });
+    },
+  );
 }
 
 // Prevent from sending new data too long after old data has been fetched
@@ -221,7 +224,7 @@ class SyncContext {
   attempted = {};
 }
 
- /**
+/**
  * Sync one file with all its locations.
  */
 function syncFile(fileId, syncContext = new SyncContext()) {
@@ -233,8 +236,7 @@ function syncFile(fileId, syncContext = new SyncContext()) {
     .then(() => {
       const getFile = () => store.state.file.itemMap[fileId];
       const getContent = () => store.state.content.itemMap[`${fileId}/content`];
-      const getSyncedContent = () => upgradeSyncedContent(
-        store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
+      const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
       const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
 
       const isTempFile = () => {
@@ -259,7 +261,7 @@ function syncFile(fileId, syncContext = new SyncContext()) {
           return false;
         }
         // Return true if it's a welcome file that has no discussion
-        const welcomeFileHashes = store.getters['data/localSettings'].welcomeFileHashes;
+        const { welcomeFileHashes } = store.getters['data/localSettings'];
         const hash = utils.hash(content.text);
         const hasDiscussions = Object.keys(content.discussions).length;
         return file.name === 'Welcome file' && welcomeFileHashes[hash] && !hasDiscussions;
@@ -415,7 +417,7 @@ function syncFile(fileId, syncContext = new SyncContext()) {
                   store.dispatch('notification/error', err);
                 }),
             })
-            .then(() => syncOneContentLocation());
+              .then(() => syncOneContentLocation());
           }
           return result;
         });
@@ -429,7 +431,8 @@ function syncFile(fileId, syncContext = new SyncContext()) {
       err => localDbSvc.unloadContents()
         .then(() => {
           throw err;
-        }))
+        }),
+    )
     .catch((err) => {
       if (err && err.message === 'TOO_LATE') {
         // Restart sync
@@ -641,8 +644,8 @@ function syncWorkspace() {
           .then(() => syncNextFile());
       };
 
-      const onSyncEnd = () => Promise.resolve(
-        workspaceProvider.onSyncEnd && workspaceProvider.onSyncEnd());
+      const onSyncEnd = () => Promise.resolve(workspaceProvider.onSyncEnd
+        && workspaceProvider.onSyncEnd());
 
       return Promise.resolve()
         .then(() => saveNextItem())
@@ -667,7 +670,8 @@ function syncWorkspace() {
             throw err;
           }, () => {
             throw err;
-          }))
+          }),
+        )
         .then(
           () => {
             if (syncContext.restart) {
@@ -682,7 +686,8 @@ function syncWorkspace() {
               return syncWorkspace();
             }
             throw err;
-          });
+          },
+        );
     });
 }
 
@@ -703,7 +708,7 @@ function requestSync() {
         clearInterval(intervalId);
         if (!isSyncPossible()) {
           // Cancel sync
-          reject('Sync not possible.');
+          reject(new Error('Sync not possible.'));
           return;
         }
 
diff --git a/src/services/tempFileSvc.js b/src/services/tempFileSvc.js
index d2ea5098..7a116178 100644
--- a/src/services/tempFileSvc.js
+++ b/src/services/tempFileSvc.js
@@ -4,10 +4,12 @@ import utils from './utils';
 import editorSvc from './editorSvc';
 import fileSvc from './fileSvc';
 
-const origin = utils.queryParams.origin;
-const fileName = utils.queryParams.fileName;
-const contentText = utils.queryParams.contentText;
-const contentProperties = utils.queryParams.contentProperties;
+const {
+  origin,
+  fileName,
+  contentText,
+  contentProperties,
+} = utils.queryParams;
 
 export default {
   setReady() {
diff --git a/src/services/templateWorker.js b/src/services/templateWorker.js
index ccbb8240..8cc69e6a 100644
--- a/src/services/templateWorker.js
+++ b/src/services/templateWorker.js
@@ -61,6 +61,7 @@ const whiteList = {
   close: 1,
 };
 
+/* eslint-disable no-restricted-globals */
 let global = self;
 while (global !== Object.prototype) {
   Object.getOwnPropertyNames(global).forEach((prop) => { // eslint-disable-line no-loop-func
diff --git a/src/services/utils.js b/src/services/utils.js
index 7ae94411..11b04572 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -2,7 +2,7 @@ import yaml from 'js-yaml';
 import '../libs/clunderscore';
 import presets from '../data/presets';
 
-const origin = `${location.protocol}//${location.host}`;
+const origin = `${window.location.protocol}//${window.location.host}`;
 
 // For utils.uid()
 const uidLength = 16;
@@ -71,14 +71,14 @@ export default {
   cleanTrashAfter: 7 * 24 * 60 * 60 * 1000, // 7 days
   origin,
   oauth2RedirectUri: `${origin}/oauth2/callback`,
-  queryParams: parseQueryParams(location.hash.slice(1)),
+  queryParams: parseQueryParams(window.location.hash.slice(1)),
   setQueryParams(params = {}) {
     this.queryParams = params;
     const serializedParams = Object.entries(this.queryParams).map(([key, value]) =>
       `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join('&');
     const hash = `#${serializedParams}`;
-    if (location.hash !== hash) {
-      location.replace(hash);
+    if (window.location.hash !== hash) {
+      window.location.replace(hash);
     }
   },
   types: [
@@ -111,7 +111,7 @@ export default {
   sanitizeName(name) {
     return `${name || ''}`
       // Replace `/`, control characters and other kind of spaces with a space
-      .replace(/[/\x00-\x1F\x7f-\xa0\s]+/g, ' ').trim()
+      .replace(/[/\x00-\x1F\x7f-\xa0\s]+/g, ' ').trim() // eslint-disable-line no-control-regex
       // Keep only 250 characters
       .slice(0, 250) || this.defaultName;
   },
@@ -172,8 +172,10 @@ export default {
     return Math.abs(this.hash(this.serializeObject(params))).toString(36);
   },
   encodeBase64(str, urlSafe = false) {
-    const result = btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
-      (match, p1) => String.fromCharCode(`0x${p1}`)));
+    const result = btoa(encodeURIComponent(str).replace(
+      /%([0-9A-F]{2})/g,
+      (match, p1) => String.fromCharCode(`0x${p1}`),
+    ));
     if (!urlSafe) {
       return result;
     }
@@ -185,8 +187,10 @@ export default {
   decodeBase64(str) {
     // In case of URL safe base64
     const sanitizedStr = str.replace(/_/g, '/').replace(/-/g, '+');
-    return decodeURIComponent(atob(sanitizedStr).split('').map(
-      c => `%${`00${c.charCodeAt(0).toString(16)}`.slice(-2)}`).join(''));
+    return decodeURIComponent(atob(sanitizedStr)
+      .split('')
+      .map(c => `%${`00${c.charCodeAt(0).toString(16)}`.slice(-2)}`)
+      .join(''));
   },
   computeProperties(yamlProperties) {
     let properties = {};
@@ -276,9 +280,9 @@ export default {
   wrapRange(range, eltProperties) {
     const rangeLength = `${range}`.length;
     let wrappedLength = 0;
-    const treeWalker = document.createTreeWalker(
-      range.commonAncestorContainer, NodeFilter.SHOW_TEXT);
-    let startOffset = range.startOffset;
+    const treeWalker = document
+      .createTreeWalker(range.commonAncestorContainer, NodeFilter.SHOW_TEXT);
+    let { startOffset } = range;
     treeWalker.currentNode = range.startContainer;
     if (treeWalker.currentNode.nodeType === Node.TEXT_NODE || treeWalker.nextNode()) {
       do {
diff --git a/src/store/content.js b/src/store/content.js
index d2e54bac..23abb20f 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -38,7 +38,7 @@ module.getters = {
     return state.itemMap[`${rootGetters['file/current'].id}/content`] || empty();
   },
   currentChangeTrigger: (state, getters) => {
-    const current = getters.current;
+    const { current } = getters;
     return utils.serializeObject([
       current.id,
       current.text,
@@ -55,7 +55,7 @@ module.getters = {
 module.actions = {
   ...module.actions,
   patchCurrent({ state, getters, commit }, value) {
-    const id = getters.current.id;
+    const { id } = getters.current;
     if (id && !state.revisionContent) {
       commit('patchItem', {
         ...value,
@@ -76,8 +76,13 @@ module.actions = {
       });
     }
   },
-  restoreRevision({ state, getters, commit, dispatch }) {
-    const revisionContent = state.revisionContent;
+  restoreRevision({
+    state,
+    getters,
+    commit,
+    dispatch,
+  }) {
+    const { revisionContent } = state;
     if (revisionContent) {
       dispatch('modal/fileRestoration', null, { root: true })
         .then(() => {
@@ -86,8 +91,8 @@ module.actions = {
           const currentContent = utils.deepCopy(getters.current);
           if (currentContent) {
             // Restore text and move discussions
-            const diffs = diffMatchPatch.diff_main(
-              currentContent.text, revisionContent.originalText);
+            const diffs = diffMatchPatch
+              .diff_main(currentContent.text, revisionContent.originalText);
             diffMatchPatch.diff_cleanupSemantic(diffs);
             Object.entries(currentContent.discussions).forEach(([, discussion]) => {
               const adjustOffset = (offsetName) => {
diff --git a/src/store/data.js b/src/store/data.js
index 8abfa7c1..0be05ead 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -10,7 +10,12 @@ import styledHtmlTemplate from '../data/styledHtmlTemplate.html';
 import styledHtmlWithTocTemplate from '../data/styledHtmlWithTocTemplate.html';
 import jekyllSiteTemplate from '../data/jekyllSiteTemplate.html';
 
-const itemTemplate = (id, data = {}) => ({ id, type: 'data', data, hash: 0 });
+const itemTemplate = (id, data = {}) => ({
+  id,
+  type: 'data',
+  data,
+  hash: 0,
+});
 
 const empty = (id) => {
   switch (id) {
@@ -226,7 +231,7 @@ export default {
     toggleStatusBar: layoutSettingsToggler('showStatusBar'),
     toggleScrollSync: layoutSettingsToggler('scrollSync'),
     toggleFocusMode: layoutSettingsToggler('focusMode'),
-    toggleSideBar: ({ commit, getters, dispatch, rootGetters }, value) => {
+    toggleSideBar: ({ getters, dispatch, rootGetters }, value) => {
       // Reset side bar
       dispatch('setSideBarPanel');
 
@@ -239,7 +244,7 @@ export default {
       }
       dispatch('patchLayoutSettings', patch);
     },
-    toggleExplorer: ({ commit, getters, dispatch, rootGetters }, value) => {
+    toggleExplorer: ({ getters, dispatch, rootGetters }, value) => {
       // Close side bar if not enough space
       const patch = {
         showExplorer: value === undefined ? !getters.layoutSettings.showExplorer : value,
@@ -263,7 +268,7 @@ export default {
       commit('setItem', itemTemplate('templates', dataToCommit));
     },
     setLastCreated: setter('lastCreated'),
-    setLastOpenedId: ({ getters, commit, dispatch, rootState }, fileId) => {
+    setLastOpenedId: ({ getters, commit, rootState }, fileId) => {
       const lastOpened = { ...getters.lastOpened };
       lastOpened[fileId] = Date.now();
       // Remove entries that don't exist anymore
diff --git a/src/store/discussion.js b/src/store/discussion.js
index da9d06d2..4793b8a7 100644
--- a/src/store/discussion.js
+++ b/src/store/discussion.js
@@ -62,8 +62,7 @@ export default {
     newDiscussion: state =>
       state.currentDiscussionId === state.newDiscussionId && state.newDiscussion,
     currentFileDiscussionLastComments: (state, getters, rootState, rootGetters) => {
-      const discussions = rootGetters['content/current'].discussions;
-      const comments = rootGetters['content/current'].comments;
+      const { discussions, comments } = rootGetters['content/current'];
       const discussionLastComments = {};
       Object.entries(comments).forEach(([, comment]) => {
         if (discussions[comment.discussionId]) {
@@ -77,13 +76,12 @@ export default {
     },
     currentFileDiscussions: (state, getters, rootState, rootGetters) => {
       const currentFileDiscussions = {};
-      const newDiscussion = getters.newDiscussion;
+      const { newDiscussion } = getters;
       if (newDiscussion) {
         currentFileDiscussions[state.newDiscussionId] = newDiscussion;
       }
-      const discussions = rootGetters['content/current'].discussions;
-      const discussionLastComments = getters.currentFileDiscussionLastComments;
-      Object.entries(discussionLastComments)
+      const { discussions } = rootGetters['content/current'];
+      Object.entries(getters.currentFileDiscussionLastComments)
         .sort(([, lastComment1], [, lastComment2]) =>
           lastComment1.created - lastComment2.created)
         .forEach(([discussionId]) => {
@@ -140,12 +138,14 @@ export default {
         commit('setNewDiscussion', { ...selection, text });
       }
     },
-    cleanCurrentFile(
-      { getters, rootGetters, commit, dispatch },
-      { filterComment, filterDiscussion } = {},
-    ) {
-      const discussions = rootGetters['content/current'].discussions;
-      const comments = rootGetters['content/current'].comments;
+    cleanCurrentFile({
+      getters,
+      rootGetters,
+      commit,
+      dispatch,
+    }, { filterComment, filterDiscussion } = {}) {
+      const { discussions } = rootGetters['content/current'];
+      const { comments } = rootGetters['content/current'];
       const patch = {
         discussions: {},
         comments: {},
@@ -158,7 +158,7 @@ export default {
         }
       });
 
-      const nextDiscussionId = getters.nextDiscussionId;
+      const { nextDiscussionId } = getters;
       dispatch('content/patchCurrent', patch, { root: true });
       if (!getters.currentDiscussion) {
         // Keep the gutter open
diff --git a/src/store/explorer.js b/src/store/explorer.js
index 651aabb5..797a1479 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -174,7 +174,12 @@ export default {
     },
   },
   actions: {
-    openNode({ state, getters, commit, dispatch }, id) {
+    openNode({
+      state,
+      getters,
+      commit,
+      dispatch,
+    }, id) {
       const node = getters.nodeMap[id];
       if (node) {
         if (node.isFolder && !state.openNodes[id]) {
@@ -186,7 +191,7 @@ export default {
     openDragTarget: debounceAction(({ state, dispatch }) => {
       dispatch('openNode', state.dragTargetId);
     }, 1000),
-    setDragTarget({ state, getters, commit, dispatch }, id) {
+    setDragTarget({ commit, dispatch }, id) {
       commit('setDragTargetId', id);
       dispatch('openDragTarget');
     },
diff --git a/src/store/findReplace.js b/src/store/findReplace.js
index e6b01ad0..1c37049f 100644
--- a/src/store/findReplace.js
+++ b/src/store/findReplace.js
@@ -21,7 +21,7 @@ export default {
     },
   },
   actions: {
-    open({ commit, state }, { type, findText }) {
+    open({ commit }, { type, findText }) {
       commit('setType', type);
       if (findText) {
         commit('setFindText', findText);
diff --git a/src/store/index.js b/src/store/index.js
index 52221774..0b1b90e8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -69,7 +69,7 @@ const store = new Vuex.Store({
           if (item.parendId === 'trash') {
             itemPath = `.stackedit-trash/${item.name}`;
           } else {
-            let name = item.name;
+            let { name } = item;
             if (folderMap[item.id]) {
               name += '/';
             }
@@ -88,10 +88,9 @@ const store = new Vuex.Store({
       [...state.folder.items, ...state.file.items].forEach(item => getPath(item));
       return result;
     },
-    pathItems: (state, getters) => {
+    pathItems: (state, { allItemMap, itemPaths }) => {
       const result = {};
-      const allItemMap = getters.allItemMap;
-      Object.entries(getters.itemPaths).forEach(([id, path]) => {
+      Object.entries(itemPaths).forEach(([id, path]) => {
         const items = result[path] || [];
         items.push(allItemMap[id]);
         result[path] = items;
@@ -128,7 +127,7 @@ const store = new Vuex.Store({
       if (state.offline !== value) {
         commit('setOffline', value);
         if (state.offline) {
-          return Promise.reject('You are offline.');
+          return Promise.reject(new Error('You are offline.'));
         }
         dispatch('notification/info', 'You are back online!');
       }
diff --git a/src/store/layout.js b/src/store/layout.js
index dc352fd9..1a1690a8 100644
--- a/src/store/layout.js
+++ b/src/store/layout.js
@@ -108,8 +108,8 @@ function computeStyles(state, getters, layoutSettings = getters['data/layoutSett
   styles.previewWidth = styles.showSidePreview ?
     panelWidth :
     doublePanelWidth;
-  const previewRightPadding = Math.max(
-    Math.floor((styles.previewWidth - styles.textWidth) / 2), minPadding);
+  const previewRightPadding = Math
+    .max(Math.floor((styles.previewWidth - styles.textWidth) / 2), minPadding);
   if (!styles.showSidePreview) {
     styles.previewWidth += constants.buttonBarWidth;
   }
@@ -122,8 +122,8 @@ function computeStyles(state, getters, layoutSettings = getters['data/layoutSett
   styles.editorWidth = styles.showSidePreview ?
     panelWidth :
     doublePanelWidth;
-  const editorRightPadding = Math.max(
-    Math.floor((styles.editorWidth - styles.textWidth) / 2), minPadding);
+  const editorRightPadding = Math
+    .max(Math.floor((styles.editorWidth - styles.textWidth) / 2), minPadding);
   styles.editorGutterWidth = showGutter && layoutSettings.showEditor
     ? constants.gutterWidth
     : 0;
@@ -146,8 +146,9 @@ function computeStyles(state, getters, layoutSettings = getters['data/layoutSett
       styles.hideLocations = true;
     }
   }
-  styles.titleMaxWidth = Math.max(minTitleMaxWidth,
-    Math.min(maxTitleMaxWidth, styles.titleMaxWidth));
+  styles.titleMaxWidth = Math
+    .max(minTitleMaxWidth, Math
+      .min(maxTitleMaxWidth, styles.titleMaxWidth));
   return styles;
 }
 
diff --git a/src/store/modal.js b/src/store/modal.js
index 9814225f..27840c75 100644
--- a/src/store/modal.js
+++ b/src/store/modal.js
@@ -37,7 +37,7 @@ export default {
         commit('setStack', [config, ...state.stack]);
       });
     },
-    hideUntil({ commit, state }, promise) {
+    hideUntil({ commit }, promise) {
       commit('setHidden', true);
       return promise.then((res) => {
         commit('setHidden', false);
diff --git a/src/store/moduleTemplate.js b/src/store/moduleTemplate.js
index b82cdcc2..3fca9669 100644
--- a/src/store/moduleTemplate.js
+++ b/src/store/moduleTemplate.js
@@ -11,10 +11,7 @@ export default (empty, simpleHash = false) => {
       itemMap: {},
     },
     getters: {
-      items: (state) => {
-        console.log(state.itemMap);
-        return Object.values(state.itemMap);
-      },
+      items: state => Object.values(state.itemMap),
     },
     mutations: {
       setItem(state, value) {
diff --git a/src/store/queue.js b/src/store/queue.js
index f7516f72..1359cb31 100644
--- a/src/store/queue.js
+++ b/src/store/queue.js
@@ -71,7 +71,7 @@ export default {
         }));
       }
     },
-    doWithLocation({ state, commit, dispatch }, { location, promise }) {
+    doWithLocation({ commit }, { location, promise }) {
       commit('setCurrentLocation', location);
       return promise
         .then((res) => {
diff --git a/src/store/workspace.js b/src/store/workspace.js
index 8be204fd..0498bea7 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -69,8 +69,7 @@ export default {
           return getters.mainWorkspaceToken;
       }
     },
-    userId: (state, getters, rootState, rootGetters) => {
-      const loginToken = getters.loginToken;
+    userId: (state, { loginToken }, rootState, rootGetters) => {
       if (!loginToken) {
         return null;
       }
diff --git a/src/components/common/app.scss b/src/styles/app.scss
similarity index 99%
rename from src/components/common/app.scss
rename to src/styles/app.scss
index 94b677bb..d133d972 100644
--- a/src/components/common/app.scss
+++ b/src/styles/app.scss
@@ -1,6 +1,4 @@
 @import './variables.scss';
-@import './base';
-@import './markdownHighlighting';
 
 body {
   background-color: #fff;
diff --git a/src/components/common/base.scss b/src/styles/base.scss
similarity index 94%
rename from src/components/common/base.scss
rename to src/styles/base.scss
index b4b647e5..cee4b061 100644
--- a/src/components/common/base.scss
+++ b/src/styles/base.scss
@@ -1,9 +1,5 @@
-@import '../../../node_modules/normalize-scss/sass/normalize';
-@import '../../node_modules/katex/dist/katex.css';
-@import './variables.scss';
-@import './fonts.scss';
-@import './prism';
-@import './mermaid';
+@import '../../node_modules/normalize-scss/sass/normalize';
+@import './variables';
 
 @include normalize();
 
diff --git a/src/components/common/fonts.scss b/src/styles/fonts.scss
similarity index 100%
rename from src/components/common/fonts.scss
rename to src/styles/fonts.scss
diff --git a/src/styles/index.js b/src/styles/index.js
new file mode 100644
index 00000000..f6e00d45
--- /dev/null
+++ b/src/styles/index.js
@@ -0,0 +1,5 @@
+import 'katex/dist/katex.css';
+import './fonts.scss';
+import './prism.scss';
+import './mermaid.scss';
+import './base.scss';
diff --git a/src/components/common/markdownHighlighting.scss b/src/styles/markdownHighlighting.scss
similarity index 100%
rename from src/components/common/markdownHighlighting.scss
rename to src/styles/markdownHighlighting.scss
diff --git a/src/components/common/mermaid.scss b/src/styles/mermaid.scss
similarity index 99%
rename from src/components/common/mermaid.scss
rename to src/styles/mermaid.scss
index 97df441b..7087553e 100644
--- a/src/components/common/mermaid.scss
+++ b/src/styles/mermaid.scss
@@ -1,4 +1,6 @@
 /* stylelint-disable color-hex-case, color-hex-length, rule-empty-line-before, comment-empty-line-before, comment-whitespace-inside, comment-no-empty */
+@import './variables';
+
 .mermaid {
   font-size: 16px;
 
diff --git a/src/components/common/prism.scss b/src/styles/prism.scss
similarity index 100%
rename from src/components/common/prism.scss
rename to src/styles/prism.scss
diff --git a/src/components/common/variables.scss b/src/styles/variables.scss
similarity index 100%
rename from src/components/common/variables.scss
rename to src/styles/variables.scss

From e97108276865d25baa4405a03d6898deac435e1d Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Sun, 6 May 2018 02:11:39 +0100
Subject: [PATCH 04/19] Removed changelog

---
 CHANGELOG.md                         | 46 ----------------------------
 package-lock.json                    | 14 ++++-----
 src/components/modals/AboutModal.vue |  2 +-
 3 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index e01c74c9..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,46 +0,0 @@
-### v5.11
-
-- New file properties modal with extension presets
-- Added new Markdown extensions: task lists, image size, mark
-
-### v5.10
-
-- Added temporary folder
-- New iframe mode (see [here](https://benweet.github.io/stackedit.js/))
-
-### v5.9
-
-- Added explorer context menu
-
-### v5.8
-
-- New import menu with HTML to Markdown conversion
-- HTML to Markdown conversion when pasting rich text in the editor
-- Custom scrollbars on webkit
-
-### v5.7
-
-- Support for CouchDB workspaces
-- Added FAQ
-- Added welcome tour
-
-### v5.6
-
-- Themes support with new dark theme
-
-### v5.5
-
-- Integration with Google Drive
-- New landing page
-
-### v5.4
-
-- Multi-workspaces capabilities
-
-### v5.3
-
-- Revision history
-
-### v5.2
-
-- Support for discussions/comments
diff --git a/package-lock.json b/package-lock.json
index 361a3354..61ae1dfa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2118,7 +2118,7 @@
       "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
       "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "requires": {
-        "hoek": "4.2.0"
+        "hoek": "4.2.1"
       }
     },
     "brace-expansion": {
@@ -3216,7 +3216,7 @@
           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
           "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
           "requires": {
-            "hoek": "4.2.0"
+            "hoek": "4.2.1"
           }
         }
       }
@@ -7627,7 +7627,7 @@
       "requires": {
         "boom": "4.3.1",
         "cryptiles": "3.1.2",
-        "hoek": "4.2.0",
+        "hoek": "4.2.1",
         "sntp": "2.1.0"
       }
     },
@@ -7648,9 +7648,9 @@
       }
     },
     "hoek": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
+      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -13537,7 +13537,7 @@
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
       "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
       "requires": {
-        "hoek": "4.2.0"
+        "hoek": "4.2.1"
       }
     },
     "sort-keys": {
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index 0e7be875..05858e6f 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -6,7 +6,7 @@
       <hr>
       StackEdit on <a target="_blank" href="https://github.com/benweet/stackedit/">GitHub</a>
       <br>
-      <a target="_blank" href="https://github.com/benweet/stackedit/issues">Issue tracker</a> — <a target="_blank" href="https://github.com/benweet/stackedit/blob/master/CHANGELOG.md">Changelog</a>
+      <a target="_blank" href="https://github.com/benweet/stackedit/issues">Issue tracker</a> — <a target="_blank" href="https://github.com/benweet/stackedit/releases">Changelog</a>
       <br>
       <a target="_blank" href="https://chrome.google.com/webstore/detail/iiooodelglhkcpgbajoejffhijaclcdg">Chrome app</a> — <a target="_blank" href="https://chrome.google.com/webstore/detail/ajehldoplanpchfokmeempkekhnhmoha">Chrome extension</a>
       <br>

From 597c747b00454e3a7cf25231c3b9cec0c5817c6a Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Sun, 13 May 2018 13:27:33 +0000
Subject: [PATCH 05/19] Use of async/await

---
 src/components/App.vue                        |   27 +-
 src/components/ExplorerNode.vue               |   52 +-
 src/components/Modal.vue                      |    4 -
 src/components/NavigationBar.vue              |   15 +-
 src/components/gutters/Comment.vue            |   13 +-
 src/components/gutters/CurrentDiscussion.vue  |   17 +-
 src/components/menus/HistoryMenu.vue          |   38 +-
 src/components/menus/MainMenu.vue             |   22 +-
 src/components/menus/MoreMenu.vue             |   42 +-
 src/components/menus/PublishMenu.vue          |  113 +-
 src/components/menus/SyncMenu.vue             |  113 +-
 src/components/menus/WorkspacesMenu.vue       |   43 +-
 src/components/modals/AboutModal.vue          |    5 +-
 src/components/modals/FilePropertiesModal.vue |    3 +
 src/components/modals/HtmlExportModal.vue     |   11 +-
 src/components/modals/ImageModal.vue          |   10 +-
 src/components/modals/PandocExportModal.vue   |   33 +-
 src/components/modals/PdfExportModal.vue      |   50 +-
 .../modals/WorkspaceManagementModal.vue       |   13 +-
 src/components/modals/common/ModalInner.vue   |   26 +-
 src/components/modals/common/modalTemplate.js |   16 +-
 src/index.js                                  |   12 +-
 src/services/backupSvc.js                     |   34 +-
 src/services/editorSvc.js                     |    8 +-
 src/services/explorerSvc.js                   |  113 +-
 src/services/exportSvc.js                     |  133 +-
 src/services/fileSvc.js                       |  116 +-
 src/services/localDbSvc.js                    |  282 ++---
 src/services/networkSvc.js                    |  338 +++---
 src/services/providers/bloggerPageProvider.js |   31 +-
 src/services/providers/bloggerProvider.js     |   30 +-
 src/services/providers/common/Provider.js     |   21 +-
 .../providers/couchdbWorkspaceProvider.js     |  296 +++--
 src/services/providers/dropboxProvider.js     |  150 ++-
 src/services/providers/gistProvider.js        |   51 +-
 src/services/providers/githubProvider.js      |  168 ++-
 .../providers/githubWorkspaceProvider.js      |  816 ++++++-------
 .../providers/googleDriveAppDataProvider.js   |  191 ++-
 src/services/providers/googleDriveProvider.js |  277 ++---
 .../providers/googleDriveWorkspaceProvider.js |  916 +++++++-------
 .../providers/helpers/couchdbHelper.js        |  162 ++-
 .../providers/helpers/dropboxHelper.js        |  138 ++-
 .../providers/helpers/githubHelper.js         |  265 ++--
 .../providers/helpers/googleHelper.js         | 1074 +++++++++--------
 .../providers/helpers/wordpressHelper.js      |  115 +-
 .../providers/helpers/zendeskHelper.js        |   89 +-
 src/services/providers/wordpressProvider.js   |   31 +-
 src/services/providers/zendeskProvider.js     |   26 +-
 src/services/publishSvc.js                    |  140 +--
 src/services/sectionUtils.js                  |   64 +-
 src/services/sponsorSvc.js                    |   40 +-
 src/services/syncSvc.js                       | 1014 ++++++++--------
 src/services/tempFileSvc.js                   |  112 +-
 src/services/userSvc.js                       |   37 +-
 src/services/utils.js                         |    8 +
 src/store/content.js                          |   64 +-
 src/store/contentState.js                     |    4 +-
 src/store/data.js                             |   58 +-
 src/store/discussion.js                       |   55 +-
 src/store/explorer.js                         |   56 +-
 src/store/file.js                             |    8 +-
 src/store/index.js                            |   52 +-
 src/store/locationTemplate.js                 |   12 +-
 src/store/modal.js                            |   62 +-
 src/store/moduleTemplate.js                   |    2 +-
 src/store/queue.js                            |   17 +-
 src/store/syncedContent.js                    |    4 +-
 src/store/userInfo.js                         |    4 +-
 src/store/workspace.js                        |   40 +-
 69 files changed, 4194 insertions(+), 4208 deletions(-)

diff --git a/src/components/App.vue b/src/components/App.vue
index 936a999f..fbd456a2 100644
--- a/src/components/App.vue
+++ b/src/components/App.vue
@@ -92,20 +92,19 @@ export default {
       return !!this.$store.getters['modal/config'];
     },
   },
-  created() {
-    syncSvc.init()
-      .then(() => {
-        networkSvc.init();
-        sponsorSvc.init();
-        this.ready = true;
-        tempFileSvc.setReady();
-      })
-      .catch((err) => {
-        if (err && err.message !== 'reload') {
-          console.error(err); // eslint-disable-line no-console
-          this.$store.dispatch('notification/error', err);
-        }
-      });
+  async created() {
+    try {
+      await syncSvc.init();
+      await networkSvc.init();
+      await sponsorSvc.init();
+      this.ready = true;
+      tempFileSvc.setReady();
+    } catch (err) {
+      if (err && err.message !== 'reload') {
+        console.error(err); // eslint-disable-line no-console
+        this.$store.dispatch('notification/error', err);
+      }
+    }
   },
 };
 </script>
diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index 428e2eb2..1309048c 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -97,29 +97,36 @@ export default {
       }
       return true;
     },
-    submitNewChild(cancel) {
+    async submitNewChild(cancel) {
       const { newChildNode } = this.$store.state.explorer;
       if (!cancel && !newChildNode.isNil && newChildNode.item.name) {
-        if (newChildNode.isFolder) {
-          fileSvc.storeItem(newChildNode.item)
-            .then(item => this.select(item.id), () => { /* cancel */ });
-        } else {
-          fileSvc.createFile(newChildNode.item)
-            .then(item => this.select(item.id), () => { /* cancel */ });
+        try {
+          if (newChildNode.isFolder) {
+            const item = await fileSvc.storeItem(newChildNode.item);
+            this.select(item.id);
+          } else {
+            const item = await fileSvc.createFile(newChildNode.item);
+            this.select(item.id);
+          }
+        } catch (e) {
+          // Cancel
         }
       }
       this.$store.commit('explorer/setNewItem', null);
     },
-    submitEdit(cancel) {
+    async submitEdit(cancel) {
       const { item } = this.$store.getters['explorer/editingNode'];
       const value = this.editingValue;
       this.setEditingId(null);
       if (!cancel && item.id && value) {
-        fileSvc.storeItem({
-          ...item,
-          name: value,
-        })
-          .catch(() => { /* cancel */ });
+        try {
+          await fileSvc.storeItem({
+            ...item,
+            name: value,
+          });
+        } catch (e) {
+          // Cancel
+        }
       }
     },
     setDragSourceId(evt) {
@@ -140,22 +147,17 @@ export default {
         && !targetNode.isNil
         && sourceNode.item.id !== targetNode.item.id
       ) {
-        const patch = {
-          id: sourceNode.item.id,
+        fileSvc.storeItem({
+          ...sourceNode.item,
           parentId: targetNode.item.id,
-        };
-        if (sourceNode.isFolder) {
-          this.$store.commit('folder/patchItem', patch);
-        } else {
-          this.$store.commit('file/patchItem', patch);
-        }
+        });
       }
     },
-    onContextMenu(evt) {
+    async onContextMenu(evt) {
       if (this.select(undefined, false)) {
         evt.preventDefault();
         evt.stopPropagation();
-        this.$store.dispatch('contextMenu/open', {
+        const item = await this.$store.dispatch('contextMenu/open', {
           coordinates: {
             left: evt.clientX,
             top: evt.clientY,
@@ -178,8 +180,8 @@ export default {
             name: 'Delete',
             perform: () => explorerSvc.deleteItem(),
           }],
-        })
-          .then(item => item.perform());
+        });
+        item.perform();
       }
     },
   },
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 91d84182..176b9781 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -175,10 +175,6 @@ export default {
   background-color: rgba(160, 160, 160, 0.5);
   overflow: auto;
 
-  hr {
-    margin: 0.5em 0;
-  }
-
   p {
     line-height: 1.5;
   }
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
index bbf77c10..9ed152b9 100644
--- a/src/components/NavigationBar.vue
+++ b/src/components/NavigationBar.vue
@@ -192,7 +192,7 @@ export default {
         editorSvc.pagedownEditor.uiManager.doClick(name);
       }
     },
-    editTitle(toggle) {
+    async editTitle(toggle) {
       this.titleFocus = toggle;
       if (toggle) {
         this.titleInputElt.setSelectionRange(0, this.titleInputElt.value.length);
@@ -200,11 +200,14 @@ export default {
         const title = this.title.trim();
         this.title = this.$store.getters['file/current'].name;
         if (title) {
-          fileSvc.storeItem({
-            ...this.$store.getters['file/current'],
-            name: title,
-          })
-            .catch(() => { /* Cancel */ });
+          try {
+            await fileSvc.storeItem({
+              ...this.$store.getters['file/current'],
+              name: title,
+            });
+          } catch (e) {
+            // Cancel
+          }
         }
       }
     },
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index 21588430..b3e063ea 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -47,12 +47,13 @@ export default {
     ...mapMutations('discussion', [
       'setIsCommenting',
     ]),
-    removeComment() {
-      this.$store.dispatch('modal/commentDeletion')
-        .then(
-          () => this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment }),
-          () => { /* Cancel */ },
-        );
+    async removeComment() {
+      try {
+        await this.$store.dispatch('modal/commentDeletion');
+        this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment });
+      } catch (e) {
+        // Cancel
+      }
     },
   },
   mounted() {
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index 36262d4c..f14b68be 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -93,14 +93,15 @@ export default {
           .start();
       }
     },
-    removeDiscussion() {
-      this.$store.dispatch('modal/discussionDeletion')
-        .then(
-          () => this.$store.dispatch('discussion/cleanCurrentFile', {
-            filterDiscussion: this.currentDiscussion,
-          }),
-          () => { /* Cancel */ },
-        );
+    async removeDiscussion() {
+      try {
+        await this.$store.dispatch('modal/discussionDeletion');
+        this.$store.dispatch('discussion/cleanCurrentFile', {
+          filterDiscussion: this.currentDiscussion,
+        });
+      } catch (e) {
+        // Cancel
+      }
     },
   },
 };
diff --git a/src/components/menus/HistoryMenu.vue b/src/components/menus/HistoryMenu.vue
index 329aa22d..57a63139 100644
--- a/src/components/menus/HistoryMenu.vue
+++ b/src/components/menus/HistoryMenu.vue
@@ -96,12 +96,13 @@ export default {
     ...mapMutations('content', [
       'setRevisionContent',
     ]),
-    signin() {
-      return googleHelper.signin()
-        .then(
-          () => syncSvc.requestSync(),
-          () => { /* Cancel */ },
-        );
+    async signin() {
+      try {
+        await googleHelper.signin();
+        syncSvc.requestSync();
+      } catch (e) {
+        // Cancel
+      }
     },
     close() {
       this.$store.dispatch('data/setSideBarPanel', 'menu');
@@ -117,10 +118,15 @@ export default {
           const currentFile = this.$store.getters['file/current'];
           this.$store.dispatch(
             'queue/enqueue',
-            () => Promise.resolve()
-              .then(() => this.workspaceProvider
-                .getRevisionContent(syncToken, currentFile.id, revision.id))
-              .then(resolve, reject),
+            async () => {
+              try {
+                const content = await this.workspaceProvider
+                  .getRevisionContent(syncToken, currentFile.id, revision.id);
+                resolve(content);
+              } catch (e) {
+                reject(e);
+              }
+            },
           );
         });
         revisionContentPromises[revision.id] = revisionContentPromise;
@@ -181,9 +187,15 @@ export default {
             revisionsPromise = new Promise((resolve, reject) => {
               this.$store.dispatch(
                 'queue/enqueue',
-                () => Promise.resolve()
-                  .then(() => this.workspaceProvider.listRevisions(syncToken, currentFile.id))
-                  .then(resolve, reject),
+                async () => {
+                  try {
+                    const revisions = await this.workspaceProvider
+                      .listRevisions(syncToken, currentFile.id);
+                    resolve(revisions);
+                  } catch (e) {
+                    reject(e);
+                  }
+                },
               );
             })
               .catch(() => {
diff --git a/src/components/menus/MainMenu.vue b/src/components/menus/MainMenu.vue
index 3eaf751f..9d4eccde 100644
--- a/src/components/menus/MainMenu.vue
+++ b/src/components/menus/MainMenu.vue
@@ -104,16 +104,20 @@ export default {
     ...mapActions('data', {
       setPanel: 'setSideBarPanel',
     }),
-    signin() {
-      return googleHelper.signin()
-        .then(
-          () => syncSvc.requestSync(),
-          () => { /* Cancel */ },
-        );
+    async signin() {
+      try {
+        await googleHelper.signin();
+        syncSvc.requestSync();
+      } catch (e) {
+        // Cancel
+      }
     },
-    fileProperties() {
-      return this.$store.dispatch('modal/open', 'fileProperties')
-        .catch(() => { /* Cancel */ });
+    async fileProperties() {
+      try {
+        await this.$store.dispatch('modal/open', 'fileProperties');
+      } catch (e) {
+        // Cancel
+      }
     },
     print() {
       window.print();
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index f1ebb76f..38735eb1 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -78,29 +78,33 @@ export default {
         document.body.removeChild(iframeElt);
       }, 60000);
     },
-    settings() {
-      return this.$store.dispatch('modal/open', 'settings')
-        .then(
-          settings => this.$store.dispatch('data/setSettings', settings),
-          () => { /* Cancel */ },
-        );
+    async settings() {
+      try {
+        const settings = await this.$store.dispatch('modal/open', 'settings');
+        this.$store.dispatch('data/setSettings', settings);
+      } catch (e) {
+        // Cancel
+      }
     },
-    templates() {
-      return this.$store.dispatch('modal/open', 'templates')
-        .then(
-          ({ templates }) => this.$store.dispatch('data/setTemplates', templates),
-          () => { /* Cancel */ },
-        );
+    async templates() {
+      try {
+        const { templates } = await this.$store.dispatch('modal/open', 'templates');
+        this.$store.dispatch('data/setTemplates', templates);
+      } catch (e) {
+        // Cancel
+      }
     },
-    reset() {
-      return this.$store.dispatch('modal/reset')
-        .then(() => {
-          window.location.href = '#reset=true';
-          window.location.reload();
-        });
+    async reset() {
+      try {
+        await this.$store.dispatch('modal/reset');
+        window.location.href = '#reset=true';
+        window.location.reload();
+      } catch (e) {
+        // Cancel
+      }
     },
     about() {
-      return this.$store.dispatch('modal/open', 'about');
+      this.$store.dispatch('modal/open', 'about');
     },
   },
 };
diff --git a/src/components/menus/PublishMenu.vue b/src/components/menus/PublishMenu.vue
index 6995ecf1..cadb3a40 100644
--- a/src/components/menus/PublishMenu.vue
+++ b/src/components/menus/PublishMenu.vue
@@ -118,12 +118,15 @@ const tokensToArray = (tokens, filter = () => true) => Object.keys(tokens)
   .filter(token => filter(token))
   .sort((token1, token2) => token1.name.localeCompare(token2.name));
 
-const openPublishModal = (token, type) => store.dispatch('modal/open', {
-  type,
-  token,
-}).then(publishLocation => publishSvc.createPublishLocation(publishLocation));
-
-const onCancel = () => {};
+const publishModalOpener = type => async (token) => {
+  try {
+    const publishLocation = await store.dispatch('modal/open', {
+      type,
+      token,
+    });
+    publishSvc.createPublishLocation(publishLocation);
+  } catch (e) { /* cancel */ }
+};
 
 export default {
   components: {
@@ -178,74 +181,48 @@ export default {
     managePublish() {
       return this.$store.dispatch('modal/open', 'publishManagement');
     },
-    addGoogleDriveAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'googleDriveAccount',
-        onResolve: () => googleHelper.addDriveAccount(!store.getters['data/localSettings'].googleDriveRestrictedAccess),
-      })
-        .catch(onCancel);
+    async addGoogleDriveAccount() {
+      try {
+        await this.$store.dispatch('modal/open', { type: 'googleDriveAccount' });
+        await googleHelper.addDriveAccount(!store.getters['data/localSettings'].googleDriveRestrictedAccess);
+      } catch (e) { /* cancel */ }
     },
-    addDropboxAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'dropboxAccount',
-        onResolve: () => dropboxHelper.addAccount(!store.getters['data/localSettings'].dropboxRestrictedAccess),
-      })
-        .catch(onCancel);
+    async addDropboxAccount() {
+      try {
+        await this.$store.dispatch('modal/open', { type: 'dropboxAccount' });
+        await dropboxHelper.addAccount(!store.getters['data/localSettings'].dropboxRestrictedAccess);
+      } catch (e) { /* cancel */ }
     },
-    addGithubAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'githubAccount',
-        onResolve: () => githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess),
-      })
-        .catch(onCancel);
+    async addGithubAccount() {
+      try {
+        await this.$store.dispatch('modal/open', { type: 'githubAccount' });
+        await githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess);
+      } catch (e) { /* cancel */ }
     },
-    addWordpressAccount() {
-      return wordpressHelper.addAccount()
-        .catch(onCancel);
+    async addWordpressAccount() {
+      try {
+        await wordpressHelper.addAccount();
+      } catch (e) { /* cancel */ }
     },
-    addBloggerAccount() {
-      return googleHelper.addBloggerAccount()
-        .catch(onCancel);
+    async addBloggerAccount() {
+      try {
+        await googleHelper.addBloggerAccount();
+      } catch (e) { /* cancel */ }
     },
-    addZendeskAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'zendeskAccount',
-        onResolve: ({ subdomain, clientId }) => zendeskHelper.addAccount(subdomain, clientId),
-      })
-        .catch(onCancel);
-    },
-    publishGoogleDrive(token) {
-      return openPublishModal(token, 'googleDrivePublish')
-        .catch(onCancel);
-    },
-    publishDropbox(token) {
-      return openPublishModal(token, 'dropboxPublish')
-        .catch(onCancel);
-    },
-    publishGithub(token) {
-      return openPublishModal(token, 'githubPublish')
-        .catch(onCancel);
-    },
-    publishGist(token) {
-      return openPublishModal(token, 'gistPublish')
-        .catch(onCancel);
-    },
-    publishWordpress(token) {
-      return openPublishModal(token, 'wordpressPublish')
-        .catch(onCancel);
-    },
-    publishBlogger(token) {
-      return openPublishModal(token, 'bloggerPublish')
-        .catch(onCancel);
-    },
-    publishBloggerPage(token) {
-      return openPublishModal(token, 'bloggerPagePublish')
-        .catch(onCancel);
-    },
-    publishZendesk(token) {
-      return openPublishModal(token, 'zendeskPublish')
-        .catch(onCancel);
+    async addZendeskAccount() {
+      try {
+        const { subdomain, clientId } = await this.$store.dispatch('modal/open', { type: 'zendeskAccount' });
+        await zendeskHelper.addAccount(subdomain, clientId);
+      } catch (e) { /* cancel */ }
     },
+    publishGoogleDrive: publishModalOpener('googleDrivePublish'),
+    publishDropbox: publishModalOpener('dropboxPublish'),
+    publishGithub: publishModalOpener('githubPublish'),
+    publishGist: publishModalOpener('gistPublish'),
+    publishWordpress: publishModalOpener('wordpressPublish'),
+    publishBlogger: publishModalOpener('bloggerPublish'),
+    publishBloggerPage: publishModalOpener('bloggerPagePublish'),
+    publishZendesk: publishModalOpener('zendeskPublish'),
   },
 };
 </script>
diff --git a/src/components/menus/SyncMenu.vue b/src/components/menus/SyncMenu.vue
index f30dcd1e..89d36e8c 100644
--- a/src/components/menus/SyncMenu.vue
+++ b/src/components/menus/SyncMenu.vue
@@ -101,8 +101,6 @@ const openSyncModal = (token, type) => store.dispatch('modal/open', {
   token,
 }).then(syncLocation => syncSvc.createSyncLocation(syncLocation));
 
-const onCancel = () => {};
-
 export default {
   components: {
     MenuEntry,
@@ -147,66 +145,79 @@ export default {
     manageSync() {
       return this.$store.dispatch('modal/open', 'syncManagement');
     },
-    addGoogleDriveAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'googleDriveAccount',
-        onResolve: () => googleHelper.addDriveAccount(!store.getters['data/localSettings'].googleDriveRestrictedAccess),
-      })
-        .catch(onCancel);
+    async addGoogleDriveAccount() {
+      try {
+        await this.$store.dispatch('modal/open', { type: 'googleDriveAccount' });
+        await googleHelper.addDriveAccount(!store.getters['data/localSettings'].googleDriveRestrictedAccess);
+      } catch (e) { /* cancel */ }
     },
-    addDropboxAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'dropboxAccount',
-        onResolve: () => dropboxHelper.addAccount(!store.getters['data/localSettings'].dropboxRestrictedAccess),
-      })
-        .catch(onCancel);
+    async addDropboxAccount() {
+      try {
+        await this.$store.dispatch('modal/open', { type: 'dropboxAccount' });
+        await dropboxHelper.addAccount(!store.getters['data/localSettings'].dropboxRestrictedAccess);
+      } catch (e) { /* cancel */ }
     },
-    addGithubAccount() {
-      return this.$store.dispatch('modal/open', {
-        type: 'githubAccount',
-        onResolve: () => githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess),
-      })
-        .catch(onCancel);
+    async addGithubAccount() {
+      try {
+        await this.$store.dispatch('modal/open', { type: 'githubAccount' });
+        await githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess);
+      } catch (e) { /* cancel */ }
     },
-    openGoogleDrive(token) {
-      return googleHelper.openPicker(token, 'doc')
-        .then(files => this.$store.dispatch(
-          'queue/enqueue',
-          () => googleDriveProvider.openFiles(token, files),
-        ));
+    async openGoogleDrive(token) {
+      const files = await googleHelper.openPicker(token, 'doc');
+      this.$store.dispatch(
+        'queue/enqueue',
+        () => googleDriveProvider.openFiles(token, files),
+      );
     },
-    openDropbox(token) {
-      return dropboxHelper.openChooser(token)
-        .then(paths => this.$store.dispatch(
-          'queue/enqueue',
-          () => dropboxProvider.openFiles(token, paths),
-        ));
+    async openDropbox(token) {
+      const paths = await dropboxHelper.openChooser(token);
+      this.$store.dispatch(
+        'queue/enqueue',
+        () => dropboxProvider.openFiles(token, paths),
+      );
     },
-    saveGoogleDrive(token) {
-      return openSyncModal(token, 'googleDriveSave')
-        .catch(onCancel);
+    async saveGoogleDrive(token) {
+      try {
+        await openSyncModal(token, 'googleDriveSave');
+      } catch (e) {
+        // Cancel
+      }
     },
-    saveDropbox(token) {
-      return openSyncModal(token, 'dropboxSave')
-        .catch(onCancel);
+    async saveDropbox(token) {
+      try {
+        await openSyncModal(token, 'dropboxSave');
+      } catch (e) {
+        // Cancel
+      }
     },
-    openGithub(token) {
-      return store.dispatch('modal/open', {
-        type: 'githubOpen',
-        token,
-      })
-        .then(syncLocation => this.$store.dispatch(
+    async openGithub(token) {
+      try {
+        const syncLocation = await store.dispatch('modal/open', {
+          type: 'githubOpen',
+          token,
+        });
+        this.$store.dispatch(
           'queue/enqueue',
           () => githubProvider.openFile(token, syncLocation),
-        ));
+        );
+      } catch (e) {
+        // Cancel
+      }
     },
-    saveGithub(token) {
-      return openSyncModal(token, 'githubSave')
-        .catch(onCancel);
+    async saveGithub(token) {
+      try {
+        await openSyncModal(token, 'githubSave');
+      } catch (e) {
+        // Cancel
+      }
     },
-    saveGist(token) {
-      return openSyncModal(token, 'gistSync')
-        .catch(onCancel);
+    async saveGist(token) {
+      try {
+        await openSyncModal(token, 'gistSync');
+      } catch (e) {
+        // Cancel
+      }
     },
   },
 };
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index 7254ef2c..5457e463 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -31,8 +31,6 @@ import { mapGetters } from 'vuex';
 import MenuEntry from './common/MenuEntry';
 import googleHelper from '../../services/providers/helpers/googleHelper';
 
-const onCancel = () => {};
-
 export default {
   components: {
     MenuEntry,
@@ -46,28 +44,37 @@ export default {
     ]),
   },
   methods: {
-    addCouchdbWorkspace() {
-      return this.$store.dispatch('modal/open', {
-        type: 'couchdbWorkspace',
-      })
-        .catch(onCancel);
+    async addCouchdbWorkspace() {
+      try {
+        this.$store.dispatch('modal/open', {
+          type: 'couchdbWorkspace',
+        });
+      } catch (e) {
+        // Cancel
+      }
     },
-    addGithubWorkspace() {
-      return this.$store.dispatch('modal/open', {
-        type: 'githubWorkspace',
-      })
-        .catch(onCancel);
+    async addGithubWorkspace() {
+      try {
+        this.$store.dispatch('modal/open', {
+          type: 'githubWorkspace',
+        });
+      } catch (e) {
+        // Cancel
+      }
     },
-    addGoogleDriveWorkspace() {
-      return googleHelper.addDriveAccount(true)
-        .then(token => this.$store.dispatch('modal/open', {
+    async addGoogleDriveWorkspace() {
+      try {
+        const token = await googleHelper.addDriveAccount(true);
+        this.$store.dispatch('modal/open', {
           type: 'googleDriveWorkspace',
           token,
-        }))
-        .catch(onCancel);
+        });
+      } catch (e) {
+        // Cancel
+      }
     },
     manageWorkspaces() {
-      return this.$store.dispatch('modal/open', 'workspaceManagement');
+      this.$store.dispatch('modal/open', 'workspaceManagement');
     },
   },
 };
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index 05858e6f..3d1550bd 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -2,7 +2,7 @@
   <modal-inner class="modal__inner-1--about-modal" aria-label="About">
     <div class="modal__content">
       <div class="logo-background"></div>
-      <small>v{{version}}<br>© 2013-2018 Dock5 Software</small>
+      <small>© 2013-2018 Dock5 Software<br>v{{version}}</small>
       <hr>
       StackEdit on <a target="_blank" href="https://github.com/benweet/stackedit/">GitHub</a>
       <br>
@@ -59,11 +59,12 @@ export default {
 
   .logo-background {
     height: 75px;
-    margin: 0.5rem 0;
+    margin: 0;
   }
 
   small {
     display: block;
+    font-size: 0.75em;
   }
 
   hr {
diff --git a/src/components/modals/FilePropertiesModal.vue b/src/components/modals/FilePropertiesModal.vue
index 34e0a863..66b8403b 100644
--- a/src/components/modals/FilePropertiesModal.vue
+++ b/src/components/modals/FilePropertiesModal.vue
@@ -41,6 +41,9 @@
         </form-entry>
         <form-entry label="Status">
           <input slot="field" class="textfield" type="text" v-model.trim="status" @keydown.enter="resolve()">
+          <div class="form-entry__info">
+            <b>Example:</b> draft
+          </div>
         </form-entry>
         <form-entry label="Date" info="YYYY-MM-DD">
           <input slot="field" class="textfield" type="text" v-model.trim="date" @keydown.enter="resolve()">
diff --git a/src/components/modals/HtmlExportModal.vue b/src/components/modals/HtmlExportModal.vue
index 2e7890c0..6fcc1352 100644
--- a/src/components/modals/HtmlExportModal.vue
+++ b/src/components/modals/HtmlExportModal.vue
@@ -37,12 +37,13 @@ export default modalTemplate({
     let timeoutId;
     this.$watch('selectedTemplate', (selectedTemplate) => {
       clearTimeout(timeoutId);
-      timeoutId = setTimeout(() => {
+      timeoutId = setTimeout(async () => {
         const currentFile = this.$store.getters['file/current'];
-        exportSvc.applyTemplate(currentFile.id, this.allTemplates[selectedTemplate])
-          .then((html) => {
-            this.result = html;
-          });
+        const html = await exportSvc.applyTemplate(
+          currentFile.id,
+          this.allTemplates[selectedTemplate],
+        );
+        this.result = html;
       }, 10);
     }, {
       immediate: true,
diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue
index 18305607..af0767cf 100644
--- a/src/components/modals/ImageModal.vue
+++ b/src/components/modals/ImageModal.vue
@@ -61,15 +61,17 @@ export default modalTemplate({
     addGooglePhotosAccount() {
       return googleHelper.addPhotosAccount();
     },
-    openGooglePhotos(token) {
+    async openGooglePhotos(token) {
       const { callback } = this.config;
       this.config.reject();
-      googleHelper.openPicker(token, 'img')
-        .then(res => res[0] && this.$store.dispatch('modal/open', {
+      const res = await googleHelper.openPicker(token, 'img');
+      if (res[0]) {
+        this.$store.dispatch('modal/open', {
           type: 'googlePhoto',
           url: res[0].url,
           callback,
-        }));
+        });
+      }
     },
   },
 });
diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue
index 4251d1cc..7c787c36 100644
--- a/src/components/modals/PandocExportModal.vue
+++ b/src/components/modals/PandocExportModal.vue
@@ -38,19 +38,20 @@ export default modalTemplate({
     selectedFormat: 'pandocExportFormat',
   },
   methods: {
-    resolve() {
+    async resolve() {
       this.config.resolve();
       const currentFile = this.$store.getters['file/current'];
       const currentContent = this.$store.getters['content/current'];
       const { selectedFormat } = this;
-      this.$store.dispatch('queue/enqueue', () => Promise.all([
+      const [sponsorToken, token] = await this.$store.dispatch('queue/enqueue', () => Promise.all([
         Promise.resolve().then(() => {
-          const sponsorToken = this.$store.getters['workspace/sponsorToken'];
-          return sponsorToken && googleHelper.refreshToken(sponsorToken);
+          const tokenToRefresh = this.$store.getters['workspace/sponsorToken'];
+          return tokenToRefresh && googleHelper.refreshToken(tokenToRefresh);
         }),
         sponsorSvc.getToken(),
-      ])
-        .then(([sponsorToken, token]) => networkSvc.request({
+      ]));
+      try {
+        const { body } = await networkSvc.request({
           method: 'POST',
           url: 'pandocExport',
           params: {
@@ -63,20 +64,16 @@ export default modalTemplate({
           body: JSON.stringify(editorSvc.getPandocAst()),
           blob: true,
           timeout: 60000,
-        })
-          .then((res) => {
-            FileSaver.saveAs(res.body, `${currentFile.name}.${selectedFormat}`);
-          }, (err) => {
-            if (err.status !== 401) {
-              throw err;
-            }
-            this.$store.dispatch('modal/sponsorOnly')
-              .catch(() => { /* Cancel */ });
-          }))
-        .catch((err) => {
+        });
+        FileSaver.saveAs(body, `${currentFile.name}.${selectedFormat}`);
+      } catch (err) {
+        if (err.status === 401) {
+          this.$store.dispatch('modal/sponsorOnly');
+        } else {
           console.error(err); // eslint-disable-line no-console
           this.$store.dispatch('notification/error', err);
-        }));
+        }
+      }
     },
   },
 });
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index 3c086387..619373c4 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -33,22 +33,24 @@ export default modalTemplate({
     selectedTemplate: 'pdfExportTemplate',
   },
   methods: {
-    resolve() {
+    async resolve() {
       this.config.resolve();
       const currentFile = this.$store.getters['file/current'];
-      this.$store.dispatch('queue/enqueue', () => Promise.all([
-        Promise.resolve().then(() => {
-          const sponsorToken = this.$store.getters['workspace/sponsorToken'];
-          return sponsorToken && googleHelper.refreshToken(sponsorToken);
-        }),
-        sponsorSvc.getToken(),
-        exportSvc.applyTemplate(
-          currentFile.id,
-          this.allTemplates[this.selectedTemplate],
-          true,
-        ),
-      ])
-        .then(([sponsorToken, token, html]) => networkSvc.request({
+      const [sponsorToken, token, html] = await this.$store
+        .dispatch('queue/enqueue', () => Promise.all([
+          Promise.resolve().then(() => {
+            const tokenToRefresh = this.$store.getters['workspace/sponsorToken'];
+            return tokenToRefresh && googleHelper.refreshToken(tokenToRefresh);
+          }),
+          sponsorSvc.getToken(),
+          exportSvc.applyTemplate(
+            currentFile.id,
+            this.allTemplates[this.selectedTemplate],
+            true,
+          ),
+        ]));
+      try {
+        const { body } = await networkSvc.request({
           method: 'POST',
           url: 'pdfExport',
           params: {
@@ -59,20 +61,16 @@ export default modalTemplate({
           body: html,
           blob: true,
           timeout: 60000,
-        })
-          .then((res) => {
-            FileSaver.saveAs(res.body, `${currentFile.name}.pdf`);
-          }, (err) => {
-            if (err.status !== 401) {
-              throw err;
-            }
-            this.$store.dispatch('modal/sponsorOnly')
-              .catch(() => { /* Cancel */ });
-          }))
-        .catch((err) => {
+        });
+        FileSaver.saveAs(body, `${currentFile.name}.pdf`);
+      } catch (err) {
+        if (err.status === 401) {
+          this.$store.dispatch('modal/sponsorOnly');
+        } else {
           console.error(err); // eslint-disable-line no-console
           this.$store.dispatch('notification/error', err);
-        }));
+        }
+      }
     },
   },
 });
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 66293a99..626777d3 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -75,12 +75,13 @@ export default {
       }
       this.editedId = null;
     },
-    remove(id) {
-      return this.$store.dispatch('modal/removeWorkspace')
-        .then(
-          () => localDbSvc.removeWorkspace(id),
-          () => { /* Cancel */ },
-        );
+    async remove(id) {
+      try {
+        await this.$store.dispatch('modal/removeWorkspace');
+        localDbSvc.removeWorkspace(id);
+      } catch (e) {
+        // Cancel
+      }
     },
   },
 };
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index c5012111..14516990 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -29,20 +29,18 @@ export default {
     },
   },
   methods: {
-    sponsor() {
-      Promise.resolve()
-        .then(() => !this.$store.getters['workspace/sponsorToken'] &&
-          // If user has to sign in
-          this.$store.dispatch('modal/signInForSponsorship', {
-            onResolve: () => googleHelper.signin()
-              .then(() => syncSvc.requestSync()),
-          }))
-        .then(() => {
-          if (!this.$store.getters.isSponsor) {
-            this.$store.dispatch('modal/open', 'sponsor');
-          }
-        })
-        .catch(() => { /* Cancel */ });
+    async sponsor() {
+      try {
+        if (!this.$store.getters['workspace/sponsorToken']) {
+          // User has to sign in
+          await this.$store.dispatch('modal/signInForSponsorship');
+          await googleHelper.signin();
+          syncSvc.requestSync();
+        }
+        if (!this.$store.getters.isSponsor) {
+          await this.$store.dispatch('modal/open', 'sponsor');
+        }
+      } catch (e) { /* cancel */ }
     },
   },
 };
diff --git a/src/components/modals/common/modalTemplate.js b/src/components/modals/common/modalTemplate.js
index 4ff7feda..600b94ed 100644
--- a/src/components/modals/common/modalTemplate.js
+++ b/src/components/modals/common/modalTemplate.js
@@ -63,17 +63,15 @@ export default (desc) => {
         return sortedTemplates;
       };
       // Make use of `function` to have `this` bound to the component
-      component.methods.configureTemplates = function () { // eslint-disable-line func-names
-        store.dispatch('modal/open', {
+      component.methods.configureTemplates = async function () { // eslint-disable-line func-names
+        const { templates, selectedId } = await store.dispatch('modal/open', {
           type: 'templates',
           selectedId: this.selectedTemplate,
-        })
-          .then(({ templates, selectedId }) => {
-            store.dispatch('data/setTemplates', templates);
-            store.dispatch('data/patchLocalSettings', {
-              [id]: selectedId,
-            });
-          });
+        });
+        store.dispatch('data/setTemplates', templates);
+        store.dispatch('data/patchLocalSettings', {
+          [id]: selectedId,
+        });
       };
     }
   });
diff --git a/src/index.js b/src/index.js
index 769c0b7b..418a5d0c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -18,14 +18,12 @@ OfflinePluginRuntime.install({
     // Tells to new SW to take control immediately
     OfflinePluginRuntime.applyUpdate();
   },
-  onUpdated: () => {
+  onUpdated: async () => {
     if (!store.state.light) {
-      localDbSvc.sync()
-        .then(() => {
-          localStorage.updated = true;
-          // Reload the webpage to load into the new version
-          window.location.reload();
-        });
+      await localDbSvc.sync();
+      localStorage.updated = true;
+      // Reload the webpage to load into the new version
+      window.location.reload();
     }
   },
 });
diff --git a/src/services/backupSvc.js b/src/services/backupSvc.js
index a2be99bc..783370b7 100644
--- a/src/services/backupSvc.js
+++ b/src/services/backupSvc.js
@@ -49,20 +49,26 @@ export default {
       }
     });
 
-    await utils.awaitSequence(Object.keys(folderNameMap), async externalId => fileSvc.storeItem({
-      id: folderIdMap[externalId],
-      type: 'folder',
-      name: folderNameMap[externalId],
-      parentId: folderIdMap[parentIdMap[externalId]],
-    }, true));
+    await utils.awaitSequence(
+      Object.keys(folderNameMap),
+      async externalId => fileSvc.setOrPatchItem({
+        id: folderIdMap[externalId],
+        type: 'folder',
+        name: folderNameMap[externalId],
+        parentId: folderIdMap[parentIdMap[externalId]],
+      }),
+    );
 
-    await utils.awaitSequence(Object.keys(fileNameMap), async externalId => fileSvc.createFile({
-      name: fileNameMap[externalId],
-      parentId: folderIdMap[parentIdMap[externalId]],
-      text: textMap[externalId],
-      properties: propertiesMap[externalId],
-      discussions: discussionsMap[externalId],
-      comments: commentsMap[externalId],
-    }, true));
+    await utils.awaitSequence(
+      Object.keys(fileNameMap),
+      async externalId => fileSvc.createFile({
+        name: fileNameMap[externalId],
+        parentId: folderIdMap[parentIdMap[externalId]],
+        text: textMap[externalId],
+        properties: propertiesMap[externalId],
+        discussions: discussionsMap[externalId],
+        comments: commentsMap[externalId],
+      }, true),
+    );
   },
 };
diff --git a/src/services/editorSvc.js b/src/services/editorSvc.js
index b7ab29f4..d940ae89 100644
--- a/src/services/editorSvc.js
+++ b/src/services/editorSvc.js
@@ -120,7 +120,7 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
   /**
    * Refresh the preview with the result of `convert()`
    */
-  refreshPreview() {
+  async refreshPreview() {
     const sectionDescList = [];
     let sectionPreviewElt;
     let sectionTocElt;
@@ -222,10 +222,10 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
       img.onerror = resolve;
       img.src = imgElt.src;
     }));
+    await Promise.all(loadedPromises);
 
-    Promise.all(loadedPromises)
-      // Debounce if sections have already been measured
-      .then(() => this.measureSectionDimensions(!!this.previewCtxMeasured));
+    // Debounce if sections have already been measured
+    this.measureSectionDimensions(!!this.previewCtxMeasured);
   },
 
   /**
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
index b89963b2..eb143d99 100644
--- a/src/services/explorerSvc.js
+++ b/src/services/explorerSvc.js
@@ -15,71 +15,74 @@ export default {
       parentId,
     });
   },
-  deleteItem() {
+  async deleteItem() {
     const selectedNode = store.getters['explorer/selectedNode'];
     if (selectedNode.isNil) {
-      return Promise.resolve();
+      return;
     }
     if (selectedNode.isTrash || selectedNode.item.parentId === 'trash') {
-      return store.dispatch('modal/trashDeletion').catch(() => { /* Cancel */ });
+      try {
+        await store.dispatch('modal/trashDeletion');
+      } catch (e) {
+        // Cancel
+      }
+      return;
     }
 
-    // See if we have a dialog to show
-    let modalAction;
+    // See if we have a confirmation dialog to show
     let moveToTrash = true;
-    if (selectedNode.isTemp) {
-      modalAction = 'modal/tempFolderDeletion';
-      moveToTrash = false;
-    } else if (selectedNode.item.parentId === 'temp') {
-      modalAction = 'modal/tempFileDeletion';
-      moveToTrash = false;
-    } else if (selectedNode.isFolder) {
-      modalAction = 'modal/folderDeletion';
+    try {
+      if (selectedNode.isTemp) {
+        await store.dispatch('modal/tempFolderDeletion', selectedNode.item);
+        moveToTrash = false;
+      } else if (selectedNode.item.parentId === 'temp') {
+        await store.dispatch('modal/tempFileDeletion', selectedNode.item);
+        moveToTrash = false;
+      } else if (selectedNode.isFolder) {
+        await store.dispatch('modal/folderDeletion', selectedNode.item);
+      }
+    } catch (e) {
+      return; // cancel
     }
 
-    return (modalAction
-      ? store.dispatch(modalAction, selectedNode.item)
-      : Promise.resolve())
-      .then(() => {
-        const deleteFile = (id) => {
-          if (moveToTrash) {
-            store.commit('file/patchItem', {
-              id,
-              parentId: 'trash',
-            });
-          } else {
-            fileSvc.deleteFile(id);
-          }
-        };
+    const deleteFile = (id) => {
+      if (moveToTrash) {
+        store.commit('file/patchItem', {
+          id,
+          parentId: 'trash',
+        });
+      } else {
+        fileSvc.deleteFile(id);
+      }
+    };
 
-        if (selectedNode === store.getters['explorer/selectedNode']) {
-          const currentFileId = store.getters['file/current'].id;
-          let doClose = selectedNode.item.id === currentFileId;
-          if (selectedNode.isFolder) {
-            const recursiveDelete = (folderNode) => {
-              folderNode.folders.forEach(recursiveDelete);
-              folderNode.files.forEach((fileNode) => {
-                doClose = doClose || fileNode.item.id === currentFileId;
-                deleteFile(fileNode.item.id);
-              });
-              store.commit('folder/deleteItem', folderNode.item.id);
-            };
-            recursiveDelete(selectedNode);
-          } else {
-            deleteFile(selectedNode.item.id);
+    if (selectedNode === store.getters['explorer/selectedNode']) {
+      const currentFileId = store.getters['file/current'].id;
+      let doClose = selectedNode.item.id === currentFileId;
+      if (selectedNode.isFolder) {
+        const recursiveDelete = (folderNode) => {
+          folderNode.folders.forEach(recursiveDelete);
+          folderNode.files.forEach((fileNode) => {
+            doClose = doClose || fileNode.item.id === currentFileId;
+            deleteFile(fileNode.item.id);
+          });
+          store.commit('folder/deleteItem', folderNode.item.id);
+        };
+        recursiveDelete(selectedNode);
+      } else {
+        deleteFile(selectedNode.item.id);
+      }
+      if (doClose) {
+        // Close the current file by opening the last opened, not deleted one
+        store.getters['data/lastOpenedIds'].some((id) => {
+          const file = store.state.file.itemMap[id];
+          if (file.parentId === 'trash') {
+            return false;
           }
-          if (doClose) {
-            // Close the current file by opening the last opened, not deleted one
-            store.getters['data/lastOpenedIds'].some((id) => {
-              const file = store.state.file.itemMap[id];
-              if (file.parentId === 'trash') {
-                return false;
-              }
-              store.commit('file/setCurrentId', id);
-              return true;
-            });
-          }
-        }
-      }, () => { /* Cancel */ });
+          store.commit('file/setCurrentId', id);
+          return true;
+        });
+      }
+    }
   },
 };
diff --git a/src/services/exportSvc.js b/src/services/exportSvc.js
index b62f57f3..b4d1addc 100644
--- a/src/services/exportSvc.js
+++ b/src/services/exportSvc.js
@@ -42,86 +42,83 @@ export default {
   /**
    * Apply the template to the file content
    */
-  applyTemplate(fileId, template = {
+  async applyTemplate(fileId, template = {
     value: '{{{files.0.content.text}}}',
     helpers: '',
   }, pdf = false) {
     const file = store.state.file.itemMap[fileId];
-    return localDbSvc.loadItem(`${fileId}/content`)
-      .then((content) => {
-        const properties = utils.computeProperties(content.properties);
-        const options = extensionSvc.getOptions(properties);
-        const converter = markdownConversionSvc.createConverter(options, true);
-        const parsingCtx = markdownConversionSvc.parseSections(converter, content.text);
-        const conversionCtx = markdownConversionSvc.convert(parsingCtx);
-        const html = conversionCtx.htmlSectionList.map(htmlSanitizer.sanitizeHtml).join('');
-        containerElt.innerHTML = html;
-        extensionSvc.sectionPreview(containerElt, options);
+    const content = await localDbSvc.loadItem(`${fileId}/content`);
+    const properties = utils.computeProperties(content.properties);
+    const options = extensionSvc.getOptions(properties);
+    const converter = markdownConversionSvc.createConverter(options, true);
+    const parsingCtx = markdownConversionSvc.parseSections(converter, content.text);
+    const conversionCtx = markdownConversionSvc.convert(parsingCtx);
+    const html = conversionCtx.htmlSectionList.map(htmlSanitizer.sanitizeHtml).join('');
+    containerElt.innerHTML = html;
+    extensionSvc.sectionPreview(containerElt, options);
 
-        // Unwrap tables
-        containerElt.querySelectorAll('.table-wrapper').cl_each((wrapperElt) => {
-          while (wrapperElt.firstChild) {
-            wrapperElt.parentNode.insertBefore(wrapperElt.firstChild, wrapperElt.nextSibling);
-          }
-          wrapperElt.parentNode.removeChild(wrapperElt);
-        });
+    // Unwrap tables
+    containerElt.querySelectorAll('.table-wrapper').cl_each((wrapperElt) => {
+      while (wrapperElt.firstChild) {
+        wrapperElt.parentNode.insertBefore(wrapperElt.firstChild, wrapperElt.nextSibling);
+      }
+      wrapperElt.parentNode.removeChild(wrapperElt);
+    });
 
-        // Make TOC
-        const headings = containerElt.querySelectorAll('h1,h2,h3,h4,h5,h6').cl_map(headingElt => ({
-          title: headingElt.textContent,
-          anchor: headingElt.id,
-          level: parseInt(headingElt.tagName.slice(1), 10),
-          children: [],
-        }));
-        const toc = groupHeadings(headings);
-        const view = {
-          pdf,
-          files: [{
-            name: file.name,
-            content: {
-              text: content.text,
-              properties,
-              yamlProperties: content.properties,
-              html: containerElt.innerHTML,
-              toc,
-            },
-          }],
-        };
-        containerElt.innerHTML = '';
+    // Make TOC
+    const headings = containerElt.querySelectorAll('h1,h2,h3,h4,h5,h6').cl_map(headingElt => ({
+      title: headingElt.textContent,
+      anchor: headingElt.id,
+      level: parseInt(headingElt.tagName.slice(1), 10),
+      children: [],
+    }));
+    const toc = groupHeadings(headings);
+    const view = {
+      pdf,
+      files: [{
+        name: file.name,
+        content: {
+          text: content.text,
+          properties,
+          yamlProperties: content.properties,
+          html: containerElt.innerHTML,
+          toc,
+        },
+      }],
+    };
+    containerElt.innerHTML = '';
 
-        // Run template conversion in a Worker to prevent attacks from helpers
-        const worker = new TemplateWorker();
-        return new Promise((resolve, reject) => {
-          const timeoutId = setTimeout(() => {
-            worker.terminate();
-            reject(new Error('Template generation timeout.'));
-          }, 10000);
-          worker.addEventListener('message', (e) => {
-            clearTimeout(timeoutId);
-            worker.terminate();
-            // e.data can contain unsafe data if helpers attempts to call postMessage
-            const [err, result] = e.data;
-            if (err) {
-              reject(new Error(`${err}`));
-            } else {
-              resolve(`${result}`);
-            }
-          });
-          worker.postMessage([template.value, view, template.helpers]);
-        });
+    // Run template conversion in a Worker to prevent attacks from helpers
+    const worker = new TemplateWorker();
+    return new Promise((resolve, reject) => {
+      const timeoutId = setTimeout(() => {
+        worker.terminate();
+        reject(new Error('Template generation timeout.'));
+      }, 10000);
+      worker.addEventListener('message', (e) => {
+        clearTimeout(timeoutId);
+        worker.terminate();
+        // e.data can contain unsafe data if helpers attempts to call postMessage
+        const [err, result] = e.data;
+        if (err) {
+          reject(new Error(`${err}`));
+        } else {
+          resolve(`${result}`);
+        }
       });
+      worker.postMessage([template.value, view, template.helpers]);
+    });
   },
+
   /**
    * Export a file to disk.
    */
-  exportToDisk(fileId, type, template) {
+  async exportToDisk(fileId, type, template) {
     const file = store.state.file.itemMap[fileId];
-    return this.applyTemplate(fileId, template)
-      .then((html) => {
-        const blob = new Blob([html], {
-          type: 'text/plain;charset=utf-8',
-        });
-        FileSaver.saveAs(blob, `${file.name}.${type}`);
-      });
+    const html = await this.applyTemplate(fileId, template);
+    const blob = new Blob([html], {
+      type: 'text/plain;charset=utf-8',
+    });
+    FileSaver.saveAs(blob, `${file.name}.${type}`);
   },
 };
diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js
index 97689512..69830fbe 100644
--- a/src/services/fileSvc.js
+++ b/src/services/fileSvc.js
@@ -7,7 +7,7 @@ export default {
   /**
    * Create a file in the store with the specified fields.
    */
-  createFile({
+  async createFile({
     name,
     parentId,
     text,
@@ -29,77 +29,99 @@ export default {
       discussions: discussions || {},
       comments: comments || {},
     };
-    const nameStripped = file.name !== utils.defaultName && file.name !== name;
-
-    // Check if there is a path conflict
     const workspaceUniquePaths = store.getters['workspace/hasUniquePaths'];
-    let pathConflict;
-    if (workspaceUniquePaths) {
-      const parentPath = store.getters.itemPaths[file.parentId] || '';
-      const path = parentPath + file.name;
-      pathConflict = !!store.getters.pathItems[path];
+
+    // Show warning dialogs
+    if (!background) {
+      // If name is being stripped
+      if (file.name !== utils.defaultName && file.name !== name) {
+        await store.dispatch('modal/stripName', name);
+      }
+
+      // Check if there is already a file with that path
+      if (workspaceUniquePaths) {
+        const parentPath = store.getters.itemPaths[file.parentId] || '';
+        const path = parentPath + file.name;
+        if (store.getters.pathItems[path]) {
+          await store.dispatch('modal/pathConflict', name);
+        }
+      }
     }
 
-    // Show warning dialogs and then save in the store
-    return Promise.resolve()
-      .then(() => !background && nameStripped && store.dispatch('modal/stripName', name))
-      .then(() => !background && pathConflict && store.dispatch('modal/pathConflict', name))
-      .then(() => {
-        store.commit('content/setItem', content);
-        store.commit('file/setItem', file);
-        if (workspaceUniquePaths) {
-          this.makePathUnique(id);
-        }
-        return store.state.file.itemMap[id];
-      });
+    // Save file and content in the store
+    store.commit('content/setItem', content);
+    store.commit('file/setItem', file);
+    if (workspaceUniquePaths) {
+      this.makePathUnique(id);
+    }
+
+    // Return the new file item
+    return store.state.file.itemMap[id];
   },
 
   /**
    * Make sanity checks and then create/update the folder/file in the store.
    */
-  async storeItem(item, background = false) {
+  async storeItem(item) {
     const id = item.id || utils.uid();
     const sanitizedName = utils.sanitizeName(item.name);
 
     if (item.type === 'folder' && forbiddenFolderNameMatcher.exec(sanitizedName)) {
-      if (background) {
-        return null;
-      }
       await store.dispatch('modal/unauthorizedName', item.name);
       throw new Error('Unauthorized name.');
     }
 
-    const workspaceUniquePaths = store.getters['workspace/hasUniquePaths'];
-
     // Show warning dialogs
-    if (!background) {
-      // If name has been stripped
-      if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) {
-        await store.dispatch('modal/stripName', item.name);
+    // If name has been stripped
+    if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) {
+      await store.dispatch('modal/stripName', item.name);
+    }
+    // Check if there is a path conflict
+    if (store.getters['workspace/hasUniquePaths']) {
+      const parentPath = store.getters.itemPaths[item.parentId] || '';
+      const path = parentPath + sanitizedName;
+      const pathItems = store.getters.pathItems[path] || [];
+      if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) {
+        await store.dispatch('modal/pathConflict', item.name);
       }
-      // Check if there is a path conflict
-      if (workspaceUniquePaths) {
-        const parentPath = store.getters.itemPaths[item.parentId] || '';
-        const path = parentPath + sanitizedName;
-        const pathItems = store.getters.pathItems[path] || [];
-        if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) {
-          await store.dispatch('modal/pathConflict', item.name);
-        }
+    }
+
+    return this.setOrPatchItem({
+      ...item,
+      id,
+    });
+  },
+
+  /**
+   * Create/update the folder/file in the store and make sure its path is unique.
+   */
+  setOrPatchItem(patch) {
+    const item = {
+      ...store.getters.allItemMap[patch.id] || patch,
+    };
+    if (!item.id) {
+      return null;
+    }
+
+    if (patch.parentId !== undefined) {
+      item.parentId = patch.parentId || null;
+    }
+    if (patch.name) {
+      const sanitizedName = utils.sanitizeName(patch.name);
+      if (item.type !== 'folder' || !forbiddenFolderNameMatcher.exec(sanitizedName)) {
+        item.name = sanitizedName;
       }
     }
 
     // Save item in the store
-    store.commit(`${item.type}/setItem`, {
-      id,
-      parentId: item.parentId || null,
-      name: sanitizedName,
-    });
+    store.commit(`${item.type}/setItem`, item);
 
     // Ensure path uniqueness
-    if (workspaceUniquePaths) {
-      this.makePathUnique(id);
+    if (store.getters['workspace/hasUniquePaths']) {
+      this.makePathUnique(item.id);
     }
-    return store.getters.allItemMap[id];
+
+    return store.getters.allItemMap[item.id];
   },
 
   /**
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index b5051ff6..cdb8f194 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -136,7 +136,7 @@ const localDbSvc = {
    * localDb will be finished. Effectively, open a transaction, then read and apply all changes
    * from the DB since the previous transaction, then write all the changes from the store.
    */
-  sync() {
+  async sync() {
     return new Promise((resolve, reject) => {
       // Create the DB transaction
       this.connection.createTx((tx) => {
@@ -275,7 +275,7 @@ const localDbSvc = {
   /**
    * Retrieve an item from the DB and put it in the store.
    */
-  loadItem(id) {
+  async loadItem(id) {
     // Check if item is in the store
     const itemInStore = store.getters.allItemMap[id];
     if (itemInStore) {
@@ -307,181 +307,165 @@ const localDbSvc = {
   /**
    * Unload from the store contents that haven't been opened recently
    */
-  unloadContents() {
-    return this.sync()
-      .then(() => {
-        // Keep only last opened files in memory
-        const lastOpenedFileIdSet = new Set(store.getters['data/lastOpenedIds']);
-        Object.keys(contentTypes).forEach((type) => {
-          store.getters[`${type}/items`].forEach((item) => {
-            const [fileId] = item.id.split('/');
-            if (!lastOpenedFileIdSet.has(fileId)) {
-              // Remove item from the store
-              store.commit(`${type}/deleteItem`, item.id);
-            }
-          });
-        });
+  async unloadContents() {
+    await this.sync();
+    // Keep only last opened files in memory
+    const lastOpenedFileIdSet = new Set(store.getters['data/lastOpenedIds']);
+    Object.keys(contentTypes).forEach((type) => {
+      store.getters[`${type}/items`].forEach((item) => {
+        const [fileId] = item.id.split('/');
+        if (!lastOpenedFileIdSet.has(fileId)) {
+          // Remove item from the store
+          store.commit(`${type}/deleteItem`, item.id);
+        }
       });
+    });
   },
 
   /**
    * Drop the database and clean the localStorage for the specified workspaceId.
    */
-  removeWorkspace(id) {
+  async removeWorkspace(id) {
     const workspaces = {
       ...store.getters['data/workspaces'],
     };
     delete workspaces[id];
     store.dispatch('data/setWorkspaces', workspaces);
     this.syncLocalStorage();
-    return new Promise((resolve, reject) => {
+    await new Promise((resolve, reject) => {
       const dbName = getDbName(id);
       const request = indexedDB.deleteDatabase(dbName);
       request.onerror = reject;
       request.onsuccess = resolve;
-    })
-      .then(() => {
-        localStorage.removeItem(`${id}/lastSyncActivity`);
-        localStorage.removeItem(`${id}/lastWindowFocus`);
-      });
+    });
+    localStorage.removeItem(`${id}/lastSyncActivity`);
+    localStorage.removeItem(`${id}/lastWindowFocus`);
   },
 
   /**
    * Create the connection and start syncing.
    */
-  init() {
-    return Promise.resolve()
-      .then(() => {
-        // Reset the app if reset flag was passed
-        if (resetApp) {
-          return Promise.all(Object.keys(store.getters['data/workspaces'])
-            .map(workspaceId => localDbSvc.removeWorkspace(workspaceId)))
-            .then(() => utils.localStorageDataIds.forEach((id) => {
-              // Clean data stored in localStorage
-              localStorage.removeItem(`data/${id}`);
-            }))
-            .then(() => {
-              window.location.reload();
-              throw new Error('reload');
-            });
-        }
+  async init() {
+    // Reset the app if reset flag was passed
+    if (resetApp) {
+      await Promise.all(Object.keys(store.getters['data/workspaces'])
+        .map(workspaceId => localDbSvc.removeWorkspace(workspaceId)));
+      utils.localStorageDataIds.forEach((id) => {
+        // Clean data stored in localStorage
+        localStorage.removeItem(`data/${id}`);
+      });
+      window.location.reload();
+      throw new Error('reload');
+    }
 
-        // Create the connection
-        this.connection = new Connection();
+    // Create the connection
+    this.connection = new Connection();
 
-        // Load the DB
-        return localDbSvc.sync();
-      })
-      .then(() => {
-        // If exportWorkspace parameter was provided
-        if (exportWorkspace) {
-          const backup = JSON.stringify(store.getters.allItemMap);
-          const blob = new Blob([backup], {
-            type: 'text/plain;charset=utf-8',
-          });
-          FileSaver.saveAs(blob, 'StackEdit workspace.json');
-          return;
-        }
+    // Load the DB
+    await localDbSvc.sync();
 
-        // Save welcome file content hash if not done already
-        const hash = utils.hash(welcomeFile);
-        const { welcomeFileHashes } = store.getters['data/localSettings'];
-        if (!welcomeFileHashes[hash]) {
-          store.dispatch('data/patchLocalSettings', {
-            welcomeFileHashes: {
-              ...welcomeFileHashes,
-              [hash]: 1,
-            },
-          });
-        }
+    // If exportWorkspace parameter was provided
+    if (exportWorkspace) {
+      const backup = JSON.stringify(store.getters.allItemMap);
+      const blob = new Blob([backup], {
+        type: 'text/plain;charset=utf-8',
+      });
+      FileSaver.saveAs(blob, 'StackEdit workspace.json');
+      return;
+    }
 
-        // If app was last opened 7 days ago and synchronization is off
-        if (!store.getters['workspace/syncToken'] &&
-          (store.state.workspace.lastFocus + utils.cleanTrashAfter < Date.now())
-        ) {
-          // Clean files
-          store.getters['file/items']
-            .filter(file => file.parentId === 'trash') // If file is in the trash
-            .forEach(file => fileSvc.deleteFile(file.id));
-        }
+    // Save welcome file content hash if not done already
+    const hash = utils.hash(welcomeFile);
+    const { welcomeFileHashes } = store.getters['data/localSettings'];
+    if (!welcomeFileHashes[hash]) {
+      store.dispatch('data/patchLocalSettings', {
+        welcomeFileHashes: {
+          ...welcomeFileHashes,
+          [hash]: 1,
+        },
+      });
+    }
 
-        // Enable sponsorship
-        if (utils.queryParams.paymentSuccess) {
-          window.location.hash = ''; // PaymentSuccess param is always on its own
-          store.dispatch('modal/paymentSuccess')
-            .catch(() => { /* Cancel */ });
-          const sponsorToken = store.getters['workspace/sponsorToken'];
-          // Force check sponsorship after a few seconds
-          const currentDate = Date.now();
-          if (sponsorToken && sponsorToken.expiresOn > currentDate - checkSponsorshipAfter) {
-            store.dispatch('data/setGoogleToken', {
-              ...sponsorToken,
-              expiresOn: currentDate - checkSponsorshipAfter,
-            });
+    // If app was last opened 7 days ago and synchronization is off
+    if (!store.getters['workspace/syncToken'] &&
+      (store.state.workspace.lastFocus + utils.cleanTrashAfter < Date.now())
+    ) {
+      // Clean files
+      store.getters['file/items']
+        .filter(file => file.parentId === 'trash') // If file is in the trash
+        .forEach(file => fileSvc.deleteFile(file.id));
+    }
+
+    // Enable sponsorship
+    if (utils.queryParams.paymentSuccess) {
+      window.location.hash = ''; // PaymentSuccess param is always on its own
+      store.dispatch('modal/paymentSuccess')
+        .catch(() => { /* Cancel */ });
+      const sponsorToken = store.getters['workspace/sponsorToken'];
+      // Force check sponsorship after a few seconds
+      const currentDate = Date.now();
+      if (sponsorToken && sponsorToken.expiresOn > currentDate - checkSponsorshipAfter) {
+        store.dispatch('data/setGoogleToken', {
+          ...sponsorToken,
+          expiresOn: currentDate - checkSponsorshipAfter,
+        });
+      }
+    }
+
+    // Sync local DB periodically
+    utils.setInterval(() => localDbSvc.sync(), 1000);
+
+    // watch current file changing
+    store.watch(
+      () => store.getters['file/current'].id,
+      async () => {
+        // See if currentFile is real, ie it has an ID
+        const currentFile = store.getters['file/current'];
+        // If current file has no ID, get the most recent file
+        if (!currentFile.id) {
+          const recentFile = store.getters['file/lastOpened'];
+          // Set it as the current file
+          if (recentFile.id) {
+            store.commit('file/setCurrentId', recentFile.id);
+          } else {
+            // If still no ID, create a new file
+            const newFile = await fileSvc.createFile({
+              name: 'Welcome file',
+              text: welcomeFile,
+            }, true);
+            // Set it as the current file
+            store.commit('file/setCurrentId', newFile.id);
+          }
+        } else {
+          try {
+            // Load contentState from DB
+            await localDbSvc.loadContentState(currentFile.id);
+            // Load syncedContent from DB
+            await localDbSvc.loadSyncedContent(currentFile.id);
+            // Load content from DB
+            try {
+              await localDbSvc.loadItem(`${currentFile.id}/content`);
+            } catch (err) {
+              // Failure (content is not available), go back to previous file
+              const lastOpenedFile = store.getters['file/lastOpened'];
+              store.commit('file/setCurrentId', lastOpenedFile.id);
+              throw err;
+            }
+            // Set last opened file
+            store.dispatch('data/setLastOpenedId', currentFile.id);
+            // Cancel new discussion and open the gutter if file contains discussions
+            store.commit(
+              'discussion/setCurrentDiscussionId',
+              store.getters['discussion/nextDiscussionId'],
+            );
+          } catch (err) {
+            console.error(err); // eslint-disable-line no-console
+            store.dispatch('notification/error', err);
           }
         }
-
-        // Sync local DB periodically
-        utils.setInterval(() => localDbSvc.sync(), 1000);
-
-        // watch current file changing
-        store.watch(
-          () => store.getters['file/current'].id,
-          () => {
-            // See if currentFile is real, ie it has an ID
-            const currentFile = store.getters['file/current'];
-            // If current file has no ID, get the most recent file
-            if (!currentFile.id) {
-              const recentFile = store.getters['file/lastOpened'];
-              // Set it as the current file
-              if (recentFile.id) {
-                store.commit('file/setCurrentId', recentFile.id);
-              } else {
-                // If still no ID, create a new file
-                fileSvc.createFile({
-                  name: 'Welcome file',
-                  text: welcomeFile,
-                }, true)
-                  // Set it as the current file
-                  .then(newFile => store.commit('file/setCurrentId', newFile.id));
-              }
-            } else {
-              Promise.resolve()
-                // Load contentState from DB
-                .then(() => localDbSvc.loadContentState(currentFile.id))
-                // Load syncedContent from DB
-                .then(() => localDbSvc.loadSyncedContent(currentFile.id))
-                // Load content from DB
-                .then(() => localDbSvc.loadItem(`${currentFile.id}/content`))
-                .then(
-                  () => {
-                    // Set last opened file
-                    store.dispatch('data/setLastOpenedId', currentFile.id);
-                    // Cancel new discussion
-                    store.commit('discussion/setCurrentDiscussionId');
-                    // Open the gutter if file contains discussions
-                    store.commit(
-                      'discussion/setCurrentDiscussionId',
-                      store.getters['discussion/nextDiscussionId'],
-                    );
-                  },
-                  (err) => {
-                    // Failure (content is not available), go back to previous file
-                    const lastOpenedFile = store.getters['file/lastOpened'];
-                    store.commit('file/setCurrentId', lastOpenedFile.id);
-                    throw err;
-                  },
-                )
-                .catch((err) => {
-                  console.error(err); // eslint-disable-line no-console
-                  store.dispatch('notification/error', err);
-                });
-            }
-          }, {
-            immediate: true,
-          },
-        );
-      });
+      },
+      { immediate: true },
+    );
   },
 };
 
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index 1747f3c3..394dc684 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -7,6 +7,27 @@ const networkTimeout = 30 * 1000; // 30 sec
 let isConnectionDown = false;
 const userInactiveAfter = 2 * 60 * 1000; // 2 minutes
 
+
+function parseHeaders(xhr) {
+  const pairs = xhr.getAllResponseHeaders().trim().split('\n');
+  const headers = {};
+  pairs.forEach((header) => {
+    const split = header.trim().split(':');
+    const key = split.shift().trim().toLowerCase();
+    const value = split.join(':').trim();
+    headers[key] = value;
+  });
+  return headers;
+}
+
+function isRetriable(err) {
+  if (err.status === 403) {
+    const googleReason = ((((err.body || {}).error || {}).errors || [])[0] || {}).reason;
+    return googleReason === 'rateLimitExceeded' || googleReason === 'userRateLimitExceeded';
+  }
+  return err.status === 429 || (err.status >= 500 && err.status < 600);
+}
+
 export default {
   init() {
     // Keep track of the last user activity
@@ -31,37 +52,34 @@ export default {
     window.addEventListener('focus', setLastFocus);
 
     // Check browser is online periodically
-    const checkOffline = () => {
+    const checkOffline = async () => {
       const isBrowserOffline = window.navigator.onLine === false;
       if (!isBrowserOffline &&
         store.state.lastOfflineCheck + networkTimeout + 5000 < Date.now() &&
         this.isUserActive()
       ) {
         store.commit('updateLastOfflineCheck');
-        new Promise((resolve, reject) => {
-          const script = document.createElement('script');
-          let timeout;
-          let clean = (cb) => {
-            clearTimeout(timeout);
-            document.head.removeChild(script);
-            clean = () => {}; // Prevent from cleaning several times
-            cb();
-          };
-          script.onload = () => clean(resolve);
-          script.onerror = () => clean(reject);
-          script.src = `https://apis.google.com/js/api.js?${Date.now()}`;
-          try {
-            document.head.appendChild(script); // This can fail with bad network
-            timeout = setTimeout(() => clean(reject), networkTimeout);
-          } catch (e) {
-            reject(e);
-          }
-        })
-          .then(() => {
-            isConnectionDown = false;
-          }, () => {
-            isConnectionDown = true;
+        const script = document.createElement('script');
+        let timeout;
+        try {
+          await new Promise((resolve, reject) => {
+            script.onload = resolve;
+            script.onerror = reject;
+            script.src = `https://apis.google.com/js/api.js?${Date.now()}`;
+            try {
+              document.head.appendChild(script); // This can fail with bad network
+              timeout = setTimeout(reject, networkTimeout);
+            } catch (e) {
+              reject(e);
+            }
           });
+          isConnectionDown = false;
+        } catch (e) {
+          isConnectionDown = true;
+        } finally {
+          clearTimeout(timeout);
+          document.head.removeChild(script);
+        }
       }
       const offline = isBrowserOffline || isConnectionDown;
       if (store.state.offline !== offline) {
@@ -88,7 +106,7 @@ export default {
   isUserActive() {
     return this.lastActivity > Date.now() - userInactiveAfter && this.isWindowFocused();
   },
-  loadScript(url) {
+  async loadScript(url) {
     if (!scriptLoadingPromises[url]) {
       scriptLoadingPromises[url] = new Promise((resolve, reject) => {
         const script = document.createElement('script');
@@ -103,7 +121,7 @@ export default {
     }
     return scriptLoadingPromises[url];
   },
-  startOauth2(url, params = {}, silent = false) {
+  async startOauth2(url, params = {}, silent = false) {
     // Build the authorize URL
     const state = utils.uid();
     params.state = state;
@@ -125,69 +143,66 @@ export default {
       }
     }
 
-    return new Promise((resolve, reject) => {
-      let checkClosedInterval;
-      let closeTimeout;
-      let msgHandler;
-      let clean = () => {
-        clearInterval(checkClosedInterval);
-        if (!silent && !wnd.closed) {
-          wnd.close();
+    let checkClosedInterval;
+    let closeTimeout;
+    let msgHandler;
+    try {
+      return await new Promise((resolve, reject) => {
+        if (silent) {
+          iframeElt.onerror = () => {
+            reject(new Error('Unknown error.'));
+          };
+          closeTimeout = setTimeout(() => {
+            isConnectionDown = true;
+            store.commit('setOffline', true);
+            store.commit('updateLastOfflineCheck');
+            reject(new Error('You are offline.'));
+          }, networkTimeout);
+        } else {
+          closeTimeout = setTimeout(() => {
+            reject(new Error('Timeout.'));
+          }, oauth2AuthorizationTimeout);
         }
-        if (iframeElt) {
-          document.body.removeChild(iframeElt);
-        }
-        clearTimeout(closeTimeout);
-        window.removeEventListener('message', msgHandler);
-        clean = () => Promise.resolve(); // Prevent from cleaning several times
-        return Promise.resolve();
-      };
 
-      if (silent) {
-        iframeElt.onerror = () => clean()
-          .then(() => reject(new Error('Unknown error.')));
-        closeTimeout = setTimeout(
-          () => clean()
-            .then(() => {
-              isConnectionDown = true;
-              store.commit('setOffline', true);
-              store.commit('updateLastOfflineCheck');
-              reject(new Error('You are offline.'));
-            }),
-          networkTimeout,
-        );
-      } else {
-        closeTimeout = setTimeout(
-          () => clean()
-            .then(() => reject(new Error('Timeout.'))),
-          oauth2AuthorizationTimeout,
-        );
-      }
-
-      msgHandler = event => event.source === wnd && event.origin === utils.origin && clean()
-        .then(() => {
-          const data = utils.parseQueryParams(`${event.data}`.slice(1));
-          if (data.error || data.state !== state) {
-            console.error(data); // eslint-disable-line no-console
-            reject(new Error('Could not get required authorization.'));
-          } else {
-            resolve({
-              accessToken: data.access_token,
-              code: data.code,
-              idToken: data.id_token,
-              expiresIn: data.expires_in,
-            });
+        msgHandler = (event) => {
+          if (event.source === wnd && event.origin === utils.origin) {
+            const data = utils.parseQueryParams(`${event.data}`.slice(1));
+            if (data.error || data.state !== state) {
+              console.error(data); // eslint-disable-line no-console
+              reject(new Error('Could not get required authorization.'));
+            } else {
+              resolve({
+                accessToken: data.access_token,
+                code: data.code,
+                idToken: data.id_token,
+                expiresIn: data.expires_in,
+              });
+            }
           }
-        });
+        };
 
-      window.addEventListener('message', msgHandler);
-      if (!silent) {
-        checkClosedInterval = setInterval(() => wnd.closed && clean()
-          .then(() => reject(new Error('Authorize window was closed.'))), 250);
+        window.addEventListener('message', msgHandler);
+        if (!silent) {
+          checkClosedInterval = setInterval(() => {
+            if (wnd.closed) {
+              reject(new Error('Authorize window was closed.'));
+            }
+          }, 250);
+        }
+      });
+    } finally {
+      clearInterval(checkClosedInterval);
+      if (!silent && !wnd.closed) {
+        wnd.close();
       }
-    });
+      if (iframeElt) {
+        document.body.removeChild(iframeElt);
+      }
+      clearTimeout(closeTimeout);
+      window.removeEventListener('message', msgHandler);
+    }
   },
-  request(configParam, offlineCheck = false) {
+  async request(configParam, offlineCheck = false) {
     let retryAfter = 500; // 500 ms
     const maxRetryAfter = 10 * 1000; // 10 sec
     const config = Object.assign({}, configParam);
@@ -198,101 +213,84 @@ export default {
       config.headers['Content-Type'] = 'application/json';
     }
 
-    function parseHeaders(xhr) {
-      const pairs = xhr.getAllResponseHeaders().trim().split('\n');
-      return pairs.reduce((headers, header) => {
-        const split = header.trim().split(':');
-        const key = split.shift().trim().toLowerCase();
-        const value = split.join(':').trim();
-        headers[key] = value;
-        return headers;
-      }, {});
-    }
-
-    function isRetriable(err) {
-      if (err.status === 403) {
-        const googleReason = ((((err.body || {}).error || {}).errors || [])[0] || {}).reason;
-        return googleReason === 'rateLimitExceeded' || googleReason === 'userRateLimitExceeded';
-      }
-      return err.status === 429 || (err.status >= 500 && err.status < 600);
-    }
-
-    const attempt =
-      () => new Promise((resolve, reject) => {
-        if (offlineCheck) {
-          store.commit('updateLastOfflineCheck');
-        }
-        const xhr = new window.XMLHttpRequest();
-        xhr.withCredentials = config.withCredentials || false;
-        let timeoutId;
-
-        xhr.onload = () => {
+    const attempt = async () => {
+      try {
+        await new Promise((resolve, reject) => {
           if (offlineCheck) {
-            isConnectionDown = false;
+            store.commit('updateLastOfflineCheck');
           }
-          clearTimeout(timeoutId);
-          const result = {
-            status: xhr.status,
-            headers: parseHeaders(xhr),
-            body: config.blob ? xhr.response : xhr.responseText,
-          };
-          if (!config.raw && !config.blob) {
-            try {
-              result.body = JSON.parse(result.body);
-            } catch (e) {
-              // ignore
+          const xhr = new window.XMLHttpRequest();
+          xhr.withCredentials = config.withCredentials || false;
+          let timeoutId;
+
+          xhr.onload = () => {
+            if (offlineCheck) {
+              isConnectionDown = false;
             }
-          }
-          if (result.status >= 200 && result.status < 300) {
-            resolve(result);
-            return;
-          }
-          reject(result);
-        };
+            clearTimeout(timeoutId);
+            const result = {
+              status: xhr.status,
+              headers: parseHeaders(xhr),
+              body: config.blob ? xhr.response : xhr.responseText,
+            };
+            if (!config.raw && !config.blob) {
+              try {
+                result.body = JSON.parse(result.body);
+              } catch (e) {
+                // ignore
+              }
+            }
+            if (result.status >= 200 && result.status < 300) {
+              resolve(result);
+              return;
+            }
+            reject(result);
+          };
 
-        xhr.onerror = () => {
-          clearTimeout(timeoutId);
-          if (offlineCheck) {
-            isConnectionDown = true;
-            store.commit('setOffline', true);
-            reject(new Error('You are offline.'));
-          } else {
-            reject(new Error('Network request failed.'));
-          }
-        };
+          xhr.onerror = () => {
+            clearTimeout(timeoutId);
+            if (offlineCheck) {
+              isConnectionDown = true;
+              store.commit('setOffline', true);
+              reject(new Error('You are offline.'));
+            } else {
+              reject(new Error('Network request failed.'));
+            }
+          };
 
-        timeoutId = setTimeout(() => {
-          xhr.abort();
-          if (offlineCheck) {
-            isConnectionDown = true;
-            store.commit('setOffline', true);
-            reject(new Error('You are offline.'));
-          } else {
-            reject(new Error('Network request timeout.'));
-          }
-        }, config.timeout);
+          timeoutId = setTimeout(() => {
+            xhr.abort();
+            if (offlineCheck) {
+              isConnectionDown = true;
+              store.commit('setOffline', true);
+              reject(new Error('You are offline.'));
+            } else {
+              reject(new Error('Network request timeout.'));
+            }
+          }, config.timeout);
 
-        const url = utils.addQueryParams(config.url, config.params);
-        xhr.open(config.method || 'GET', url);
-        Object.entries(config.headers).forEach(([key, value]) =>
-          value && xhr.setRequestHeader(key, `${value}`));
-        if (config.blob) {
-          xhr.responseType = 'blob';
-        }
-        xhr.send(config.body || null);
-      })
-        .catch((err) => {
-          // Try again later in case of retriable error
-          if (isRetriable(err) && retryAfter < maxRetryAfter) {
-            return new Promise((resolve) => {
-              setTimeout(resolve, retryAfter);
-              // Exponential backoff
-              retryAfter *= 2;
-            })
-              .then(attempt);
+          const url = utils.addQueryParams(config.url, config.params);
+          xhr.open(config.method || 'GET', url);
+          Object.entries(config.headers).forEach(([key, value]) =>
+            value && xhr.setRequestHeader(key, `${value}`));
+          if (config.blob) {
+            xhr.responseType = 'blob';
           }
-          throw err;
+          xhr.send(config.body || null);
         });
+      } catch (err) {
+        // Try again later in case of retriable error
+        if (isRetriable(err) && retryAfter < maxRetryAfter) {
+          await new Promise((resolve) => {
+            setTimeout(resolve, retryAfter);
+            // Exponential backoff
+            retryAfter *= 2;
+          });
+          attempt();
+        }
+        throw err;
+      }
+    };
 
     return attempt();
   },
diff --git a/src/services/providers/bloggerPageProvider.js b/src/services/providers/bloggerPageProvider.js
index 4b317589..1e4121e3 100644
--- a/src/services/providers/bloggerPageProvider.js
+++ b/src/services/providers/bloggerPageProvider.js
@@ -15,24 +15,21 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.pageId} — ${location.blogUrl} — ${token.name}`;
   },
-  publish(token, html, metadata, publishLocation) {
-    return googleHelper.uploadBlogger(
+  async publish(token, html, metadata, publishLocation) {
+    const page = await googleHelper.uploadBlogger({
       token,
-      publishLocation.blogUrl,
-      publishLocation.blogId,
-      publishLocation.pageId,
-      metadata.title,
-      html,
-      null,
-      null,
-      null,
-      true,
-    )
-      .then(page => ({
-        ...publishLocation,
-        blogId: page.blog.id,
-        pageId: page.id,
-      }));
+      blogUrl: publishLocation.blogUrl,
+      blogId: publishLocation.blogId,
+      postId: publishLocation.pageId,
+      title: metadata.title,
+      content: html,
+      isPage: true,
+    });
+    return {
+      ...publishLocation,
+      blogId: page.blog.id,
+      pageId: page.id,
+    };
   },
   makeLocation(token, blogUrl, pageId) {
     const location = {
diff --git a/src/services/providers/bloggerProvider.js b/src/services/providers/bloggerProvider.js
index df87d688..020ab2b9 100644
--- a/src/services/providers/bloggerProvider.js
+++ b/src/services/providers/bloggerProvider.js
@@ -15,23 +15,21 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.postId} — ${location.blogUrl} — ${token.name}`;
   },
-  publish(token, html, metadata, publishLocation) {
-    return googleHelper.uploadBlogger(
+  async publish(token, html, metadata, publishLocation) {
+    const post = await googleHelper.uploadBlogger({
+      ...publishLocation,
       token,
-      publishLocation.blogUrl,
-      publishLocation.blogId,
-      publishLocation.postId,
-      metadata.title,
-      html,
-      metadata.tags,
-      metadata.status === 'draft',
-      metadata.date,
-    )
-      .then(post => ({
-        ...publishLocation,
-        blogId: post.blog.id,
-        postId: post.id,
-      }));
+      title: metadata.title,
+      content: html,
+      labels: metadata.tags,
+      isDraft: metadata.status === 'draft',
+      published: metadata.date,
+    });
+    return {
+      ...publishLocation,
+      blogId: post.blog.id,
+      postId: post.id,
+    };
   },
   makeLocation(token, blogUrl, postId) {
     const location = {
diff --git a/src/services/providers/common/Provider.js b/src/services/providers/common/Provider.js
index 1dab5605..15684a01 100644
--- a/src/services/providers/common/Provider.js
+++ b/src/services/providers/common/Provider.js
@@ -2,6 +2,7 @@ import providerRegistry from './providerRegistry';
 import emptyContent from '../../../data/emptyContent';
 import utils from '../../utils';
 import store from '../../../store';
+import fileSvc from '../../fileSvc';
 
 const dataExtractor = /<!--stackedit_data:([A-Za-z0-9+/=\s]+)-->$/;
 
@@ -66,6 +67,14 @@ export default class Provider {
     return utils.addItemHash(result);
   }
 
+  static getContentSyncData(fileId) {
+    const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
+    if (!syncData) {
+      throw new Error(); // No need for a proper error message.
+    }
+    return syncData;
+  }
+
   /**
    * Find and open a file with location that meets the criteria
    */
@@ -73,13 +82,13 @@ export default class Provider {
     const location = utils.search(allLocations, criteria);
     if (location) {
       // Found one, open it if it exists
-      const file = store.state.file.itemMap[location.fileId];
-      if (file) {
-        store.commit('file/setCurrentId', file.id);
+      const item = store.state.file.itemMap[location.fileId];
+      if (item) {
+        store.commit('file/setCurrentId', item.id);
         // If file is in the trash, restore it
-        if (file.parentId === 'trash') {
-          store.commit('file/patchItem', {
-            ...file,
+        if (item.parentId === 'trash') {
+          fileSvc.setOrPatchItem({
+            ...item,
             parentId: null,
           });
         }
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index b89b098e..20c3400b 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -3,13 +3,6 @@ import couchdbHelper from './helpers/couchdbHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
 
-const getSyncData = (fileId) => {
-  const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
-  return syncData
-    ? Promise.resolve(syncData)
-    : Promise.reject(); // No need for a proper error message.
-};
-
 let syncLastSeq;
 
 export default new Provider({
@@ -17,7 +10,7 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  initWorkspace() {
+  async initWorkspace() {
     const dbUrl = (utils.queryParams.dbUrl || '').replace(/\/?$/, ''); // Remove trailing /
     const workspaceParams = {
       providerId: this.id,
@@ -35,85 +28,85 @@ export default new Provider({
       });
     }
 
-    return Promise.resolve()
-      .then(() => getWorkspace() || couchdbHelper.getDb(getToken())
-        .then((db) => {
-          store.dispatch('data/patchWorkspaces', {
-            [workspaceId]: {
-              id: workspaceId,
-              name: db.db_name,
-              providerId: this.id,
-              dbUrl,
-            },
-          });
-          return getWorkspace();
-        }, () => {
-          throw new Error(`${dbUrl} is not accessible. Make sure you have the right permissions.`);
-        }))
-      .then((workspace) => {
-        // Fix the URL hash
-        utils.setQueryParams(workspaceParams);
-        if (workspace.url !== window.location.href) {
-          store.dispatch('data/patchWorkspaces', {
-            [workspace.id]: {
-              ...workspace,
-              url: window.location.href,
-            },
-          });
-        }
-        return getWorkspace();
+    // Create the workspace
+    let workspace = getWorkspace();
+    if (!workspace) {
+      // Make sure the database exists and retrieve its name
+      let db;
+      try {
+        db = await couchdbHelper.getDb(getToken());
+      } catch (e) {
+        throw new Error(`${dbUrl} is not accessible. Make sure you have the proper permissions.`);
+      }
+      store.dispatch('data/patchWorkspaces', {
+        [workspaceId]: {
+          id: workspaceId,
+          name: db.db_name,
+          providerId: this.id,
+          dbUrl,
+        },
       });
+      workspace = getWorkspace();
+    }
+
+    // Fix the URL hash
+    utils.setQueryParams(workspaceParams);
+    if (workspace.url !== window.location.href) {
+      store.dispatch('data/patchWorkspaces', {
+        [workspace.id]: {
+          ...workspace,
+          url: window.location.href,
+        },
+      });
+    }
+    return getWorkspace();
   },
-  getChanges() {
+  async getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
     const lastSeq = store.getters['data/localSettings'].syncLastSeq;
-    return couchdbHelper.getChanges(syncToken, lastSeq)
-      .then((result) => {
-        const changes = result.changes.filter((change) => {
-          if (!change.deleted && change.doc) {
-            change.item = change.doc.item;
-            if (!change.item || !change.item.id || !change.item.type) {
-              return false;
-            }
-            // Build sync data
-            change.syncData = {
-              id: change.id,
-              itemId: change.item.id,
-              type: change.item.type,
-              hash: change.item.hash,
-              rev: change.doc._rev, // eslint-disable-line no-underscore-dangle
-            };
-          }
-          change.syncDataId = change.id;
-          return true;
-        });
-        syncLastSeq = result.lastSeq;
-        return changes;
-      });
+    const result = await couchdbHelper.getChanges(syncToken, lastSeq);
+    const changes = result.changes.filter((change) => {
+      if (!change.deleted && change.doc) {
+        change.item = change.doc.item;
+        if (!change.item || !change.item.id || !change.item.type) {
+          return false;
+        }
+        // Build sync data
+        change.syncData = {
+          id: change.id,
+          itemId: change.item.id,
+          type: change.item.type,
+          hash: change.item.hash,
+          rev: change.doc._rev, // eslint-disable-line no-underscore-dangle
+        };
+      }
+      change.syncDataId = change.id;
+      return true;
+    });
+    syncLastSeq = result.lastSeq;
+    return changes;
   },
   onChangesApplied() {
     store.dispatch('data/patchLocalSettings', {
       syncLastSeq,
     });
   },
-  saveSimpleItem(item, syncData) {
+  async saveSimpleItem(item, syncData) {
     const syncToken = store.getters['workspace/syncToken'];
-    return couchdbHelper.uploadDocument(
-      syncToken,
+    const { id, rev } = couchdbHelper.uploadDocument({
+      token: syncToken,
       item,
-      undefined,
-      undefined,
-      syncData && syncData.id,
-      syncData && syncData.rev,
-    )
-      .then(res => ({
-        // Build sync data
-        id: res.id,
-        itemId: item.id,
-        type: item.type,
-        hash: item.hash,
-        rev: res.rev,
-      }));
+      documentId: syncData && syncData.id,
+      rev: syncData && syncData.rev,
+    });
+    return {
+      // Build sync data
+      id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+      rev,
+    };
   },
   removeItem(syncData) {
     const syncToken = store.getters['workspace/syncToken'];
@@ -122,65 +115,61 @@ export default new Provider({
   downloadContent(token, syncLocation) {
     return this.downloadData(`${syncLocation.fileId}/content`);
   },
-  downloadData(dataId) {
+  async downloadData(dataId) {
     const syncData = store.getters['data/syncDataByItemId'][dataId];
     if (!syncData) {
       return Promise.resolve();
     }
     const syncToken = store.getters['workspace/syncToken'];
-    return couchdbHelper.retrieveDocumentWithAttachments(syncToken, syncData.id)
-      .then((body) => {
-        let item;
-        if (body.item.type === 'content') {
-          item = Provider.parseContent(body.attachments.data, body.item.id);
-        } else {
-          item = utils.addItemHash(JSON.parse(body.attachments.data));
-        }
-        const rev = body._rev; // eslint-disable-line no-underscore-dangle
-        if (item.hash !== syncData.hash || rev !== syncData.rev) {
-          store.dispatch('data/patchSyncData', {
-            [syncData.id]: {
-              ...syncData,
-              hash: item.hash,
-              rev,
-            },
-          });
-        }
-        return item;
-      });
-  },
-  uploadContent(token, content, syncLocation) {
-    return this.uploadData(content)
-      .then(() => syncLocation);
-  },
-  uploadData(item) {
-    const syncData = store.getters['data/syncDataByItemId'][item.id];
-    if (syncData && syncData.hash === item.hash) {
-      return Promise.resolve();
-    }
-    let data;
-    let dataType;
-    if (item.type === 'content') {
-      data = Provider.serializeContent(item);
-      dataType = 'text/plain';
+    const body = await couchdbHelper.retrieveDocumentWithAttachments(syncToken, syncData.id);
+    let item;
+    if (body.item.type === 'content') {
+      item = Provider.parseContent(body.attachments.data, body.item.id);
     } else {
-      data = JSON.stringify(item);
-      dataType = 'application/json';
+      item = utils.addItemHash(JSON.parse(body.attachments.data));
     }
-    const syncToken = store.getters['workspace/syncToken'];
-    return couchdbHelper.uploadDocument(
-      syncToken,
-      {
-        id: item.id,
-        type: item.type,
-        hash: item.hash,
-      },
-      data,
-      dataType,
-      syncData && syncData.id,
-      syncData && syncData.rev,
-    )
-      .then(res => store.dispatch('data/patchSyncData', {
+    const rev = body._rev; // eslint-disable-line no-underscore-dangle
+    if (item.hash !== syncData.hash || rev !== syncData.rev) {
+      store.dispatch('data/patchSyncData', {
+        [syncData.id]: {
+          ...syncData,
+          hash: item.hash,
+          rev,
+        },
+      });
+    }
+    return item;
+  },
+  async uploadContent(token, content, syncLocation) {
+    await this.uploadData(content);
+    return syncLocation;
+  },
+  async uploadData(item) {
+    const syncData = store.getters['data/syncDataByItemId'][item.id];
+    if (!syncData || syncData.hash !== item.hash) {
+      let data;
+      let dataType;
+      if (item.type === 'content') {
+        data = Provider.serializeContent(item);
+        dataType = 'text/plain';
+      } else {
+        data = JSON.stringify(item);
+        dataType = 'application/json';
+      }
+      const syncToken = store.getters['workspace/syncToken'];
+      const res = await couchdbHelper.uploadDocument({
+        token: syncToken,
+        item: {
+          id: item.id,
+          type: item.type,
+          hash: item.hash,
+        },
+        data,
+        dataType,
+        documentId: syncData && syncData.id,
+        rev: syncData && syncData.rev,
+      });
+      store.dispatch('data/patchSyncData', {
         [res.id]: {
           // Build sync data
           id: res.id,
@@ -189,37 +178,34 @@ export default new Provider({
           hash: item.hash,
           rev: res.rev,
         },
-      }));
+      });
+    }
   },
-  listRevisions(token, fileId) {
-    return getSyncData(fileId)
-      .then(syncData => couchdbHelper.retrieveDocumentWithRevisions(token, syncData.id))
-      .then((body) => {
-        const revisions = [];
-        body._revs_info.forEach((revInfo) => { // eslint-disable-line no-underscore-dangle
-          if (revInfo.status === 'available') {
-            revisions.push({
-              id: revInfo.rev,
-              sub: null,
-              created: null,
-            });
-          }
+  async listRevisions(token, fileId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const body = await couchdbHelper.retrieveDocumentWithRevisions(token, syncData.id);
+    const revisions = [];
+    body._revs_info.forEach((revInfo) => { // eslint-disable-line no-underscore-dangle
+      if (revInfo.status === 'available') {
+        revisions.push({
+          id: revInfo.rev,
+          sub: null,
+          created: null,
         });
-        return revisions;
-      });
+      }
+    });
+    return revisions;
   },
-  loadRevision(token, fileId, revision) {
-    return getSyncData(fileId)
-      .then(syncData => couchdbHelper.retrieveDocument(token, syncData.id, revision.id))
-      .then((body) => {
-        revision.sub = body.sub;
-        revision.created = body.time || 1; // Has to be truthy to prevent from loading several times
-      });
+  async loadRevision(token, fileId, revision) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const body = await couchdbHelper.retrieveDocument(token, syncData.id, revision.id);
+    revision.sub = body.sub;
+    revision.created = body.time || 1; // Has to be truthy to prevent from loading several times
   },
-  getRevisionContent(token, fileId, revisionId) {
-    return getSyncData(fileId)
-      .then(syncData => couchdbHelper
-        .retrieveDocumentWithAttachments(token, syncData.id, revisionId))
-      .then(body => Provider.parseContent(body.attachments.data, body.item.id));
+  async getRevisionContent(token, fileId, revisionId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const body = await couchdbHelper
+      .retrieveDocumentWithAttachments(token, syncData.id, revisionId);
+    return Provider.parseContent(body.attachments.data, body.item.id);
   },
 });
diff --git a/src/services/providers/dropboxProvider.js b/src/services/providers/dropboxProvider.js
index f386fddd..c47a829e 100644
--- a/src/services/providers/dropboxProvider.js
+++ b/src/services/providers/dropboxProvider.js
@@ -34,94 +34,88 @@ export default new Provider({
   checkPath(path) {
     return path && path.match(/^\/[^\\<>:"|?*]+$/);
   },
-  downloadContent(token, syncLocation) {
-    return dropboxHelper.downloadFile(
+  async downloadContent(token, syncLocation) {
+    const { content } = await dropboxHelper.downloadFile({
       token,
-      makePathRelative(token, syncLocation.path),
-      syncLocation.dropboxFileId,
-    )
-      .then(({ content }) => Provider.parseContent(content, `${syncLocation.fileId}/content`));
+      path: makePathRelative(token, syncLocation.path),
+      fileId: syncLocation.dropboxFileId,
+    });
+    return Provider.parseContent(content, `${syncLocation.fileId}/content`);
   },
-  uploadContent(token, content, syncLocation) {
-    return dropboxHelper.uploadFile(
+  async uploadContent(token, content, syncLocation) {
+    const dropboxFile = await dropboxHelper.uploadFile({
       token,
-      makePathRelative(token, syncLocation.path),
-      Provider.serializeContent(content),
-      syncLocation.dropboxFileId,
-    )
-      .then(dropboxFile => ({
-        ...syncLocation,
-        path: makePathAbsolute(token, dropboxFile.path_display),
-        dropboxFileId: dropboxFile.id,
-      }));
+      path: makePathRelative(token, syncLocation.path),
+      content: Provider.serializeContent(content),
+      fileId: syncLocation.dropboxFileId,
+    });
+    return {
+      ...syncLocation,
+      path: makePathAbsolute(token, dropboxFile.path_display),
+      dropboxFileId: dropboxFile.id,
+    };
   },
-  publish(token, html, metadata, publishLocation) {
-    return dropboxHelper.uploadFile(
+  async publish(token, html, metadata, publishLocation) {
+    const dropboxFile = await dropboxHelper.uploadFile({
       token,
-      publishLocation.path,
-      html,
-      publishLocation.dropboxFileId,
-    )
-      .then(dropboxFile => ({
-        ...publishLocation,
-        path: makePathAbsolute(token, dropboxFile.path_display),
-        dropboxFileId: dropboxFile.id,
-      }));
+      path: publishLocation.path,
+      content: html,
+      fileId: publishLocation.dropboxFileId,
+    });
+    return {
+      ...publishLocation,
+      path: makePathAbsolute(token, dropboxFile.path_display),
+      dropboxFileId: dropboxFile.id,
+    };
   },
-  openFiles(token, paths) {
-    const openOneFile = () => {
-      const path = paths.pop();
-      if (!path) {
-        return null;
-      }
-      if (Provider.openFileWithLocation(store.getters['syncLocation/items'], {
+  async openFiles(token, paths) {
+    await utils.awaitSequence(paths, async (path) => {
+      // Check if the file exists and open it
+      if (!Provider.openFileWithLocation(store.getters['syncLocation/items'], {
         providerId: this.id,
         path,
       })) {
-        // File exists and has just been opened. Next...
-        return openOneFile();
-      }
-      // Download content from Dropbox and create the file
-      const syncLocation = {
-        path,
-        providerId: this.id,
-        sub: token.sub,
-      };
-      return this.downloadContent(token, syncLocation)
-        .then((content) => {
-          let name = path;
-          const slashPos = name.lastIndexOf('/');
-          if (slashPos > -1 && slashPos < name.length - 1) {
-            name = name.slice(slashPos + 1);
-          }
-          const dotPos = name.lastIndexOf('.');
-          if (dotPos > 0 && slashPos < name.length) {
-            name = name.slice(0, dotPos);
-          }
-          return fileSvc.createFile({
-            name,
-            parentId: store.getters['file/current'].parentId,
-            text: content.text,
-            properties: content.properties,
-            discussions: content.discussions,
-            comments: content.comments,
-          }, true);
-        })
-        .then((item) => {
-          store.commit('file/setCurrentId', item.id);
-          store.commit('syncLocation/setItem', {
-            ...syncLocation,
-            id: utils.uid(),
-            fileId: item.id,
-          });
-          store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Dropbox.`);
-        })
-        .catch(() => {
+        // Download content from Dropbox
+        const syncLocation = {
+          path,
+          providerId: this.id,
+          sub: token.sub,
+        };
+        let content;
+        try {
+          content = await this.downloadContent(token, syncLocation);
+        } catch (e) {
           store.dispatch('notification/error', `Could not open file ${path}.`);
-        })
-        .then(() => openOneFile());
-    };
-    return Promise.resolve(openOneFile());
+          return;
+        }
+
+        // Create the file
+        let name = path;
+        const slashPos = name.lastIndexOf('/');
+        if (slashPos > -1 && slashPos < name.length - 1) {
+          name = name.slice(slashPos + 1);
+        }
+        const dotPos = name.lastIndexOf('.');
+        if (dotPos > 0 && slashPos < name.length) {
+          name = name.slice(0, dotPos);
+        }
+        const item = await fileSvc.createFile({
+          name,
+          parentId: store.getters['file/current'].parentId,
+          text: content.text,
+          properties: content.properties,
+          discussions: content.discussions,
+          comments: content.comments,
+        }, true);
+        store.commit('file/setCurrentId', item.id);
+        store.commit('syncLocation/setItem', {
+          ...syncLocation,
+          id: utils.uid(),
+          fileId: item.id,
+        });
+        store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Dropbox.`);
+      }
+    });
   },
   makeLocation(token, path) {
     return {
diff --git a/src/services/providers/gistProvider.js b/src/services/providers/gistProvider.js
index eef09bab..762fb4cb 100644
--- a/src/services/providers/gistProvider.js
+++ b/src/services/providers/gistProvider.js
@@ -15,39 +15,38 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.filename} — ${location.gistId} — ${token.name}`;
   },
-  downloadContent(token, syncLocation) {
-    return githubHelper.downloadGist(token, syncLocation.gistId, syncLocation.filename)
-      .then(content => Provider.parseContent(content, `${syncLocation.fileId}/content`));
+  async downloadContent(token, syncLocation) {
+    const content = await githubHelper.downloadGist({
+      ...syncLocation,
+      token,
+    });
+    return Provider.parseContent(content, `${syncLocation.fileId}/content`);
   },
-  uploadContent(token, content, syncLocation) {
+  async uploadContent(token, content, syncLocation) {
     const file = store.state.file.itemMap[syncLocation.fileId];
     const description = utils.sanitizeName(file && file.name);
-    return githubHelper.uploadGist(
+    const gist = await githubHelper.uploadGist({
+      ...syncLocation,
       token,
       description,
-      syncLocation.filename,
-      Provider.serializeContent(content),
-      syncLocation.isPublic,
-      syncLocation.gistId,
-    )
-      .then(gist => ({
-        ...syncLocation,
-        gistId: gist.id,
-      }));
+      content: Provider.serializeContent(content),
+    });
+    return {
+      ...syncLocation,
+      gistId: gist.id,
+    };
   },
-  publish(token, html, metadata, publishLocation) {
-    return githubHelper.uploadGist(
+  async publish(token, html, metadata, publishLocation) {
+    const gist = await githubHelper.uploadGist({
+      ...publishLocation,
       token,
-      metadata.title,
-      publishLocation.filename,
-      html,
-      publishLocation.isPublic,
-      publishLocation.gistId,
-    )
-      .then(gist => ({
-        ...publishLocation,
-        gistId: gist.id,
-      }));
+      description: metadata.title,
+      content: html,
+    });
+    return {
+      ...publishLocation,
+      gistId: gist.id,
+    };
   },
   makeLocation(token, filename, isPublic, gistId) {
     return {
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index a88c5165..63d5bf13 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -18,99 +18,83 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.path} — ${location.owner}/${location.repo} — ${token.name}`;
   },
-  downloadContent(token, syncLocation) {
-    return githubHelper.downloadFile(
-      token,
-      syncLocation.owner,
-      syncLocation.repo,
-      syncLocation.branch,
-      syncLocation.path,
-    )
-      .then(({ sha, content }) => {
-        savedSha[syncLocation.id] = sha;
-        return Provider.parseContent(content, `${syncLocation.fileId}/content`);
-      })
-      .catch(() => null); // Ignore error, upload is going to fail anyway
-  },
-  uploadContent(token, content, syncLocation) {
-    let result = Promise.resolve();
-    if (!savedSha[syncLocation.id]) {
-      result = this.downloadContent(token, syncLocation); // Get the last sha
-    }
-    return result
-      .then(() => {
-        const sha = savedSha[syncLocation.id];
-        delete savedSha[syncLocation.id];
-        return githubHelper.uploadFile(
-          token,
-          syncLocation.owner,
-          syncLocation.repo,
-          syncLocation.branch,
-          syncLocation.path,
-          Provider.serializeContent(content),
-          sha,
-        );
-      })
-      .then(() => syncLocation);
-  },
-  publish(token, html, metadata, publishLocation) {
-    return this.downloadContent(token, publishLocation) // Get the last sha
-      .then(() => {
-        const sha = savedSha[publishLocation.id];
-        delete savedSha[publishLocation.id];
-        return githubHelper.uploadFile(
-          token,
-          publishLocation.owner,
-          publishLocation.repo,
-          publishLocation.branch,
-          publishLocation.path,
-          html,
-          sha,
-        );
-      })
-      .then(() => publishLocation);
-  },
-  openFile(token, syncLocation) {
-    return Promise.resolve()
-      .then(() => {
-        if (Provider.openFileWithLocation(store.getters['syncLocation/items'], syncLocation)) {
-          // File exists and has just been opened. Next...
-          return null;
-        }
-        // Download content from GitHub and create the file
-        return this.downloadContent(token, syncLocation)
-          .then((content) => {
-            let name = syncLocation.path;
-            const slashPos = name.lastIndexOf('/');
-            if (slashPos > -1 && slashPos < name.length - 1) {
-              name = name.slice(slashPos + 1);
-            }
-            const dotPos = name.lastIndexOf('.');
-            if (dotPos > 0 && slashPos < name.length) {
-              name = name.slice(0, dotPos);
-            }
-            return fileSvc.createFile({
-              name,
-              parentId: store.getters['file/current'].parentId,
-              text: content.text,
-              properties: content.properties,
-              discussions: content.discussions,
-              comments: content.comments,
-            }, true);
-          })
-          .then((item) => {
-            store.commit('file/setCurrentId', item.id);
-            store.commit('syncLocation/setItem', {
-              ...syncLocation,
-              id: utils.uid(),
-              fileId: item.id,
-            });
-            store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from GitHub.`);
-          })
-          .catch(() => {
-            store.dispatch('notification/error', `Could not open file ${syncLocation.path}.`);
-          });
+  async downloadContent(token, syncLocation) {
+    try {
+      const { sha, content } = await githubHelper.downloadFile({
+        ...syncLocation,
+        token,
       });
+      savedSha[syncLocation.id] = sha;
+      return Provider.parseContent(content, `${syncLocation.fileId}/content`);
+    } catch (e) {
+      // Ignore error, upload is going to fail anyway
+      return null;
+    }
+  },
+  async uploadContent(token, content, syncLocation) {
+    if (!savedSha[syncLocation.id]) {
+      await this.downloadContent(token, syncLocation); // Get the last sha
+    }
+    const sha = savedSha[syncLocation.id];
+    delete savedSha[syncLocation.id];
+    await githubHelper.uploadFile({
+      ...syncLocation,
+      token,
+      content: Provider.serializeContent(content),
+      sha,
+    });
+    return syncLocation;
+  },
+  async publish(token, html, metadata, publishLocation) {
+    await this.downloadContent(token, publishLocation); // Get the last sha
+    const sha = savedSha[publishLocation.id];
+    delete savedSha[publishLocation.id];
+    await githubHelper.uploadFile({
+      ...publishLocation,
+      token,
+      content: html,
+      sha,
+    });
+    return publishLocation;
+  },
+  async openFile(token, syncLocation) {
+    // Check if the file exists and open it
+    if (!Provider.openFileWithLocation(store.getters['syncLocation/items'], syncLocation)) {
+      // Download content from GitHub
+      let content;
+      try {
+        content = await this.downloadContent(token, syncLocation);
+      } catch (e) {
+        store.dispatch('notification/error', `Could not open file ${syncLocation.path}.`);
+        return;
+      }
+
+      // Create the file
+      let name = syncLocation.path;
+      const slashPos = name.lastIndexOf('/');
+      if (slashPos > -1 && slashPos < name.length - 1) {
+        name = name.slice(slashPos + 1);
+      }
+      const dotPos = name.lastIndexOf('.');
+      if (dotPos > 0 && slashPos < name.length) {
+        name = name.slice(0, dotPos);
+      }
+      const item = await fileSvc.createFile({
+        name,
+        parentId: store.getters['file/current'].parentId,
+        text: content.text,
+        properties: content.properties,
+        discussions: content.discussions,
+        comments: content.comments,
+      }, true);
+      store.commit('file/setCurrentId', item.id);
+      store.commit('syncLocation/setItem', {
+        ...syncLocation,
+        id: utils.uid(),
+        fileId: item.id,
+      });
+      store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from GitHub.`);
+    }
   },
   parseRepoUrl(url) {
     const parsedRepo = url && url.match(/([^/:]+)\/([^/]+?)(?:\.git|\/)?$/);
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 898fb85d..b57ed3c1 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -4,15 +4,8 @@ import Provider from './common/Provider';
 import utils from '../utils';
 import userSvc from '../userSvc';
 
-const getSyncData = (fileId) => {
-  const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
-  return syncData
-    ? Promise.resolve(syncData)
-    : Promise.reject(); // No need for a proper error message.
-};
-
 const getAbsolutePath = syncData =>
-  (store.getters['workspace/currentWorkspace'].path || '') + syncData.id;
+  `${store.getters['workspace/currentWorkspace'].path || ''}${syncData.id}`;
 
 const getWorkspaceWithOwner = () => {
   const workspace = store.getters['workspace/currentWorkspace'];
@@ -38,7 +31,7 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  initWorkspace() {
+  async initWorkspace() {
     const [owner, repo] = (utils.queryParams.repo || '').split('/');
     const { branch } = utils.queryParams;
     const workspaceParams = {
@@ -55,409 +48,390 @@ export default new Provider({
     const workspaceId = utils.makeWorkspaceId(workspaceParams);
     let workspace = store.getters['data/sanitizedWorkspaces'][workspaceId];
 
-    return Promise.resolve()
-      .then(() => {
-        // See if we already have a token
-        if (workspace) {
-          // Token sub is in the workspace
-          const token = store.getters['data/githubTokens'][workspace.sub];
-          if (token) {
-            return token;
-          }
-        }
-        // If no token has been found, popup an authorize window and get one
-        return store.dispatch('modal/open', {
-          type: 'githubAccount',
-          onResolve: () => githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess),
-        });
-      })
-      .then((token) => {
-        if (!workspace) {
-          const pathEntries = (path || '').split('/');
-          const name = pathEntries[pathEntries.length - 2] || repo; // path ends with `/`
-          workspace = {
-            ...workspaceParams,
-            id: workspaceId,
-            sub: token.sub,
-            name,
-          };
-        }
-        // Fix the URL hash
-        utils.setQueryParams(workspaceParams);
-        if (workspace.url !== window.location.href) {
-          store.dispatch('data/patchWorkspaces', {
-            [workspaceId]: {
-              ...workspace,
-              url: window.location.href,
-            },
-          });
-        }
-        return store.getters['data/sanitizedWorkspaces'][workspaceId];
+    // See if we already have a token
+    let token;
+    if (workspace) {
+      // Token sub is in the workspace
+      token = store.getters['data/githubTokens'][workspace.sub];
+    }
+    if (!token) {
+      await store.dispatch('modal/open', { type: 'githubAccount' });
+      token = await githubHelper.addAccount(store.getters['data/localSettings'].githubRepoFullAccess);
+    }
+
+    if (!workspace) {
+      const pathEntries = (path || '').split('/');
+      const name = pathEntries[pathEntries.length - 2] || repo; // path ends with `/`
+      workspace = {
+        ...workspaceParams,
+        id: workspaceId,
+        sub: token.sub,
+        name,
+      };
+    }
+
+    // Fix the URL hash
+    utils.setQueryParams(workspaceParams);
+    if (workspace.url !== window.location.href) {
+      store.dispatch('data/patchWorkspaces', {
+        [workspaceId]: {
+          ...workspace,
+          url: window.location.href,
+        },
       });
+    }
+    return store.getters['data/sanitizedWorkspaces'][workspaceId];
   },
-  getChanges() {
+  async getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
     const { owner, repo, branch } = getWorkspaceWithOwner();
-    return githubHelper.getHeadTree(syncToken, owner, repo, branch)
-      .then((tree) => {
-        const workspacePath = store.getters['workspace/currentWorkspace'].path || '';
-        const syncDataByPath = store.getters['data/syncData'];
-        const syncDataByItemId = store.getters['data/syncDataByItemId'];
+    const tree = await githubHelper.getTree({
+      token: syncToken,
+      owner,
+      repo,
+      branch,
+    });
+    const workspacePath = store.getters['workspace/currentWorkspace'].path || '';
+    const syncDataByPath = store.getters['data/syncData'];
+    const syncDataByItemId = store.getters['data/syncDataByItemId'];
 
-        // Store all blobs sha
-        treeShaMap = Object.create(null);
-        // Store interesting paths
-        treeFolderMap = Object.create(null);
-        treeFileMap = Object.create(null);
-        treeDataMap = Object.create(null);
-        treeSyncLocationMap = Object.create(null);
-        treePublishLocationMap = Object.create(null);
+    // Store all blobs sha
+    treeShaMap = Object.create(null);
+    // Store interesting paths
+    treeFolderMap = Object.create(null);
+    treeFileMap = Object.create(null);
+    treeDataMap = Object.create(null);
+    treeSyncLocationMap = Object.create(null);
+    treePublishLocationMap = Object.create(null);
 
-        tree.filter(({ type, path }) => type === 'blob' && path.indexOf(workspacePath) === 0)
-          .forEach((blobEntry) => {
-            // Make path relative
-            const path = blobEntry.path.slice(workspacePath.length);
-            // Collect blob sha
-            treeShaMap[path] = blobEntry.sha;
-            // Collect parents path
-            let parentPath = '';
-            path.split('/').slice(0, -1).forEach((folderName) => {
-              const folderPath = `${parentPath}${folderName}/`;
-              treeFolderMap[folderPath] = parentPath;
-              parentPath = folderPath;
-            });
-            // Collect file path
-            if (path.indexOf('.stackedit-data/') === 0) {
-              treeDataMap[path] = true;
-            } else if (endsWith(path, '.md')) {
-              treeFileMap[path] = parentPath;
-            } else if (endsWith(path, '.sync')) {
-              treeSyncLocationMap[path] = true;
-            } else if (endsWith(path, '.publish')) {
-              treePublishLocationMap[path] = true;
-            }
-          });
-
-        // Collect changes
-        const changes = [];
-        const pathIds = {};
-        const syncDataToIgnore = Object.create(null);
-        const getId = (path) => {
-          const syncData = syncDataByPath[path];
-          const id = syncData ? syncData.itemId : utils.uid();
-          pathIds[path] = id;
-          return id;
-        };
-
-        // Folder creations/updates
-        // Assume map entries are sorted from top to bottom
-        Object.entries(treeFolderMap).forEach(([path, parentPath]) => {
-          const id = getId(path);
-          const item = utils.addItemHash({
-            id,
-            type: 'folder',
-            name: path.slice(parentPath.length, -1),
-            parentId: pathIds[parentPath] || null,
-          });
-          changes.push({
-            syncDataId: path,
-            item,
-            syncData: {
-              id: path,
-              itemId: id,
-              type: item.type,
-              hash: item.hash,
-            },
-          });
+    tree.filter(({ type, path }) => type === 'blob' && path.indexOf(workspacePath) === 0)
+      .forEach((blobEntry) => {
+        // Make path relative
+        const path = blobEntry.path.slice(workspacePath.length);
+        // Collect blob sha
+        treeShaMap[path] = blobEntry.sha;
+        // Collect parents path
+        let parentPath = '';
+        path.split('/').slice(0, -1).forEach((folderName) => {
+          const folderPath = `${parentPath}${folderName}/`;
+          treeFolderMap[folderPath] = parentPath;
+          parentPath = folderPath;
         });
-
-        // File creations/updates
-        Object.entries(treeFileMap).forEach(([path, parentPath]) => {
-          const id = getId(path);
-          const item = utils.addItemHash({
-            id,
-            type: 'file',
-            name: path.slice(parentPath.length, -'.md'.length),
-            parentId: pathIds[parentPath] || null,
-          });
-          changes.push({
-            syncDataId: path,
-            item,
-            syncData: {
-              id: path,
-              itemId: id,
-              type: item.type,
-              hash: item.hash,
-            },
-          });
-
-          // Content creations/updates
-          const contentSyncData = syncDataByItemId[`${id}/content`];
-          if (contentSyncData) {
-            syncDataToIgnore[contentSyncData.id] = true;
-          }
-          if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
-            // Use `/` as a prefix to get a unique syncData id
-            changes.push({
-              syncDataId: `/${path}`,
-              item: {
-                id: `${id}/content`,
-                type: 'content',
-                // Need a truthy value to force saving sync data
-                hash: 1,
-              },
-              syncData: {
-                id: `/${path}`,
-                itemId: `${id}/content`,
-                type: 'content',
-                // Need a truthy value to force downloading the content
-                hash: 1,
-              },
-            });
-          }
-        });
-
-        // Data creations/updates
-        Object.keys(treeDataMap).forEach((path) => {
-          try {
-            const [, id] = path.match(/^\.stackedit-data\/([\s\S]+)\.json$/);
-            pathIds[path] = id;
-            const syncData = syncDataByItemId[id];
-            if (syncData) {
-              syncDataToIgnore[syncData.id] = true;
-            }
-            if (!syncData || syncData.sha !== treeShaMap[path]) {
-              changes.push({
-                syncDataId: path,
-                item: {
-                  id,
-                  type: 'data',
-                  // Need a truthy value to force saving sync data
-                  hash: 1,
-                },
-                syncData: {
-                  id: path,
-                  itemId: id,
-                  type: 'data',
-                  // Need a truthy value to force downloading the content
-                  hash: 1,
-                },
-              });
-            }
-          } catch (e) {
-            // Ignore parsing errors
-          }
-        });
-
-        // Location creations/updates
-        [{
-          type: 'syncLocation',
-          map: treeSyncLocationMap,
-          pathMatcher: /^([\s\S]+)\.([\w-]+)\.sync$/,
-        }, {
-          type: 'publishLocation',
-          map: treePublishLocationMap,
-          pathMatcher: /^([\s\S]+)\.([\w-]+)\.publish$/,
-        }]
-          .forEach(({ type, map, pathMatcher }) => Object.keys(map).forEach((path) => {
-            try {
-              const [, filePath, data] = path.match(pathMatcher);
-              // If there is a corresponding md file in the tree
-              const fileId = pathIds[`${filePath}.md`];
-              if (fileId) {
-                const id = getId(path);
-                const item = utils.addItemHash({
-                  ...JSON.parse(utils.decodeBase64(data)),
-                  id,
-                  type,
-                  fileId,
-                });
-                changes.push({
-                  syncDataId: path,
-                  item,
-                  syncData: {
-                    id: path,
-                    itemId: id,
-                    type: item.type,
-                    hash: item.hash,
-                  },
-                });
-              }
-            } catch (e) {
-              // Ignore parsing errors
-            }
-          }));
-
-        // Deletions
-        Object.keys(syncDataByPath).forEach((path) => {
-          if (!pathIds[path] && !syncDataToIgnore[path]) {
-            changes.push({ syncDataId: path });
-          }
-        });
-
-        return changes;
+        // Collect file path
+        if (path.indexOf('.stackedit-data/') === 0) {
+          treeDataMap[path] = true;
+        } else if (endsWith(path, '.md')) {
+          treeFileMap[path] = parentPath;
+        } else if (endsWith(path, '.sync')) {
+          treeSyncLocationMap[path] = true;
+        } else if (endsWith(path, '.publish')) {
+          treePublishLocationMap[path] = true;
+        }
       });
-  },
-  saveSimpleItem(item) {
-    const path = store.getters.itemPaths[item.fileId || item.id];
-    return Promise.resolve()
-      .then(() => {
-        const syncToken = store.getters['workspace/syncToken'];
-        const { owner, repo, branch } = getWorkspaceWithOwner();
-        const syncData = {
-          itemId: item.id,
+
+    // Collect changes
+    const changes = [];
+    const pathIds = {};
+    const syncDataToIgnore = Object.create(null);
+    const getId = (path) => {
+      const syncData = syncDataByPath[path];
+      const id = syncData ? syncData.itemId : utils.uid();
+      pathIds[path] = id;
+      return id;
+    };
+
+    // Folder creations/updates
+    // Assume map entries are sorted from top to bottom
+    Object.entries(treeFolderMap).forEach(([path, parentPath]) => {
+      const id = getId(path);
+      const item = utils.addItemHash({
+        id,
+        type: 'folder',
+        name: path.slice(parentPath.length, -1),
+        parentId: pathIds[parentPath] || null,
+      });
+      changes.push({
+        syncDataId: path,
+        item,
+        syncData: {
+          id: path,
+          itemId: id,
           type: item.type,
           hash: item.hash,
-        };
+        },
+      });
+    });
 
-        if (item.type === 'file') {
-          syncData.id = `${path}.md`;
-        } else if (item.type === 'folder') {
-          syncData.id = path;
-        }
-        if (syncData.id) {
-          return syncData;
-        }
+    // File creations/updates
+    Object.entries(treeFileMap).forEach(([path, parentPath]) => {
+      const id = getId(path);
+      const item = utils.addItemHash({
+        id,
+        type: 'file',
+        name: path.slice(parentPath.length, -'.md'.length),
+        parentId: pathIds[parentPath] || null,
+      });
+      changes.push({
+        syncDataId: path,
+        item,
+        syncData: {
+          id: path,
+          itemId: id,
+          type: item.type,
+          hash: item.hash,
+        },
+      });
 
-        // locations are stored as paths, so we upload an empty file
-        const data = utils.encodeBase64(utils.serializeObject({
-          ...item,
-          id: undefined,
-          type: undefined,
-          fileId: undefined,
-        }), true);
-        const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
-        syncData.id = `${path}.${data}.${extension}`;
-        return githubHelper.uploadFile(
-          syncToken,
-          owner,
-          repo,
-          branch,
-          getAbsolutePath(syncData),
-          '',
-          treeShaMap[syncData.id],
-        ).then(() => syncData);
-      });
-  },
-  removeItem(syncData) {
-    // Ignore content deletion
-    if (syncData.type === 'content') {
-      return Promise.resolve();
-    }
-    const syncToken = store.getters['workspace/syncToken'];
-    const { owner, repo, branch } = getWorkspaceWithOwner();
-    return githubHelper.removeFile(
-      syncToken,
-      owner,
-      repo,
-      branch,
-      getAbsolutePath(syncData),
-      treeShaMap[syncData.id],
-    );
-  },
-  downloadContent(token, syncLocation) {
-    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (!syncData || !contentSyncData) {
-      return Promise.resolve();
-    }
-    const { owner, repo, branch } = getWorkspaceWithOwner();
-    return githubHelper.downloadFile(token, owner, repo, branch, getAbsolutePath(syncData))
-      .then(({ sha, content }) => {
-        const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
-        if (item.hash !== contentSyncData.hash) {
-          store.dispatch('data/patchSyncData', {
-            [contentSyncData.id]: {
-              ...contentSyncData,
-              hash: item.hash,
-              sha,
-            },
-          });
-        }
-        return item;
-      });
-  },
-  downloadData(dataId) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
-    if (!syncData) {
-      return Promise.resolve();
-    }
-    const syncToken = store.getters['workspace/syncToken'];
-    const { owner, repo, branch } = getWorkspaceWithOwner();
-    return githubHelper.downloadFile(syncToken, owner, repo, branch, getAbsolutePath(syncData))
-      .then(({ sha, content }) => {
-        const item = JSON.parse(content);
-        if (item.hash !== syncData.hash) {
-          store.dispatch('data/patchSyncData', {
-            [syncData.id]: {
-              ...syncData,
-              hash: item.hash,
-              sha,
-            },
-          });
-        }
-        return item;
-      });
-  },
-  uploadContent(token, content, syncLocation) {
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (contentSyncData && contentSyncData.hash === content.hash) {
-      return Promise.resolve(syncLocation);
-    }
-    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
-    const { owner, repo, branch } = getWorkspaceWithOwner();
-    return githubHelper.uploadFile(
-      token,
-      owner,
-      repo,
-      branch,
-      getAbsolutePath(syncData),
-      Provider.serializeContent(content),
-      treeShaMap[syncData.id],
-    )
-      .then((res) => {
-        const id = `/${syncData.id}`;
-        store.dispatch('data/patchSyncData', {
-          [id]: {
-            // Build sync data
-            id,
-            itemId: content.id,
-            type: content.type,
-            hash: content.hash,
-            sha: res.content.sha,
+      // Content creations/updates
+      const contentSyncData = syncDataByItemId[`${id}/content`];
+      if (contentSyncData) {
+        syncDataToIgnore[contentSyncData.id] = true;
+      }
+      if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
+        // Use `/` as a prefix to get a unique syncData id
+        changes.push({
+          syncDataId: `/${path}`,
+          item: {
+            id: `${id}/content`,
+            type: 'content',
+            // Need a truthy value to force saving sync data
+            hash: 1,
+          },
+          syncData: {
+            id: `/${path}`,
+            itemId: `${id}/content`,
+            type: 'content',
+            // Need a truthy value to force downloading the content
+            hash: 1,
           },
         });
-        return syncLocation;
-      });
+      }
+    });
+
+    // Data creations/updates
+    Object.keys(treeDataMap).forEach((path) => {
+      try {
+        const [, id] = path.match(/^\.stackedit-data\/([\s\S]+)\.json$/);
+        pathIds[path] = id;
+        const syncData = syncDataByItemId[id];
+        if (syncData) {
+          syncDataToIgnore[syncData.id] = true;
+        }
+        if (!syncData || syncData.sha !== treeShaMap[path]) {
+          changes.push({
+            syncDataId: path,
+            item: {
+              id,
+              type: 'data',
+              // Need a truthy value to force saving sync data
+              hash: 1,
+            },
+            syncData: {
+              id: path,
+              itemId: id,
+              type: 'data',
+              // Need a truthy value to force downloading the content
+              hash: 1,
+            },
+          });
+        }
+      } catch (e) {
+        // Ignore parsing errors
+      }
+    });
+
+    // Location creations/updates
+    [{
+      type: 'syncLocation',
+      map: treeSyncLocationMap,
+      pathMatcher: /^([\s\S]+)\.([\w-]+)\.sync$/,
+    }, {
+      type: 'publishLocation',
+      map: treePublishLocationMap,
+      pathMatcher: /^([\s\S]+)\.([\w-]+)\.publish$/,
+    }]
+      .forEach(({ type, map, pathMatcher }) => Object.keys(map).forEach((path) => {
+        try {
+          const [, filePath, data] = path.match(pathMatcher);
+          // If there is a corresponding md file in the tree
+          const fileId = pathIds[`${filePath}.md`];
+          if (fileId) {
+            const id = getId(path);
+            const item = utils.addItemHash({
+              ...JSON.parse(utils.decodeBase64(data)),
+              id,
+              type,
+              fileId,
+            });
+            changes.push({
+              syncDataId: path,
+              item,
+              syncData: {
+                id: path,
+                itemId: id,
+                type: item.type,
+                hash: item.hash,
+              },
+            });
+          }
+        } catch (e) {
+          // Ignore parsing errors
+        }
+      }));
+
+    // Deletions
+    Object.keys(syncDataByPath).forEach((path) => {
+      if (!pathIds[path] && !syncDataToIgnore[path]) {
+        changes.push({ syncDataId: path });
+      }
+    });
+
+    return changes;
   },
-  uploadData(item) {
-    const oldSyncData = store.getters['data/syncDataByItemId'][item.id];
-    if (oldSyncData && oldSyncData.hash === item.hash) {
-      return Promise.resolve();
-    }
+  async saveSimpleItem(item) {
+    const path = store.getters.itemPaths[item.fileId || item.id];
+    const syncToken = store.getters['workspace/syncToken'];
     const syncData = {
-      id: `.stackedit-data/${item.id}.json`,
       itemId: item.id,
       type: item.type,
       hash: item.hash,
     };
+
+    if (item.type === 'file') {
+      syncData.id = `${path}.md`;
+      return syncData;
+    }
+    if (item.type === 'folder') {
+      syncData.id = path;
+      return syncData;
+    }
+
+    // locations are stored as paths, so we upload an empty file
+    const data = utils.encodeBase64(utils.serializeObject({
+      ...item,
+      id: undefined,
+      type: undefined,
+      fileId: undefined,
+    }), true);
+    const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
+    syncData.id = `${path}.${data}.${extension}`;
+    await githubHelper.uploadFile({
+      ...getWorkspaceWithOwner(),
+      token: syncToken,
+      path: getAbsolutePath(syncData),
+      content: '',
+      sha: treeShaMap[syncData.id],
+    });
+    return syncData;
+  },
+  async removeItem(syncData) {
+    // Ignore content deletion
+    if (syncData.type !== 'content') {
+      const syncToken = store.getters['workspace/syncToken'];
+      await githubHelper.removeFile({
+        ...getWorkspaceWithOwner(),
+        token: syncToken,
+        path: getAbsolutePath(syncData),
+        sha: treeShaMap[syncData.id],
+      });
+    }
+  },
+  async downloadContent(token, syncLocation) {
+    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
+    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
+    if (!syncData || !contentSyncData) {
+      return null;
+    }
+    const { sha, content } = await githubHelper.downloadFile({
+      ...getWorkspaceWithOwner(),
+      token,
+      path: getAbsolutePath(syncData),
+    });
+    const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
+    if (item.hash !== contentSyncData.hash) {
+      store.dispatch('data/patchSyncData', {
+        [contentSyncData.id]: {
+          ...contentSyncData,
+          hash: item.hash,
+          sha,
+        },
+      });
+    }
+    return item;
+  },
+  async downloadData(dataId) {
+    const syncData = store.getters['data/syncDataByItemId'][dataId];
+    if (!syncData) {
+      return null;
+    }
     const syncToken = store.getters['workspace/syncToken'];
-    const { owner, repo, branch } = getWorkspaceWithOwner();
-    return githubHelper.uploadFile(
-      syncToken,
-      owner,
-      repo,
-      branch,
-      getAbsolutePath(syncData),
-      JSON.stringify(item),
-      oldSyncData && oldSyncData.sha,
-    )
-      .then(res => store.dispatch('data/patchSyncData', {
+    const { sha, content } = await githubHelper.downloadFile({
+      ...getWorkspaceWithOwner(),
+      token: syncToken,
+      path: getAbsolutePath(syncData),
+    });
+    const item = JSON.parse(content);
+    if (item.hash !== syncData.hash) {
+      store.dispatch('data/patchSyncData', {
+        [syncData.id]: {
+          ...syncData,
+          hash: item.hash,
+          sha,
+        },
+      });
+    }
+    return item;
+  },
+  async uploadContent(token, content, syncLocation) {
+    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
+    if (!contentSyncData || contentSyncData.hash !== content.hash) {
+      const path = `${store.getters.itemPaths[syncLocation.fileId]}.md`;
+      const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
+      const id = `/${path}`;
+      const res = await githubHelper.uploadFile({
+        ...getWorkspaceWithOwner(),
+        token,
+        path: absolutePath,
+        content: Provider.serializeContent(content),
+        sha: treeShaMap[id],
+      });
+      store.dispatch('data/patchSyncData', {
+        [id]: {
+          // Build sync data
+          id,
+          itemId: content.id,
+          type: content.type,
+          hash: content.hash,
+          sha: res.content.sha,
+        },
+      });
+    }
+    return syncLocation;
+  },
+  async uploadData(item) {
+    const oldSyncData = store.getters['data/syncDataByItemId'][item.id];
+    if (!oldSyncData || oldSyncData.hash !== item.hash) {
+      const syncData = {
+        id: `.stackedit-data/${item.id}.json`,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+      };
+      const syncToken = store.getters['workspace/syncToken'];
+      const res = await githubHelper.uploadFile({
+        ...getWorkspaceWithOwner(),
+        token: syncToken,
+        path: getAbsolutePath(syncData),
+        content: JSON.stringify(item),
+        sha: oldSyncData && oldSyncData.sha,
+      });
+      store.dispatch('data/patchSyncData', {
         [syncData.id]: {
           ...syncData,
           sha: res.content.sha,
         },
-      }));
+      });
+    }
   },
   onSyncEnd() {
     // Clean up
@@ -468,34 +442,48 @@ export default new Provider({
     treeSyncLocationMap = null;
     treePublishLocationMap = null;
   },
-  listRevisions(token, fileId) {
+  async listRevisions(token, fileId) {
     const { owner, repo, branch } = getWorkspaceWithOwner();
-    return getSyncData(fileId)
-      .then(syncData => githubHelper.getCommits(token, owner, repo, branch, syncData.id))
-      .then(entries => entries.map((entry) => {
-        let user;
-        if (entry.author && entry.author.login) {
-          user = entry.author;
-        } else if (entry.committer && entry.committer.login) {
-          user = entry.committer;
-        }
-        const sub = `gh:${user.id}`;
-        userSvc.addInfo({ id: sub, name: user.login, imageUrl: user.avatar_url });
-        const date = (entry.commit.author && entry.commit.author.date)
-          || (entry.commit.committer && entry.commit.committer.date);
-        return {
-          id: entry.sha,
-          sub,
-          created: date ? new Date(date).getTime() : 1,
-        };
-      })
-        .sort((revision1, revision2) => revision2.created - revision1.created));
+    const syncData = Provider.getContentSyncData(fileId);
+    const entries = await githubHelper.getCommits({
+      token,
+      owner,
+      repo,
+      sha: branch,
+      path: syncData.id,
+    });
+    return entries.map(({
+      author,
+      committer,
+      commit,
+      sha,
+    }) => {
+      let user;
+      if (author && author.login) {
+        user = author;
+      } else if (committer && committer.login) {
+        user = committer;
+      }
+      const sub = `gh:${user.id}`;
+      userSvc.addInfo({ id: sub, name: user.login, imageUrl: user.avatar_url });
+      const date = (commit.author && commit.author.date)
+        || (commit.committer && commit.committer.date);
+      return {
+        id: sha,
+        sub,
+        created: date ? new Date(date).getTime() : 1,
+      };
+    })
+      .sort((revision1, revision2) => revision2.created - revision1.created);
   },
-  getRevisionContent(token, fileId, revisionId) {
-    const { owner, repo } = getWorkspaceWithOwner();
-    return getSyncData(fileId)
-      .then(syncData => githubHelper
-        .downloadFile(token, owner, repo, revisionId, getAbsolutePath(syncData)))
-      .then(({ content }) => Provider.parseContent(content, `${fileId}/content`));
+  async getRevisionContent(token, fileId, revisionId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const { content } = await githubHelper.downloadFile({
+      ...getWorkspaceWithOwner(),
+      token,
+      branch: revisionId,
+      path: getAbsolutePath(syncData),
+    });
+    return Provider.parseContent(content, `${fileId}/content`);
   },
 });
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index 7c9498bc..d83a63b0 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -10,65 +10,59 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  initWorkspace() {
+  async initWorkspace() {
     // Nothing much to do since the main workspace isn't necessarily synchronized
-    return Promise.resolve()
-      .then(() => {
-        // Remove the URL hash
-        utils.setQueryParams();
-        // Return the main workspace
-        return store.getters['data/workspaces'].main;
-      });
+    // Remove the URL hash
+    utils.setQueryParams();
+    // Return the main workspace
+    return store.getters['data/workspaces'].main;
   },
-  getChanges() {
+  async getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
     const startPageToken = store.getters['data/localSettings'].syncStartPageToken;
-    return googleHelper.getChanges(syncToken, startPageToken, true)
-      .then((result) => {
-        const changes = result.changes.filter((change) => {
-          if (change.file) {
-            // Parse item from file name
-            try {
-              change.item = JSON.parse(change.file.name);
-            } catch (e) {
-              return false;
-            }
-            // Build sync data
-            change.syncData = {
-              id: change.fileId,
-              itemId: change.item.id,
-              type: change.item.type,
-              hash: change.item.hash,
-            };
-          }
-          change.syncDataId = change.fileId;
-          return true;
-        });
-        syncStartPageToken = result.startPageToken;
-        return changes;
-      });
+    const result = await googleHelper.getChanges(syncToken, startPageToken, true);
+    const changes = result.changes.filter((change) => {
+      if (change.file) {
+        // Parse item from file name
+        try {
+          change.item = JSON.parse(change.file.name);
+        } catch (e) {
+          return false;
+        }
+        // Build sync data
+        change.syncData = {
+          id: change.fileId,
+          itemId: change.item.id,
+          type: change.item.type,
+          hash: change.item.hash,
+        };
+      }
+      change.syncDataId = change.fileId;
+      return true;
+    });
+    syncStartPageToken = result.startPageToken;
+    return changes;
   },
   onChangesApplied() {
     store.dispatch('data/patchLocalSettings', {
       syncStartPageToken,
     });
   },
-  saveSimpleItem(item, syncData, ifNotTooLate) {
+  async saveSimpleItem(item, syncData, ifNotTooLate) {
     const syncToken = store.getters['workspace/syncToken'];
-    return googleHelper.uploadAppDataFile(
-      syncToken,
-      JSON.stringify(item),
-      undefined,
-      syncData && syncData.id,
+    const file = await googleHelper.uploadAppDataFile({
+      token: syncToken,
+      name: JSON.stringify(item),
+      fileId: syncData && syncData.id,
       ifNotTooLate,
-    )
-      .then(file => ({
-        // Build sync data
-        id: file.id,
-        itemId: item.id,
-        type: item.type,
-        hash: item.hash,
-      }));
+    });
+    // Build sync data
+    return {
+      id: file.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
   },
   removeItem(syncData, ifNotTooLate) {
     const syncToken = store.getters['workspace/syncToken'];
@@ -77,48 +71,44 @@ export default new Provider({
   downloadContent(token, syncLocation) {
     return this.downloadData(`${syncLocation.fileId}/content`);
   },
-  downloadData(dataId) {
+  async downloadData(dataId) {
     const syncData = store.getters['data/syncDataByItemId'][dataId];
     if (!syncData) {
-      return Promise.resolve();
+      return null;
     }
     const syncToken = store.getters['workspace/syncToken'];
-    return googleHelper.downloadAppDataFile(syncToken, syncData.id)
-      .then((data) => {
-        const item = utils.addItemHash(JSON.parse(data));
-        if (item.hash !== syncData.hash) {
-          store.dispatch('data/patchSyncData', {
-            [syncData.id]: {
-              ...syncData,
-              hash: item.hash,
-            },
-          });
-        }
-        return item;
+    const data = await googleHelper.downloadAppDataFile(syncToken, syncData.id);
+    const item = utils.addItemHash(JSON.parse(data));
+    if (item.hash !== syncData.hash) {
+      store.dispatch('data/patchSyncData', {
+        [syncData.id]: {
+          ...syncData,
+          hash: item.hash,
+        },
       });
-  },
-  uploadContent(token, content, syncLocation, ifNotTooLate) {
-    return this.uploadData(content, ifNotTooLate)
-      .then(() => syncLocation);
-  },
-  uploadData(item, ifNotTooLate) {
-    const syncData = store.getters['data/syncDataByItemId'][item.id];
-    if (syncData && syncData.hash === item.hash) {
-      return Promise.resolve();
     }
-    const syncToken = store.getters['workspace/syncToken'];
-    return googleHelper.uploadAppDataFile(
-      syncToken,
-      JSON.stringify({
-        id: item.id,
-        type: item.type,
-        hash: item.hash,
-      }),
-      JSON.stringify(item),
-      syncData && syncData.id,
-      ifNotTooLate,
-    )
-      .then(file => store.dispatch('data/patchSyncData', {
+    return item;
+  },
+  async uploadContent(token, content, syncLocation, ifNotTooLate) {
+    await this.uploadData(content, ifNotTooLate);
+    return syncLocation;
+  },
+  async uploadData(item, ifNotTooLate) {
+    const syncData = store.getters['data/syncDataByItemId'][item.id];
+    if (!syncData || syncData.hash !== item.hash) {
+      const syncToken = store.getters['workspace/syncToken'];
+      const file = await googleHelper.uploadAppDataFile({
+        token: syncToken,
+        name: JSON.stringify({
+          id: item.id,
+          type: item.type,
+          hash: item.hash,
+        }),
+        media: JSON.stringify(item),
+        fileId: syncData && syncData.id,
+        ifNotTooLate,
+      });
+      store.dispatch('data/patchSyncData', {
         [file.id]: {
           // Build sync data
           id: file.id,
@@ -126,27 +116,22 @@ export default new Provider({
           type: item.type,
           hash: item.hash,
         },
-      }));
-  },
-  listRevisions(token, fileId) {
-    const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
-    if (!syncData) {
-      return Promise.reject(); // No need for a proper error message.
+      });
     }
-    return googleHelper.getAppDataFileRevisions(token, syncData.id)
-      .then(revisions => revisions.map(revision => ({
-        id: revision.id,
-        sub: revision.lastModifyingUser && `go:${revision.lastModifyingUser.permissionId}`,
-        created: new Date(revision.modifiedTime).getTime(),
-      }))
-        .sort((revision1, revision2) => revision2.created - revision1.created));
   },
-  getRevisionContent(token, fileId, revisionId) {
-    const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
-    if (!syncData) {
-      return Promise.reject(); // No need for a proper error message.
-    }
-    return googleHelper.downloadAppDataFileRevision(token, syncData.id, revisionId)
-      .then(content => JSON.parse(content));
+  async listRevisions(token, fileId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const revisions = await googleHelper.getAppDataFileRevisions(token, syncData.id);
+    return revisions.map(revision => ({
+      id: revision.id,
+      sub: revision.lastModifyingUser && `go:${revision.lastModifyingUser.permissionId}`,
+      created: new Date(revision.modifiedTime).getTime(),
+    }))
+      .sort((revision1, revision2) => revision2.created - revision1.created);
+  },
+  async getRevisionContent(token, fileId, revisionId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const content = await googleHelper.downloadAppDataFileRevision(token, syncData.id, revisionId);
+    return JSON.parse(content);
   },
 });
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index 97d9e5c1..82dca036 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -17,184 +17,167 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.driveFileId} — ${token.name}`;
   },
-  initAction() {
+  async initAction() {
     const state = googleHelper.driveState || {};
-    return state.userId && Promise.resolve()
-      .then(() => {
-        // Try to find the token corresponding to the user ID
-        const token = store.getters['data/googleTokens'][state.userId];
-        // If not found or not enough permission, popup an OAuth2 window
-        return token && token.isDrive ? token : store.dispatch('modal/open', {
-          type: 'googleDriveAccount',
-          onResolve: () => googleHelper.addDriveAccount(
-            !store.getters['data/localSettings'].googleDriveRestrictedAccess,
-            state.userId,
-          ),
-        });
-      })
-      .then((token) => {
-        const openWorkspaceIfExists = (file) => {
-          const folderId = file
-            && file.appProperties
-            && file.appProperties.folderId;
-          if (folderId) {
-            // See if we have the corresponding workspace
-            const workspaceParams = {
-              providerId: 'googleDriveWorkspace',
-              folderId,
-            };
-            const workspaceId = utils.makeWorkspaceId(workspaceParams);
-            const workspace = store.getters['data/sanitizedWorkspaces'][workspaceId];
-            // If we have the workspace, open it by changing the current URL
-            if (workspace) {
-              utils.setQueryParams(workspaceParams);
+    if (state.userId) {
+      // Try to find the token corresponding to the user ID
+      let token = store.getters['data/googleTokens'][state.userId];
+      // If not found or not enough permission, popup an OAuth2 window
+      if (!token || !token.isDrive) {
+        await store.dispatch('modal/open', { type: 'googleDriveAccount' });
+        token = await googleHelper.addDriveAccount(
+          !store.getters['data/localSettings'].googleDriveRestrictedAccess,
+          state.userId,
+        );
+      }
+
+      const openWorkspaceIfExists = (file) => {
+        const folderId = file
+          && file.appProperties
+          && file.appProperties.folderId;
+        if (folderId) {
+          // See if we have the corresponding workspace
+          const workspaceParams = {
+            providerId: 'googleDriveWorkspace',
+            folderId,
+          };
+          const workspaceId = utils.makeWorkspaceId(workspaceParams);
+          const workspace = store.getters['data/sanitizedWorkspaces'][workspaceId];
+          // If we have the workspace, open it by changing the current URL
+          if (workspace) {
+            utils.setQueryParams(workspaceParams);
+          }
+        }
+      };
+
+      switch (state.action) {
+        case 'create':
+        default:
+          // See if folder is part of a workspace we can open
+          try {
+            const folder = await googleHelper.getFile(token, state.folderId);
+            folder.appProperties = folder.appProperties || {};
+            googleHelper.driveActionFolder = folder;
+            openWorkspaceIfExists(folder);
+          } catch (err) {
+            if (!err || err.status !== 404) {
+              throw err;
             }
+            // We received an HTTP 404 meaning we have no permission to read the folder
+            googleHelper.driveActionFolder = { id: state.folderId };
           }
-        };
+          break;
 
-        switch (state.action) {
-          case 'create':
-          default:
-            // See if folder is part of a workspace we can open
-            return googleHelper.getFile(token, state.folderId)
-              .then((folder) => {
-                folder.appProperties = folder.appProperties || {};
-                googleHelper.driveActionFolder = folder;
-                openWorkspaceIfExists(folder);
-              }, (err) => {
-                if (!err || err.status !== 404) {
-                  throw err;
-                }
-                // We received an HTTP 404 meaning we have no permission to read the folder
-                googleHelper.driveActionFolder = { id: state.folderId };
-              });
+        case 'open': {
+          await utils.awaitSequence(state.ids || [], async (id) => {
+            const file = await googleHelper.getFile(token, id);
+            file.appProperties = file.appProperties || {};
+            googleHelper.driveActionFiles.push(file);
+          });
 
-          case 'open': {
-            const getOneFile = (ids = state.ids || []) => {
-              const id = ids.shift();
-              return id && googleHelper.getFile(token, id)
-                .then((file) => {
-                  file.appProperties = file.appProperties || {};
-                  googleHelper.driveActionFiles.push(file);
-                  return getOneFile(ids);
-                });
-            };
-
-            return getOneFile()
-              // Check if first file is part of a workspace
-              .then(() => openWorkspaceIfExists(googleHelper.driveActionFiles[0]));
-          }
+          // Check if first file is part of a workspace
+          openWorkspaceIfExists(googleHelper.driveActionFiles[0]);
         }
-      });
+      }
+    }
   },
-  performAction() {
-    return Promise.resolve()
-      .then(() => {
-        const state = googleHelper.driveState || {};
-        const token = store.getters['data/googleTokens'][state.userId];
-        switch (token && state.action) {
-          case 'create':
-            return fileSvc.createFile({}, true)
-              .then((file) => {
-                store.commit('file/setCurrentId', file.id);
-                // Return a new syncLocation
-                return this.makeLocation(token, null, googleHelper.driveActionFolder.id);
-              });
-          case 'open':
-            return store.dispatch(
-              'queue/enqueue',
-              () => this.openFiles(token, googleHelper.driveActionFiles),
-            );
-          default:
-            return null;
-        }
-      });
+  async performAction() {
+    const state = googleHelper.driveState || {};
+    const token = store.getters['data/googleTokens'][state.userId];
+    switch (token && state.action) {
+      case 'create': {
+        const file = await fileSvc.createFile({}, true);
+        store.commit('file/setCurrentId', file.id);
+        // Return a new syncLocation
+        return this.makeLocation(token, null, googleHelper.driveActionFolder.id);
+      }
+      case 'open':
+        store.dispatch(
+          'queue/enqueue',
+          () => this.openFiles(token, googleHelper.driveActionFiles),
+        );
+        return null;
+      default:
+        return null;
+    }
   },
-  downloadContent(token, syncLocation) {
-    return googleHelper.downloadFile(token, syncLocation.driveFileId)
-      .then(content => Provider.parseContent(content, `${syncLocation.fileId}/content`));
+  async downloadContent(token, syncLocation) {
+    const content = await googleHelper.downloadFile(token, syncLocation.driveFileId);
+    return Provider.parseContent(content, `${syncLocation.fileId}/content`);
   },
-  uploadContent(token, content, syncLocation, ifNotTooLate) {
+  async uploadContent(token, content, syncLocation, ifNotTooLate) {
     const file = store.state.file.itemMap[syncLocation.fileId];
     const name = utils.sanitizeName(file && file.name);
     const parents = [];
     if (syncLocation.driveParentId) {
       parents.push(syncLocation.driveParentId);
     }
-    return googleHelper.uploadFile(
+    const driveFile = await googleHelper.uploadFile({
       token,
       name,
       parents,
-      undefined,
-      Provider.serializeContent(content),
-      undefined,
-      syncLocation.driveFileId,
-      undefined,
+      media: Provider.serializeContent(content),
+      fileId: syncLocation.driveFileId,
       ifNotTooLate,
-    )
-      .then(driveFile => ({
-        ...syncLocation,
-        driveFileId: driveFile.id,
-      }));
+    });
+    return {
+      ...syncLocation,
+      driveFileId: driveFile.id,
+    };
   },
-  publish(token, html, metadata, publishLocation) {
-    return googleHelper.uploadFile(
+  async publish(token, html, metadata, publishLocation) {
+    const driveFile = await googleHelper.uploadFile({
       token,
-      metadata.title,
-      [],
-      undefined,
-      html,
-      publishLocation.templateId ? 'text/html' : undefined,
-      publishLocation.driveFileId,
-    )
-      .then(driveFile => ({
-        ...publishLocation,
-        driveFileId: driveFile.id,
-      }));
+      name: metadata.title,
+      parents: [],
+      media: html,
+      mediaType: publishLocation.templateId ? 'text/html' : undefined,
+      fileId: publishLocation.driveFileId,
+    });
+    return {
+      ...publishLocation,
+      driveFileId: driveFile.id,
+    };
   },
-  openFiles(token, driveFiles) {
-    const openOneFile = () => {
-      const driveFile = driveFiles.shift();
-      if (!driveFile) {
-        return null;
-      }
-      if (Provider.openFileWithLocation(store.getters['syncLocation/items'], {
+  async openFiles(token, driveFiles) {
+    return utils.awaitSequence(driveFiles, async (driveFile) => {
+      // Check if the file exists and open it
+      if (!Provider.openFileWithLocation(store.getters['syncLocation/items'], {
         providerId: this.id,
         driveFileId: driveFile.id,
       })) {
-        // File exists and has just been opened. Next...
-        return openOneFile();
-      }
-      // Download content from Google Drive and create the file
-      const syncLocation = {
-        driveFileId: driveFile.id,
-        providerId: this.id,
-        sub: token.sub,
-      };
-      return this.downloadContent(token, syncLocation)
-        .then(content => fileSvc.createFile({
+        // Download content from Google Drive
+        const syncLocation = {
+          driveFileId: driveFile.id,
+          providerId: this.id,
+          sub: token.sub,
+        };
+        let content;
+        try {
+          content = await this.downloadContent(token, syncLocation);
+        } catch (e) {
+          store.dispatch('notification/error', `Could not open file ${driveFile.id}.`);
+          return;
+        }
+
+        // Create the file
+        const item = await fileSvc.createFile({
           name: driveFile.name,
           parentId: store.getters['file/current'].parentId,
           text: content.text,
           properties: content.properties,
           discussions: content.discussions,
           comments: content.comments,
-        }, true))
-        .then((item) => {
-          store.commit('file/setCurrentId', item.id);
-          store.commit('syncLocation/setItem', {
-            ...syncLocation,
-            id: utils.uid(),
-            fileId: item.id,
-          });
-          store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Google Drive.`);
-        })
-        .catch(() => {
-          store.dispatch('notification/error', `Could not open file ${driveFile.id}.`);
-        })
-        .then(() => openOneFile());
-    };
-    return Promise.resolve(openOneFile());
+        }, true);
+        store.commit('file/setCurrentId', item.id);
+        store.commit('syncLocation/setItem', {
+          ...syncLocation,
+          id: utils.uid(),
+          fileId: item.id,
+        });
+        store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Google Drive.`);
+      }
+    });
   },
   makeLocation(token, fileId, folderId) {
     const location = {
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index b11aff52..37552336 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -4,13 +4,6 @@ import Provider from './common/Provider';
 import utils from '../utils';
 import fileSvc from '../fileSvc';
 
-const getSyncData = (fileId) => {
-  const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
-  return syncData
-    ? Promise.resolve(syncData)
-    : Promise.reject(); // No need for a proper error message.
-};
-
 let fileIdToOpen;
 let syncStartPageToken;
 
@@ -19,7 +12,7 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  initWorkspace() {
+  async initWorkspace() {
     const makeWorkspaceParams = folderId => ({
       providerId: this.id,
       folderId,
@@ -31,489 +24,437 @@ export default new Provider({
     const getWorkspace = folderId =>
       store.getters['data/sanitizedWorkspaces'][makeWorkspaceId(folderId)];
 
-    const initFolder = (token, folder) => Promise.resolve({
-      folderId: folder.id,
-      dataFolderId: folder.appProperties.dataFolderId,
-      trashFolderId: folder.appProperties.trashFolderId,
-    })
-      .then((properties) => {
-        // Make sure data folder exists
-        if (properties.dataFolderId) {
-          return properties;
-        }
-        return googleHelper.uploadFile(
-          token,
-          '.stackedit-data',
-          [folder.id],
-          { folderId: folder.id },
-          undefined,
-          googleHelper.folderMimeType,
-        )
-          .then(dataFolder => ({
-            ...properties,
-            dataFolderId: dataFolder.id,
-          }));
-      })
-      .then((properties) => {
-        // Make sure trash folder exists
-        if (properties.trashFolderId) {
-          return properties;
-        }
-        return googleHelper.uploadFile(
-          token,
-          '.stackedit-trash',
-          [folder.id],
-          { folderId: folder.id },
-          undefined,
-          googleHelper.folderMimeType,
-        )
-          .then(trashFolder => ({
-            ...properties,
-            trashFolderId: trashFolder.id,
-          }));
-      })
-      .then((properties) => {
-        // Update workspace if some properties are missing
-        if (properties.folderId === folder.appProperties.folderId
-          && properties.dataFolderId === folder.appProperties.dataFolderId
-          && properties.trashFolderId === folder.appProperties.trashFolderId
-        ) {
-          return properties;
-        }
-        return googleHelper.uploadFile(
-          token,
-          undefined,
-          undefined,
-          properties,
-          undefined,
-          googleHelper.folderMimeType,
-          folder.id,
-        )
-          .then(() => properties);
-      })
-      .then((properties) => {
-        // Update workspace in the store
-        const workspaceId = makeWorkspaceId(folder.id);
-        store.dispatch('data/patchWorkspaces', {
-          [workspaceId]: {
-            id: workspaceId,
-            sub: token.sub,
-            name: folder.name,
-            providerId: this.id,
-            url: window.location.href,
-            folderId: folder.id,
-            teamDriveId: folder.teamDriveId,
-            dataFolderId: properties.dataFolderId,
-            trashFolderId: properties.trashFolderId,
-          },
-        });
+    const initFolder = async (token, folder) => {
+      const appProperties = {
+        folderId: folder.id,
+        dataFolderId: folder.appProperties.dataFolderId,
+        trashFolderId: folder.appProperties.trashFolderId,
+      };
 
-        // Return the workspace
-        return store.getters['data/sanitizedWorkspaces'][workspaceId];
-      });
-
-    return Promise.resolve()
-      .then(() => {
-        const workspace = getWorkspace(utils.queryParams.folderId);
-        // See if we already have a token
-        const googleTokens = store.getters['data/googleTokens'];
-        // Token sub is in the workspace or in the url if workspace is about to be created
-        const token = workspace ? googleTokens[workspace.sub] : googleTokens[utils.queryParams.sub];
-        if (token && token.isDrive && token.driveFullAccess) {
-          return token;
-        }
-        // If no token has been found, popup an authorize window and get one
-        return store.dispatch('modal/workspaceGoogleRedirection', {
-          onResolve: () => googleHelper.addDriveAccount(true, utils.queryParams.sub),
-        });
-      })
-      .then(token => Promise.resolve()
-        // If no folderId is provided, create one
-        .then(() => utils.queryParams.folderId || googleHelper.uploadFile(
+      // Make sure data folder exists
+      if (!appProperties.dataFolderId) {
+        appProperties.dataFolderId = (await googleHelper.uploadFile({
           token,
-          'StackEdit workspace',
-          [],
-          undefined,
-          undefined,
-          googleHelper.folderMimeType,
-        )
-          .then(folder => initFolder(token, {
-            ...folder,
-            appProperties: {},
-          })
-            .then(() => folder.id)))
-        // If workspace does not exist, initialize one
-        .then(folderId => getWorkspace(folderId) || googleHelper.getFile(token, folderId)
-          .then((folder) => {
-            folder.appProperties = folder.appProperties || {};
-            const folderIdProperty = folder.appProperties.folderId;
-            if (folderIdProperty && folderIdProperty !== folderId) {
-              throw new Error(`Folder ${folderId} is part of another workspace.`);
-            }
-            return initFolder(token, folder);
-          }, () => {
-            throw new Error(`Folder ${folderId} is not accessible. Make sure you have the right permissions.`);
-          }))
-        .then((workspace) => {
-          // Fix the URL hash
-          utils.setQueryParams(makeWorkspaceParams(workspace.folderId));
-          if (workspace.url !== window.location.href) {
-            store.dispatch('data/patchWorkspaces', {
-              [workspace.id]: {
-                ...workspace,
-                url: window.location.href,
-              },
-            });
-          }
-          return store.getters['data/sanitizedWorkspaces'][workspace.id];
-        }));
-  },
-  performAction() {
-    return Promise.resolve()
-      .then(() => {
-        const state = googleHelper.driveState || {};
-        const token = this.getToken();
-        switch (token && state.action) {
-          case 'create':
-            return Promise.resolve()
-              .then(() => {
-                const driveFolder = googleHelper.driveActionFolder;
-                let syncData = store.getters['data/syncData'][driveFolder.id];
-                if (!syncData && driveFolder.appProperties.id) {
-                  // Create folder if not already synced
-                  store.commit('folder/setItem', {
-                    id: driveFolder.appProperties.id,
-                    name: driveFolder.name,
-                  });
-                  const item = store.state.folder.itemMap[driveFolder.appProperties.id];
-                  syncData = {
-                    id: driveFolder.id,
-                    itemId: item.id,
-                    type: item.type,
-                    hash: item.hash,
-                  };
-                  store.dispatch('data/patchSyncData', {
-                    [syncData.id]: syncData,
-                  });
-                }
-                return fileSvc.createFile({
-                  parentId: syncData && syncData.itemId,
-                }, true)
-                  .then((file) => {
-                    store.commit('file/setCurrentId', file.id);
-                    // File will be created on next workspace sync
-                  });
-              });
-          case 'open':
-            return Promise.resolve()
-              .then(() => {
-                // open first file only
-                const firstFile = googleHelper.driveActionFiles[0];
-                const syncData = store.getters['data/syncData'][firstFile.id];
-                if (!syncData) {
-                  fileIdToOpen = firstFile.id;
-                } else {
-                  store.commit('file/setCurrentId', syncData.itemId);
-                }
-              });
-          default:
-            return null;
-        }
+          name: '.stackedit-data',
+          parents: [folder.id],
+          appProperties: { folderId: folder.id },
+          mediaType: googleHelper.folderMimeType,
+        })).id;
+      }
+
+      // Make sure trash folder exists
+      if (!appProperties.trashFolderId) {
+        appProperties.trashFolderId = (await googleHelper.uploadFile({
+          token,
+          name: '.stackedit-trash',
+          parents: [folder.id],
+          appProperties: { folderId: folder.id },
+          mediaType: googleHelper.folderMimeType,
+        })).id;
+      }
+
+      // Update workspace if some properties are missing
+      if (appProperties.folderId !== folder.appProperties.folderId
+        || appProperties.dataFolderId !== folder.appProperties.dataFolderId
+        || appProperties.trashFolderId !== folder.appProperties.trashFolderId
+      ) {
+        await googleHelper.uploadFile({
+          token,
+          appProperties,
+          mediaType: googleHelper.folderMimeType,
+          fileId: folder.id,
+        });
+      }
+
+      // Update workspace in the store
+      const workspaceId = makeWorkspaceId(folder.id);
+      store.dispatch('data/patchWorkspaces', {
+        [workspaceId]: {
+          id: workspaceId,
+          sub: token.sub,
+          name: folder.name,
+          providerId: this.id,
+          url: window.location.href,
+          folderId: folder.id,
+          teamDriveId: folder.teamDriveId,
+          dataFolderId: appProperties.dataFolderId,
+          trashFolderId: appProperties.trashFolderId,
+        },
       });
+    };
+
+    // Token sub is in the workspace or in the url if workspace is about to be created
+    const { sub } = getWorkspace(utils.queryParams.folderId) || utils.queryParams;
+    // See if we already have a token
+    let token = store.getters['data/googleTokens'][sub];
+    // If no token has been found, popup an authorize window and get one
+    if (!token || !token.isDrive || !token.driveFullAccess) {
+      await store.dispatch('modal/workspaceGoogleRedirection');
+      token = await googleHelper.addDriveAccount(true, utils.queryParams.sub);
+    }
+
+    let { folderId } = utils.queryParams;
+    // If no folderId is provided, create one
+    if (!folderId) {
+      const folder = await googleHelper.uploadFile({
+        token,
+        name: 'StackEdit workspace',
+        parents: [],
+        mediaType: googleHelper.folderMimeType,
+      });
+      await initFolder(token, {
+        ...folder,
+        appProperties: {},
+      });
+      folderId = folder.id;
+    }
+
+    // Init workspace
+    let workspace = getWorkspace(folderId);
+    if (!workspace) {
+      let folder;
+      try {
+        folder = googleHelper.getFile(token, folderId);
+      } catch (err) {
+        throw new Error(`Folder ${folderId} is not accessible. Make sure you have the right permissions.`);
+      }
+      folder.appProperties = folder.appProperties || {};
+      const folderIdProperty = folder.appProperties.folderId;
+      if (folderIdProperty && folderIdProperty !== folderId) {
+        throw new Error(`Folder ${folderId} is part of another workspace.`);
+      }
+      await initFolder(token, folder);
+      workspace = getWorkspace(folderId);
+    }
+
+    // Fix the URL hash
+    utils.setQueryParams(makeWorkspaceParams(workspace.folderId));
+    if (workspace.url !== window.location.href) {
+      store.dispatch('data/patchWorkspaces', {
+        [workspace.id]: {
+          ...workspace,
+          url: window.location.href,
+        },
+      });
+    }
+    return store.getters['data/sanitizedWorkspaces'][workspace.id];
   },
-  getChanges() {
+  async performAction() {
+    const state = googleHelper.driveState || {};
+    const token = this.getToken();
+    switch (token && state.action) {
+      case 'create': {
+        const driveFolder = googleHelper.driveActionFolder;
+        let syncData = store.getters['data/syncData'][driveFolder.id];
+        if (!syncData && driveFolder.appProperties.id) {
+          // Create folder if not already synced
+          store.commit('folder/setItem', {
+            id: driveFolder.appProperties.id,
+            name: driveFolder.name,
+          });
+          const item = store.state.folder.itemMap[driveFolder.appProperties.id];
+          syncData = {
+            id: driveFolder.id,
+            itemId: item.id,
+            type: item.type,
+            hash: item.hash,
+          };
+          store.dispatch('data/patchSyncData', {
+            [syncData.id]: syncData,
+          });
+        }
+        const file = await fileSvc.createFile({
+          parentId: syncData && syncData.itemId,
+        }, true);
+        store.commit('file/setCurrentId', file.id);
+        // File will be created on next workspace sync
+        break;
+      }
+      case 'open': {
+        // open first file only
+        const firstFile = googleHelper.driveActionFiles[0];
+        const syncData = store.getters['data/syncData'][firstFile.id];
+        if (!syncData) {
+          fileIdToOpen = firstFile.id;
+        } else {
+          store.commit('file/setCurrentId', syncData.itemId);
+        }
+        break;
+      }
+      default:
+    }
+  },
+  async getChanges() {
     const workspace = store.getters['workspace/currentWorkspace'];
     const syncToken = store.getters['workspace/syncToken'];
-    const startPageToken = store.getters['data/localSettings'].syncStartPageToken;
-    return googleHelper.getChanges(syncToken, startPageToken, false, workspace.teamDriveId)
-      .then((result) => {
-        // Collect possible parent IDs
-        const parentIds = {};
-        Object.entries(store.getters['data/syncDataByItemId']).forEach(([id, syncData]) => {
-          parentIds[syncData.id] = id;
-        });
-        result.changes.forEach((change) => {
-          const { id } = (change.file || {}).appProperties || {};
-          if (id) {
-            parentIds[change.fileId] = id;
-          }
-        });
+    const lastStartPageToken = store.getters['data/localSettings'].syncStartPageToken;
+    const { changes, startPageToken } = await googleHelper
+      .getChanges(syncToken, lastStartPageToken, false, workspace.teamDriveId);
 
-        // Collect changes
-        const changes = [];
-        result.changes.forEach((change) => {
-          // Ignore changes on StackEdit own folders
-          if (change.fileId === workspace.folderId
-            || change.fileId === workspace.dataFolderId
-            || change.fileId === workspace.trashFolderId
-          ) {
+    // Collect possible parent IDs
+    const parentIds = {};
+    Object.entries(store.getters['data/syncDataByItemId']).forEach(([id, syncData]) => {
+      parentIds[syncData.id] = id;
+    });
+    changes.forEach((change) => {
+      const { id } = (change.file || {}).appProperties || {};
+      if (id) {
+        parentIds[change.fileId] = id;
+      }
+    });
+
+    // Collect changes
+    const result = [];
+    changes.forEach((change) => {
+      // Ignore changes on StackEdit own folders
+      if (change.fileId === workspace.folderId
+        || change.fileId === workspace.dataFolderId
+        || change.fileId === workspace.trashFolderId
+      ) {
+        return;
+      }
+
+      let contentChange;
+      if (change.file) {
+        // Ignore changes in files that are not in the workspace
+        const { appProperties } = change.file;
+        if (!appProperties || appProperties.folderId !== workspace.folderId
+        ) {
+          return;
+        }
+
+        // If change is on a data item
+        if (change.file.parents[0] === workspace.dataFolderId) {
+          // Data item has a JSON filename
+          try {
+            change.item = JSON.parse(change.file.name);
+          } catch (e) {
             return;
           }
+        } else {
+          // Change on a file or folder
+          const type = change.file.mimeType === googleHelper.folderMimeType
+            ? 'folder'
+            : 'file';
+          const item = {
+            id: appProperties.id,
+            type,
+            name: change.file.name,
+            parentId: null,
+          };
 
-          let contentChange;
-          if (change.file) {
-            // Ignore changes in files that are not in the workspace
-            const { appProperties } = change.file;
-            if (!appProperties || appProperties.folderId !== workspace.folderId
-            ) {
-              return;
-            }
-
-            // If change is on a data item
-            if (change.file.parents[0] === workspace.dataFolderId) {
-              // Data item has a JSON filename
-              try {
-                change.item = JSON.parse(change.file.name);
-              } catch (e) {
-                return;
-              }
-            } else {
-              // Change on a file or folder
-              const type = change.file.mimeType === googleHelper.folderMimeType
-                ? 'folder'
-                : 'file';
-              const item = {
-                id: appProperties.id,
-                type,
-                name: change.file.name,
-                parentId: null,
-              };
-
-              // Fill parentId
-              if (change.file.parents.some(parentId => parentId === workspace.trashFolderId)) {
-                item.parentId = 'trash';
-              } else {
-                change.file.parents.some((parentId) => {
-                  if (!parentIds[parentId]) {
-                    return false;
-                  }
-                  item.parentId = parentIds[parentId];
-                  return true;
-                });
-              }
-              change.item = utils.addItemHash(item);
-
-              if (type === 'file') {
-                // create a fake change as a file content change
-                contentChange = {
-                  item: {
-                    id: `${appProperties.id}/content`,
-                    type: 'content',
-                    // Need a truthy value to force saving sync data
-                    hash: 1,
-                  },
-                  syncData: {
-                    id: `${change.fileId}/content`,
-                    itemId: `${appProperties.id}/content`,
-                    type: 'content',
-                    // Need a truthy value to force downloading the content
-                    hash: 1,
-                  },
-                  syncDataId: `${change.fileId}/content`,
-                };
-              }
-            }
-
-            // Build sync data
-            change.syncData = {
-              id: change.fileId,
-              parentIds: change.file.parents,
-              itemId: change.item.id,
-              type: change.item.type,
-              hash: change.item.hash,
-            };
+          // Fill parentId
+          if (change.file.parents.some(parentId => parentId === workspace.trashFolderId)) {
+            item.parentId = 'trash';
           } else {
-            // Item was removed
-            const syncData = store.getters['data/syncData'][change.fileId];
-            if (syncData && syncData.type === 'file') {
-              // create a fake change as a file content change
-              contentChange = {
-                syncDataId: `${change.fileId}/content`,
-              };
-            }
+            change.file.parents.some((parentId) => {
+              if (!parentIds[parentId]) {
+                return false;
+              }
+              item.parentId = parentIds[parentId];
+              return true;
+            });
           }
+          change.item = utils.addItemHash(item);
 
-          // Push change
-          change.syncDataId = change.fileId;
-          changes.push(change);
-          if (contentChange) {
-            changes.push(contentChange);
+          if (type === 'file') {
+            // create a fake change as a file content change
+            contentChange = {
+              item: {
+                id: `${appProperties.id}/content`,
+                type: 'content',
+                // Need a truthy value to force saving sync data
+                hash: 1,
+              },
+              syncData: {
+                id: `${change.fileId}/content`,
+                itemId: `${appProperties.id}/content`,
+                type: 'content',
+                // Need a truthy value to force downloading the content
+                hash: 1,
+              },
+              syncDataId: `${change.fileId}/content`,
+            };
           }
-        });
-        syncStartPageToken = result.startPageToken;
-        return changes;
-      });
+        }
+
+        // Build sync data
+        change.syncData = {
+          id: change.fileId,
+          parentIds: change.file.parents,
+          itemId: change.item.id,
+          type: change.item.type,
+          hash: change.item.hash,
+        };
+      } else {
+        // Item was removed
+        const syncData = store.getters['data/syncData'][change.fileId];
+        if (syncData && syncData.type === 'file') {
+          // create a fake change as a file content change
+          contentChange = {
+            syncDataId: `${change.fileId}/content`,
+          };
+        }
+      }
+
+      // Push change
+      change.syncDataId = change.fileId;
+      result.push(change);
+      if (contentChange) {
+        result.push(contentChange);
+      }
+    });
+    syncStartPageToken = startPageToken;
+    return result;
   },
   onChangesApplied() {
     store.dispatch('data/patchLocalSettings', {
       syncStartPageToken,
     });
   },
-  saveSimpleItem(item, syncData, ifNotTooLate) {
-    return Promise.resolve()
-      .then(() => {
-        const workspace = store.getters['workspace/currentWorkspace'];
-        const syncToken = store.getters['workspace/syncToken'];
-        if (item.type !== 'file' && item.type !== 'folder') {
-          return googleHelper.uploadFile(
-            syncToken,
-            JSON.stringify(item),
-            [workspace.dataFolderId],
-            {
-              folderId: workspace.folderId,
-            },
-            undefined,
-            undefined,
-            syncData && syncData.id,
-            syncData && syncData.parentIds,
-            ifNotTooLate,
-          );
-        }
-
-        // For type `file` or `folder`
-        const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
-        let parentId;
-        if (item.parentId === 'trash') {
-          parentId = workspace.trashFolderId;
-        } else if (parentSyncData) {
-          parentId = parentSyncData.id;
-        } else {
-          parentId = workspace.folderId;
-        }
-
-        return googleHelper.uploadFile(
-          syncToken,
-          item.name,
-          [parentId],
-          {
-            id: item.id,
-            folderId: workspace.folderId,
-          },
-          undefined,
-          item.type === 'folder' ? googleHelper.folderMimeType : undefined,
-          syncData && syncData.id,
-          syncData && syncData.parentIds,
-          ifNotTooLate,
-        );
-      })
-      .then(file => ({
-        // Build sync data
-        id: file.id,
-        itemId: item.id,
-        type: item.type,
-        hash: item.hash,
-      }));
-  },
-  removeItem(syncData, ifNotTooLate) {
-    // Ignore content deletion
-    if (syncData.type === 'content') {
-      return Promise.resolve();
-    }
+  async saveSimpleItem(item, syncData, ifNotTooLate) {
+    const workspace = store.getters['workspace/currentWorkspace'];
     const syncToken = store.getters['workspace/syncToken'];
-    return googleHelper.removeFile(syncToken, syncData.id, ifNotTooLate);
+    let file;
+    if (item.type !== 'file' && item.type !== 'folder') {
+      // For sync/publish locations, store item as filename
+      file = await googleHelper.uploadFile({
+        token: syncToken,
+        name: JSON.stringify(item),
+        parents: [workspace.dataFolderId],
+        appProperties: {
+          folderId: workspace.folderId,
+        },
+        fileId: syncData && syncData.id,
+        oldParents: syncData && syncData.parentIds,
+        ifNotTooLate,
+      });
+    } else {
+      // For type `file` or `folder`
+      const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
+      let parentId;
+      if (item.parentId === 'trash') {
+        parentId = workspace.trashFolderId;
+      } else if (parentSyncData) {
+        parentId = parentSyncData.id;
+      } else {
+        parentId = workspace.folderId;
+      }
+
+      file = await googleHelper.uploadFile({
+        token: syncToken,
+        name: item.name,
+        parents: [parentId],
+        appProperties: {
+          id: item.id,
+          folderId: workspace.folderId,
+        },
+        mediaType: item.type === 'folder' ? googleHelper.folderMimeType : undefined,
+        fileId: syncData && syncData.id,
+        oldParents: syncData && syncData.parentIds,
+        ifNotTooLate,
+      });
+    }
+    // Build sync data
+    return {
+      id: file.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
   },
-  downloadContent(token, syncLocation) {
+  async removeItem(syncData, ifNotTooLate) {
+    // Ignore content deletion
+    if (syncData.type !== 'content') {
+      const syncToken = store.getters['workspace/syncToken'];
+      await googleHelper.removeFile(syncToken, syncData.id, ifNotTooLate);
+    }
+  },
+  async downloadContent(token, syncLocation) {
     const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
     const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
     if (!syncData || !contentSyncData) {
-      return Promise.resolve();
+      return null;
     }
-    return googleHelper.downloadFile(token, syncData.id)
-      .then((content) => {
-        const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
-        if (item.hash !== contentSyncData.hash) {
-          store.dispatch('data/patchSyncData', {
-            [contentSyncData.id]: {
-              ...contentSyncData,
-              hash: item.hash,
-            },
-          });
-        }
-        // Open the file requested by action if it wasn't synced yet
-        if (fileIdToOpen && fileIdToOpen === syncData.id) {
-          fileIdToOpen = null;
-          // Open the file once downloaded content has been stored
-          setTimeout(() => {
-            store.commit('file/setCurrentId', syncData.itemId);
-          }, 10);
-        }
-        return item;
+    const content = await googleHelper.downloadFile(token, syncData.id);
+    const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
+    if (item.hash !== contentSyncData.hash) {
+      store.dispatch('data/patchSyncData', {
+        [contentSyncData.id]: {
+          ...contentSyncData,
+          hash: item.hash,
+        },
       });
+    }
+
+    // Open the file requested by action if it wasn't synced yet
+    if (fileIdToOpen && fileIdToOpen === syncData.id) {
+      fileIdToOpen = null;
+      // Open the file once downloaded content has been stored
+      setTimeout(() => {
+        store.commit('file/setCurrentId', syncData.itemId);
+      }, 10);
+    }
+    return item;
   },
-  downloadData(dataId) {
+  async downloadData(dataId) {
     const syncData = store.getters['data/syncDataByItemId'][dataId];
     if (!syncData) {
-      return Promise.resolve();
+      return null;
     }
     const syncToken = store.getters['workspace/syncToken'];
-    return googleHelper.downloadFile(syncToken, syncData.id)
-      .then((content) => {
-        const item = JSON.parse(content);
-        if (item.hash !== syncData.hash) {
-          store.dispatch('data/patchSyncData', {
-            [syncData.id]: {
-              ...syncData,
-              hash: item.hash,
-            },
-          });
-        }
-        return item;
+    const content = await googleHelper.downloadFile(syncToken, syncData.id);
+    const item = JSON.parse(content);
+    if (item.hash !== syncData.hash) {
+      store.dispatch('data/patchSyncData', {
+        [syncData.id]: {
+          ...syncData,
+          hash: item.hash,
+        },
       });
-  },
-  uploadContent(token, content, syncLocation, ifNotTooLate) {
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (contentSyncData && contentSyncData.hash === content.hash) {
-      return Promise.resolve(syncLocation);
     }
-    return Promise.resolve()
-      .then(() => {
-        const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
-        if (syncData) {
-          // Only update file media
-          return googleHelper.uploadFile(
-            token,
-            undefined,
-            undefined,
-            undefined,
-            Provider.serializeContent(content),
-            undefined,
-            syncData.id,
-            undefined,
-            ifNotTooLate,
-          );
-        }
+    return item;
+  },
+  async uploadContent(token, content, syncLocation, ifNotTooLate) {
+    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
+    if (!contentSyncData || contentSyncData.hash !== content.hash) {
+      const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
+      let file;
+      if (syncData) {
+        // Only update file media
+        file = await googleHelper.uploadFile({
+          token,
+          media: Provider.serializeContent(content),
+          fileId: syncData.id,
+          ifNotTooLate,
+        });
+      } else {
         // Create file with media
         const workspace = store.getters['workspace/currentWorkspace'];
         // Use deepCopy to freeze objects
         const item = utils.deepCopy(store.state.file.itemMap[syncLocation.fileId]);
         const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
-        return googleHelper.uploadFile(
+        file = await googleHelper.uploadFile({
           token,
-          item.name,
-          [parentSyncData ? parentSyncData.id : workspace.folderId],
-          {
+          name: item.name,
+          parents: [parentSyncData ? parentSyncData.id : workspace.folderId],
+          appProperties: {
             id: item.id,
             folderId: workspace.folderId,
           },
-          Provider.serializeContent(content),
-          undefined,
-          undefined,
-          undefined,
+          media: Provider.serializeContent(content),
           ifNotTooLate,
-        )
-          .then((file) => {
-            store.dispatch('data/patchSyncData', {
-              [file.id]: {
-                id: file.id,
-                itemId: item.id,
-                type: item.type,
-                hash: item.hash,
-              },
-            });
-            return file;
-          });
-      })
-      .then(file => store.dispatch('data/patchSyncData', {
+        });
+        store.dispatch('data/patchSyncData', {
+          [file.id]: {
+            id: file.id,
+            itemId: item.id,
+            type: item.type,
+            hash: item.hash,
+          },
+        });
+      }
+      store.dispatch('data/patchSyncData', {
         [`${file.id}/content`]: {
           // Build sync data
           id: `${file.id}/content`,
@@ -521,34 +462,32 @@ export default new Provider({
           type: content.type,
           hash: content.hash,
         },
-      }))
-      .then(() => syncLocation);
-  },
-  uploadData(item, ifNotTooLate) {
-    const syncData = store.getters['data/syncDataByItemId'][item.id];
-    if (syncData && syncData.hash === item.hash) {
-      return Promise.resolve();
+      });
     }
-    const workspace = store.getters['workspace/currentWorkspace'];
-    const syncToken = store.getters['workspace/syncToken'];
-    return googleHelper.uploadFile(
-      syncToken,
-      JSON.stringify({
-        id: item.id,
-        type: item.type,
-        hash: item.hash,
-      }),
-      [workspace.dataFolderId],
-      {
-        folderId: workspace.folderId,
-      },
-      JSON.stringify(item),
-      undefined,
-      syncData && syncData.id,
-      syncData && syncData.parentIds,
-      ifNotTooLate,
-    )
-      .then(file => store.dispatch('data/patchSyncData', {
+    return syncLocation;
+  },
+  async uploadData(item, ifNotTooLate) {
+    const syncData = store.getters['data/syncDataByItemId'][item.id];
+    if (!syncData || syncData.hash !== item.hash) {
+      const workspace = store.getters['workspace/currentWorkspace'];
+      const syncToken = store.getters['workspace/syncToken'];
+      const file = await googleHelper.uploadFile({
+        token: syncToken,
+        name: JSON.stringify({
+          id: item.id,
+          type: item.type,
+          hash: item.hash,
+        }),
+        parents: [workspace.dataFolderId],
+        appProperties: {
+          folderId: workspace.folderId,
+        },
+        media: JSON.stringify(item),
+        fileId: syncData && syncData.id,
+        oldParents: syncData && syncData.parentIds,
+        ifNotTooLate,
+      });
+      store.dispatch('data/patchSyncData', {
         [file.id]: {
           // Build sync data
           id: file.id,
@@ -556,21 +495,22 @@ export default new Provider({
           type: item.type,
           hash: item.hash,
         },
-      }));
+      });
+    }
   },
-  listRevisions(token, fileId) {
-    return getSyncData(fileId)
-      .then(syncData => googleHelper.getFileRevisions(token, syncData.id))
-      .then(revisions => revisions.map(revision => ({
-        id: revision.id,
-        sub: revision.lastModifyingUser && revision.lastModifyingUser.permissionId,
-        created: new Date(revision.modifiedTime).getTime(),
-      }))
-        .sort((revision1, revision2) => revision2.created - revision1.created));
+  async listRevisions(token, fileId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const revisions = await googleHelper.getFileRevisions(token, syncData.id);
+    return revisions.map(revision => ({
+      id: revision.id,
+      sub: revision.lastModifyingUser && revision.lastModifyingUser.permissionId,
+      created: new Date(revision.modifiedTime).getTime(),
+    }))
+      .sort((revision1, revision2) => revision2.created - revision1.created);
   },
-  getRevisionContent(token, fileId, revisionId) {
-    return getSyncData(fileId)
-      .then(syncData => googleHelper.downloadFileRevision(token, syncData.id, revisionId))
-      .then(content => Provider.parseContent(content, `${fileId}/content`));
+  async getRevisionContent(token, fileId, revisionId) {
+    const syncData = Provider.getContentSyncData(fileId);
+    const content = await googleHelper.downloadFileRevision(token, syncData.id, revisionId);
+    return Provider.parseContent(content, `${fileId}/content`);
   },
 });
diff --git a/src/services/providers/helpers/couchdbHelper.js b/src/services/providers/helpers/couchdbHelper.js
index a681f418..f78c9eeb 100644
--- a/src/services/providers/helpers/couchdbHelper.js
+++ b/src/services/providers/helpers/couchdbHelper.js
@@ -2,31 +2,37 @@ import networkSvc from '../../networkSvc';
 import utils from '../../utils';
 import store from '../../../store';
 
-const request = (token, options = {}) => {
+const request = async (token, options = {}) => {
   const baseUrl = `${token.dbUrl}/`;
   const getLastToken = () => store.getters['data/couchdbTokens'][token.sub];
 
-  const ifUnauthorized = cb => (err) => {
+  const assertUnauthorized = (err) => {
     if (err.status !== 401) {
       throw err;
     }
-    return cb(err);
   };
 
-  const onUnauthorized = () => networkSvc.request({
-    method: 'POST',
-    url: utils.resolveUrl(baseUrl, '../_session'),
-    withCredentials: true,
-    body: {
-      name: getLastToken().name,
-      password: getLastToken().password,
-    },
-  })
-    .catch(ifUnauthorized(() => store.dispatch('modal/open', {
-      type: 'couchdbCredentials',
-      token: getLastToken(),
-    })
-      .then(onUnauthorized)));
+  const onUnauthorized = async () => {
+    try {
+      const { name, password } = getLastToken();
+      await networkSvc.request({
+        method: 'POST',
+        url: utils.resolveUrl(baseUrl, '../_session'),
+        withCredentials: true,
+        body: {
+          name,
+          password,
+        },
+      });
+    } catch (err) {
+      assertUnauthorized(err);
+      await store.dispatch('modal/open', {
+        type: 'couchdbCredentials',
+        token: getLastToken(),
+      });
+      await onUnauthorized();
+    }
+  };
 
   const config = {
     ...options,
@@ -38,55 +44,75 @@ const request = (token, options = {}) => {
     withCredentials: true,
   };
 
-  return networkSvc.request(config)
-    .catch(ifUnauthorized(() => onUnauthorized()
-      .then(() => networkSvc.request(config))))
-    .then(res => res.body)
-    .catch((err) => {
-      if (err.status === 409) {
-        throw new Error('TOO_LATE');
-      }
-      throw err;
-    });
+  try {
+    let res;
+    try {
+      res = await networkSvc.request(config);
+    } catch (err) {
+      assertUnauthorized(err);
+      await onUnauthorized();
+      res = await networkSvc.request(config);
+    }
+    return res.body;
+  } catch (err) {
+    if (err.status === 409) {
+      throw new Error('TOO_LATE');
+    }
+    throw err;
+  }
 };
 
 export default {
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/database/common.html#db
+   */
   getDb(token) {
     return request(token);
   },
-  getChanges(token, lastSeq) {
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/database/changes.html#db-changes
+   */
+  async getChanges(token, lastSeq) {
     const result = {
       changes: [],
+      lastSeq,
     };
 
-    const getPage = (since = 0) => request(token, {
-      method: 'GET',
-      path: '_changes',
-      params: {
-        since,
-        include_docs: true,
-        limit: 1000,
-      },
-    })
-      .then((body) => {
-        result.changes = result.changes.concat(body.results);
-        if (body.pending) {
-          return getPage(body.last_seq);
-        }
-        result.lastSeq = body.last_seq;
-        return result;
+    const getPage = async () => {
+      const body = await request(token, {
+        method: 'GET',
+        path: '_changes',
+        params: {
+          since: result.lastSeq || 0,
+          include_docs: true,
+          limit: 1000,
+        },
       });
+      result.changes = [...result.changes, ...body.results];
+      result.lastSeq = body.last_seq;
+      if (body.pending) {
+        return getPage();
+      }
+      return result;
+    };
 
-    return getPage(lastSeq);
+    return getPage();
   },
-  uploadDocument(
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/database/common.html#post--db
+   * http://docs.couchdb.org/en/2.1.1/api/document/common.html#put--db-docid
+   */
+  async uploadDocument({
     token,
     item,
     data = null,
     dataType = null,
     documentId = null,
     rev = null,
-  ) {
+  }) {
     const options = {
       method: 'POST',
       body: { item, time: Date.now() },
@@ -110,34 +136,48 @@ export default {
     }
     return request(token, options);
   },
-  removeDocument(token, documentId, rev) {
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/document/common.html#delete--db-docid
+   */
+  async removeDocument(token, documentId, rev) {
     return request(token, {
       method: 'DELETE',
       path: documentId,
       params: { rev },
     });
   },
-  retrieveDocument(token, documentId, rev) {
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/document/common.html#get--db-docid
+   */
+  async retrieveDocument(token, documentId, rev) {
     return request(token, {
       path: documentId,
       params: { rev },
     });
   },
-  retrieveDocumentWithAttachments(token, documentId, rev) {
-    return request(token, {
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/document/common.html#get--db-docid
+   */
+  async retrieveDocumentWithAttachments(token, documentId, rev) {
+    const body = await request(token, {
       path: documentId,
       params: { attachments: true, rev },
-    })
-      .then((body) => {
-        body.attachments = {};
-        // eslint-disable-next-line no-underscore-dangle
-        Object.entries(body._attachments).forEach(([name, attachment]) => {
-          body.attachments[name] = utils.decodeBase64(attachment.data);
-        });
-        return body;
-      });
+    });
+    body.attachments = {};
+    // eslint-disable-next-line no-underscore-dangle
+    Object.entries(body._attachments).forEach(([name, attachment]) => {
+      body.attachments[name] = utils.decodeBase64(attachment.data);
+    });
+    return body;
   },
-  retrieveDocumentWithRevisions(token, documentId) {
+
+  /**
+   * http://docs.couchdb.org/en/2.1.1/api/document/common.html#get--db-docid
+   */
+  async retrieveDocumentWithRevisions(token, documentId) {
     return request(token, {
       path: documentId,
       params: {
diff --git a/src/services/providers/helpers/dropboxHelper.js b/src/services/providers/helpers/dropboxHelper.js
index 5c33bd22..a8f4baed 100644
--- a/src/services/providers/helpers/dropboxHelper.js
+++ b/src/services/providers/helpers/dropboxHelper.js
@@ -1,8 +1,6 @@
 import networkSvc from '../../networkSvc';
 import store from '../../../store';
 
-let Dropbox;
-
 const getAppKey = (fullAccess) => {
   if (fullAccess) {
     return 'lq6mwopab8wskas';
@@ -22,89 +20,105 @@ const request = (token, options, args) => networkSvc.request({
 });
 
 export default {
-  startOauth2(fullAccess, sub = null, silent = false) {
-    return networkSvc.startOauth2(
+
+  /**
+   * https://www.dropbox.com/developers/documentation/http/documentation#oauth2-authorize
+   */
+  async startOauth2(fullAccess, sub = null, silent = false) {
+    const { accessToken } = await networkSvc.startOauth2(
       'https://www.dropbox.com/oauth2/authorize',
       {
         client_id: getAppKey(fullAccess),
         response_type: 'token',
       },
       silent,
-    )
-      // Call the user info endpoint
-      .then(({ accessToken }) => request({ accessToken }, {
-        method: 'POST',
-        url: 'https://api.dropboxapi.com/2/users/get_current_account',
-      })
-        .then((res) => {
-          // Check the returned sub consistency
-          if (sub && `${res.body.account_id}` !== sub) {
-            throw new Error('Dropbox account ID not expected.');
-          }
-          // Build token object including scopes and sub
-          const token = {
-            accessToken,
-            name: res.body.name.display_name,
-            sub: `${res.body.account_id}`,
-            fullAccess,
-          };
-          // Add token to dropboxTokens
-          store.dispatch('data/setDropboxToken', token);
-          return token;
-        }));
-  },
-  loadClientScript() {
-    if (Dropbox) {
-      return Promise.resolve();
+    );
+
+    // Call the user info endpoint
+    const { body } = await request({ accessToken }, {
+      method: 'POST',
+      url: 'https://api.dropboxapi.com/2/users/get_current_account',
+    });
+
+    // Check the returned sub consistency
+    if (sub && `${body.account_id}` !== sub) {
+      throw new Error('Dropbox account ID not expected.');
     }
-    return networkSvc.loadScript('https://www.dropbox.com/static/api/2/dropins.js')
-      .then(() => {
-        ({ Dropbox } = window);
-      });
+
+    // Build token object including scopes and sub
+    const token = {
+      accessToken,
+      name: body.name.display_name,
+      sub: `${body.account_id}`,
+      fullAccess,
+    };
+
+    // Add token to dropboxTokens
+    store.dispatch('data/setDropboxToken', token);
+    return token;
   },
   addAccount(fullAccess = false) {
     return this.startOauth2(fullAccess);
   },
-  uploadFile(token, path, content, fileId) {
-    return request(token, {
+
+  /**
+   * https://www.dropbox.com/developers/documentation/http/documentation#files-upload
+   */
+  async uploadFile({
+    token,
+    path,
+    content,
+    fileId,
+  }) {
+    return (await request(token, {
       method: 'POST',
       url: 'https://content.dropboxapi.com/2/files/upload',
       body: content,
     }, {
       path: fileId || path,
       mode: 'overwrite',
-    })
-      .then(res => res.body);
+    })).body;
   },
-  downloadFile(token, path, fileId) {
-    return request(token, {
+
+  /**
+   * https://www.dropbox.com/developers/documentation/http/documentation#files-download
+   */
+  async downloadFile({
+    token,
+    path,
+    fileId,
+  }) {
+    const res = await request(token, {
       method: 'POST',
       url: 'https://content.dropboxapi.com/2/files/download',
       raw: true,
     }, {
       path: fileId || path,
-    })
-      .then(res => ({
-        id: JSON.parse(res.headers['dropbox-api-result']).id,
-        content: res.body,
-      }));
+    });
+    return {
+      id: JSON.parse(res.headers['dropbox-api-result']).id,
+      content: res.body,
+    };
   },
-  openChooser(token) {
-    return this.loadClientScript()
-      .then(() => new Promise((resolve) => {
-        Dropbox.appKey = getAppKey(token.fullAccess);
-        Dropbox.choose({
-          multiselect: true,
-          linkType: 'direct',
-          success: (files) => {
-            const paths = files.map((file) => {
-              const path = file.link.replace(/.*\/view\/[^/]*/, '');
-              return decodeURI(path);
-            });
-            resolve(paths);
-          },
-          cancel: () => resolve([]),
-        });
-      }));
+
+  /**
+   * https://www.dropbox.com/developers/chooser
+   */
+  async openChooser(token) {
+    if (!window.Dropbox) {
+      await networkSvc.loadScript('https://www.dropbox.com/static/api/2/dropins.js');
+    }
+    return new Promise((resolve) => {
+      window.Dropbox.appKey = getAppKey(token.fullAccess);
+      window.Dropbox.choose({
+        multiselect: true,
+        linkType: 'direct',
+        success: files => resolve(files.map((file) => {
+          const path = file.link.replace(/.*\/view\/[^/]*/, '');
+          return decodeURI(path);
+        })),
+        cancel: () => resolve([]),
+      });
+    });
   },
 };
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index cbb4733f..7668e9d3 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -20,7 +20,8 @@ const request = (token, options) => networkSvc.request({
 const repoRequest = (token, owner, repo, options) => request(token, {
   ...options,
   url: `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/${options.url}`,
-});
+})
+  .then(res => res.body);
 
 const getCommitMessage = (name, path) => {
   const message = store.getters['data/computedSettings'].github[name];
@@ -28,95 +29,131 @@ const getCommitMessage = (name, path) => {
 };
 
 export default {
-  startOauth2(scopes, sub = null, silent = false) {
-    return networkSvc.startOauth2(
+
+  /**
+   * https://developer.github.com/apps/building-oauth-apps/authorization-options-for-oauth-apps/
+   */
+  async startOauth2(scopes, sub = null, silent = false) {
+    const { code } = await networkSvc.startOauth2(
       'https://github.com/login/oauth/authorize',
       {
         client_id: clientId,
         scope: scopes.join(' '),
       },
       silent,
-    )
-      // Exchange code with token
-      .then(data => networkSvc.request({
-        method: 'GET',
-        url: 'oauth2/githubToken',
-        params: {
-          clientId,
-          code: data.code,
-        },
-      })
-        .then(res => res.body))
-      // Call the user info endpoint
-      .then(accessToken => networkSvc.request({
-        method: 'GET',
-        url: 'https://api.github.com/user',
-        params: {
-          access_token: accessToken,
-        },
-      })
-        .then((res) => {
-          // Check the returned sub consistency
-          if (sub && `${res.body.id}` !== sub) {
-            throw new Error('GitHub account ID not expected.');
-          }
-          // Build token object including scopes and sub
-          const token = {
-            scopes,
-            accessToken,
-            name: res.body.login,
-            sub: `${res.body.id}`,
-            repoFullAccess: scopes.indexOf('repo') !== -1,
-          };
-          // Add token to githubTokens
-          store.dispatch('data/setGithubToken', token);
-          return token;
-        }));
+    );
+
+    // Exchange code with token
+    const accessToken = (await networkSvc.request({
+      method: 'GET',
+      url: 'oauth2/githubToken',
+      params: {
+        clientId,
+        code,
+      },
+    })).body;
+
+    // Call the user info endpoint
+    const user = (await networkSvc.request({
+      method: 'GET',
+      url: 'https://api.github.com/user',
+      params: {
+        access_token: accessToken,
+      },
+    })).body;
+
+    // Check the returned sub consistency
+    if (sub && `${user.id}` !== sub) {
+      throw new Error('GitHub account ID not expected.');
+    }
+
+    // Build token object including scopes and sub
+    const token = {
+      scopes,
+      accessToken,
+      name: user.login,
+      sub: `${user.id}`,
+      repoFullAccess: scopes.indexOf('repo') !== -1,
+    };
+
+    // Add token to githubTokens
+    store.dispatch('data/setGithubToken', token);
+    return token;
   },
-  addAccount(repoFullAccess = false) {
+  async addAccount(repoFullAccess = false) {
     return this.startOauth2(getScopes({ repoFullAccess }));
   },
-  getUser(userId) {
-    return networkSvc.request({
+
+  /**
+   * Getting a user from its userId is not feasible with API v3.
+   * Using an undocumented endpoint...
+   */
+  async getUser(userId) {
+    const user = (await networkSvc.request({
       url: `https://api.github.com/user/${userId}`,
       params: {
         t: Date.now(), // Prevent from caching
       },
-    })
-      .then((res) => {
-        store.commit('userInfo/addItem', {
-          id: `gh:${res.body.id}`,
-          name: res.body.login,
-          imageUrl: res.body.avatar_url || '',
-        });
-        return res.body;
-      });
+    })).body;
+    store.commit('userInfo/addItem', {
+      id: `gh:${user.id}`,
+      name: user.login,
+      imageUrl: user.avatar_url || '',
+    });
+    return user;
   },
-  getTree(token, owner, repo, sha) {
-    return repoRequest(token, owner, repo, {
-      url: `git/trees/${encodeURIComponent(sha)}?recursive=1`,
-    })
-      .then((res) => {
-        if (res.body.truncated) {
-          throw new Error('Git tree too big. Please remove some files in the repository.');
-        }
-        return res.body.tree;
-      });
-  },
-  getHeadTree(token, owner, repo, branch) {
-    return repoRequest(token, owner, repo, {
+
+  /**
+   * https://developer.github.com/v3/repos/commits/#get-a-single-commit
+   * https://developer.github.com/v3/git/trees/#get-a-tree
+   */
+  async getTree({
+    token,
+    owner,
+    repo,
+    branch,
+  }) {
+    const { commit } = (await repoRequest(token, owner, repo, {
       url: `commits/${encodeURIComponent(branch)}`,
-    })
-      .then(res => this.getTree(token, owner, repo, res.body.commit.tree.sha));
+    })).body;
+    const { tree, truncated } = (await repoRequest(token, owner, repo, {
+      url: `git/trees/${encodeURIComponent(commit.tree.sha)}?recursive=1`,
+    })).body;
+    if (truncated) {
+      throw new Error('Git tree too big. Please remove some files in the repository.');
+    }
+    return tree;
   },
-  getCommits(token, owner, repo, sha, path) {
+
+  /**
+   * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
+   */
+  async getCommits({
+    token,
+    owner,
+    repo,
+    sha,
+    path,
+  }) {
     return repoRequest(token, owner, repo, {
       url: 'commits',
       params: { sha, path },
-    })
-      .then(res => res.body);
+    });
   },
-  uploadFile(token, owner, repo, branch, path, content, sha) {
+
+  /**
+   * https://developer.github.com/v3/repos/contents/#create-a-file
+   * https://developer.github.com/v3/repos/contents/#update-a-file
+   */
+  async uploadFile({
+    token,
+    owner,
+    repo,
+    branch,
+    path,
+    content,
+    sha,
+  }) {
     return repoRequest(token, owner, repo, {
       method: 'PUT',
       url: `contents/${encodeURIComponent(path)}`,
@@ -126,10 +163,20 @@ export default {
         sha,
         branch,
       },
-    })
-      .then(res => res.body);
+    });
   },
-  removeFile(token, owner, repo, branch, path, sha) {
+
+  /**
+   * https://developer.github.com/v3/repos/contents/#delete-a-file
+   */
+  async removeFile({
+    token,
+    owner,
+    repo,
+    branch,
+    path,
+    sha,
+  }) {
     return repoRequest(token, owner, repo, {
       method: 'DELETE',
       url: `contents/${encodeURIComponent(path)}`,
@@ -138,21 +185,42 @@ export default {
         sha,
         branch,
       },
-    })
-      .then(res => res.body);
+    });
   },
-  downloadFile(token, owner, repo, branch, path) {
-    return repoRequest(token, owner, repo, {
+
+  /**
+   * https://developer.github.com/v3/repos/contents/#get-contents
+   */
+  async downloadFile({
+    token,
+    owner,
+    repo,
+    branch,
+    path,
+  }) {
+    const body = await repoRequest(token, owner, repo, {
       url: `contents/${encodeURIComponent(path)}`,
       params: { ref: branch },
-    })
-      .then(res => ({
-        sha: res.body.sha,
-        content: utils.decodeBase64(res.body.content),
-      }));
+    });
+    return {
+      sha: body.sha,
+      content: utils.decodeBase64(body.content),
+    };
   },
-  uploadGist(token, description, filename, content, isPublic, gistId) {
-    return request(token, gistId ? {
+
+  /**
+   * https://developer.github.com/v3/gists/#create-a-gist
+   * https://developer.github.com/v3/gists/#edit-a-gist
+   */
+  async uploadGist({
+    token,
+    description,
+    filename,
+    content,
+    isPublic,
+    gistId,
+  }) {
+    const { body } = await request(token, gistId ? {
       method: 'PATCH',
       url: `https://api.github.com/gists/${gistId}`,
       body: {
@@ -175,19 +243,24 @@ export default {
         },
         public: isPublic,
       },
-    })
-      .then(res => res.body);
+    });
+    return body;
   },
-  downloadGist(token, gistId, filename) {
-    return request(token, {
+
+  /**
+   * https://developer.github.com/v3/gists/#get-a-single-gist
+   */
+  async downloadGist({
+    token,
+    gistId,
+    filename,
+  }) {
+    const result = (await request(token, {
       url: `https://api.github.com/gists/${gistId}`,
-    })
-      .then((res) => {
-        const result = res.body.files[filename];
-        if (!result) {
-          throw new Error('Gist file not found.');
-        }
-        return result.content;
-      });
+    })).body.files[filename];
+    if (!result) {
+      throw new Error('Gist file not found.');
+    }
+    return result.content;
   },
 };
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 16181bbb..9a19ab6f 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -6,8 +6,6 @@ const clientId = GOOGLE_CLIENT_ID;
 const apiKey = 'AIzaSyC_M4RA9pY6XmM9pmFxlT59UPMO7aHr9kk';
 const appsDomain = null;
 const tokenExpirationMargin = 5 * 60 * 1000; // 5 min (Google tokens expire after 1h)
-let gapi;
-let google;
 
 const driveAppDataScopes = ['https://www.googleapis.com/auth/drive.appdata'];
 const getDriveScopes = token => [token.driveFullAccess
@@ -17,8 +15,6 @@ const getDriveScopes = token => [token.driveFullAccess
 const bloggerScopes = ['https://www.googleapis.com/auth/blogger'];
 const photosScopes = ['https://www.googleapis.com/auth/photos'];
 
-const libraries = ['picker'];
-
 const checkIdToken = (idToken) => {
   try {
     const token = idToken.split('.');
@@ -43,176 +39,36 @@ export default {
   driveState,
   driveActionFolder: null,
   driveActionFiles: [],
-  request(token, options) {
-    return networkSvc.request({
-      ...options,
-      headers: {
-        ...options.headers || {},
-        Authorization: `Bearer ${token.accessToken}`,
-      },
-    }, true)
-      .catch((err) => {
-        const { reason } = (((err.body || {}).error || {}).errors || [])[0] || {};
-        if (reason === 'authError') {
-          // Mark the token as revoked and get a new one
-          store.dispatch('data/setGoogleToken', {
-            ...token,
-            expiresOn: 0,
-          });
-          // Refresh token and retry
-          return this.refreshToken(token, token.scopes)
-            .then(refreshedToken => this.request(refreshedToken, options));
-        }
-        throw err;
-      });
-  },
-  uploadFileInternal(
-    refreshedToken,
-    name,
-    parents,
-    appProperties,
-    media = null,
-    mediaType = null,
-    fileId = null,
-    oldParents = null,
-    ifNotTooLate = cb => res => cb(res),
-  ) {
-    return Promise.resolve()
-      // Refreshing a token can take a while if an oauth window pops up, make sure it's not too late
-      .then(ifNotTooLate(() => {
-        const options = {
-          method: 'POST',
-          url: 'https://www.googleapis.com/drive/v3/files',
-        };
-        const params = {
-          supportsTeamDrives: true,
-        };
-        const metadata = { name, appProperties };
-        if (fileId) {
-          options.method = 'PATCH';
-          options.url = `https://www.googleapis.com/drive/v3/files/${fileId}`;
-          if (parents && oldParents) {
-            params.addParents = parents
-              .filter(parent => oldParents.indexOf(parent) === -1)
-              .join(',');
-            params.removeParents = oldParents
-              .filter(parent => parents.indexOf(parent) === -1)
-              .join(',');
-          }
-        } else if (parents) {
-          metadata.parents = parents;
-        }
-        if (media) {
-          const boundary = `-------${utils.uid()}`;
-          const delimiter = `\r\n--${boundary}\r\n`;
-          const closeDelimiter = `\r\n--${boundary}--`;
-          let multipartRequestBody = '';
-          multipartRequestBody += delimiter;
-          multipartRequestBody += 'Content-Type: application/json; charset=UTF-8\r\n\r\n';
-          multipartRequestBody += JSON.stringify(metadata);
-          multipartRequestBody += delimiter;
-          multipartRequestBody += `Content-Type: ${mediaType || 'text/plain'}; charset=UTF-8\r\n\r\n`;
-          multipartRequestBody += media;
-          multipartRequestBody += closeDelimiter;
-          options.url = options.url.replace(
-            'https://www.googleapis.com/',
-            'https://www.googleapis.com/upload/',
-          );
-          return this.request(refreshedToken, {
-            ...options,
-            params: {
-              ...params,
-              uploadType: 'multipart',
-            },
-            headers: {
-              'Content-Type': `multipart/mixed; boundary="${boundary}"`,
-            },
-            body: multipartRequestBody,
-          }).then(res => res.body);
-        }
-        if (mediaType) {
-          metadata.mimeType = mediaType;
-        }
-        return this.request(refreshedToken, {
-          ...options,
-          body: metadata,
-          params,
-        }).then(res => res.body);
-      }));
-  },
-  downloadFileInternal(refreshedToken, id) {
-    return this.request(refreshedToken, {
-      method: 'GET',
-      url: `https://www.googleapis.com/drive/v3/files/${id}?alt=media`,
-      raw: true,
-    }).then(res => res.body);
-  },
-  removeFileInternal(refreshedToken, id, ifNotTooLate = cb => res => cb(res)) {
-    return Promise.resolve()
-      // Refreshing a token can take a while if an oauth window pops up, so check if it's too late
-      .then(ifNotTooLate(() => this.request(refreshedToken, {
-        method: 'DELETE',
-        url: `https://www.googleapis.com/drive/v3/files/${id}`,
-        params: {
-          supportsTeamDrives: true,
+  async $request(token, options) {
+    try {
+      return (await networkSvc.request({
+        ...options,
+        headers: {
+          ...options.headers || {},
+          Authorization: `Bearer ${token.accessToken}`,
         },
-      })));
-  },
-  getFileRevisionsInternal(refreshedToken, id) {
-    return Promise.resolve()
-      .then(() => {
-        const revisions = [];
-        const getPage = pageToken => this.request(refreshedToken, {
-          method: 'GET',
-          url: `https://www.googleapis.com/drive/v3/files/${id}/revisions`,
-          params: {
-            pageToken,
-            pageSize: 1000,
-            fields: 'nextPageToken,revisions(id,modifiedTime,lastModifyingUser/permissionId,lastModifyingUser/displayName,lastModifyingUser/photoLink)',
-          },
-        })
-          .then((res) => {
-            res.body.revisions.forEach((revision) => {
-              store.commit('userInfo/addItem', {
-                id: revision.lastModifyingUser.permissionId,
-                name: revision.lastModifyingUser.displayName,
-                imageUrl: revision.lastModifyingUser.photoLink,
-              });
-              revisions.push(revision);
-            });
-            if (res.body.nextPageToken) {
-              return getPage(res.body.nextPageToken);
-            }
-            return revisions;
-          });
-
-        return getPage();
-      });
-  },
-  downloadFileRevisionInternal(refreshedToken, fileId, revisionId) {
-    return Promise.resolve()
-      .then(() => this.request(refreshedToken, {
-        method: 'GET',
-        url: `https://www.googleapis.com/drive/v3/files/${fileId}/revisions/${revisionId}?alt=media`,
-        raw: true,
-      }).then(res => res.body));
-  },
-  getUser(userId) {
-    return networkSvc.request({
-      method: 'GET',
-      url: `https://www.googleapis.com/plus/v1/people/${userId}?key=${apiKey}`,
-    }, true)
-      .then((res) => {
-        store.commit('userInfo/addItem', {
-          id: `go:${res.body.id}`,
-          name: res.body.displayName,
-          imageUrl: (res.body.image.url || '').replace(/\bsz?=\d+$/, 'sz=40'),
+      }, true)).body;
+    } catch (err) {
+      const { reason } = (((err.body || {}).error || {}).errors || [])[0] || {};
+      if (reason === 'authError') {
+        // Mark the token as revoked and get a new one
+        store.dispatch('data/setGoogleToken', {
+          ...token,
+          expiresOn: 0,
         });
-        return res.body;
-      });
+        // Refresh token and retry
+        const refreshedToken = await this.refreshToken(token, token.scopes);
+        return this.$request(refreshedToken, options);
+      }
+      throw err;
+    }
   },
-  startOauth2(scopes, sub = null, silent = false) {
-    return networkSvc.startOauth2(
+
+  /**
+   * https://developers.google.com/identity/protocols/OpenIDConnect
+   */
+  async startOauth2(scopes, sub = null, silent = false) {
+    const { accessToken, expiresIn, idToken } = await networkSvc.startOauth2(
       'https://accounts.google.com/o/oauth2/v2/auth',
       {
         client_id: clientId,
@@ -224,86 +80,89 @@ export default {
         nonce: utils.uid(),
       },
       silent,
-    )
-      // Call the token info endpoint
-      .then(data => networkSvc.request({
-        method: 'POST',
-        url: 'https://www.googleapis.com/oauth2/v3/tokeninfo',
-        params: {
-          access_token: data.accessToken,
-        },
-      }, true).then((res) => {
-        // Check the returned client ID consistency
-        if (res.body.aud !== clientId) {
-          throw new Error('Client ID inconsistent.');
-        }
-        // Check the returned sub consistency
-        if (sub && `${res.body.sub}` !== sub) {
-          throw new Error('Google account ID not expected.');
-        }
-        // Build token object including scopes and sub
-        return {
-          scopes,
-          accessToken: data.accessToken,
-          expiresOn: Date.now() + (data.expiresIn * 1000),
-          idToken: data.idToken,
-          sub: `${res.body.sub}`,
-          isLogin: !store.getters['workspace/mainWorkspaceToken'] &&
-            scopes.indexOf('https://www.googleapis.com/auth/drive.appdata') !== -1,
-          isSponsor: false,
-          isDrive: scopes.indexOf('https://www.googleapis.com/auth/drive') !== -1 ||
-            scopes.indexOf('https://www.googleapis.com/auth/drive.file') !== -1,
-          isBlogger: scopes.indexOf('https://www.googleapis.com/auth/blogger') !== -1,
-          isPhotos: scopes.indexOf('https://www.googleapis.com/auth/photos') !== -1,
-          driveFullAccess: scopes.indexOf('https://www.googleapis.com/auth/drive') !== -1,
-        };
-      }))
+    );
+
+    // Call the token info endpoint
+    const { body } = await networkSvc.request({
+      method: 'POST',
+      url: 'https://www.googleapis.com/oauth2/v3/tokeninfo',
+      params: {
+        access_token: accessToken,
+      },
+    }, true);
+
+    // Check the returned client ID consistency
+    if (body.aud !== clientId) {
+      throw new Error('Client ID inconsistent.');
+    }
+    // Check the returned sub consistency
+    if (sub && `${body.sub}` !== sub) {
+      throw new Error('Google account ID not expected.');
+    }
+
+    // Build token object including scopes and sub
+    const existingToken = store.getters['data/googleTokens'][body.sub];
+    const token = {
+      scopes,
+      accessToken,
+      expiresOn: Date.now() + (expiresIn * 1000),
+      idToken,
+      sub: body.sub,
+      name: (existingToken || {}).name || 'Unknown',
+      isLogin: !store.getters['workspace/mainWorkspaceToken'] &&
+        scopes.indexOf('https://www.googleapis.com/auth/drive.appdata') !== -1,
+      isSponsor: false,
+      isDrive: scopes.indexOf('https://www.googleapis.com/auth/drive') !== -1 ||
+        scopes.indexOf('https://www.googleapis.com/auth/drive.file') !== -1,
+      isBlogger: scopes.indexOf('https://www.googleapis.com/auth/blogger') !== -1,
+      isPhotos: scopes.indexOf('https://www.googleapis.com/auth/photos') !== -1,
+      driveFullAccess: scopes.indexOf('https://www.googleapis.com/auth/drive') !== -1,
+    };
+
+    try {
       // Call the user info endpoint
-      .then(token => this.getUser(token.sub)
-        .catch((err) => {
-          if (err.status === 404) {
-            store.dispatch('notification/info', 'Please activate Google Plus to change your account name and photo!');
-          } else {
-            throw err;
-          }
-        })
-        .then((user = {}) => {
-          const existingToken = store.getters['data/googleTokens'][token.sub];
-          // Add name to token
-          token.name = user.displayName || (existingToken && existingToken.name) || 'Unknown';
-          if (existingToken) {
-            // We probably retrieved a new token with restricted scopes.
-            // That's no problem, token will be refreshed later with merged scopes.
-            // Restore flags
-            Object.assign(token, {
-              isLogin: existingToken.isLogin || token.isLogin,
-              isSponsor: existingToken.isSponsor,
-              isDrive: existingToken.isDrive || token.isDrive,
-              isBlogger: existingToken.isBlogger || token.isBlogger,
-              isPhotos: existingToken.isPhotos || token.isPhotos,
-              driveFullAccess: existingToken.driveFullAccess || token.driveFullAccess,
-            });
-          }
-          return token.isLogin && networkSvc.request({
-            method: 'GET',
-            url: 'userInfo',
-            params: {
-              idToken: token.idToken,
-            },
-          })
-            .then((res) => {
-              token.isSponsor = res.body.sponsorUntil > Date.now();
-            }, () => {
-              // Ignore error
-            });
-        })
-        .then(() => {
-          // Add token to googleTokens
-          store.dispatch('data/setGoogleToken', token);
-          return token;
-        }));
+      token.name = (await this.getUser(token.sub)).displayName;
+    } catch (err) {
+      if (err.status === 404) {
+        store.dispatch('notification/info', 'Please activate Google Plus to change your account name and photo.');
+      } else {
+        throw err;
+      }
+    }
+
+    if (existingToken) {
+      // We probably retrieved a new token with restricted scopes.
+      // That's no problem, token will be refreshed later with merged scopes.
+      // Restore flags
+      Object.assign(token, {
+        isLogin: existingToken.isLogin || token.isLogin,
+        isSponsor: existingToken.isSponsor,
+        isDrive: existingToken.isDrive || token.isDrive,
+        isBlogger: existingToken.isBlogger || token.isBlogger,
+        isPhotos: existingToken.isPhotos || token.isPhotos,
+        driveFullAccess: existingToken.driveFullAccess || token.driveFullAccess,
+      });
+    }
+
+    if (token.isLogin) {
+      try {
+        token.isSponsor = (await networkSvc.request({
+          method: 'GET',
+          url: 'userInfo',
+          params: {
+            idToken: token.idToken,
+          },
+        })).body.sponsorUntil > Date.now();
+      } catch (err) {
+        // Ignore
+      }
+    }
+
+    // Add token to googleTokens
+    store.dispatch('data/setGoogleToken', token);
+    return token;
   },
-  refreshToken(token, scopes = []) {
+  async refreshToken(token, scopes = []) {
     const { sub } = token;
     const lastToken = store.getters['data/googleTokens'][sub];
     const mergedScopes = [...new Set([
@@ -311,59 +170,29 @@ export default {
       ...lastToken.scopes,
     ])];
 
-    return Promise.resolve()
-      .then(() => {
-        if (
-          // If we already have permissions for the requested scopes
-          mergedScopes.length === lastToken.scopes.length &&
-          // And lastToken is not expired
-          lastToken.expiresOn > Date.now() + tokenExpirationMargin &&
-          // And in case of a login token, ID token is still valid
-          (!lastToken.isLogin || checkIdToken(lastToken.idToken))
-        ) {
-          return lastToken;
-        }
-        // New scopes are requested or existing token is going to expire.
-        // Try to get a new token in background
-        return this.startOauth2(mergedScopes, sub, true)
-          // If it fails try to popup a window
-          .catch((err) => {
-            if (store.state.offline) {
-              throw err;
-            }
-            return store.dispatch('modal/providerRedirection', {
-              providerName: 'Google',
-              onResolve: () => this.startOauth2(mergedScopes, sub),
-            });
-          });
-      });
-  },
-  loadClientScript() {
-    if (gapi) {
-      return Promise.resolve();
+    if (
+      // If we already have permissions for the requested scopes
+      mergedScopes.length === lastToken.scopes.length &&
+      // And lastToken is not expired
+      lastToken.expiresOn > Date.now() + tokenExpirationMargin &&
+      // And in case of a login token, ID token is still valid
+      (!lastToken.isLogin || checkIdToken(lastToken.idToken))
+    ) {
+      return lastToken;
+    }
+
+    // New scopes are requested or existing token is about to expire.
+    // Try to get a new token in background
+    try {
+      return await this.startOauth2(mergedScopes, sub, true);
+    } catch (err) {
+      // If it fails try to popup a window
+      if (store.state.offline) {
+        throw err;
+      }
+      await store.dispatch('modal/providerRedirection', { providerName: 'Google' });
+      return this.startOauth2(mergedScopes, sub);
     }
-    return networkSvc.loadScript('https://apis.google.com/js/api.js')
-      .then(() => Promise.all(libraries
-        .map(library => new Promise((resolve, reject) => window.gapi.load(library, {
-          callback: resolve,
-          onerror: reject,
-          timeout: 30000,
-          ontimeout: reject,
-        })))))
-      .then(() => {
-        ({ gapi } = window);
-        ({ google } = window);
-      });
-  },
-  getSponsorship(token) {
-    return this.refreshToken(token)
-      .then(refreshedToken => networkSvc.request({
-        method: 'GET',
-        url: 'userInfo',
-        params: {
-          idToken: refreshedToken.idToken,
-        },
-      }, true));
   },
   signin() {
     return this.startOauth2(driveAppDataScopes);
@@ -377,42 +206,96 @@ export default {
   addPhotosAccount() {
     return this.startOauth2(photosScopes);
   },
-  getChanges(token, startPageToken, isAppData, teamDriveId = null) {
-    const result = {
-      changes: [],
-    };
-    let fileFields = 'file/name';
-    if (!isAppData) {
-      fileFields += ',file/parents,file/mimeType,file/appProperties';
-    }
-    return this.refreshToken(token, isAppData ? driveAppDataScopes : getDriveScopes(token))
-      .then((refreshedToken) => {
-        const getPage = (pageToken = '1') => this.request(refreshedToken, {
-          method: 'GET',
-          url: 'https://www.googleapis.com/drive/v3/changes',
-          params: {
-            pageToken,
-            spaces: isAppData ? 'appDataFolder' : 'drive',
-            pageSize: 1000,
-            fields: `nextPageToken,newStartPageToken,changes(fileId,${fileFields})`,
-            supportsTeamDrives: true,
-            includeTeamDriveItems: !!teamDriveId,
-            teamDriveId,
-          },
-        })
-          .then((res) => {
-            result.changes = result.changes.concat(res.body.changes.filter(item => item.fileId));
-            if (res.body.nextPageToken) {
-              return getPage(res.body.nextPageToken);
-            }
-            result.startPageToken = res.body.newStartPageToken;
-            return result;
-          });
-
-        return getPage(startPageToken);
-      });
+  async getSponsorship(token) {
+    const refreshedToken = await this.refreshToken(token);
+    return networkSvc.request({
+      method: 'GET',
+      url: 'userInfo',
+      params: {
+        idToken: refreshedToken.idToken,
+      },
+    }, true);
   },
-  uploadFile(
+
+  /**
+   * https://developers.google.com/drive/v3/reference/files/create
+   * https://developers.google.com/drive/v3/reference/files/update
+   * https://developers.google.com/drive/v3/web/simple-upload
+   */
+  async $uploadFile({
+    refreshedToken,
+    name,
+    parents,
+    appProperties,
+    media = null,
+    mediaType = null,
+    fileId = null,
+    oldParents = null,
+    ifNotTooLate = cb => res => cb(res),
+  }) {
+    // Refreshing a token can take a while if an oauth window pops up, make sure it's not too late
+    return ifNotTooLate(() => {
+      const options = {
+        method: 'POST',
+        url: 'https://www.googleapis.com/drive/v3/files',
+      };
+      const params = {
+        supportsTeamDrives: true,
+      };
+      const metadata = { name, appProperties };
+      if (fileId) {
+        options.method = 'PATCH';
+        options.url = `https://www.googleapis.com/drive/v3/files/${fileId}`;
+        if (parents && oldParents) {
+          params.addParents = parents
+            .filter(parent => oldParents.indexOf(parent) === -1)
+            .join(',');
+          params.removeParents = oldParents
+            .filter(parent => parents.indexOf(parent) === -1)
+            .join(',');
+        }
+      } else if (parents) {
+        metadata.parents = parents;
+      }
+      if (media) {
+        const boundary = `-------${utils.uid()}`;
+        const delimiter = `\r\n--${boundary}\r\n`;
+        const closeDelimiter = `\r\n--${boundary}--`;
+        let multipartRequestBody = '';
+        multipartRequestBody += delimiter;
+        multipartRequestBody += 'Content-Type: application/json; charset=UTF-8\r\n\r\n';
+        multipartRequestBody += JSON.stringify(metadata);
+        multipartRequestBody += delimiter;
+        multipartRequestBody += `Content-Type: ${mediaType || 'text/plain'}; charset=UTF-8\r\n\r\n`;
+        multipartRequestBody += media;
+        multipartRequestBody += closeDelimiter;
+        options.url = options.url.replace(
+          'https://www.googleapis.com/',
+          'https://www.googleapis.com/upload/',
+        );
+        return this.$request(refreshedToken, {
+          ...options,
+          params: {
+            ...params,
+            uploadType: 'multipart',
+          },
+          headers: {
+            'Content-Type': `multipart/mixed; boundary="${boundary}"`,
+          },
+          body: multipartRequestBody,
+        });
+      }
+      if (mediaType) {
+        metadata.mimeType = mediaType;
+      }
+      return this.$request(refreshedToken, {
+        ...options,
+        body: metadata,
+        params,
+      });
+    });
+  },
+  async uploadFile({
     token,
     name,
     parents,
@@ -422,81 +305,214 @@ export default {
     fileId,
     oldParents,
     ifNotTooLate,
-  ) {
-    return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this.uploadFileInternal(
-        refreshedToken,
-        name,
-        parents,
-        appProperties,
-        media,
-        mediaType,
-        fileId,
-        oldParents,
-        ifNotTooLate,
-      ));
+  }) {
+    const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
+    return this.$uploadFile({
+      refreshedToken,
+      name,
+      parents,
+      appProperties,
+      media,
+      mediaType,
+      fileId,
+      oldParents,
+      ifNotTooLate,
+    });
   },
-  uploadAppDataFile(token, name, media, fileId, ifNotTooLate) {
-    return this.refreshToken(token, driveAppDataScopes)
-      .then(refreshedToken => this.uploadFileInternal(
-        refreshedToken,
-        name,
-        ['appDataFolder'],
-        undefined,
-        media,
-        undefined,
-        fileId,
-        undefined,
-        ifNotTooLate,
-      ));
+  async uploadAppDataFile({
+    token,
+    name,
+    media,
+    fileId,
+    ifNotTooLate,
+  }) {
+    const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
+    return this.$uploadFile({
+      refreshedToken,
+      name,
+      parents: ['appDataFolder'],
+      media,
+      fileId,
+      ifNotTooLate,
+    });
   },
-  getFile(token, id) {
-    return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this.request(refreshedToken, {
+
+  /**
+   * https://developers.google.com/drive/v3/reference/files/get
+   */
+  async getFile(token, id) {
+    const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
+    return this.$request(refreshedToken, {
+      method: 'GET',
+      url: `https://www.googleapis.com/drive/v3/files/${id}`,
+      params: {
+        fields: 'id,name,mimeType,appProperties,teamDriveId',
+        supportsTeamDrives: true,
+      },
+    });
+  },
+
+  /**
+   * https://developers.google.com/drive/v3/web/manage-downloads
+   */
+  async $downloadFile(refreshedToken, id) {
+    return this.$request(refreshedToken, {
+      method: 'GET',
+      url: `https://www.googleapis.com/drive/v3/files/${id}?alt=media`,
+      raw: true,
+    });
+  },
+  async downloadFile(token, id) {
+    const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
+    return this.$downloadFile(refreshedToken, id);
+  },
+  async downloadAppDataFile(token, id) {
+    const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
+    return this.$downloadFile(refreshedToken, id);
+  },
+
+  /**
+   * https://developers.google.com/drive/v3/reference/files/delete
+   */
+  async $removeFile(refreshedToken, id, ifNotTooLate = cb => res => cb(res)) {
+    // Refreshing a token can take a while if an oauth window pops up, so check if it's too late
+    return ifNotTooLate(() => this.$request(refreshedToken, {
+      method: 'DELETE',
+      url: `https://www.googleapis.com/drive/v3/files/${id}`,
+      params: {
+        supportsTeamDrives: true,
+      },
+    }));
+  },
+  async removeFile(token, id, ifNotTooLate) {
+    const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
+    return this.$removeFile(refreshedToken, id, ifNotTooLate);
+  },
+  async removeAppDataFile(token, id, ifNotTooLate = cb => res => cb(res)) {
+    const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
+    return this.$removeFile(refreshedToken, id, ifNotTooLate);
+  },
+
+  /**
+   * https://developers.google.com/drive/v3/reference/revisions/list
+   */
+  async $getFileRevisions(refreshedToken, id) {
+    const allRevisions = [];
+    const getPage = async (pageToken) => {
+      const { revisions, nextPageToken } = await this.$request(refreshedToken, {
         method: 'GET',
-        url: `https://www.googleapis.com/drive/v3/files/${id}`,
+        url: `https://www.googleapis.com/drive/v3/files/${id}/revisions`,
         params: {
-          fields: 'id,name,mimeType,appProperties,teamDriveId',
-          supportsTeamDrives: true,
+          pageToken,
+          pageSize: 1000,
+          fields: 'nextPageToken,revisions(id,modifiedTime,lastModifyingUser/permissionId,lastModifyingUser/displayName,lastModifyingUser/photoLink)',
         },
-      }))
-      .then(res => res.body);
+      });
+      revisions.forEach((revision) => {
+        store.commit('userInfo/addItem', {
+          id: revision.lastModifyingUser.permissionId,
+          name: revision.lastModifyingUser.displayName,
+          imageUrl: revision.lastModifyingUser.photoLink,
+        });
+        allRevisions.push(revision);
+      });
+      if (nextPageToken) {
+        return getPage(nextPageToken);
+      }
+      return allRevisions;
+    };
+    return getPage();
   },
-  downloadFile(token, id) {
-    return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this.downloadFileInternal(refreshedToken, id));
+  async getFileRevisions(token, id) {
+    const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
+    return this.$getFileRevisions(refreshedToken, id);
   },
-  downloadAppDataFile(token, id) {
-    return this.refreshToken(token, driveAppDataScopes)
-      .then(refreshedToken => this.downloadFileInternal(refreshedToken, id));
+  async getAppDataFileRevisions(token, id) {
+    const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
+    return this.$getFileRevisions(refreshedToken, id);
   },
-  removeFile(token, id, ifNotTooLate) {
-    return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this.removeFileInternal(refreshedToken, id, ifNotTooLate));
+
+  /**
+   * https://developers.google.com/drive/v3/reference/revisions/get
+   */
+  async $downloadFileRevision(refreshedToken, id, revisionId) {
+    return this.$request(refreshedToken, {
+      method: 'GET',
+      url: `https://www.googleapis.com/drive/v3/files/${id}/revisions/${revisionId}?alt=media`,
+      raw: true,
+    });
   },
-  removeAppDataFile(token, id, ifNotTooLate = cb => res => cb(res)) {
-    return this.refreshToken(token, driveAppDataScopes)
-      .then(refreshedToken => this.removeFileInternal(refreshedToken, id, ifNotTooLate));
+  async downloadFileRevision(token, fileId, revisionId) {
+    const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
+    return this.$downloadFileRevision(refreshedToken, fileId, revisionId);
   },
-  getFileRevisions(token, id) {
-    return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this.getFileRevisionsInternal(refreshedToken, id));
+  async downloadAppDataFileRevision(token, fileId, revisionId) {
+    const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
+    return this.$downloadFileRevision(refreshedToken, fileId, revisionId);
   },
-  getAppDataFileRevisions(token, id) {
-    return this.refreshToken(token, driveAppDataScopes)
-      .then(refreshedToken => this.getFileRevisionsInternal(refreshedToken, id));
+
+  /**
+   * https://developers.google.com/+/web/api/rest/latest/people/get
+   */
+  async getUser(userId) {
+    const { body } = await networkSvc.request({
+      method: 'GET',
+      url: `https://www.googleapis.com/plus/v1/people/${userId}?key=${apiKey}`,
+    }, true);
+    store.commit('userInfo/addItem', {
+      id: `go:${body.id}`,
+      name: body.displayName,
+      imageUrl: (body.image.url || '').replace(/\bsz?=\d+$/, 'sz=40'),
+    });
+    return body;
   },
-  downloadFileRevision(token, fileId, revisionId) {
-    return this.refreshToken(token, getDriveScopes(token))
-      .then(refreshedToken => this
-        .downloadFileRevisionInternal(refreshedToken, fileId, revisionId));
+
+  /**
+   * https://developers.google.com/drive/v3/reference/changes/list
+   */
+  async getChanges(token, startPageToken, isAppData, teamDriveId = null) {
+    const result = {
+      changes: [],
+    };
+    let fileFields = 'file/name';
+    if (!isAppData) {
+      fileFields += ',file/parents,file/mimeType,file/appProperties';
+    }
+    const refreshedToken = await this.refreshToken(
+      token,
+      isAppData ? driveAppDataScopes : getDriveScopes(token),
+    );
+
+    const getPage = async (pageToken = '1') => {
+      const { changes, nextPageToken, newStartPageToken } = await this.$request(refreshedToken, {
+        method: 'GET',
+        url: 'https://www.googleapis.com/drive/v3/changes',
+        params: {
+          pageToken,
+          spaces: isAppData ? 'appDataFolder' : 'drive',
+          pageSize: 1000,
+          fields: `nextPageToken,newStartPageToken,changes(fileId,${fileFields})`,
+          supportsTeamDrives: true,
+          includeTeamDriveItems: !!teamDriveId,
+          teamDriveId,
+        },
+      });
+      result.changes = [...result.changes, ...changes.filter(item => item.fileId)];
+      if (nextPageToken) {
+        return getPage(nextPageToken);
+      }
+      result.startPageToken = newStartPageToken;
+      return result;
+    };
+    return getPage(startPageToken);
   },
-  downloadAppDataFileRevision(token, fileId, revisionId) {
-    return this.refreshToken(token, driveAppDataScopes)
-      .then(refreshedToken => this
-        .downloadFileRevisionInternal(refreshedToken, fileId, revisionId));
-  },
-  uploadBlogger(
+
+  /**
+   * https://developers.google.com/blogger/docs/3.0/reference/blogs/getByUrl
+   * https://developers.google.com/blogger/docs/3.0/reference/posts/insert
+   * https://developers.google.com/blogger/docs/3.0/reference/posts/update
+   */
+  async uploadBlogger({
     token,
     blogUrl,
     blogId,
@@ -507,135 +523,143 @@ export default {
     isDraft,
     published,
     isPage,
-  ) {
-    return this.refreshToken(token, bloggerScopes)
-      .then(refreshedToken => Promise.resolve()
-        .then(() => {
-          if (blogId) {
-            return blogId;
-          }
-          return this.request(refreshedToken, {
-            url: 'https://www.googleapis.com/blogger/v3/blogs/byurl',
-            params: {
-              url: blogUrl,
-            },
-          }).then(res => res.body.id);
-        })
-        .then((resolvedBlogId) => {
-          const path = isPage ? 'pages' : 'posts';
-          const options = {
-            method: 'POST',
-            url: `https://www.googleapis.com/blogger/v3/blogs/${resolvedBlogId}/${path}/`,
-            body: {
-              kind: isPage ? 'blogger#page' : 'blogger#post',
-              blog: {
-                id: resolvedBlogId,
-              },
-              title,
-              content,
-            },
-          };
-          if (labels) {
-            options.body.labels = labels;
-          }
-          if (published) {
-            options.body.published = published.toISOString();
-          }
-          // If it's an update
-          if (postId) {
-            options.method = 'PUT';
-            options.url += postId;
-            options.body.id = postId;
-          }
-          return this.request(refreshedToken, options)
-            .then(res => res.body);
-        })
-        .then((post) => {
-          if (isPage) {
-            return post;
-          }
-          const options = {
-            method: 'POST',
-            url: `https://www.googleapis.com/blogger/v3/blogs/${post.blog.id}/posts/${post.id}/`,
-            params: {},
-          };
-          if (isDraft) {
-            options.url += 'revert';
-          } else {
-            options.url += 'publish';
-            if (published) {
-              options.params.publishDate = published.toISOString();
-            }
-          }
-          return this.request(refreshedToken, options)
-            .then(res => res.body);
-        }));
+  }) {
+    const refreshedToken = await this.refreshToken(token, bloggerScopes);
+
+    // Get the blog ID
+    const blog = { id: blogId };
+    if (!blog.id) {
+      blog.id = (await this.$request(refreshedToken, {
+        url: 'https://www.googleapis.com/blogger/v3/blogs/byurl',
+        params: {
+          url: blogUrl,
+        },
+      })).id;
+    }
+
+    // Create/update the post/page
+    const path = isPage ? 'pages' : 'posts';
+    let options = {
+      method: 'POST',
+      url: `https://www.googleapis.com/blogger/v3/blogs/${blog.id}/${path}/`,
+      body: {
+        kind: isPage ? 'blogger#page' : 'blogger#post',
+        blog,
+        title,
+        content,
+      },
+    };
+    if (labels) {
+      options.body.labels = labels;
+    }
+    if (published) {
+      options.body.published = published.toISOString();
+    }
+    // If it's an update
+    if (postId) {
+      options.method = 'PUT';
+      options.url += postId;
+      options.body.id = postId;
+    }
+    const post = await this.$request(refreshedToken, options);
+    if (isPage) {
+      return post;
+    }
+
+    // Revert/publish post
+    options = {
+      method: 'POST',
+      url: `https://www.googleapis.com/blogger/v3/blogs/${post.blog.id}/posts/${post.id}/`,
+      params: {},
+    };
+    if (isDraft) {
+      options.url += 'revert';
+    } else {
+      options.url += 'publish';
+      if (published) {
+        options.params.publishDate = published.toISOString();
+      }
+    }
+    return this.$request(refreshedToken, options);
   },
-  openPicker(token, type = 'doc') {
+
+  /**
+   * https://developers.google.com/picker/docs/
+   */
+  async openPicker(token, type = 'doc') {
     const scopes = type === 'img' ? photosScopes : getDriveScopes(token);
-    return this.loadClientScript()
-      .then(() => this.refreshToken(token, scopes))
-      .then(refreshedToken => new Promise((resolve) => {
-        let picker;
-        const pickerBuilder = new google.picker.PickerBuilder()
-          .setOAuthToken(refreshedToken.accessToken)
-          .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
-          .hideTitleBar()
-          .setCallback((data) => {
-            switch (data[google.picker.Response.ACTION]) {
-              case google.picker.Action.PICKED:
-              case google.picker.Action.CANCEL:
-                resolve(data.docs || []);
-                picker.dispose();
-                break;
-              default:
-            }
-          });
-        switch (type) {
-          default:
-          case 'doc': {
-            const mimeTypes = [
-              'text/plain',
-              'text/x-markdown',
-              'application/octet-stream',
-            ].join(',');
-
-            const view = new google.picker.DocsView(google.picker.ViewId.DOCS);
-            view.setMimeTypes(mimeTypes);
-            pickerBuilder.addView(view);
-
-            const teamDriveView = new google.picker.DocsView(google.picker.ViewId.DOCS);
-            teamDriveView.setMimeTypes(mimeTypes);
-            teamDriveView.setEnableTeamDrives(true);
-            pickerBuilder.addView(teamDriveView);
-
-            pickerBuilder.enableFeature(google.picker.Feature.MULTISELECT_ENABLED);
-            pickerBuilder.enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES);
-            break;
-          }
-          case 'folder': {
-            const folderView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
-            folderView.setSelectFolderEnabled(true);
-            folderView.setMimeTypes(this.folderMimeType);
-            pickerBuilder.addView(folderView);
-
-            const teamDriveView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
-            teamDriveView.setSelectFolderEnabled(true);
-            teamDriveView.setEnableTeamDrives(true);
-            teamDriveView.setMimeTypes(this.folderMimeType);
-            pickerBuilder.addView(teamDriveView);
-            break;
-          }
-          case 'img': {
-            const view = new google.picker.PhotosView();
-            view.setType('highlights');
-            pickerBuilder.addView(view);
-            pickerBuilder.addView(google.picker.ViewId.PHOTO_UPLOAD);
-            break;
-          }
-        }
-        picker = pickerBuilder.build();
-        picker.setVisible(true);
+    if (!window.google) {
+      await networkSvc.loadScript('https://apis.google.com/js/api.js');
+      await new Promise((resolve, reject) => window.gapi.load('picker', {
+        callback: resolve,
+        onerror: reject,
+        timeout: 30000,
+        ontimeout: reject,
       }));
+    }
+    const refreshedToken = await this.refreshToken(token, scopes);
+    const { google } = window;
+    return Promise((resolve) => {
+      let picker;
+      const pickerBuilder = new google.picker.PickerBuilder()
+        .setOAuthToken(refreshedToken.accessToken)
+        .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
+        .hideTitleBar()
+        .setCallback((data) => {
+          switch (data[google.picker.Response.ACTION]) {
+            case google.picker.Action.PICKED:
+            case google.picker.Action.CANCEL:
+              resolve(data.docs || []);
+              picker.dispose();
+              break;
+            default:
+          }
+        });
+      switch (type) {
+        default:
+        case 'doc': {
+          const mimeTypes = [
+            'text/plain',
+            'text/x-markdown',
+            'application/octet-stream',
+          ].join(',');
+
+          const view = new google.picker.DocsView(google.picker.ViewId.DOCS);
+          view.setMimeTypes(mimeTypes);
+          pickerBuilder.addView(view);
+
+          const teamDriveView = new google.picker.DocsView(google.picker.ViewId.DOCS);
+          teamDriveView.setMimeTypes(mimeTypes);
+          teamDriveView.setEnableTeamDrives(true);
+          pickerBuilder.addView(teamDriveView);
+
+          pickerBuilder.enableFeature(google.picker.Feature.MULTISELECT_ENABLED);
+          pickerBuilder.enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES);
+          break;
+        }
+        case 'folder': {
+          const folderView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
+          folderView.setSelectFolderEnabled(true);
+          folderView.setMimeTypes(this.folderMimeType);
+          pickerBuilder.addView(folderView);
+
+          const teamDriveView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
+          teamDriveView.setSelectFolderEnabled(true);
+          teamDriveView.setEnableTeamDrives(true);
+          teamDriveView.setMimeTypes(this.folderMimeType);
+          pickerBuilder.addView(teamDriveView);
+          break;
+        }
+        case 'img': {
+          const view = new google.picker.PhotosView();
+          view.setType('highlights');
+          pickerBuilder.addView(view);
+          pickerBuilder.addView(google.picker.ViewId.PHOTO_UPLOAD);
+          break;
+        }
+      }
+      picker = pickerBuilder.build();
+      picker.setVisible(true);
+    });
   },
 };
diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js
index c58b7bb1..ad4c9a78 100644
--- a/src/services/providers/helpers/wordpressHelper.js
+++ b/src/services/providers/helpers/wordpressHelper.js
@@ -10,11 +10,15 @@ const request = (token, options) => networkSvc.request({
     ...options.headers || {},
     Authorization: `Bearer ${token.accessToken}`,
   },
-});
+})
+  .then(res => res.body);
 
 export default {
-  startOauth2(sub = null, silent = false) {
-    return networkSvc.startOauth2(
+  /**
+   * https://developer.wordpress.com/docs/oauth2/
+   */
+  async startOauth2(sub = null, silent = false) {
+    const { accessToken, expiresIn } = await networkSvc.startOauth2(
       'https://public-api.wordpress.com/oauth2/authorize',
       {
         client_id: clientId,
@@ -22,49 +26,49 @@ export default {
         scope: 'global',
       },
       silent,
-    )
-      // Call the user info endpoint
-      .then(data => request({ accessToken: data.accessToken }, {
-        url: 'https://public-api.wordpress.com/rest/v1.1/me',
-      })
-        .then((res) => {
-          // Check the returned sub consistency
-          if (sub && `${res.body.ID}` !== sub) {
-            throw new Error('WordPress account ID not expected.');
-          }
-          // Build token object including scopes and sub
-          const token = {
-            accessToken: data.accessToken,
-            expiresOn: Date.now() + (data.expiresIn * 1000),
-            name: res.body.display_name,
-            sub: `${res.body.ID}`,
-          };
-          // Add token to wordpressTokens
-          store.dispatch('data/setWordpressToken', token);
-          return token;
-        }));
+    );
+
+    // Call the user info endpoint
+    const body = await request({ accessToken }, {
+      url: 'https://public-api.wordpress.com/rest/v1.1/me',
+    });
+
+    // Check the returned sub consistency
+    if (sub && `${body.ID}` !== sub) {
+      throw new Error('WordPress account ID not expected.');
+    }
+    // Build token object including scopes and sub
+    const token = {
+      accessToken,
+      expiresOn: Date.now() + (expiresIn * 1000),
+      name: body.display_name,
+      sub: `${body.ID}`,
+    };
+    // Add token to wordpressTokens
+    store.dispatch('data/setWordpressToken', token);
+    return token;
   },
-  refreshToken(token) {
+  async refreshToken(token) {
     const { sub } = token;
     const lastToken = store.getters['data/wordpressTokens'][sub];
 
-    return Promise.resolve()
-      .then(() => {
-        if (lastToken.expiresOn > Date.now() + tokenExpirationMargin) {
-          return lastToken;
-        }
-        // Existing token is going to expire.
-        // Try to get a new token in background
-        return store.dispatch('modal/providerRedirection', {
-          providerName: 'WordPress',
-          onResolve: () => this.startOauth2(sub),
-        });
-      });
+    if (lastToken.expiresOn > Date.now() + tokenExpirationMargin) {
+      return lastToken;
+    }
+    // Existing token is going to expire.
+    // Try to get a new token in background
+    await store.dispatch('modal/providerRedirection', { providerName: 'WordPress' });
+    return this.startOauth2(sub);
   },
   addAccount(fullAccess = false) {
     return this.startOauth2(fullAccess);
   },
-  uploadPost(
+
+  /**
+   * https://developer.wordpress.com/docs/api/1.2/post/sites/%24site/posts/new/
+   * https://developer.wordpress.com/docs/api/1.2/post/sites/%24site/posts/%24post_ID/
+   */
+  async uploadPost({
     token,
     domain,
     siteId,
@@ -78,23 +82,22 @@ export default {
     featuredImage,
     status,
     date,
-  ) {
-    return this.refreshToken(token)
-      .then(refreshedToken => request(refreshedToken, {
-        method: 'POST',
-        url: `https://public-api.wordpress.com/rest/v1.2/sites/${siteId || domain}/posts/${postId || 'new'}`,
-        body: {
-          content,
-          title,
-          tags,
-          categories,
-          excerpt,
-          author,
-          featured_image: featuredImage || '',
-          status,
-          date: date && date.toISOString(),
-        },
-      })
-        .then(res => res.body));
+  }) {
+    const refreshedToken = await this.refreshToken(token);
+    await request(refreshedToken, {
+      method: 'POST',
+      url: `https://public-api.wordpress.com/rest/v1.2/sites/${siteId || domain}/posts/${postId || 'new'}`,
+      body: {
+        content,
+        title,
+        tags,
+        categories,
+        excerpt,
+        author,
+        featured_image: featuredImage || '',
+        status,
+        date: date && date.toISOString(),
+      },
+    });
   },
 };
diff --git a/src/services/providers/helpers/zendeskHelper.js b/src/services/providers/helpers/zendeskHelper.js
index 6ed07f8f..ed22eb97 100644
--- a/src/services/providers/helpers/zendeskHelper.js
+++ b/src/services/providers/helpers/zendeskHelper.js
@@ -7,11 +7,16 @@ const request = (token, options) => networkSvc.request({
     ...options.headers || {},
     Authorization: `Bearer ${token.accessToken}`,
   },
-});
+})
+  .then(res => res.body);
+
 
 export default {
-  startOauth2(subdomain, clientId, sub = null, silent = false) {
-    return networkSvc.startOauth2(
+  /**
+   * https://support.zendesk.com/hc/en-us/articles/203663836-Using-OAuth-authentication-with-your-application
+   */
+  async startOauth2(subdomain, clientId, sub = null, silent = false) {
+    const { accessToken } = await networkSvc.startOauth2(
       `https://${subdomain}.zendesk.com/oauth/authorizations/new`,
       {
         client_id: clientId,
@@ -19,33 +24,39 @@ export default {
         scope: 'read hc:write',
       },
       silent,
-    )
-      // Call the user info endpoint
-      .then(({ accessToken }) => request({ accessToken }, {
-        url: `https://${subdomain}.zendesk.com/api/v2/users/me.json`,
-      })
-        .then((res) => {
-          const uniqueSub = `${subdomain}/${res.body.user.id}`;
-          // Check the returned sub consistency
-          if (sub && uniqueSub !== sub) {
-            throw new Error('Zendesk account ID not expected.');
-          }
-          // Build token object including scopes and sub
-          const token = {
-            accessToken,
-            name: res.body.user.name,
-            subdomain,
-            sub: uniqueSub,
-          };
-          // Add token to zendeskTokens
-          store.dispatch('data/setZendeskToken', token);
-          return token;
-        }));
+    );
+
+    // Call the user info endpoint
+    const { user } = await request({ accessToken }, {
+      url: `https://${subdomain}.zendesk.com/api/v2/users/me.json`,
+    });
+    const uniqueSub = `${subdomain}/${user.id}`;
+
+    // Check the returned sub consistency
+    if (sub && uniqueSub !== sub) {
+      throw new Error('Zendesk account ID not expected.');
+    }
+
+    // Build token object including scopes and sub
+    const token = {
+      accessToken,
+      name: user.name,
+      subdomain,
+      sub: uniqueSub,
+    };
+
+    // Add token to zendeskTokens
+    store.dispatch('data/setZendeskToken', token);
+    return token;
   },
   addAccount(subdomain, clientId) {
     return this.startOauth2(subdomain, clientId);
   },
-  uploadArticle(
+
+  /**
+   * https://developer.zendesk.com/rest_api/docs/help_center/articles
+   */
+  async uploadArticle({
     token,
     sectionId,
     articleId,
@@ -54,20 +65,25 @@ export default {
     labels,
     locale,
     isDraft,
-  ) {
+  }) {
     const article = {
       title,
       body: content,
       locale,
       draft: isDraft,
     };
+
     if (articleId) {
-      return request(token, {
+      // Update article
+      await request(token, {
         method: 'PUT',
         url: `https://${token.subdomain}.zendesk.com/api/v2/help_center/articles/${articleId}/translations/${locale}.json`,
         body: { translation: article },
-      })
-        .then(() => labels && request(token, {
+      });
+
+      // Add labels
+      if (labels) {
+        await request(token, {
           method: 'PUT',
           url: `https://${token.subdomain}.zendesk.com/api/v2/help_center/articles/${articleId}.json`,
           body: {
@@ -75,17 +91,20 @@ export default {
               label_names: labels,
             },
           },
-        }))
-        .then(() => articleId);
+        });
+      }
+      return articleId;
     }
+
+    // Create new article
     if (labels) {
       article.label_names = labels;
     }
-    return request(token, {
+    const body = await request(token, {
       method: 'POST',
       url: `https://${token.subdomain}.zendesk.com/api/v2/help_center/sections/${sectionId}/articles.json`,
       body: { article },
-    })
-      .then(res => `${res.body.article.id}`);
+    });
+    return `${body.article.id}`;
   },
 };
diff --git a/src/services/providers/wordpressProvider.js b/src/services/providers/wordpressProvider.js
index f6374774..554220a9 100644
--- a/src/services/providers/wordpressProvider.js
+++ b/src/services/providers/wordpressProvider.js
@@ -14,27 +14,18 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.postId} — ${location.domain} — ${token.name}`;
   },
-  publish(token, html, metadata, publishLocation) {
-    return wordpressHelper.uploadPost(
+  async publish(token, html, metadata, publishLocation) {
+    const post = await wordpressHelper.uploadPost({
+      ...publishLocation,
+      ...metadata,
       token,
-      publishLocation.domain,
-      publishLocation.siteId,
-      publishLocation.postId,
-      metadata.title,
-      html,
-      metadata.tags,
-      metadata.categories,
-      metadata.excerpt,
-      metadata.author,
-      metadata.featuredImage,
-      metadata.status,
-      metadata.date,
-    )
-      .then(post => ({
-        ...publishLocation,
-        siteId: `${post.site_ID}`,
-        postId: `${post.ID}`,
-      }));
+      content: html,
+    });
+    return {
+      ...publishLocation,
+      siteId: `${post.site_ID}`,
+      postId: `${post.ID}`,
+    };
   },
   makeLocation(token, domain, postId) {
     const location = {
diff --git a/src/services/providers/zendeskProvider.js b/src/services/providers/zendeskProvider.js
index 633cd393..7f0406cc 100644
--- a/src/services/providers/zendeskProvider.js
+++ b/src/services/providers/zendeskProvider.js
@@ -15,21 +15,19 @@ export default new Provider({
     const token = this.getToken(location);
     return `${location.articleId} — ${token.name} — ${token.subdomain}`;
   },
-  publish(token, html, metadata, publishLocation) {
-    return zendeskHelper.uploadArticle(
+  async publish(token, html, metadata, publishLocation) {
+    const articleId = await zendeskHelper.uploadArticle({
+      ...publishLocation,
       token,
-      publishLocation.sectionId,
-      publishLocation.articleId,
-      metadata.title,
-      html,
-      metadata.tags,
-      publishLocation.locale,
-      metadata.status === 'draft',
-    )
-      .then(articleId => ({
-        ...publishLocation,
-        articleId,
-      }));
+      title: metadata.title,
+      content: html,
+      labels: metadata.tags,
+      isDraft: metadata.status === 'draft',
+    });
+    return {
+      ...publishLocation,
+      articleId,
+    };
   },
   makeLocation(token, sectionId, locale, articleId) {
     const location = {
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index 91748b99..bbcbb1aa 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -38,80 +38,66 @@ const ensureDate = (value, defaultValue) => {
   return new Date(`${value}`);
 };
 
-function publish(publishLocation) {
+const publish = async (publishLocation) => {
   const { fileId } = publishLocation;
   const template = store.getters['data/allTemplates'][publishLocation.templateId];
-  return exportSvc.applyTemplate(fileId, template)
-    .then(html => localDbSvc.loadItem(`${fileId}/content`)
-      .then((content) => {
-        const file = store.state.file.itemMap[fileId];
-        const properties = utils.computeProperties(content.properties);
-        const provider = providerRegistry.providers[publishLocation.providerId];
-        const token = provider.getToken(publishLocation);
-        const metadata = {
-          title: ensureString(properties.title, file.name),
-          author: ensureString(properties.author),
-          tags: ensureArray(properties.tags),
-          categories: ensureArray(properties.categories),
-          excerpt: ensureString(properties.excerpt),
-          featuredImage: ensureString(properties.featuredImage),
-          status: ensureString(properties.status),
-          date: ensureDate(properties.date, new Date()),
-        };
-        return provider.publish(token, html, metadata, publishLocation);
-      }));
-}
+  const html = await exportSvc.applyTemplate(fileId, template);
+  const content = await localDbSvc.loadItem(`${fileId}/content`);
+  const file = store.state.file.itemMap[fileId];
+  const properties = utils.computeProperties(content.properties);
+  const provider = providerRegistry.providers[publishLocation.providerId];
+  const token = provider.getToken(publishLocation);
+  const metadata = {
+    title: ensureString(properties.title, file.name),
+    author: ensureString(properties.author),
+    tags: ensureArray(properties.tags),
+    categories: ensureArray(properties.categories),
+    excerpt: ensureString(properties.excerpt),
+    featuredImage: ensureString(properties.featuredImage),
+    status: ensureString(properties.status),
+    date: ensureDate(properties.date, new Date()),
+  };
+  return provider.publish(token, html, metadata, publishLocation);
+};
 
-function publishFile(fileId) {
+const publishFile = async (fileId) => {
   let counter = 0;
-  return loadContent(fileId)
-    .then(() => {
-      const publishLocations = [
-        ...store.getters['publishLocation/filteredGroupedByFileId'][fileId] || [],
-      ];
-      const publishOneContentLocation = () => {
-        const publishLocation = publishLocations.shift();
-        if (!publishLocation) {
-          return null;
-        }
-        return store.dispatch('queue/doWithLocation', {
-          location: publishLocation,
-          promise: publish(publishLocation)
-            .then((publishLocationToStore) => {
-              // Replace publish location if modified
-              if (utils.serializeObject(publishLocation) !==
-                utils.serializeObject(publishLocationToStore)
-              ) {
-                store.commit('publishLocation/patchItem', publishLocationToStore);
-              }
-              counter += 1;
-              return publishOneContentLocation();
-            }, (err) => {
-              if (store.state.offline) {
-                throw err;
-              }
-              console.error(err); // eslint-disable-line no-console
-              store.dispatch('notification/error', err);
-              return publishOneContentLocation();
-            }),
-        });
-      };
-      return publishOneContentLocation();
-    })
-    .then(() => {
-      const file = store.state.file.itemMap[fileId];
-      store.dispatch('notification/info', `"${file.name}" was published to ${counter} location(s).`);
-    })
-    .then(
-      () => localDbSvc.unloadContents(),
-      err => localDbSvc.unloadContents()
-        .then(() => {
-          throw err;
-        }),
-    );
-}
+  await loadContent(fileId);
+  const publishLocations = [
+    ...store.getters['publishLocation/filteredGroupedByFileId'][fileId] || [],
+  ];
+  try {
+    await utils.awaitSequence(publishLocations, async (publishLocation) => {
+      await store.dispatch('queue/doWithLocation', {
+        location: publishLocation,
+        action: async () => {
+          const publishLocationToStore = await publish(publishLocation);
+          try {
+            // Replace publish location if modified
+            if (utils.serializeObject(publishLocation) !==
+              utils.serializeObject(publishLocationToStore)
+            ) {
+              store.commit('publishLocation/patchItem', publishLocationToStore);
+            }
+            counter += 1;
+          } catch (err) {
+            if (store.state.offline) {
+              throw err;
+            }
+            console.error(err); // eslint-disable-line no-console
+            store.dispatch('notification/error', err);
+          }
+        },
+      });
+    });
+    const file = store.state.file.itemMap[fileId];
+    store.dispatch('notification/info', `"${file.name}" was published to ${counter} location(s).`);
+  } finally {
+    await localDbSvc.unloadContents();
+  }
+};
 
-function requestPublish() {
+const requestPublish = () => {
   // No publish in light mode
   if (store.state.light) {
     return;
@@ -135,21 +121,21 @@ function requestPublish() {
     intervalId = utils.setInterval(() => attempt(), 1000);
     attempt();
   }));
-}
+};
 
-function createPublishLocation(publishLocation) {
+const createPublishLocation = (publishLocation) => {
   publishLocation.id = utils.uid();
   const currentFile = store.getters['file/current'];
   publishLocation.fileId = currentFile.id;
   store.dispatch(
     'queue/enqueue',
-    () => publish(publishLocation)
-      .then((publishLocationToStore) => {
-        store.commit('publishLocation/setItem', publishLocationToStore);
-        store.dispatch('notification/info', `A new publication location was added to "${currentFile.name}".`);
-      }),
+    async () => {
+      const publishLocationToStore = await publish(publishLocation);
+      store.commit('publishLocation/setItem', publishLocationToStore);
+      store.dispatch('notification/info', `A new publication location was added to "${currentFile.name}".`);
+    },
   );
-}
+};
 
 export default {
   requestPublish,
diff --git a/src/services/sectionUtils.js b/src/services/sectionUtils.js
index 9bbe1321..05202ca0 100644
--- a/src/services/sectionUtils.js
+++ b/src/services/sectionUtils.js
@@ -1,46 +1,46 @@
-function SectionDimension(startOffset, endOffset) {
-  this.startOffset = startOffset;
-  this.endOffset = endOffset;
-  this.height = endOffset - startOffset;
+class SectionDimension {
+  constructor(startOffset, endOffset) {
+    this.startOffset = startOffset;
+    this.endOffset = endOffset;
+    this.height = endOffset - startOffset;
+  }
 }
 
-function dimensionNormalizer(dimensionName) {
-  return (editorSvc) => {
-    const dimensionList = editorSvc.previewCtx.sectionDescList
-      .map(sectionDesc => sectionDesc[dimensionName]);
-    let dimension;
-    let i;
-    let j;
-    for (i = 0; i < dimensionList.length; i += 1) {
-      dimension = dimensionList[i];
-      if (dimension.height) {
-        for (j = i + 1; j < dimensionList.length && dimensionList[j].height === 0; j += 1) {
-          // Loop
-        }
-        const normalizeFactor = j - i;
-        if (normalizeFactor !== 1) {
-          const normalizedHeight = dimension.height / normalizeFactor;
+const dimensionNormalizer = dimensionName => (editorSvc) => {
+  const dimensionList = editorSvc.previewCtx.sectionDescList
+    .map(sectionDesc => sectionDesc[dimensionName]);
+  let dimension;
+  let i;
+  let j;
+  for (i = 0; i < dimensionList.length; i += 1) {
+    dimension = dimensionList[i];
+    if (dimension.height) {
+      for (j = i + 1; j < dimensionList.length && dimensionList[j].height === 0; j += 1) {
+        // Loop
+      }
+      const normalizeFactor = j - i;
+      if (normalizeFactor !== 1) {
+        const normalizedHeight = dimension.height / normalizeFactor;
+        dimension.height = normalizedHeight;
+        dimension.endOffset = dimension.startOffset + dimension.height;
+        for (j = i + 1; j < i + normalizeFactor; j += 1) {
+          const startOffset = dimension.endOffset;
+          dimension = dimensionList[j];
+          dimension.startOffset = startOffset;
           dimension.height = normalizedHeight;
           dimension.endOffset = dimension.startOffset + dimension.height;
-          for (j = i + 1; j < i + normalizeFactor; j += 1) {
-            const startOffset = dimension.endOffset;
-            dimension = dimensionList[j];
-            dimension.startOffset = startOffset;
-            dimension.height = normalizedHeight;
-            dimension.endOffset = dimension.startOffset + dimension.height;
-          }
-          i = j - 1;
         }
+        i = j - 1;
       }
     }
-  };
-}
+  }
+};
 
 const normalizeEditorDimensions = dimensionNormalizer('editorDimension');
 const normalizePreviewDimensions = dimensionNormalizer('previewDimension');
 const normalizeTocDimensions = dimensionNormalizer('tocDimension');
 
-function measureSectionDimensions(editorSvc) {
+const measureSectionDimensions = (editorSvc) => {
   let editorSectionOffset = 0;
   let previewSectionOffset = 0;
   let tocSectionOffset = 0;
@@ -106,7 +106,7 @@ function measureSectionDimensions(editorSvc) {
   normalizeEditorDimensions(editorSvc);
   normalizePreviewDimensions(editorSvc);
   normalizeTocDimensions(editorSvc);
-}
+};
 
 export default {
   measureSectionDimensions,
diff --git a/src/services/sponsorSvc.js b/src/services/sponsorSvc.js
index 26807542..b583460a 100644
--- a/src/services/sponsorSvc.js
+++ b/src/services/sponsorSvc.js
@@ -8,20 +8,19 @@ let lastCheck = 0;
 const appId = 'ESTHdCYOi18iLhhO';
 let monetize;
 
-const getMonetize = () => Promise.resolve()
-  .then(() => networkSvc.loadScript('https://cdn.monetizejs.com/api/js/latest/monetize.min.js'))
-  .then(() => {
-    monetize = monetize || new window.MonetizeJS({
-      applicationID: appId,
-    });
+const getMonetize = async () => {
+  await networkSvc.loadScript('https://cdn.monetizejs.com/api/js/latest/monetize.min.js');
+  monetize = monetize || new window.MonetizeJS({
+    applicationID: appId,
   });
+};
 
 const isGoogleSponsor = () => {
   const sponsorToken = store.getters['workspace/sponsorToken'];
   return sponsorToken && sponsorToken.isSponsor;
 };
 
-const checkPayment = () => {
+const checkPayment = async () => {
   const currentDate = Date.now();
   if (!isGoogleSponsor()
     && networkSvc.isUserActive()
@@ -30,15 +29,15 @@ const checkPayment = () => {
     && lastCheck + checkPaymentEvery < currentDate
   ) {
     lastCheck = currentDate;
-    getMonetize()
-      .then(() => monetize.getPaymentsImmediate((err, payments) => {
-        const isSponsor = payments && payments.app === appId && (
-          (payments.chargeOption && payments.chargeOption.alias === 'once') ||
-          (payments.subscriptionOption && payments.subscriptionOption.alias === 'yearly'));
-        if (isSponsor !== store.state.monetizeSponsor) {
-          store.commit('setMonetizeSponsor', isSponsor);
-        }
-      }));
+    await getMonetize();
+    monetize.getPaymentsImmediate((err, payments) => {
+      const isSponsor = payments && payments.app === appId && (
+        (payments.chargeOption && payments.chargeOption.alias === 'once') ||
+        (payments.subscriptionOption && payments.subscriptionOption.alias === 'yearly'));
+      if (isSponsor !== store.state.monetizeSponsor) {
+        store.commit('setMonetizeSponsor', isSponsor);
+      }
+    });
   }
 };
 
@@ -46,12 +45,11 @@ export default {
   init: () => {
     utils.setInterval(checkPayment, 2000);
   },
-  getToken() {
+  async getToken() {
     if (isGoogleSponsor() || store.state.offline) {
-      return Promise.resolve();
+      return null;
     }
-    return getMonetize()
-      .then(() => new Promise(resolve =>
-        monetize.getTokenImmediate((err, result) => resolve(result))));
+    await getMonetize();
+    return new Promise(resolve => monetize.getTokenImmediate((err, result) => resolve(result)));
   },
 };
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 343329ad..709cc266 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -50,36 +50,36 @@ const isSyncPossible = () => !store.state.offline &&
 /**
  * Return true if we are the many window, ie we have the lastSyncActivity lock.
  */
-function isSyncWindow() {
+const isSyncWindow = () => {
   const storedLastSyncActivity = getLastStoredSyncActivity();
   return lastSyncActivity === storedLastSyncActivity ||
     Date.now() > inactivityThreshold + storedLastSyncActivity;
-}
+};
 
 /**
  * Return true if auto sync can start, ie if lastSyncActivity is old enough.
  */
-function isAutoSyncReady() {
+const isAutoSyncReady = () => {
   let { autoSyncEvery } = store.getters['data/computedSettings'];
   if (autoSyncEvery < minAutoSyncEvery) {
     autoSyncEvery = minAutoSyncEvery;
   }
   return Date.now() > autoSyncEvery + getLastStoredSyncActivity();
-}
+};
 
 /**
  * Update the lastSyncActivity, assuming we have the lock.
  */
-function setLastSyncActivity() {
+const setLastSyncActivity = () => {
   const currentDate = Date.now();
   lastSyncActivity = currentDate;
   localStorage.setItem(store.getters['workspace/lastSyncActivityKey'], currentDate);
-}
+};
 
 /**
  * Upgrade hashes if syncedContent is from an old version
  */
-function upgradeSyncedContent(syncedContent) {
+const upgradeSyncedContent = (syncedContent) => {
   if (syncedContent.v) {
     return syncedContent;
   }
@@ -100,12 +100,12 @@ function upgradeSyncedContent(syncedContent) {
     syncHistory,
     v: 1,
   };
-}
+};
 
 /**
  * Clean a syncedContent.
  */
-function cleanSyncedContent(syncedContent) {
+const cleanSyncedContent = (syncedContent) => {
   // Clean syncHistory from removed syncLocations
   Object.keys(syncedContent.syncHistory).forEach((syncLocationId) => {
     if (syncLocationId !== 'main' && !store.state.syncLocation.itemMap[syncLocationId]) {
@@ -123,12 +123,12 @@ function cleanSyncedContent(syncedContent) {
         delete syncedContent.historyData[hash];
       }
     });
-}
+};
 
 /**
  * Apply changes retrieved from the main provider. Update sync data accordingly.
  */
-function applyChanges(changes) {
+const applyChanges = (changes) => {
   const storeItemMap = { ...store.getters.allItemMap };
   const syncData = { ...store.getters['data/syncData'] };
   let saveSyncData = false;
@@ -170,12 +170,12 @@ function applyChanges(changes) {
   if (saveSyncData) {
     store.dispatch('data/setSyncData', syncData);
   }
-}
+};
 
 /**
  * Create a sync location by uploading the current file content.
  */
-function createSyncLocation(syncLocation) {
+const createSyncLocation = (syncLocation) => {
   syncLocation.id = utils.uid();
   const currentFile = store.getters['file/current'];
   const fileId = currentFile.id;
@@ -184,29 +184,27 @@ function createSyncLocation(syncLocation) {
   const content = utils.deepCopy(store.getters['content/current']);
   store.dispatch(
     'queue/enqueue',
-    () => {
+    async () => {
       const provider = providerRegistry.providers[syncLocation.providerId];
       const token = provider.getToken(syncLocation);
-      return provider.uploadContent(token, {
+      const syncLocationToStore = await provider.uploadContent(token, {
         ...content,
         history: [content.hash],
-      }, syncLocation)
-        .then(syncLocationToStore => localDbSvc.loadSyncedContent(fileId)
-          .then(() => {
-            const newSyncedContent = utils.deepCopy(upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]));
-            const newSyncHistoryItem = [];
-            newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
-            newSyncHistoryItem[LAST_SEEN] = content.hash;
-            newSyncHistoryItem[LAST_SENT] = content.hash;
-            newSyncedContent.historyData[content.hash] = content;
+      }, syncLocation);
+      await localDbSvc.loadSyncedContent(fileId);
+      const newSyncedContent = utils.deepCopy(upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]));
+      const newSyncHistoryItem = [];
+      newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
+      newSyncHistoryItem[LAST_SEEN] = content.hash;
+      newSyncHistoryItem[LAST_SENT] = content.hash;
+      newSyncedContent.historyData[content.hash] = content;
 
-            store.commit('syncedContent/patchItem', newSyncedContent);
-            store.commit('syncLocation/setItem', syncLocationToStore);
-            store.dispatch('notification/info', `A new synchronized location was added to "${currentFile.name}".`);
-          }));
+      store.commit('syncedContent/patchItem', newSyncedContent);
+      store.commit('syncLocation/setItem', syncLocationToStore);
+      store.dispatch('notification/info', `A new synchronized location was added to "${currentFile.name}".`);
     },
   );
-}
+};
 
 // Prevent from sending new data too long after old data has been fetched
 const tooLateChecker = (timeout) => {
@@ -219,6 +217,34 @@ const tooLateChecker = (timeout) => {
   };
 };
 
+const isTempFile = (fileId) => {
+  if (store.getters['data/syncDataByItemId'][`${fileId}/content`]) {
+    // If file has already been synced, it's not a temp file
+    return false;
+  }
+  const file = store.state.file.itemMap[fileId];
+  const content = store.state.content.itemMap[`${fileId}/content`];
+  if (!file || !content) {
+    return false;
+  }
+  if (file.parentId === 'temp') {
+    return true;
+  }
+  const locations = [
+    ...store.getters['syncLocation/filteredGroupedByFileId'][fileId] || [],
+    ...store.getters['publishLocation/filteredGroupedByFileId'][fileId] || [],
+  ];
+  if (locations.length) {
+    // If file has sync/publish locations, it's not a temp file
+    return false;
+  }
+  // Return true if it's a welcome file that has no discussion
+  const { welcomeFileHashes } = store.getters['data/localSettings'];
+  const hash = utils.hash(content.text);
+  const hasDiscussions = Object.keys(content.discussions).length;
+  return file.name === 'Welcome file' && welcomeFileHashes[hash] && !hasDiscussions;
+};
+
 class SyncContext {
   restart = false;
   attempted = {};
@@ -227,332 +253,288 @@ class SyncContext {
 /**
  * Sync one file with all its locations.
  */
-function syncFile(fileId, syncContext = new SyncContext()) {
+const syncFile = async (fileId, syncContext = new SyncContext()) => {
   syncContext.attempted[`${fileId}/content`] = true;
 
-  return localDbSvc.loadSyncedContent(fileId)
-    .then(() => localDbSvc.loadItem(`${fileId}/content`)
-      .catch(() => {})) // Item may not exist if content has not been downloaded yet
-    .then(() => {
-      const getFile = () => store.state.file.itemMap[fileId];
-      const getContent = () => store.state.content.itemMap[`${fileId}/content`];
-      const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
-      const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
+  await localDbSvc.loadSyncedContent(fileId);
+  try {
+    await localDbSvc.loadItem(`${fileId}/content`);
+  } catch (e) {
+    // Item may not exist if content has not been downloaded yet
+  }
+  const getContent = () => store.state.content.itemMap[`${fileId}/content`];
+  const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
+  const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
 
-      const isTempFile = () => {
-        if (store.getters['data/syncDataByItemId'][`${fileId}/content`]) {
-          // If file has already been synced, it's not a temp file
-          return false;
-        }
-        const file = getFile();
-        const content = getContent();
-        if (!file || !content) {
-          return false;
-        }
-        if (file.parentId === 'temp') {
-          return true;
-        }
-        const locations = [
-          ...store.getters['syncLocation/filteredGroupedByFileId'][fileId] || [],
-          ...store.getters['publishLocation/filteredGroupedByFileId'][fileId] || [],
-        ];
-        if (locations.length) {
-          // If file has explicit sync/publish locations, it's not a temp file
-          return false;
-        }
-        // Return true if it's a welcome file that has no discussion
-        const { welcomeFileHashes } = store.getters['data/localSettings'];
-        const hash = utils.hash(content.text);
-        const hasDiscussions = Object.keys(content.discussions).length;
-        return file.name === 'Welcome file' && welcomeFileHashes[hash] && !hasDiscussions;
-      };
+  try {
+    if (isTempFile(fileId)) {
+      return;
+    }
 
-      if (isTempFile()) {
-        return null;
+    const syncLocations = [
+      ...store.getters['syncLocation/filteredGroupedByFileId'][fileId] || [],
+    ];
+    if (isWorkspaceSyncPossible()) {
+      syncLocations.unshift({ id: 'main', providerId: workspaceProvider.id, fileId });
+    }
+
+    await utils.awaitSequence(syncLocations, async (syncLocation) => {
+      const provider = providerRegistry.providers[syncLocation.providerId];
+      if (!provider) {
+        return;
+      }
+      const token = provider.getToken(syncLocation);
+      if (!token) {
+        return;
       }
 
-      const attemptedLocations = {};
-      const syncOneContentLocation = () => {
-        const syncLocations = [
-          ...store.getters['syncLocation/filteredGroupedByFileId'][fileId] || [],
-        ];
-        if (isWorkspaceSyncPossible()) {
-          syncLocations.unshift({ id: 'main', providerId: workspaceProvider.id, fileId });
-        }
-        let result;
-        syncLocations.some((syncLocation) => {
-          const provider = providerRegistry.providers[syncLocation.providerId];
-          if (
-            // Skip if it has been attempted already
-            !attemptedLocations[syncLocation.id] &&
-            // Skip temp file
-            !isTempFile()
-          ) {
-            attemptedLocations[syncLocation.id] = true;
-            const token = provider && provider.getToken(syncLocation);
-            result = token && store.dispatch('queue/doWithLocation', {
-              location: syncLocation,
-              promise: provider.downloadContent(token, syncLocation)
-                .then((serverContent = null) => {
-                  const syncedContent = getSyncedContent();
-                  const syncHistoryItem = getSyncHistoryItem(syncLocation.id);
-                  let mergedContent = (() => {
-                    const clientContent = utils.deepCopy(getContent());
-                    if (!clientContent) {
-                      return utils.deepCopy(serverContent);
-                    }
-                    if (!serverContent) {
-                      // Sync location has not been created yet
-                      return clientContent;
-                    }
-                    if (serverContent.hash === clientContent.hash) {
-                      // Server and client contents are synced
-                      return clientContent;
-                    }
-                    if (syncedContent.historyData[serverContent.hash]) {
-                      // Server content has not changed or has already been merged
-                      return clientContent;
-                    }
-                    // Perform a merge with last merged content if any, or a simple fusion otherwise
-                    let lastMergedContent;
-                    serverContent.history.some((hash) => {
-                      lastMergedContent = syncedContent.historyData[hash];
-                      return lastMergedContent;
-                    });
-                    if (!lastMergedContent && syncHistoryItem) {
-                      lastMergedContent = syncedContent.historyData[syncHistoryItem[LAST_MERGED]];
-                    }
-                    return diffUtils.mergeContent(serverContent, clientContent, lastMergedContent);
-                  })();
-
-                  if (!mergedContent) {
-                    return null;
-                  }
-
-                  // Update or set content in store
-                  store.commit('content/setItem', {
-                    id: `${fileId}/content`,
-                    text: utils.sanitizeText(mergedContent.text),
-                    properties: utils.sanitizeText(mergedContent.properties),
-                    discussions: mergedContent.discussions,
-                    comments: mergedContent.comments,
-                  });
-
-                  // Retrieve content with new `hash` and freeze it
-                  mergedContent = utils.deepCopy(getContent());
-
-                  // Make merged content history
-                  const mergedContentHistory = serverContent ? serverContent.history.slice() : [];
-                  let skipUpload = true;
-                  if (mergedContentHistory[0] !== mergedContent.hash) {
-                    // Put merged content hash at the beginning of history
-                    mergedContentHistory.unshift(mergedContent.hash);
-                    // Server content is either out of sync or its history is incomplete, do upload
-                    skipUpload = false;
-                  }
-                  if (syncHistoryItem
-                    && syncHistoryItem[LAST_SENT] != null
-                    && syncHistoryItem[LAST_SENT] !== mergedContent.hash
-                  ) {
-                    // Clean up by removing the hash we've previously added
-                    const idx = mergedContentHistory.lastIndexOf(syncHistoryItem[LAST_SENT]);
-                    if (idx !== -1) {
-                      mergedContentHistory.splice(idx, 1);
-                    }
-                  }
-
-                  // Store last sent if it's in the server history,
-                  // and merged content which will be sent if different
-                  const newSyncedContent = utils.deepCopy(syncedContent);
-                  const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || [];
-                  newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
-                  if (serverContent &&
-                    (serverContent.hash === newSyncHistoryItem[LAST_SEEN] ||
-                    serverContent.history.indexOf(newSyncHistoryItem[LAST_SEEN]) !== -1)
-                  ) {
-                    // That's the 2nd time we've seen this content, trust it for future merges
-                    newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_SEEN];
-                  }
-                  newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_MERGED] || null;
-                  newSyncHistoryItem[LAST_SEEN] = mergedContent.hash;
-                  newSyncHistoryItem[LAST_SENT] = skipUpload ? null : mergedContent.hash;
-                  newSyncedContent.historyData[mergedContent.hash] = mergedContent;
-
-                  // Clean synced content from unused revisions
-                  cleanSyncedContent(newSyncedContent);
-                  // Store synced content
-                  store.commit('syncedContent/patchItem', newSyncedContent);
-
-                  if (skipUpload) {
-                    // Server content and merged content are equal, skip content upload
-                    return null;
-                  }
-
-                  // Upload merged content
-                  return provider.uploadContent(token, {
-                    ...mergedContent,
-                    history: mergedContentHistory.slice(0, maxContentHistory),
-                  }, syncLocation, tooLateChecker(restartContentSyncAfter))
-                    .then((syncLocationToStore) => {
-                      // Replace sync location if modified
-                      if (utils.serializeObject(syncLocation) !==
-                        utils.serializeObject(syncLocationToStore)
-                      ) {
-                        store.commit('syncLocation/patchItem', syncLocationToStore);
-                      }
-
-                      // If content was just created, restart sync to create the file as well
-                      if (provider === workspaceProvider &&
-                        !store.getters['data/syncDataByItemId'][fileId]
-                      ) {
-                        syncContext.restart = true;
-                      }
-                    });
-                })
-                .catch((err) => {
-                  if (store.state.offline || (err && err.message === 'TOO_LATE')) {
-                    throw err;
-                  }
-                  console.error(err); // eslint-disable-line no-console
-                  store.dispatch('notification/error', err);
-                }),
-            })
-              .then(() => syncOneContentLocation());
+      const doSyncLocation = async () => {
+        const serverContent = await provider.downloadContent(token, syncLocation);
+        const syncedContent = getSyncedContent();
+        const syncHistoryItem = getSyncHistoryItem(syncLocation.id);
+        let mergedContent = (() => {
+          const clientContent = utils.deepCopy(getContent());
+          if (!clientContent) {
+            return utils.deepCopy(serverContent || null);
           }
-          return result;
+          if (!serverContent) {
+            // Sync location has not been created yet
+            return clientContent;
+          }
+          if (serverContent.hash === clientContent.hash) {
+            // Server and client contents are synced
+            return clientContent;
+          }
+          if (syncedContent.historyData[serverContent.hash]) {
+            // Server content has not changed or has already been merged
+            return clientContent;
+          }
+          // Perform a merge with last merged content if any, or a simple fusion otherwise
+          let lastMergedContent = utils.someResult(
+            serverContent.history,
+            hash => syncedContent.historyData[hash],
+          );
+          if (!lastMergedContent && syncHistoryItem) {
+            lastMergedContent = syncedContent.historyData[syncHistoryItem[LAST_MERGED]];
+          }
+          return diffUtils.mergeContent(serverContent, clientContent, lastMergedContent);
+        })();
+
+        if (!mergedContent) {
+          return;
+        }
+
+        // Update or set content in store
+        store.commit('content/setItem', {
+          id: `${fileId}/content`,
+          text: utils.sanitizeText(mergedContent.text),
+          properties: utils.sanitizeText(mergedContent.properties),
+          discussions: mergedContent.discussions,
+          comments: mergedContent.comments,
         });
-        return result;
+
+        // Retrieve content with its new hash value and freeze it
+        mergedContent = utils.deepCopy(getContent());
+
+        // Make merged content history
+        const mergedContentHistory = serverContent ? serverContent.history.slice() : [];
+        let skipUpload = true;
+        if (mergedContentHistory[0] !== mergedContent.hash) {
+          // Put merged content hash at the beginning of history
+          mergedContentHistory.unshift(mergedContent.hash);
+          // Server content is either out of sync or its history is incomplete, do upload
+          skipUpload = false;
+        }
+        if (syncHistoryItem
+          && syncHistoryItem[LAST_SENT] != null
+          && syncHistoryItem[LAST_SENT] !== mergedContent.hash
+        ) {
+          // Clean up by removing the hash we've previously added
+          const idx = mergedContentHistory.lastIndexOf(syncHistoryItem[LAST_SENT]);
+          if (idx !== -1) {
+            mergedContentHistory.splice(idx, 1);
+          }
+        }
+
+        // Store last sent if it's in the server history,
+        // and merged content which will be sent if different
+        const newSyncedContent = utils.deepCopy(syncedContent);
+        const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || [];
+        newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
+        if (serverContent &&
+          (serverContent.hash === newSyncHistoryItem[LAST_SEEN] ||
+          serverContent.history.indexOf(newSyncHistoryItem[LAST_SEEN]) !== -1)
+        ) {
+          // That's the 2nd time we've seen this content, trust it for future merges
+          newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_SEEN];
+        }
+        newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_MERGED] || null;
+        newSyncHistoryItem[LAST_SEEN] = mergedContent.hash;
+        newSyncHistoryItem[LAST_SENT] = skipUpload ? null : mergedContent.hash;
+        newSyncedContent.historyData[mergedContent.hash] = mergedContent;
+
+        // Clean synced content from unused revisions
+        cleanSyncedContent(newSyncedContent);
+        // Store synced content
+        store.commit('syncedContent/patchItem', newSyncedContent);
+
+        if (skipUpload) {
+          // Server content and merged content are equal, skip content upload
+          return;
+        }
+
+        // Upload merged content
+        const syncLocationToStore = await provider.uploadContent(token, {
+          ...mergedContent,
+          history: mergedContentHistory.slice(0, maxContentHistory),
+        }, syncLocation, tooLateChecker(restartContentSyncAfter));
+
+        // Replace sync location if modified
+        if (utils.serializeObject(syncLocation) !==
+          utils.serializeObject(syncLocationToStore)
+        ) {
+          store.commit('syncLocation/patchItem', syncLocationToStore);
+        }
+
+        // If content was just created, restart sync to create the file as well
+        if (provider === workspaceProvider &&
+          !store.getters['data/syncDataByItemId'][fileId]
+        ) {
+          syncContext.restart = true;
+        }
       };
 
-      return syncOneContentLocation();
-    })
-    .then(
-      () => localDbSvc.unloadContents(),
-      err => localDbSvc.unloadContents()
-        .then(() => {
-          throw err;
-        }),
-    )
-    .catch((err) => {
-      if (err && err.message === 'TOO_LATE') {
-        // Restart sync
-        return syncFile(fileId, syncContext);
-      }
-      throw err;
+      await store.dispatch('queue/doWithLocation', {
+        location: syncLocation,
+        action: async () => {
+          try {
+            await doSyncLocation();
+          } catch (err) {
+            if (store.state.offline || (err && err.message === 'TOO_LATE')) {
+              throw err;
+            }
+            console.error(err); // eslint-disable-line no-console
+            store.dispatch('notification/error', err);
+          }
+        },
+      });
     });
-}
+  } catch (err) {
+    if (err && err.message === 'TOO_LATE') {
+      // Restart sync
+      await syncFile(fileId, syncContext);
+    }
+    throw err;
+  } finally {
+    await localDbSvc.unloadContents();
+  }
+};
 
 /**
  * Sync a data item, typically settings, workspaces and templates.
  */
-function syncDataItem(dataId) {
+const syncDataItem = async (dataId) => {
   const getItem = () => store.state.data.itemMap[dataId]
     || store.state.data.lsItemMap[dataId];
 
   const item = getItem();
   const syncData = store.getters['data/syncDataByItemId'][dataId];
-  // Sync if item hash and syncData hash are inconsistent
+  // Sync if item hash and syncData hash are out of sync
   if (syncData && item && item.hash === syncData.hash) {
-    return null;
+    return;
   }
 
-  return workspaceProvider.downloadData(dataId)
-    .then((serverItem = null) => {
-      const dataSyncData = store.getters['data/dataSyncData'][dataId];
-      let mergedItem = (() => {
-        const clientItem = utils.deepCopy(getItem());
-        if (!clientItem) {
-          return serverItem;
-        }
-        if (!serverItem) {
-          return clientItem;
-        }
-        if (!dataSyncData) {
-          return serverItem;
-        }
-        if (dataSyncData.hash !== serverItem.hash) {
-          // Server version has changed
-          if (dataSyncData.hash !== clientItem.hash && typeof clientItem.data === 'object') {
-            // Client version has changed as well, merge data objects
-            return {
-              ...clientItem,
-              data: diffUtils.mergeObjects(serverItem.data, clientItem.data),
-            };
-          }
-          return serverItem;
-        }
-        return clientItem;
-      })();
-
-      if (!mergedItem) {
-        return null;
+  const serverItem = await workspaceProvider.downloadData(dataId);
+  const dataSyncData = store.getters['data/dataSyncData'][dataId];
+  let mergedItem = (() => {
+    const clientItem = utils.deepCopy(getItem());
+    if (!clientItem) {
+      return serverItem;
+    }
+    if (!serverItem) {
+      return clientItem;
+    }
+    if (!dataSyncData) {
+      return serverItem;
+    }
+    if (dataSyncData.hash !== serverItem.hash) {
+      // Server version has changed
+      if (dataSyncData.hash !== clientItem.hash && typeof clientItem.data === 'object') {
+        // Client version has changed as well, merge data objects
+        return {
+          ...clientItem,
+          data: diffUtils.mergeObjects(serverItem.data, clientItem.data),
+        };
       }
+      return serverItem;
+    }
+    return clientItem;
+  })();
 
-      // Update item in store
-      store.commit('data/setItem', {
-        id: dataId,
-        ...mergedItem,
-      });
+  if (!mergedItem) {
+    return;
+  }
 
-      // Retrieve item with new `hash` and freeze it
-      mergedItem = utils.deepCopy(getItem());
+  // Update item in store
+  store.commit('data/setItem', {
+    id: dataId,
+    ...mergedItem,
+  });
 
-      return Promise.resolve()
-        .then(() => {
-          if (serverItem && serverItem.hash === mergedItem.hash) {
-            return null;
-          }
-          return workspaceProvider.uploadData(mergedItem, tooLateChecker(restartContentSyncAfter));
-        })
-        .then(() => store.dispatch('data/patchDataSyncData', {
-          [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
-        }));
-    });
-}
+  // Retrieve item with new `hash` and freeze it
+  mergedItem = utils.deepCopy(getItem());
+
+  if (serverItem && serverItem.hash === mergedItem.hash) {
+    return;
+  }
+  await workspaceProvider.uploadData(mergedItem, tooLateChecker(restartContentSyncAfter));
+  store.dispatch('data/patchDataSyncData', {
+    [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
+  });
+};
 
 /**
  * Sync the whole workspace with the main provider and the current file explicit locations.
  */
-function syncWorkspace() {
-  const workspace = store.getters['workspace/currentWorkspace'];
-  const syncContext = new SyncContext();
+const syncWorkspace = async () => {
+  try {
+    const workspace = store.getters['workspace/currentWorkspace'];
+    const syncContext = new SyncContext();
 
-  return Promise.resolve()
-    .then(() => {
-      // Store the sub in the DB since it's not safely stored in the token
-      const syncToken = store.getters['workspace/syncToken'];
-      const localSettings = store.getters['data/localSettings'];
-      if (!localSettings.syncSub) {
-        store.dispatch('data/patchLocalSettings', {
-          syncSub: syncToken.sub,
-        });
-      } else if (localSettings.syncSub !== syncToken.sub) {
-        throw new Error('Synchronization failed due to token inconsistency.');
-      }
-    })
-    .then(() => workspaceProvider.getChanges())
-    .then((changes) => {
-      // Apply changes
-      applyChanges(changes);
-      if (workspaceProvider.onChangesApplied) {
-        workspaceProvider.onChangesApplied();
-      }
+    // Store the sub in the DB since it's not safely stored in the token
+    const syncToken = store.getters['workspace/syncToken'];
+    const localSettings = store.getters['data/localSettings'];
+    if (!localSettings.syncSub) {
+      store.dispatch('data/patchLocalSettings', {
+        syncSub: syncToken.sub,
+      });
+    } else if (localSettings.syncSub !== syncToken.sub) {
+      throw new Error('Synchronization failed due to token inconsistency.');
+    }
 
-      // Prevent from sending items too long after changes have been retrieved
-      const ifNotTooLate = tooLateChecker(restartSyncAfter);
+    const changes = await workspaceProvider.getChanges();
+    // Apply changes
+    applyChanges(changes);
+    if (workspaceProvider.onChangesApplied) {
+      workspaceProvider.onChangesApplied();
+    }
 
-      // Called until no item to save
-      const saveNextItem = ifNotTooLate(() => {
-        const storeItemMap = {
-          ...store.state.file.itemMap,
-          ...store.state.folder.itemMap,
-          ...store.state.syncLocation.itemMap,
-          ...store.state.publishLocation.itemMap,
-          // Deal with contents and data later
-        };
-        const syncDataByItemId = store.getters['data/syncDataByItemId'];
-        let promise;
-        Object.entries(storeItemMap).some(([id, item]) => {
+    // Prevent from sending items too long after changes have been retrieved
+    const ifNotTooLate = tooLateChecker(restartSyncAfter);
+
+    // Called until no item to save
+    const saveNextItem = ifNotTooLate(async () => {
+      const storeItemMap = {
+        ...store.state.file.itemMap,
+        ...store.state.folder.itemMap,
+        ...store.state.syncLocation.itemMap,
+        ...store.state.publishLocation.itemMap,
+        // Deal with contents and data later
+      };
+      const syncDataByItemId = store.getters['data/syncDataByItemId'];
+      const [changedItem, syncDataToUpdate] = utils.someResult(
+        Object.entries(storeItemMap),
+        ([id, item]) => {
           const existingSyncData = syncDataByItemId[id];
           if ((!existingSyncData || existingSyncData.hash !== item.hash)
             // Add file/folder if parent has been added
@@ -560,156 +542,141 @@ function syncWorkspace() {
             // Add file if content has been added
             && (item.type !== 'file' || syncDataByItemId[`${id}/content`])
           ) {
-            promise = workspaceProvider
-              .saveSimpleItem(
-                // Use deepCopy to freeze objects
-                utils.deepCopy(item),
-                utils.deepCopy(existingSyncData),
-                ifNotTooLate,
-              )
-              .then(resultSyncData => store.dispatch('data/patchSyncData', {
-                [resultSyncData.id]: resultSyncData,
-              }))
-              .then(() => saveNextItem());
+            return [item, existingSyncData];
           }
-          return promise;
-        });
-        return promise;
-      });
-
-      // Called until no item to remove
-      const removeNextItem = ifNotTooLate(() => {
-        const storeItemMap = {
-          ...store.state.file.itemMap,
-          ...store.state.folder.itemMap,
-          ...store.state.syncLocation.itemMap,
-          ...store.state.publishLocation.itemMap,
-          ...store.state.content.itemMap,
-        };
-        const syncData = store.getters['data/syncData'];
-        let promise;
-        Object.entries(syncData).some(([, existingSyncData]) => {
-          if (!storeItemMap[existingSyncData.itemId] &&
-            // We don't want to delete data items, especially on first sync
-            existingSyncData.type !== 'data' &&
-            // Remove content only if file has been removed
-            (existingSyncData.type !== 'content' || !storeItemMap[existingSyncData.itemId.split('/')[0]])
-          ) {
-            // Use deepCopy to freeze objects
-            const syncDataToRemove = utils.deepCopy(existingSyncData);
-            promise = workspaceProvider
-              .removeItem(syncDataToRemove, ifNotTooLate)
-              .then(() => {
-                const syncDataCopy = { ...store.getters['data/syncData'] };
-                delete syncDataCopy[syncDataToRemove.id];
-                store.dispatch('data/setSyncData', syncDataCopy);
-              })
-              .then(() => removeNextItem());
-          }
-          return promise;
-        });
-        return promise;
-      });
-
-      const getOneFileIdToSync = () => {
-        const contentIds = [...new Set([
-          ...Object.keys(localDbSvc.hashMap.content),
-          ...store.getters['file/items'].map(file => `${file.id}/content`),
-        ])];
-        let fileId;
-        contentIds.some((contentId) => {
-          // Get content hash from itemMap or from localDbSvc if not loaded
-          const loadedContent = store.state.content.itemMap[contentId];
-          const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
-          const syncData = store.getters['data/syncDataByItemId'][contentId];
-          if (
-            // Sync if content syncing was not attempted yet
-            !syncContext.attempted[contentId] &&
-            // And if syncData does not exist or if content hash and syncData hash are inconsistent
-            (!syncData || syncData.hash !== hash)
-          ) {
-            [fileId] = contentId.split('/');
-          }
-          return fileId;
-        });
-        return fileId;
-      };
-
-      const syncNextFile = () => {
-        const fileId = getOneFileIdToSync();
-        if (!fileId) {
           return null;
-        }
-        return syncFile(fileId, syncContext)
-          .then(() => syncNextFile());
-      };
+        },
+      ) || [];
 
-      const onSyncEnd = () => Promise.resolve(workspaceProvider.onSyncEnd
-        && workspaceProvider.onSyncEnd());
-
-      return Promise.resolve()
-        .then(() => saveNextItem())
-        .then(() => removeNextItem())
-        // Sync settings only in the main workspace
-        .then(() => workspace.id === 'main' && syncDataItem('settings'))
-        // Sync workspaces only in the main workspace
-        .then(() => workspace.id === 'main' && syncDataItem('workspaces'))
-        .then(() => syncDataItem('templates'))
-        .then(() => {
-          const currentFileId = store.getters['file/current'].id;
-          if (currentFileId) {
-            // Sync current file first
-            return syncFile(currentFileId, syncContext)
-              .then(() => syncNextFile());
-          }
-          return syncNextFile();
-        })
-        .then(
-          () => onSyncEnd(),
-          err => onSyncEnd().then(() => {
-            throw err;
-          }, () => {
-            throw err;
-          }),
-        )
-        .then(
-          () => {
-            if (syncContext.restart) {
-              // Restart sync
-              return syncWorkspace();
-            }
-            return null;
-          },
-          (err) => {
-            if (err && err.message === 'TOO_LATE') {
-              // Restart sync
-              return syncWorkspace();
-            }
-            throw err;
-          },
-        );
+      if (changedItem) {
+        const resultSyncData = await workspaceProvider
+          .saveSimpleItem(
+            // Use deepCopy to freeze objects
+            utils.deepCopy(changedItem),
+            utils.deepCopy(syncDataToUpdate),
+            ifNotTooLate,
+          );
+        store.dispatch('data/patchSyncData', {
+          [resultSyncData.id]: resultSyncData,
+        });
+        await saveNextItem();
+      }
     });
-}
+    await saveNextItem();
+
+    // Called until no item to remove
+    const removeNextItem = ifNotTooLate(async () => {
+      const storeItemMap = {
+        ...store.state.file.itemMap,
+        ...store.state.folder.itemMap,
+        ...store.state.syncLocation.itemMap,
+        ...store.state.publishLocation.itemMap,
+        ...store.state.content.itemMap,
+      };
+      const syncData = store.getters['data/syncData'];
+      const syncDataToRemove = utils.deepCopy(utils.someResult(
+        Object.values(syncData),
+        existingSyncData => !storeItemMap[existingSyncData.itemId]
+          // We don't want to delete data items, especially on first sync
+          && existingSyncData.type !== 'data'
+          // Remove content only if file has been removed
+          && (existingSyncData.type !== 'content'
+            || !storeItemMap[existingSyncData.itemId.split('/')[0]])
+          && existingSyncData,
+      ));
+
+      if (syncDataToRemove) {
+        // Use deepCopy to freeze objects
+        await workspaceProvider.removeItem(syncDataToRemove, ifNotTooLate);
+        const syncDataCopy = { ...store.getters['data/syncData'] };
+        delete syncDataCopy[syncDataToRemove.id];
+        store.dispatch('data/setSyncData', syncDataCopy);
+        await removeNextItem();
+      }
+    });
+    await removeNextItem();
+
+    // Sync settings and workspaces only in the main workspace
+    if (workspace.id === 'main') {
+      await syncDataItem('settings');
+      await syncDataItem('workspaces');
+    }
+    await syncDataItem('templates');
+
+    const getOneFileIdToSync = () => {
+      const contentIds = [...new Set([
+        ...Object.keys(localDbSvc.hashMap.content),
+        ...store.getters['file/items'].map(file => `${file.id}/content`),
+      ])];
+      return utils.someResult(contentIds, (contentId) => {
+        // Get content hash from itemMap or from localDbSvc if not loaded
+        const loadedContent = store.state.content.itemMap[contentId];
+        const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
+        const syncData = store.getters['data/syncDataByItemId'][contentId];
+        if (
+          // Sync if content syncing was not attempted yet
+          !syncContext.attempted[contentId] &&
+          // And if syncData does not exist or if content hash and syncData hash are inconsistent
+          (!syncData || syncData.hash !== hash)
+        ) {
+          const [fileId] = contentId.split('/');
+          return fileId;
+        }
+        return null;
+      });
+    };
+
+    const syncNextFile = async () => {
+      const fileId = getOneFileIdToSync();
+      if (fileId) {
+        await syncFile(fileId, syncContext);
+        await syncNextFile();
+      }
+    };
+
+    const currentFileId = store.getters['file/current'].id;
+    if (currentFileId) {
+      // Sync current file first
+      await syncFile(currentFileId, syncContext);
+    }
+    await syncNextFile();
+
+    if (syncContext.restart) {
+      // Restart sync
+      await syncWorkspace();
+    }
+  } catch (err) {
+    if (err && err.message === 'TOO_LATE') {
+      // Restart sync
+      await syncWorkspace();
+    } else {
+      throw err;
+    }
+  } finally {
+    if (workspaceProvider.onSyncEnd) {
+      workspaceProvider.onSyncEnd();
+    }
+  }
+};
 
 /**
  * Enqueue a sync task, if possible.
  */
-function requestSync() {
+const requestSync = () => {
   // No sync in light mode
   if (store.state.light) {
     return;
   }
 
-  store.dispatch('queue/enqueueSyncRequest', () => new Promise((resolve, reject) => {
+  store.dispatch('queue/enqueueSyncRequest', async () => {
     let intervalId;
-    const attempt = () => {
+    const attempt = async () => {
       // Only start syncing when these conditions are met
       if (networkSvc.isUserActive() && isSyncWindow()) {
         clearInterval(intervalId);
         if (!isSyncPossible()) {
           // Cancel sync
-          reject(new Error('Sync not possible.'));
-          return;
+          throw new Error('Sync not possible.');
         }
 
         // Determine if we have to clean files
@@ -729,91 +696,86 @@ function requestSync() {
         // Call setLastSyncActivity periodically
         intervalId = utils.setInterval(() => setLastSyncActivity(), 1000);
         setLastSyncActivity();
-        const cleaner = cb => (res) => {
-          clearInterval(intervalId);
-          cb(res);
-        };
 
-        Promise.resolve()
-          .then(() => {
-            if (isWorkspaceSyncPossible()) {
-              return syncWorkspace();
+        try {
+          if (isWorkspaceSyncPossible()) {
+            await syncWorkspace();
+          } else if (hasCurrentFileSyncLocations()) {
+            // Only sync current file if workspace sync is unavailable.
+            // We could sync all files that are out-of-sync but it would
+            // require to load all the syncedContent objects from the DB.
+            await syncFile(store.getters['file/current'].id);
+          }
+
+          // Clean files
+          Object.entries(fileHashesToClean).forEach(([fileId, fileHash]) => {
+            const file = store.state.file.itemMap[fileId];
+            if (file && file.hash === fileHash) {
+              fileSvc.deleteFile(fileId);
             }
-            if (hasCurrentFileSyncLocations()) {
-              // Only sync current file if workspace sync is unavailable.
-              // We could also sync files that are out-of-sync but it would
-              // require to load all the syncedContent objects from the DB.
-              return syncFile(store.getters['file/current'].id);
-            }
-            return null;
-          })
-          .then(() => {
-            // Clean files
-            Object.entries(fileHashesToClean).forEach(([fileId, fileHash]) => {
-              const file = store.state.file.itemMap[fileId];
-              if (file && file.hash === fileHash) {
-                fileSvc.deleteFile(fileId);
-              }
-            });
-          })
-          .then(cleaner(resolve), cleaner(reject));
+          });
+        } finally {
+          clearInterval(intervalId);
+        }
       }
     };
+
     intervalId = utils.setInterval(() => attempt(), 1000);
     attempt();
-  }));
-}
+  });
+};
 
 export default {
-  init() {
-    return Promise.resolve()
-      .then(() => {
-        // Load workspaces and tokens from localStorage
-        localDbSvc.syncLocalStorage();
+  async init() {
+    // Load workspaces and tokens from localStorage
+    localDbSvc.syncLocalStorage();
 
-        // Try to find a suitable action provider
-        actionProvider = providerRegistry.providers[utils.queryParams.providerId];
-        return actionProvider && actionProvider.initAction && actionProvider.initAction();
-      })
-      .then(() => {
-        // Try to find a suitable workspace sync provider
-        workspaceProvider = providerRegistry.providers[utils.queryParams.providerId];
-        if (!workspaceProvider || !workspaceProvider.initWorkspace) {
-          workspaceProvider = googleDriveAppDataProvider;
-        }
-        return workspaceProvider.initWorkspace();
-      })
-      .then(workspace => store.dispatch('workspace/setCurrentWorkspaceId', workspace.id))
-      .then(() => localDbSvc.init())
-      .then(() => {
-        // Try to find a suitable action provider
-        actionProvider = providerRegistry.providers[utils.queryParams.providerId] || actionProvider;
-        return actionProvider && actionProvider.performAction && actionProvider.performAction()
-          .then(newSyncLocation => newSyncLocation && this.createSyncLocation(newSyncLocation));
-      })
-      .then(() => tempFileSvc.init())
-      .then(() => {
-        if (!store.state.light) {
-          // Sync periodically
-          utils.setInterval(() => {
-            if (isSyncPossible()
-              && networkSvc.isUserActive()
-              && isSyncWindow()
-              && isAutoSyncReady()
-            ) {
-              requestSync();
-            }
-          }, 1000);
+    // Try to find a suitable action provider
+    actionProvider = providerRegistry.providers[utils.queryParams.providerId];
+    if (actionProvider && actionProvider.initAction) {
+      await actionProvider.initAction();
+    }
 
-          // Unload contents from memory periodically
-          utils.setInterval(() => {
-            // Wait for sync and publish to finish
-            if (store.state.queue.isEmpty) {
-              localDbSvc.unloadContents();
-            }
-          }, 5000);
+    // Try to find a suitable workspace sync provider
+    workspaceProvider = providerRegistry.providers[utils.queryParams.providerId];
+    if (!workspaceProvider || !workspaceProvider.initWorkspace) {
+      workspaceProvider = googleDriveAppDataProvider;
+    }
+    const workspace = await workspaceProvider.initWorkspace();
+    store.dispatch('workspace/setCurrentWorkspaceId', workspace.id);
+    await localDbSvc.init();
+
+    // Try to find a suitable action provider
+    actionProvider = providerRegistry.providers[utils.queryParams.providerId] || actionProvider;
+    if (actionProvider && actionProvider.performAction) {
+      const newSyncLocation = await actionProvider.performAction();
+      if (newSyncLocation) {
+        this.createSyncLocation(newSyncLocation);
+      }
+    }
+
+    await tempFileSvc.init();
+
+    if (!store.state.light) {
+      // Sync periodically
+      utils.setInterval(() => {
+        if (isSyncPossible()
+          && networkSvc.isUserActive()
+          && isSyncWindow()
+          && isAutoSyncReady()
+        ) {
+          requestSync();
         }
-      });
+      }, 1000);
+
+      // Unload contents from memory periodically
+      utils.setInterval(() => {
+        // Wait for sync and publish to finish
+        if (store.state.queue.isEmpty) {
+          localDbSvc.unloadContents();
+        }
+      }, 5000);
+    }
   },
   isSyncPossible,
   requestSync,
diff --git a/src/services/tempFileSvc.js b/src/services/tempFileSvc.js
index 7a116178..1a6ef961 100644
--- a/src/services/tempFileSvc.js
+++ b/src/services/tempFileSvc.js
@@ -25,75 +25,73 @@ export default {
     }
     this.closed = true;
   },
-  init() {
+  async init() {
     if (!origin || !window.parent) {
-      return Promise.resolve();
+      return;
     }
-
     store.commit('setLight', true);
 
-    return fileSvc.createFile({
+    const file = await fileSvc.createFile({
       name: fileName || utils.getHostname(origin),
       text: contentText || '\n',
       properties: contentProperties,
       parentId: 'temp',
-    }, true)
-      .then((file) => {
-        const fileItemMap = store.state.file.itemMap;
+    }, true);
 
-        // Sanitize file creations
-        const lastCreated = {};
-        Object.entries(store.getters['data/lastCreated']).forEach(([id, createdOn]) => {
-          if (fileItemMap[id] && fileItemMap[id].parentId === 'temp') {
-            lastCreated[id] = createdOn;
-          }
-        });
+    const fileItemMap = store.state.file.itemMap;
 
-        // Track file creation from other site
-        lastCreated[file.id] = {
-          created: Date.now(),
-        };
+    // Sanitize file creations
+    const lastCreated = {};
+    Object.entries(store.getters['data/lastCreated']).forEach(([id, createdOn]) => {
+      if (fileItemMap[id] && fileItemMap[id].parentId === 'temp') {
+        lastCreated[id] = createdOn;
+      }
+    });
 
-        // Keep only the last 10 temp files created by other sites
-        Object.entries(lastCreated)
-          .sort(([, createdOn1], [, createdOn2]) => createdOn2 - createdOn1)
-          .splice(10)
-          .forEach(([id]) => {
-            delete lastCreated[id];
-            fileSvc.deleteFile(id);
-          });
+    // Track file creation from other site
+    lastCreated[file.id] = {
+      created: Date.now(),
+    };
 
-        // Store file creations and open the file
-        store.dispatch('data/setLastCreated', lastCreated);
-        store.commit('file/setCurrentId', file.id);
-
-        const onChange = cledit.Utils.debounce(() => {
-          const currentFile = store.getters['file/current'];
-          if (currentFile.id !== file.id) {
-            // Close editor if file has changed for some reason
-            this.close();
-          } else if (!this.closed && editorSvc.previewCtx.html != null) {
-            const content = store.getters['content/current'];
-            const properties = utils.computeProperties(content.properties);
-            window.parent.postMessage({
-              type: 'fileChange',
-              payload: {
-                id: file.id,
-                name: currentFile.name,
-                content: {
-                  text: content.text.slice(0, -1), // Remove trailing LF
-                  properties,
-                  yamlProperties: content.properties,
-                  html: editorSvc.previewCtx.html,
-                },
-              },
-            }, origin);
-          }
-        }, 25);
-
-        // Watch preview refresh and file name changes
-        editorSvc.$on('previewCtx', onChange);
-        store.watch(() => store.getters['file/current'].name, onChange);
+    // Keep only the last 10 temp files created by other sites
+    Object.entries(lastCreated)
+      .sort(([, createdOn1], [, createdOn2]) => createdOn2 - createdOn1)
+      .splice(10)
+      .forEach(([id]) => {
+        delete lastCreated[id];
+        fileSvc.deleteFile(id);
       });
+
+    // Store file creations and open the file
+    store.dispatch('data/setLastCreated', lastCreated);
+    store.commit('file/setCurrentId', file.id);
+
+    const onChange = cledit.Utils.debounce(() => {
+      const currentFile = store.getters['file/current'];
+      if (currentFile.id !== file.id) {
+        // Close editor if file has changed for some reason
+        this.close();
+      } else if (!this.closed && editorSvc.previewCtx.html != null) {
+        const content = store.getters['content/current'];
+        const properties = utils.computeProperties(content.properties);
+        window.parent.postMessage({
+          type: 'fileChange',
+          payload: {
+            id: file.id,
+            name: currentFile.name,
+            content: {
+              text: content.text.slice(0, -1), // Remove trailing LF
+              properties,
+              yamlProperties: content.properties,
+              html: editorSvc.previewCtx.html,
+            },
+          },
+        }, origin);
+      }
+    }, 25);
+
+    // Watch preview refresh and file name changes
+    editorSvc.$on('previewCtx', onChange);
+    store.watch(() => store.getters['file/current'].name, onChange);
   },
 };
diff --git a/src/services/userSvc.js b/src/services/userSvc.js
index d9f41a24..537d6ba0 100644
--- a/src/services/userSvc.js
+++ b/src/services/userSvc.js
@@ -16,7 +16,7 @@ export default {
     promised[id] = true;
     store.commit('userInfo/addItem', { id, name, imageUrl });
   },
-  getInfo(userId) {
+  async getInfo(userId) {
     if (!promised[userId]) {
       const [type, sub] = parseUserId(userId);
 
@@ -33,27 +33,26 @@ export default {
       if (!store.state.offline) {
         promised[userId] = true;
         switch (type) {
-          case 'github': {
-            return githubHelper.getUser(sub)
-              .catch((err) => {
-                if (err.status !== 404) {
-                  promised[userId] = false;
-                }
-              });
-          }
+          case 'github':
+            try {
+              await githubHelper.getUser(sub);
+            } catch (err) {
+              if (err.status !== 404) {
+                promised[userId] = false;
+              }
+            }
+            break;
           case 'google':
-          default: {
-            return googleHelper.getUser(sub)
-              .catch((err) => {
-                if (err.status !== 404) {
-                  promised[userId] = false;
-                }
-              });
-          }
+          default:
+            try {
+              await googleHelper.getUser(sub);
+            } catch (err) {
+              if (err.status !== 404) {
+                promised[userId] = false;
+              }
+            }
         }
       }
     }
-
-    return null;
   },
 };
diff --git a/src/services/utils.js b/src/services/utils.js
index 11b04572..6430c0e4 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -224,6 +224,14 @@ export default {
     };
     return runWithNextValue();
   },
+  someResult(values, func) {
+    let result;
+    values.some((value) => {
+      result = func(value);
+      return result;
+    });
+    return result;
+  },
   parseQueryParams,
   addQueryParams(url = '', params = {}, hash = false) {
     const keys = Object.keys(params).filter(key => params[key] != null);
diff --git a/src/store/content.js b/src/store/content.js
index 23abb20f..57f901a8 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -31,11 +31,11 @@ module.mutations = {
 
 module.getters = {
   ...module.getters,
-  current: (state, getters, rootState, rootGetters) => {
-    if (state.revisionContent) {
-      return state.revisionContent;
+  current: ({ itemMap, revisionContent }, getters, rootState, rootGetters) => {
+    if (revisionContent) {
+      return revisionContent;
     }
-    return state.itemMap[`${rootGetters['file/current'].id}/content`] || empty();
+    return itemMap[`${rootGetters['file/current'].id}/content`] || empty();
   },
   currentChangeTrigger: (state, getters) => {
     const { current } = getters;
@@ -45,11 +45,9 @@ module.getters = {
       current.hash,
     ]);
   },
-  currentProperties: (state, getters) => utils.computeProperties(getters.current.properties),
-  isCurrentEditable: (state, getters, rootState, rootGetters) =>
-    !state.revisionContent &&
-    getters.current.id &&
-    rootGetters['layout/styles'].showEditor,
+  currentProperties: (state, { current }) => utils.computeProperties(current.properties),
+  isCurrentEditable: ({ revisionContent }, { current }, rootState, rootGetters) =>
+    !revisionContent && current.id && rootGetters['layout/styles'].showEditor,
 };
 
 module.actions = {
@@ -76,7 +74,7 @@ module.actions = {
       });
     }
   },
-  restoreRevision({
+  async restoreRevision({
     state,
     getters,
     commit,
@@ -84,31 +82,29 @@ module.actions = {
   }) {
     const { revisionContent } = state;
     if (revisionContent) {
-      dispatch('modal/fileRestoration', null, { root: true })
-        .then(() => {
-          // Close revision
-          commit('setRevisionContent');
-          const currentContent = utils.deepCopy(getters.current);
-          if (currentContent) {
-            // Restore text and move discussions
-            const diffs = diffMatchPatch
-              .diff_main(currentContent.text, revisionContent.originalText);
-            diffMatchPatch.diff_cleanupSemantic(diffs);
-            Object.entries(currentContent.discussions).forEach(([, discussion]) => {
-              const adjustOffset = (offsetName) => {
-                const marker = new cledit.Marker(discussion[offsetName], offsetName === 'end');
-                marker.adjustOffset(diffs);
-                discussion[offsetName] = marker.offset;
-              };
-              adjustOffset('start');
-              adjustOffset('end');
-            });
-            dispatch('patchCurrent', {
-              ...currentContent,
-              text: revisionContent.originalText,
-            });
-          }
+      await dispatch('modal/fileRestoration', null, { root: true });
+      // Close revision
+      commit('setRevisionContent');
+      const currentContent = utils.deepCopy(getters.current);
+      if (currentContent) {
+        // Restore text and move discussions
+        const diffs = diffMatchPatch
+          .diff_main(currentContent.text, revisionContent.originalText);
+        diffMatchPatch.diff_cleanupSemantic(diffs);
+        Object.entries(currentContent.discussions).forEach(([, discussion]) => {
+          const adjustOffset = (offsetName) => {
+            const marker = new cledit.Marker(discussion[offsetName], offsetName === 'end');
+            marker.adjustOffset(diffs);
+            discussion[offsetName] = marker.offset;
+          };
+          adjustOffset('start');
+          adjustOffset('end');
         });
+        dispatch('patchCurrent', {
+          ...currentContent,
+          text: revisionContent.originalText,
+        });
+      }
     }
   },
 };
diff --git a/src/store/contentState.js b/src/store/contentState.js
index a53279a7..dc3bbbcf 100644
--- a/src/store/contentState.js
+++ b/src/store/contentState.js
@@ -5,8 +5,8 @@ const module = moduleTemplate(empty, true);
 
 module.getters = {
   ...module.getters,
-  current: (state, getters, rootState, rootGetters) =>
-    state.itemMap[`${rootGetters['file/current'].id}/contentState`] || empty(),
+  current: ({ itemMap }, getters, rootState, rootGetters) =>
+    itemMap[`${rootGetters['file/current'].id}/contentState`] || empty(),
 };
 
 module.actions = {
diff --git a/src/store/data.js b/src/store/data.js
index 0be05ead..d85586f1 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -104,7 +104,7 @@ export default {
     lsItemMap: {},
   },
   mutations: {
-    setItem: (state, value) => {
+    setItem: ({ itemMap, lsItemMap }, value) => {
       // Create an empty item and override its data field
       const emptyItem = empty(value.id);
       const data = typeof value.data === 'object'
@@ -118,19 +118,19 @@ export default {
       });
 
       // Store item in itemMap or lsItemMap if its stored in the localStorage
-      Vue.set(lsItemIdSet.has(item.id) ? state.lsItemMap : state.itemMap, item.id, item);
+      Vue.set(lsItemIdSet.has(item.id) ? lsItemMap : itemMap, item.id, item);
     },
-    deleteItem(state, id) {
+    deleteItem({ itemMap }, id) {
       // Only used by localDbSvc to clean itemMap from object moved to localStorage
-      Vue.delete(state.itemMap, id);
+      Vue.delete(itemMap, id);
     },
   },
   getters: {
     workspaces: getter('workspaces'),
-    sanitizedWorkspaces: (state, getters, rootState, rootGetters) => {
+    sanitizedWorkspaces: (state, { workspaces }, rootState, rootGetters) => {
       const sanitizedWorkspaces = {};
       const mainWorkspaceToken = rootGetters['workspace/mainWorkspaceToken'];
-      Object.entries(getters.workspaces).forEach(([id, workspace]) => {
+      Object.entries(workspaces).forEach(([id, workspace]) => {
         const sanitizedWorkspace = {
           id,
           providerId: mainWorkspaceToken && 'googleDriveAppData',
@@ -146,9 +146,9 @@ export default {
       return sanitizedWorkspaces;
     },
     settings: getter('settings'),
-    computedSettings: (state, getters) => {
-      const customSettings = yaml.safeLoad(getters.settings);
-      const settings = yaml.safeLoad(defaultSettings);
+    computedSettings: (state, { settings }) => {
+      const customSettings = yaml.safeLoad(settings);
+      const parsedSettings = yaml.safeLoad(defaultSettings);
       const override = (obj, opt) => {
         const objType = Object.prototype.toString.call(obj);
         const optType = Object.prototype.toString.call(opt);
@@ -166,44 +166,44 @@ export default {
         });
         return obj;
       };
-      return override(settings, customSettings);
+      return override(parsedSettings, customSettings);
     },
     localSettings: getter('localSettings'),
     layoutSettings: getter('layoutSettings'),
     templates: getter('templates'),
-    allTemplates: (state, getters) => ({
-      ...getters.templates,
+    allTemplates: (state, { templates }) => ({
+      ...templates,
       ...additionalTemplates,
     }),
     lastCreated: getter('lastCreated'),
     lastOpened: getter('lastOpened'),
-    lastOpenedIds: (state, getters, rootState) => {
-      const lastOpened = {
-        ...getters.lastOpened,
+    lastOpenedIds: (state, { lastOpened }, rootState) => {
+      const result = {
+        ...lastOpened,
       };
       const currentFileId = rootState.file.currentId;
-      if (currentFileId && !lastOpened[currentFileId]) {
-        lastOpened[currentFileId] = Date.now();
+      if (currentFileId && !result[currentFileId]) {
+        result[currentFileId] = Date.now();
       }
-      return Object.keys(lastOpened)
+      return Object.keys(result)
         .filter(id => rootState.file.itemMap[id])
-        .sort((id1, id2) => lastOpened[id2] - lastOpened[id1])
+        .sort((id1, id2) => result[id2] - result[id1])
         .slice(0, 20);
     },
     syncData: getter('syncData'),
-    syncDataByItemId: (state, getters) => {
+    syncDataByItemId: (state, { syncData }) => {
       const result = {};
-      Object.entries(getters.syncData).forEach(([, value]) => {
+      Object.entries(syncData).forEach(([, value]) => {
         result[value.itemId] = value;
       });
       return result;
     },
-    syncDataByType: (state, getters) => {
+    syncDataByType: (state, { syncData }) => {
       const result = {};
       utils.types.forEach((type) => {
         result[type] = {};
       });
-      Object.entries(getters.syncData).forEach(([, item]) => {
+      Object.entries(syncData).forEach(([, item]) => {
         if (result[item.type]) {
           result[item.type][item.itemId] = item;
         }
@@ -212,12 +212,12 @@ export default {
     },
     dataSyncData: getter('dataSyncData'),
     tokens: getter('tokens'),
-    googleTokens: (state, getters) => getters.tokens.google || {},
-    couchdbTokens: (state, getters) => getters.tokens.couchdb || {},
-    dropboxTokens: (state, getters) => getters.tokens.dropbox || {},
-    githubTokens: (state, getters) => getters.tokens.github || {},
-    wordpressTokens: (state, getters) => getters.tokens.wordpress || {},
-    zendeskTokens: (state, getters) => getters.tokens.zendesk || {},
+    googleTokens: (state, { tokens }) => tokens.google || {},
+    couchdbTokens: (state, { tokens }) => tokens.couchdb || {},
+    dropboxTokens: (state, { tokens }) => tokens.dropbox || {},
+    githubTokens: (state, { tokens }) => tokens.github || {},
+    wordpressTokens: (state, { tokens }) => tokens.wordpress || {},
+    zendeskTokens: (state, { tokens }) => tokens.zendesk || {},
   },
   actions: {
     setWorkspaces: setter('workspaces'),
diff --git a/src/store/discussion.js b/src/store/discussion.js
index 4793b8a7..1c1d1ab5 100644
--- a/src/store/discussion.js
+++ b/src/store/discussion.js
@@ -59,8 +59,8 @@ export default {
     },
   },
   getters: {
-    newDiscussion: state =>
-      state.currentDiscussionId === state.newDiscussionId && state.newDiscussion,
+    newDiscussion: ({ currentDiscussionId, newDiscussionId, newDiscussion }) =>
+      currentDiscussionId === newDiscussionId && newDiscussion,
     currentFileDiscussionLastComments: (state, getters, rootState, rootGetters) => {
       const { discussions, comments } = rootGetters['content/current'];
       const discussionLastComments = {};
@@ -74,14 +74,18 @@ export default {
       });
       return discussionLastComments;
     },
-    currentFileDiscussions: (state, getters, rootState, rootGetters) => {
+    currentFileDiscussions: (
+      { newDiscussionId },
+      { newDiscussion, currentFileDiscussionLastComments },
+      rootState,
+      rootGetters,
+    ) => {
       const currentFileDiscussions = {};
-      const { newDiscussion } = getters;
       if (newDiscussion) {
-        currentFileDiscussions[state.newDiscussionId] = newDiscussion;
+        currentFileDiscussions[newDiscussionId] = newDiscussion;
       }
       const { discussions } = rootGetters['content/current'];
-      Object.entries(getters.currentFileDiscussionLastComments)
+      Object.entries(currentFileDiscussionLastComments)
         .sort(([, lastComment1], [, lastComment2]) =>
           lastComment1.created - lastComment2.created)
         .forEach(([discussionId]) => {
@@ -89,17 +93,22 @@ export default {
         });
       return currentFileDiscussions;
     },
-    currentDiscussion: (state, getters) =>
-      getters.currentFileDiscussions[state.currentDiscussionId],
+    currentDiscussion: ({ currentDiscussionId }, { currentFileDiscussions }) =>
+      currentFileDiscussions[currentDiscussionId],
     previousDiscussionId: idShifter(-1),
     nextDiscussionId: idShifter(1),
-    currentDiscussionComments: (state, getters, rootState, rootGetters) => {
+    currentDiscussionComments: (
+      { currentDiscussionId },
+      { currentDiscussion },
+      rootState,
+      rootGetters,
+    ) => {
       const comments = {};
-      if (getters.currentDiscussion) {
+      if (currentDiscussion) {
         const contentComments = rootGetters['content/current'].comments;
         Object.entries(contentComments)
           .filter(([, comment]) =>
-            comment.discussionId === state.currentDiscussionId)
+            comment.discussionId === currentDiscussionId)
           .sort(([, comment1], [, comment2]) =>
             comment1.created - comment2.created)
           .forEach(([commentId, comment]) => {
@@ -108,10 +117,12 @@ export default {
       }
       return comments;
     },
-    currentDiscussionLastCommentId: (state, getters) =>
-      Object.keys(getters.currentDiscussionComments).pop(),
-    currentDiscussionLastComment: (state, getters) =>
-      getters.currentDiscussionComments[getters.currentDiscussionLastCommentId],
+    currentDiscussionLastCommentId: (state, { currentDiscussionComments }) =>
+      Object.keys(currentDiscussionComments).pop(),
+    currentDiscussionLastComment: (
+      state,
+      { currentDiscussionComments, currentDiscussionLastCommentId },
+    ) => currentDiscussionComments[currentDiscussionLastCommentId],
   },
   actions: {
     cancelNewComment({ commit, getters }) {
@@ -120,15 +131,15 @@ export default {
         commit('setCurrentDiscussionId', getters.nextDiscussionId);
       }
     },
-    createNewDiscussion({ commit, dispatch, rootGetters }, selection) {
+    async createNewDiscussion({ commit, dispatch, rootGetters }, selection) {
       const loginToken = rootGetters['workspace/loginToken'];
       if (!loginToken) {
-        dispatch('modal/signInForComment', {
-          onResolve: () => googleHelper.signin()
-            .then(() => syncSvc.requestSync())
-            .then(() => dispatch('createNewDiscussion', selection)),
-        }, { root: true })
-          .catch(() => { /* Cancel */ });
+        try {
+          await dispatch('modal/signInForComment', null, { root: true });
+          await googleHelper.signin();
+          syncSvc.requestSync();
+          await dispatch('createNewDiscussion', selection);
+        } catch (e) { /* cancel */ }
       } else if (selection) {
         let text = rootGetters['content/current'].text.slice(selection.start, selection.end).trim();
         const maxLength = 80;
diff --git a/src/store/explorer.js b/src/store/explorer.js
index 797a1479..c1ca2152 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -44,11 +44,11 @@ const fakeFileNode = new Node(emptyFile());
 fakeFileNode.item.id = 'fake';
 fakeFileNode.noDrag = true;
 
-function getParent(node, getters) {
-  if (node.isNil) {
+function getParent({ item, isNil }, { nodeMap, rootNode }) {
+  if (isNil) {
     return nilFileNode;
   }
-  return getters.nodeMap[node.item.parentId] || getters.rootNode;
+  return nodeMap[item.parentId] || rootNode;
 }
 
 function getFolder(node, getters) {
@@ -67,6 +67,21 @@ export default {
     newChildNode: nilFileNode,
     openNodes: {},
   },
+  mutations: {
+    setSelectedId: setter('selectedId'),
+    setEditingId: setter('editingId'),
+    setDragSourceId: setter('dragSourceId'),
+    setDragTargetId: setter('dragTargetId'),
+    setNewItem(state, item) {
+      state.newChildNode = item ? new Node(item, [], item.type === 'folder') : nilFileNode;
+    },
+    setNewItemName(state, name) {
+      state.newChildNode.item.name = name;
+    },
+    toggleOpenNode(state, id) {
+      Vue.set(state.openNodes, id, !state.openNodes[id]);
+    },
+  },
   getters: {
     nodeStructure: (state, getters, rootState, rootGetters) => {
       const rootNode = new Node(emptyFolder(), [], true, true);
@@ -138,41 +153,26 @@ export default {
         rootNode,
       };
     },
-    nodeMap: (state, getters) => getters.nodeStructure.nodeMap,
-    rootNode: (state, getters) => getters.nodeStructure.rootNode,
+    nodeMap: (state, { nodeStructure }) => nodeStructure.nodeMap,
+    rootNode: (state, { nodeStructure }) => nodeStructure.rootNode,
     newChildNodeParent: (state, getters) => getParent(state.newChildNode, getters),
-    selectedNode: (state, getters) => getters.nodeMap[state.selectedId] || nilFileNode,
+    selectedNode: ({ selectedId }, { nodeMap }) => nodeMap[selectedId] || nilFileNode,
     selectedNodeFolder: (state, getters) => getFolder(getters.selectedNode, getters),
-    editingNode: (state, getters) => getters.nodeMap[state.editingId] || nilFileNode,
-    dragSourceNode: (state, getters) => getters.nodeMap[state.dragSourceId] || nilFileNode,
-    dragTargetNode: (state, getters) => {
-      if (state.dragTargetId === 'fake') {
+    editingNode: ({ editingId }, { nodeMap }) => nodeMap[editingId] || nilFileNode,
+    dragSourceNode: ({ dragSourceId }, { nodeMap }) => nodeMap[dragSourceId] || nilFileNode,
+    dragTargetNode: ({ dragTargetId }, { nodeMap }) => {
+      if (dragTargetId === 'fake') {
         return fakeFileNode;
       }
-      return getters.nodeMap[state.dragTargetId] || nilFileNode;
+      return nodeMap[dragTargetId] || nilFileNode;
     },
-    dragTargetNodeFolder: (state, getters) => {
-      if (state.dragTargetId === 'fake') {
+    dragTargetNodeFolder: ({ dragTargetId }, getters) => {
+      if (dragTargetId === 'fake') {
         return getters.rootNode;
       }
       return getFolder(getters.dragTargetNode, getters);
     },
   },
-  mutations: {
-    setSelectedId: setter('selectedId'),
-    setEditingId: setter('editingId'),
-    setDragSourceId: setter('dragSourceId'),
-    setDragTargetId: setter('dragTargetId'),
-    setNewItem(state, item) {
-      state.newChildNode = item ? new Node(item, [], item.type === 'folder') : nilFileNode;
-    },
-    setNewItemName(state, name) {
-      state.newChildNode.item.name = name;
-    },
-    toggleOpenNode(state, id) {
-      Vue.set(state.openNodes, id, !state.openNodes[id]);
-    },
-  },
   actions: {
     openNode({
       state,
diff --git a/src/store/file.js b/src/store/file.js
index a29b9b25..ffaaf4a3 100644
--- a/src/store/file.js
+++ b/src/store/file.js
@@ -10,10 +10,10 @@ module.state = {
 
 module.getters = {
   ...module.getters,
-  current: state => state.itemMap[state.currentId] || empty(),
-  isCurrentTemp: (state, getters) => getters.current.parentId === 'temp',
-  lastOpened: (state, getters, rootState, rootGetters) =>
-    state.itemMap[rootGetters['data/lastOpenedIds'][0]] || getters.items[0] || empty(),
+  current: ({ itemMap, currentId }) => itemMap[currentId] || empty(),
+  isCurrentTemp: (state, { current }) => current.parentId === 'temp',
+  lastOpened: ({ itemMap }, { items }, rootState, rootGetters) =>
+    itemMap[rootGetters['data/lastOpenedIds'][0]] || items[0] || empty(),
 };
 
 module.mutations = {
diff --git a/src/store/index.js b/src/store/index.js
index 0b1b90e8..f811c287 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -54,13 +54,33 @@ const store = new Vuex.Store({
     minuteCounter: 0,
     monetizeSponsor: false,
   },
+  mutations: {
+    setLight: (state, value) => {
+      state.light = value;
+    },
+    setOffline: (state, value) => {
+      state.offline = value;
+    },
+    updateLastOfflineCheck: (state) => {
+      state.lastOfflineCheck = Date.now();
+    },
+    updateMinuteCounter: (state) => {
+      state.minuteCounter += 1;
+    },
+    setMonetizeSponsor: (state, value) => {
+      state.monetizeSponsor = value;
+    },
+    setGoogleSponsor: (state, value) => {
+      state.googleSponsor = value;
+    },
+  },
   getters: {
     allItemMap: (state) => {
       const result = {};
       utils.types.forEach(type => Object.assign(result, state[type].itemMap));
       return result;
     },
-    itemPaths: (state) => {
+    itemPaths: (state, getters) => {
       const result = {};
       const folderMap = state.folder.itemMap;
       const getPath = (item) => {
@@ -84,8 +104,10 @@ const store = new Vuex.Store({
         result[item.id] = itemPath;
         return itemPath;
       };
-
-      [...state.folder.items, ...state.file.items].forEach(item => getPath(item));
+      [
+        ...getters['folder/items'],
+        ...getters['file/items'],
+      ].forEach(item => getPath(item));
       return result;
     },
     pathItems: (state, { allItemMap, itemPaths }) => {
@@ -97,29 +119,9 @@ const store = new Vuex.Store({
       });
       return result;
     },
-    isSponsor: (state, getters) => {
+    isSponsor: ({ light, monetizeSponsor }, getters) => {
       const sponsorToken = getters['workspace/sponsorToken'];
-      return state.light || state.monetizeSponsor || (sponsorToken && sponsorToken.isSponsor);
-    },
-  },
-  mutations: {
-    setLight: (state, value) => {
-      state.light = value;
-    },
-    setOffline: (state, value) => {
-      state.offline = value;
-    },
-    updateLastOfflineCheck: (state) => {
-      state.lastOfflineCheck = Date.now();
-    },
-    updateMinuteCounter: (state) => {
-      state.minuteCounter += 1;
-    },
-    setMonetizeSponsor: (state, value) => {
-      state.monetizeSponsor = value;
-    },
-    setGoogleSponsor: (state, value) => {
-      state.googleSponsor = value;
+      return light || monetizeSponsor || (sponsorToken && sponsorToken.isSponsor);
     },
   },
   actions: {
diff --git a/src/store/locationTemplate.js b/src/store/locationTemplate.js
index f4932791..7aadbd7f 100644
--- a/src/store/locationTemplate.js
+++ b/src/store/locationTemplate.js
@@ -12,22 +12,22 @@ export default (empty) => {
 
   module.getters = {
     ...module.getters,
-    groupedByFileId: (state, getters) => {
+    groupedByFileId: (state, { items }) => {
       const groups = {};
-      getters.items.forEach(item => addToGroup(groups, item));
+      items.forEach(item => addToGroup(groups, item));
       return groups;
     },
-    filteredGroupedByFileId: (state, getters) => {
+    filteredGroupedByFileId: (state, { items }) => {
       const groups = {};
-      getters.items.filter((item) => {
+      items.filter((item) => {
         // Filter items that we can't use
         const provider = providerRegistry.providers[item.providerId];
         return provider && provider.getToken(item);
       }).forEach(item => addToGroup(groups, item));
       return groups;
     },
-    current: (state, getters, rootState, rootGetters) => {
-      const locations = getters.filteredGroupedByFileId[rootGetters['file/current'].id] || [];
+    current: (state, { filteredGroupedByFileId }, rootState, rootGetters) => {
+      const locations = filteredGroupedByFileId[rootGetters['file/current'].id] || [];
       return locations.map((location) => {
         const provider = providerRegistry.providers[location.providerId];
         return {
diff --git a/src/store/modal.js b/src/store/modal.js
index 27840c75..5ec3ba32 100644
--- a/src/store/modal.js
+++ b/src/store/modal.js
@@ -13,39 +13,28 @@ export default {
     },
   },
   getters: {
-    config: state => !state.hidden && state.stack[0],
+    config: ({ hidden, stack }) => !hidden && stack[0],
   },
   actions: {
-    open({ commit, state }, param) {
-      return new Promise((resolve, reject) => {
-        const config = typeof param === 'object' ? { ...param } : { type: param };
-        const clean = () => commit('setStack', state.stack.filter((otherConfig => otherConfig !== config)));
-        config.resolve = (result) => {
-          clean();
-          if (config.onResolve) {
-            // Call onResolve immediately (mostly to prevent browsers from blocking popup windows)
-            config.onResolve(result)
-              .then(res => resolve(res));
-          } else {
-            resolve(result);
-          }
-        };
-        config.reject = (error) => {
-          clean();
-          reject(error);
-        };
-        commit('setStack', [config, ...state.stack]);
-      });
+    async open({ commit, state }, param) {
+      const config = typeof param === 'object' ? { ...param } : { type: param };
+      try {
+        return await new Promise((resolve, reject) => {
+          config.resolve = resolve;
+          config.reject = reject;
+          commit('setStack', [config, ...state.stack]);
+        });
+      } finally {
+        commit('setStack', state.stack.filter((otherConfig => otherConfig !== config)));
+      }
     },
-    hideUntil({ commit }, promise) {
-      commit('setHidden', true);
-      return promise.then((res) => {
+    async hideUntil({ commit }, promise) {
+      try {
+        commit('setHidden', true);
+        return await promise;
+      } finally {
         commit('setHidden', false);
-        return res;
-      }, (err) => {
-        commit('setHidden', false);
-        throw err;
-      });
+      }
     },
     folderDeletion: ({ dispatch }, item) => dispatch('open', {
       content: `<p>You are about to delete the folder <b>${item.name}</b>. Its files will be moved to Trash. Are you sure?</p>`,
@@ -105,39 +94,34 @@ export default {
       resolveText: 'Yes, clean',
       rejectText: 'No',
     }),
-    providerRedirection: ({ dispatch }, { providerName, onResolve }) => dispatch('open', {
+    providerRedirection: ({ dispatch }, { providerName }) => dispatch('open', {
       content: `<p>You are about to navigate to the <b>${providerName}</b> authorization page.</p>`,
       resolveText: 'Ok, go on',
       rejectText: 'Cancel',
-      onResolve,
     }),
-    workspaceGoogleRedirection: ({ dispatch }, { onResolve }) => dispatch('open', {
+    workspaceGoogleRedirection: ({ dispatch }) => dispatch('open', {
       content: '<p>StackEdit needs full Google Drive access to open this workspace.</p>',
       resolveText: 'Ok, grant',
       rejectText: 'Cancel',
-      onResolve,
     }),
-    signInForSponsorship: ({ dispatch }, { onResolve }) => dispatch('open', {
+    signInForSponsorship: ({ dispatch }) => dispatch('open', {
       type: 'signInForSponsorship',
       content: `<p>You have to sign in with Google to sponsor.</p>
       <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
       resolveText: 'Ok, sign in',
       rejectText: 'Cancel',
-      onResolve,
     }),
-    signInForComment: ({ dispatch }, { onResolve }) => dispatch('open', {
+    signInForComment: ({ dispatch }) => dispatch('open', {
       content: `<p>You have to sign in with Google to start commenting.</p>
       <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
       resolveText: 'Ok, sign in',
       rejectText: 'Cancel',
-      onResolve,
     }),
-    signInForHistory: ({ dispatch }, { onResolve }) => dispatch('open', {
+    signInForHistory: ({ dispatch }) => dispatch('open', {
       content: `<p>You have to sign in with Google to enable revision history.</p>
       <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
       resolveText: 'Ok, sign in',
       rejectText: 'Cancel',
-      onResolve,
     }),
     sponsorOnly: ({ dispatch }) => dispatch('open', {
       content: '<p>This feature is restricted to sponsors as it relies on server resources.</p>',
diff --git a/src/store/moduleTemplate.js b/src/store/moduleTemplate.js
index 3fca9669..4f4a78f4 100644
--- a/src/store/moduleTemplate.js
+++ b/src/store/moduleTemplate.js
@@ -11,7 +11,7 @@ export default (empty, simpleHash = false) => {
       itemMap: {},
     },
     getters: {
-      items: state => Object.values(state.itemMap),
+      items: ({ itemMap }) => Object.values(itemMap),
     },
     mutations: {
       setItem(state, value) {
diff --git a/src/store/queue.js b/src/store/queue.js
index 1359cb31..084a86a0 100644
--- a/src/store/queue.js
+++ b/src/store/queue.js
@@ -71,16 +71,13 @@ export default {
         }));
       }
     },
-    doWithLocation({ commit }, { location, promise }) {
-      commit('setCurrentLocation', location);
-      return promise
-        .then((res) => {
-          commit('setCurrentLocation', {});
-          return res;
-        }, (err) => {
-          commit('setCurrentLocation', {});
-          throw err;
-        });
+    async doWithLocation({ commit }, { location, action }) {
+      try {
+        commit('setCurrentLocation', location);
+        return await action();
+      } finally {
+        commit('setCurrentLocation', {});
+      }
     },
   },
 };
diff --git a/src/store/syncedContent.js b/src/store/syncedContent.js
index fd53ad93..1388fb02 100644
--- a/src/store/syncedContent.js
+++ b/src/store/syncedContent.js
@@ -5,8 +5,8 @@ const module = moduleTemplate(empty, true);
 
 module.getters = {
   ...module.getters,
-  current: (state, getters, rootState, rootGetters) =>
-    state.itemMap[`${rootGetters['file/current'].id}/syncedContent`] || empty(),
+  current: ({ itemMap }, getters, rootState, rootGetters) =>
+    itemMap[`${rootGetters['file/current'].id}/syncedContent`] || empty(),
 };
 
 export default module;
diff --git a/src/store/userInfo.js b/src/store/userInfo.js
index adc0d861..a7aaf474 100644
--- a/src/store/userInfo.js
+++ b/src/store/userInfo.js
@@ -6,8 +6,8 @@ export default {
     itemMap: {},
   },
   mutations: {
-    addItem: (state, item) => {
-      Vue.set(state.itemMap, item.id, item);
+    addItem: ({ itemMap }, item) => {
+      Vue.set(itemMap, item.id, item);
     },
   },
 };
diff --git a/src/store/workspace.js b/src/store/workspace.js
index 0498bea7..cad751d6 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -19,54 +19,50 @@ export default {
       const workspaces = rootGetters['data/sanitizedWorkspaces'];
       return workspaces.main;
     },
-    currentWorkspace: (state, getters, rootState, rootGetters) => {
+    currentWorkspace: ({ currentWorkspaceId }, { mainWorkspace }, rootState, rootGetters) => {
       const workspaces = rootGetters['data/sanitizedWorkspaces'];
-      return workspaces[state.currentWorkspaceId] || getters.mainWorkspace;
+      return workspaces[currentWorkspaceId] || mainWorkspace;
     },
-    hasUniquePaths: (state, getters) => {
-      const workspace = getters.currentWorkspace;
-      return workspace.providerId === 'githubWorkspace';
-    },
-    lastSyncActivityKey: (state, getters) => `${getters.currentWorkspace.id}/lastSyncActivity`,
-    lastFocusKey: (state, getters) => `${getters.currentWorkspace.id}/lastWindowFocus`,
+    hasUniquePaths: (state, { currentWorkspace }) =>
+      currentWorkspace.providerId === 'githubWorkspace',
+    lastSyncActivityKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastSyncActivity`,
+    lastFocusKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastWindowFocus`,
     mainWorkspaceToken: (state, getters, rootState, rootGetters) => {
       const googleTokens = rootGetters['data/googleTokens'];
       const loginSubs = Object.keys(googleTokens)
         .filter(sub => googleTokens[sub].isLogin);
       return googleTokens[loginSubs[0]];
     },
-    syncToken: (state, getters, rootState, rootGetters) => {
-      const workspace = getters.currentWorkspace;
-      switch (workspace.providerId) {
+    syncToken: (state, { currentWorkspace, mainWorkspaceToken }, rootState, rootGetters) => {
+      switch (currentWorkspace.providerId) {
         case 'googleDriveWorkspace': {
           const googleTokens = rootGetters['data/googleTokens'];
-          return googleTokens[workspace.sub];
+          return googleTokens[currentWorkspace.sub];
         }
         case 'githubWorkspace': {
           const githubTokens = rootGetters['data/githubTokens'];
-          return githubTokens[workspace.sub];
+          return githubTokens[currentWorkspace.sub];
         }
         case 'couchdbWorkspace': {
           const couchdbTokens = rootGetters['data/couchdbTokens'];
-          return couchdbTokens[workspace.id];
+          return couchdbTokens[currentWorkspace.id];
         }
         default:
-          return getters.mainWorkspaceToken;
+          return mainWorkspaceToken;
       }
     },
-    loginToken: (state, getters, rootState, rootGetters) => {
-      const workspace = getters.currentWorkspace;
-      switch (workspace.providerId) {
+    loginToken: (state, { currentWorkspace, mainWorkspaceToken }, rootState, rootGetters) => {
+      switch (currentWorkspace.providerId) {
         case 'googleDriveWorkspace': {
           const googleTokens = rootGetters['data/googleTokens'];
-          return googleTokens[workspace.sub];
+          return googleTokens[currentWorkspace.sub];
         }
         case 'githubWorkspace': {
           const githubTokens = rootGetters['data/githubTokens'];
-          return githubTokens[workspace.sub];
+          return githubTokens[currentWorkspace.sub];
         }
         default:
-          return getters.mainWorkspaceToken;
+          return mainWorkspaceToken;
       }
     },
     userId: (state, { loginToken }, rootState, rootGetters) => {
@@ -82,7 +78,7 @@ export default {
       });
       return prefix ? `${prefix}:${loginToken.sub}` : loginToken.sub;
     },
-    sponsorToken: (state, getters) => getters.mainWorkspaceToken,
+    sponsorToken: (state, { mainWorkspaceToken }) => mainWorkspaceToken,
   },
   actions: {
     setCurrentWorkspaceId: ({ commit, getters }, value) => {

From e05e7717eb479c12a94fb1d30c1f9ce387c4cc38 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Thu, 7 Jun 2018 23:56:11 +0000
Subject: [PATCH 06/19] Added tests

---
 .babelrc                                      |    2 +-
 .gitignore                                    |    3 +-
 package-lock.json                             | 3415 +++++++++++++++++
 package.json                                  |   22 +-
 src/components/App.vue                        |   51 +-
 src/components/ButtonBar.vue                  |   12 +-
 src/components/ContextMenu.vue                |    8 +-
 src/components/Explorer.vue                   |   10 +-
 src/components/ExplorerNode.vue               |    4 +-
 src/components/Modal.vue                      |   36 +-
 src/components/NavigationBar.vue              |   21 +-
 src/components/ProviderName.vue               |   17 -
 src/components/common/globals.js              |   46 +
 src/components/gutters/Comment.vue            |    2 +-
 src/components/gutters/CurrentDiscussion.vue  |    2 +-
 src/components/menus/MoreMenu.vue             |    2 +-
 src/components/modals/PandocExportModal.vue   |    2 +-
 src/components/modals/PdfExportModal.vue      |    2 +-
 .../modals/WorkspaceManagementModal.vue       |    2 +-
 src/components/modals/common/ModalInner.vue   |    2 +-
 src/data/faq.md                               |    4 +-
 src/data/pagedownButtons.js                   |    9 +-
 src/data/simpleModals.js                      |   97 +
 src/index.js                                  |    4 +-
 src/libs/clunderscore.js                      |    3 +-
 src/services/explorerSvc.js                   |   15 +-
 src/services/fileSvc.js                       |   35 +-
 src/services/localDbSvc.js                    |    2 +-
 src/services/networkSvc.js                    |   39 +-
 .../providers/couchdbWorkspaceProvider.js     |  141 +-
 .../providers/githubWorkspaceProvider.js      |  220 +-
 .../providers/googleDriveAppDataProvider.js   |  115 +-
 .../providers/googleDriveWorkspaceProvider.js |  198 +-
 .../providers/helpers/githubHelper.js         |   14 +-
 .../providers/helpers/googleHelper.js         |   13 +-
 .../providers/helpers/wordpressHelper.js      |    5 +-
 src/services/publishSvc.js                    |   14 +-
 src/services/syncSvc.js                       |  264 +-
 src/services/utils.js                         |   13 +-
 src/store/content.js                          |    2 +-
 src/store/contextMenu.js                      |   30 +-
 src/store/discussion.js                       |    2 +-
 src/store/explorer.js                         |    6 +-
 src/store/index.js                            |   35 +
 src/store/modal.js                            |   95 -
 src/store/notification.js                     |   12 +-
 static/landing/index.html                     |   29 +-
 test/unit/.eslintrc                           |    8 +
 test/unit/jest.conf.js                        |   35 +
 test/unit/mocks/cryptoMock.js                 |    7 +
 test/unit/mocks/localStorageMock.js           |    9 +
 test/unit/mocks/mutationObserverMock.js       |    6 +
 test/unit/mocks/templateWorkerMock.js         |    1 +
 test/unit/setup.js                            |    5 +
 test/unit/specs/components/ButtonBar.spec.js  |   41 +
 .../unit/specs/components/ContextMenu.spec.js |   32 +
 test/unit/specs/components/Explorer.spec.js   |  186 +
 .../specs/components/ExplorerNode.spec.js     |  273 ++
 .../specs/components/NavigationBar.spec.js    |   17 +
 .../specs/components/Notification.spec.js     |   38 +
 test/unit/specs/specUtils.js                  |   51 +
 61 files changed, 5068 insertions(+), 718 deletions(-)
 delete mode 100644 src/components/ProviderName.vue
 create mode 100644 src/components/common/globals.js
 create mode 100644 src/data/simpleModals.js
 create mode 100644 test/unit/.eslintrc
 create mode 100644 test/unit/jest.conf.js
 create mode 100644 test/unit/mocks/cryptoMock.js
 create mode 100644 test/unit/mocks/localStorageMock.js
 create mode 100644 test/unit/mocks/mutationObserverMock.js
 create mode 100644 test/unit/mocks/templateWorkerMock.js
 create mode 100644 test/unit/setup.js
 create mode 100644 test/unit/specs/components/ButtonBar.spec.js
 create mode 100644 test/unit/specs/components/ContextMenu.spec.js
 create mode 100644 test/unit/specs/components/Explorer.spec.js
 create mode 100644 test/unit/specs/components/ExplorerNode.spec.js
 create mode 100644 test/unit/specs/components/NavigationBar.spec.js
 create mode 100644 test/unit/specs/components/Notification.spec.js
 create mode 100644 test/unit/specs/specUtils.js

diff --git a/.babelrc b/.babelrc
index 13f0e471..1d93173e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -8,7 +8,7 @@
   "env": {
     "test": {
       "presets": ["env", "stage-2"],
-      "plugins": [ "istanbul" ]
+      "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"]
     }
   }
 }
diff --git a/.gitignore b/.gitignore
index 93a1cf6a..23a42a30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,7 @@ node_modules/
 dist/
 .history
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 .vscode
 stackedit_v4
 chrome-app/*.zip
+/test/unit/coverage/
diff --git a/package-lock.json b/package-lock.json
index 61ae1dfa..0083ac26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -599,6 +599,18 @@
         "glob-to-regexp": "0.3.0"
       }
     },
+    "@types/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=",
+      "dev": true
+    },
+    "@types/strip-json-comments": {
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz",
+      "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
+      "dev": true
+    },
     "@vue/component-compiler-utils": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-1.2.1.tgz",
@@ -708,6 +720,14 @@
         }
       }
     },
+    "@vue/test-utils": {
+      "version": "1.0.0-beta.16",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.16.tgz",
+      "integrity": "sha512-TF9ae3zhs8qBN98Bix2Bh3IrwkhscEV3HRthPgtzJPNG0YHUyNTlZNXH36vbP0nuSAs9Om8XjVd8/MDj8ehpEA==",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
     "abab": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
@@ -813,6 +833,12 @@
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "dev": true
+    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -856,6 +882,15 @@
         "normalize-path": "2.1.1"
       }
     },
+    "append-transform": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
+      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "1.0.0"
+      }
+    },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -1040,6 +1075,12 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -1357,6 +1398,12 @@
         "babel-types": "6.26.0"
       }
     },
+    "babel-helper-vue-jsx-merge-props": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==",
+      "dev": true
+    },
     "babel-helpers": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
@@ -1367,6 +1414,16 @@
         "babel-template": "6.26.0"
       }
     },
+    "babel-jest": {
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-21.2.0.tgz",
+      "integrity": "sha512-O0W2qLoWu1QOoOGgxiR2JID4O6WSpxPiQanrkyi9SSlM0PJ60Ptzlck47lhtnr9YZO3zYOsxHwnyeWJ6AffoBQ==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-istanbul": "4.1.6",
+        "babel-preset-jest": "21.2.0"
+      }
+    },
     "babel-loader": {
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz",
@@ -1438,6 +1495,67 @@
         "babel-runtime": "6.26.0"
       }
     },
+    "babel-plugin-dynamic-import-node": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.2.0.tgz",
+      "integrity": "sha512-yeDwKaLgGdTpXL7RgGt5r6T4LmnTza/hUn5Ul8uZSGGMtEjYo13Nxai7SQaGCTEzUtg9Zq9qJn0EjEr7SeSlTQ==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz",
+      "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "6.13.0",
+        "find-up": "2.1.0",
+        "istanbul-lib-instrument": "1.10.1",
+        "test-exclude": "4.2.1"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        }
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz",
+      "integrity": "sha512-yi5QuiVyyvhBUDLP4ButAnhYzkdrUwWDtvUJv71hjH3fclhnZg4HkDeqaitcR2dZZx/E67kGkRcPVjtVu+SJfQ==",
+      "dev": true
+    },
+    "babel-plugin-jsx-event-modifiers": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-event-modifiers/-/babel-plugin-jsx-event-modifiers-2.0.5.tgz",
+      "integrity": "sha512-tWGnCk0whZ+nZcj9tYLw4+y08tPJXqaEjIxRJZS6DkUUae72Kz4BsoGpxt/Kow7mmgQJpvFCw8IPLSNh5rkZCg==",
+      "dev": true
+    },
+    "babel-plugin-jsx-v-model": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-v-model/-/babel-plugin-jsx-v-model-2.0.3.tgz",
+      "integrity": "sha512-SIx3Y3XxwGEz56Q1atwr5GaZsxJ2IRYmn5dl38LFkaTAvjnbNQxsZHO+ylJPsd+Hmv+ixJBYYFEekPBTHwiGfQ==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "html-tags": "2.0.0",
+        "svg-tags": "1.0.0"
+      }
+    },
+    "babel-plugin-jsx-vue-functional": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-vue-functional/-/babel-plugin-jsx-vue-functional-2.1.0.tgz",
+      "integrity": "sha1-VjCgyG/hkE0owwRl5r8c9xI1ojk=",
+      "dev": true
+    },
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
@@ -1474,6 +1592,12 @@
       "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
       "dev": true
     },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
@@ -1816,6 +1940,15 @@
         "babel-types": "6.26.0"
       }
     },
+    "babel-plugin-transform-vue-jsx": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz",
+      "integrity": "sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw==",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2"
+      }
+    },
     "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -1876,6 +2009,16 @@
         }
       }
     },
+    "babel-preset-jest": {
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz",
+      "integrity": "sha512-hm9cBnr2h3J7yXoTtAVV0zg+3vg0Q/gT2GYuzlreTU0EPkJRtlNgKJJ3tBKEn0+VjAi3JykV6xCJkuUYttEEfA==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-jest-hoist": "21.2.0",
+        "babel-plugin-syntax-object-rest-spread": "6.13.0"
+      }
+    },
     "babel-preset-stage-2": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
@@ -1901,6 +2044,34 @@
         "babel-plugin-transform-object-rest-spread": "6.26.0"
       }
     },
+    "babel-preset-vue": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-vue/-/babel-preset-vue-1.2.1.tgz",
+      "integrity": "sha512-a/Z+6SJ4GXyAoCMfYidDH6OzXnccPNJ5nEaPMjALqCkP9SJkqxz9V0uUS//sGuWszcD8kibdwJRzU+brl8DdFQ==",
+      "dev": true,
+      "requires": {
+        "babel-helper-vue-jsx-merge-props": "2.0.3",
+        "babel-plugin-jsx-event-modifiers": "2.0.5",
+        "babel-plugin-jsx-v-model": "2.0.3",
+        "babel-plugin-jsx-vue-functional": "2.1.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-vue-jsx": "3.7.0"
+      }
+    },
+    "babel-preset-vue-app": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-vue-app/-/babel-preset-vue-app-1.3.2.tgz",
+      "integrity": "sha512-PLyyyVdrvgL4szMF7D5SuUhy85aBzy0+s5MO2QhpTwVqfW0qVaPFJi6K3d25CKz1nOV437JgpVvPj1W6tLGJ5g==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-object-rest-spread": "6.26.0",
+        "babel-plugin-transform-runtime": "6.23.0",
+        "babel-preset-env": "1.6.1",
+        "babel-preset-vue": "1.2.1",
+        "babel-runtime": "6.26.0"
+      }
+    },
     "babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
@@ -2153,6 +2324,23 @@
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz",
       "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44="
     },
+    "browser-resolve": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
+      "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "dev": true
+        }
+      }
+    },
     "browserify-aes": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
@@ -2233,6 +2421,15 @@
         "electron-to-chromium": "1.3.30"
       }
     },
+    "bser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
+      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "dev": true,
+      "requires": {
+        "node-int64": "0.4.0"
+      }
+    },
     "buffer": {
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -2271,6 +2468,12 @@
       "integrity": "sha1-ypRw6NTRuXf9dUP04qtqfclRAag=",
       "dev": true
     },
+    "buffer-from": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
+      "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
+      "dev": true
+    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -2426,6 +2629,15 @@
       "integrity": "sha1-jjV0Xv1IOj4ju301CZAybSMZ/BY=",
       "dev": true
     },
+    "capture-exit": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
+      "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+      "dev": true,
+      "requires": {
+        "rsvp": "3.6.2"
+      }
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -2622,6 +2834,12 @@
       "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
       "dev": true
     },
+    "ci-info": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz",
+      "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==",
+      "dev": true
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2947,6 +3165,12 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
+    "compare-versions": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.2.1.tgz",
+      "integrity": "sha512-2y2nHcopMG/NAyk6vWXlLs86XeM9sik4jmx1tKIgzMi9/RQ2eo758RGpxQO3ErihHmg0RlQITPqgz73y6s7quA==",
+      "dev": true
+    },
     "component-emitter": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
@@ -3009,6 +3233,27 @@
         }
       }
     },
+    "condense-newlines": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
+      "integrity": "sha1-PemFVTE5R10yUCyDsC9gaE0kxV8=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "2.0.1",
+        "is-whitespace": "0.3.0",
+        "kind-of": "3.2.2"
+      }
+    },
+    "config-chain": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
+      }
+    },
     "connect-history-api-fallback": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
@@ -3590,6 +3835,26 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
     },
+    "default-require-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
+      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+      "dev": true,
+      "requires": {
+        "strip-bom": "2.0.0"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "0.2.1"
+          }
+        }
+      }
+    },
     "defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -3718,6 +3983,18 @@
         "repeating": "2.0.1"
       }
     },
+    "detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
     "diff-match-patch": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz",
@@ -3904,6 +4181,30 @@
         "jsbn": "0.1.1"
       }
     },
+    "editorconfig": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
+      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "commander": "2.12.2",
+        "lru-cache": "3.2.0",
+        "semver": "5.5.0",
+        "sigmund": "1.0.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
+          "dev": true,
+          "requires": {
+            "pseudomap": "1.0.2"
+          }
+        }
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -4648,6 +4949,49 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "exec-sh": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
+      "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
+      "dev": true,
+      "requires": {
+        "merge": "1.2.0"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        }
+      }
+    },
     "execall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
@@ -4663,6 +5007,12 @@
       "integrity": "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=",
       "dev": true
     },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
     "expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
@@ -4690,6 +5040,31 @@
         "homedir-polyfill": "1.0.1"
       }
     },
+    "expect": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-23.0.1.tgz",
+      "integrity": "sha1-mRMfL9kRVZX4zDaXQB5/BzTUX+8=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "3.2.1",
+        "jest-diff": "23.0.1",
+        "jest-get-type": "22.4.3",
+        "jest-matcher-utils": "23.0.1",
+        "jest-message-util": "23.0.0",
+        "jest-regex-util": "23.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        }
+      }
+    },
     "express": {
       "version": "4.16.3",
       "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
@@ -5387,6 +5762,15 @@
         "lodash": "4.17.4"
       }
     },
+    "fb-watchman": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "dev": true,
+      "requires": {
+        "bser": "2.0.0"
+      }
+    },
     "fd-slicer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -5474,6 +5858,16 @@
       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
       "dev": true
     },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "minimatch": "3.0.4"
+      }
+    },
     "filesize": {
       "version": "3.5.11",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
@@ -5493,6 +5887,24 @@
         "repeat-string": "1.6.1"
       }
     },
+    "find-babel-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.1.0.tgz",
+      "integrity": "sha1-rMAQQ6Z0n+w0Qpvmtk9ULrtdY1U=",
+      "dev": true,
+      "requires": {
+        "json5": "0.5.1",
+        "path-exists": "3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
     "find-cache-dir": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
@@ -7307,6 +7719,12 @@
         "lodash": "4.17.4"
       }
     },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true
+    },
     "gulp": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
@@ -8266,6 +8684,15 @@
         }
       }
     },
+    "identity-obj-proxy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
+      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
+      "dev": true,
+      "requires": {
+        "harmony-reflect": "1.5.1"
+      }
+    },
     "ieee754": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
@@ -8306,6 +8733,36 @@
       "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
       "dev": true
     },
+    "import-local": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+      "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "2.0.0",
+        "resolve-cwd": "2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0"
+          }
+        }
+      }
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -8533,6 +8990,15 @@
       "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
       "dev": true
     },
+    "is-ci": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
+      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
+      "dev": true,
+      "requires": {
+        "ci-info": "1.1.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
@@ -8638,6 +9104,12 @@
       "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=",
       "dev": true
     },
+    "is-generator-fn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz",
+      "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=",
+      "dev": true
+    },
     "is-glob": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
@@ -8848,6 +9320,12 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-whitespace": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
+      "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=",
+      "dev": true
+    },
     "is-whitespace-character": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz",
@@ -8891,6 +9369,1191 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
+    "istanbul-api": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.1.tgz",
+      "integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.1",
+        "compare-versions": "3.2.1",
+        "fileset": "2.0.3",
+        "istanbul-lib-coverage": "1.2.0",
+        "istanbul-lib-hook": "1.2.0",
+        "istanbul-lib-instrument": "1.10.1",
+        "istanbul-lib-report": "1.1.4",
+        "istanbul-lib-source-maps": "1.2.4",
+        "istanbul-reports": "1.3.0",
+        "js-yaml": "3.11.0",
+        "mkdirp": "0.5.1",
+        "once": "1.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "requires": {
+            "lodash": "4.17.10"
+          }
+        },
+        "lodash": {
+          "version": "4.17.10",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
+      "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz",
+      "integrity": "sha512-p3En6/oGkFQV55Up8ZPC2oLxvgSxD8CzA0yBrhRZSh3pfv3OFj9aSGVC0yoerAi/O4u7jUVnOGVX1eVFM+0tmQ==",
+      "dev": true,
+      "requires": {
+        "append-transform": "0.4.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz",
+      "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
+      "dev": true,
+      "requires": {
+        "babel-generator": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "istanbul-lib-coverage": "1.2.0",
+        "semver": "5.5.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz",
+      "integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "1.2.0",
+        "mkdirp": "0.5.1",
+        "path-parse": "1.0.5",
+        "supports-color": "3.2.3"
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz",
+      "integrity": "sha512-UzuK0g1wyQijiaYQxj/CdNycFhAd2TLtO2obKQMTZrZ1jzEMRY3rvpASEKkaxbRR6brvdovfA03znPa/pXcejg==",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0",
+        "istanbul-lib-coverage": "1.2.0",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.3.0.tgz",
+      "integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==",
+      "dev": true,
+      "requires": {
+        "handlebars": "4.0.11"
+      }
+    },
+    "jest": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-23.0.1.tgz",
+      "integrity": "sha1-DQgykO5BEs7Pt4Dfb/gTMu03MgE=",
+      "dev": true,
+      "requires": {
+        "import-local": "1.0.0",
+        "jest-cli": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "jest-cli": {
+          "version": "23.0.1",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.0.1.tgz",
+          "integrity": "sha1-NRpbpRzyjs8gM22XowuXDR9TClY=",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "3.1.0",
+            "chalk": "2.4.1",
+            "exit": "0.1.2",
+            "glob": "7.1.2",
+            "graceful-fs": "4.1.11",
+            "import-local": "1.0.0",
+            "is-ci": "1.1.0",
+            "istanbul-api": "1.3.1",
+            "istanbul-lib-coverage": "1.2.0",
+            "istanbul-lib-instrument": "1.10.1",
+            "istanbul-lib-source-maps": "1.2.4",
+            "jest-changed-files": "23.0.1",
+            "jest-config": "23.0.1",
+            "jest-environment-jsdom": "23.0.1",
+            "jest-get-type": "22.4.3",
+            "jest-haste-map": "23.0.1",
+            "jest-message-util": "23.0.0",
+            "jest-regex-util": "23.0.0",
+            "jest-resolve-dependencies": "23.0.1",
+            "jest-runner": "23.0.1",
+            "jest-runtime": "23.0.1",
+            "jest-snapshot": "23.0.1",
+            "jest-util": "23.0.1",
+            "jest-validate": "23.0.1",
+            "jest-worker": "23.0.1",
+            "micromatch": "2.3.11",
+            "node-notifier": "5.2.1",
+            "realpath-native": "1.0.0",
+            "rimraf": "2.6.2",
+            "slash": "1.0.0",
+            "string-length": "2.0.0",
+            "strip-ansi": "4.0.0",
+            "which": "1.3.0",
+            "yargs": "11.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz",
+          "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
+          "dev": true,
+          "requires": {
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "2.1.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "9.0.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "9.0.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+          "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0"
+          }
+        }
+      }
+    },
+    "jest-changed-files": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.0.1.tgz",
+      "integrity": "sha1-95Vy0HIIROpd+EwqRI6GLCJU9gw=",
+      "dev": true,
+      "requires": {
+        "throat": "4.1.0"
+      }
+    },
+    "jest-config": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.0.1.tgz",
+      "integrity": "sha1-Z5i/8SR8ejkLEycZMwUAFYL8WPo=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.3",
+        "babel-jest": "23.0.1",
+        "chalk": "2.4.1",
+        "glob": "7.1.2",
+        "jest-environment-jsdom": "23.0.1",
+        "jest-environment-node": "23.0.1",
+        "jest-get-type": "22.4.3",
+        "jest-jasmine2": "23.0.1",
+        "jest-regex-util": "23.0.0",
+        "jest-resolve": "23.0.1",
+        "jest-util": "23.0.1",
+        "jest-validate": "23.0.1",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "babel-jest": {
+          "version": "23.0.1",
+          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.0.1.tgz",
+          "integrity": "sha1-u6079SP7IC2gXtCmVAtIyE7tE6Y=",
+          "dev": true,
+          "requires": {
+            "babel-plugin-istanbul": "4.1.6",
+            "babel-preset-jest": "23.0.1"
+          }
+        },
+        "babel-plugin-jest-hoist": {
+          "version": "23.0.1",
+          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz",
+          "integrity": "sha1-6qEclkVjrqnCG+zvK994U/fzwUg=",
+          "dev": true
+        },
+        "babel-preset-jest": {
+          "version": "23.0.1",
+          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz",
+          "integrity": "sha1-YxzFRcbPAhlDATvK8i9F2H/mIZg=",
+          "dev": true,
+          "requires": {
+            "babel-plugin-jest-hoist": "23.0.1",
+            "babel-plugin-syntax-object-rest-spread": "6.13.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-diff": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.0.1.tgz",
+      "integrity": "sha1-PUkTfO4SwyCktNK0pvpugtSRoWo=",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "diff": "3.5.0",
+        "jest-get-type": "22.4.3",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-docblock": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.0.1.tgz",
+      "integrity": "sha1-3t3RgzO+XcJBUmCgTvP86SdrVyU=",
+      "dev": true,
+      "requires": {
+        "detect-newline": "2.1.0"
+      }
+    },
+    "jest-each": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.0.1.tgz",
+      "integrity": "sha1-puXb9TCvxr+ddHkt3mnY23D4RwY=",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-environment-jsdom": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.0.1.tgz",
+      "integrity": "sha1-2mieuTWNwW5XCKuyCPTrJqQ5V1w=",
+      "dev": true,
+      "requires": {
+        "jest-mock": "23.0.1",
+        "jest-util": "23.0.1",
+        "jsdom": "11.11.0"
+      }
+    },
+    "jest-environment-node": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.0.1.tgz",
+      "integrity": "sha1-Z2t0DiBfHyvnckGWnngSvoJO55U=",
+      "dev": true,
+      "requires": {
+        "jest-mock": "23.0.1",
+        "jest-util": "23.0.1"
+      }
+    },
+    "jest-get-type": {
+      "version": "22.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+      "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+      "dev": true
+    },
+    "jest-haste-map": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.0.1.tgz",
+      "integrity": "sha1-zYkFKr/Iy6AfVgu+wJ1PNq7CXU8=",
+      "dev": true,
+      "requires": {
+        "fb-watchman": "2.0.0",
+        "graceful-fs": "4.1.11",
+        "jest-docblock": "23.0.1",
+        "jest-serializer": "23.0.1",
+        "jest-worker": "23.0.1",
+        "micromatch": "2.3.11",
+        "sane": "2.5.2"
+      }
+    },
+    "jest-jasmine2": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.0.1.tgz",
+      "integrity": "sha1-Fth1NW5jYIcrukhCb30x/cGwvOo=",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "co": "4.6.0",
+        "expect": "23.0.1",
+        "is-generator-fn": "1.0.0",
+        "jest-diff": "23.0.1",
+        "jest-each": "23.0.1",
+        "jest-matcher-utils": "23.0.1",
+        "jest-message-util": "23.0.0",
+        "jest-snapshot": "23.0.1",
+        "jest-util": "23.0.1",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-leak-detector": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz",
+      "integrity": "sha1-nboHUFrDSVw50+wJrB5WRZnoYaA=",
+      "dev": true,
+      "requires": {
+        "pretty-format": "23.0.1"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz",
+      "integrity": "sha1-DGwNrt+YM8Kn82I2Bp7+y0w/bl8=",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "jest-get-type": "22.4.3",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-message-util": {
+      "version": "23.0.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.0.0.tgz",
+      "integrity": "sha1-Bz89dscB98cYpLmvHrfxOHksR5Y=",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "7.0.0-beta.44",
+        "chalk": "2.4.1",
+        "micromatch": "2.3.11",
+        "slash": "1.0.0",
+        "stack-utils": "1.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-mock": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.0.1.tgz",
+      "integrity": "sha1-FWn0d5aMZo/HKCc6F8N2d3O0Y1c=",
+      "dev": true
+    },
+    "jest-raw-loader": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz",
+      "integrity": "sha1-zp9W1UZQ8VfEp9FtIkul1hO81iY=",
+      "dev": true
+    },
+    "jest-regex-util": {
+      "version": "23.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.0.0.tgz",
+      "integrity": "sha1-3Vwf3gxG9DcTFM8Q96dRoj9Oj3Y=",
+      "dev": true
+    },
+    "jest-resolve": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.0.1.tgz",
+      "integrity": "sha1-P4QDRisQo0wt8dR6q1V0xJNbzSQ=",
+      "dev": true,
+      "requires": {
+        "browser-resolve": "1.11.2",
+        "chalk": "2.4.1",
+        "realpath-native": "1.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz",
+      "integrity": "sha1-0BoQ3a2RUsTOzfXqwriFccS2pk0=",
+      "dev": true,
+      "requires": {
+        "jest-regex-util": "23.0.0",
+        "jest-snapshot": "23.0.1"
+      }
+    },
+    "jest-runner": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.0.1.tgz",
+      "integrity": "sha1-sXauPs+eGUqkuEp/z3DRuNsjGqc=",
+      "dev": true,
+      "requires": {
+        "exit": "0.1.2",
+        "graceful-fs": "4.1.11",
+        "jest-config": "23.0.1",
+        "jest-docblock": "23.0.1",
+        "jest-haste-map": "23.0.1",
+        "jest-jasmine2": "23.0.1",
+        "jest-leak-detector": "23.0.1",
+        "jest-message-util": "23.0.0",
+        "jest-runtime": "23.0.1",
+        "jest-util": "23.0.1",
+        "jest-worker": "23.0.1",
+        "source-map-support": "0.5.6",
+        "throat": "4.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+          "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "1.0.0",
+            "source-map": "0.6.1"
+          }
+        }
+      }
+    },
+    "jest-runtime": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.0.1.tgz",
+      "integrity": "sha1-sddl+wP7bUBDgFrycGdqaT9QTVc=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.3",
+        "babel-plugin-istanbul": "4.1.6",
+        "chalk": "2.4.1",
+        "convert-source-map": "1.5.1",
+        "exit": "0.1.2",
+        "fast-json-stable-stringify": "2.0.0",
+        "graceful-fs": "4.1.11",
+        "jest-config": "23.0.1",
+        "jest-haste-map": "23.0.1",
+        "jest-message-util": "23.0.0",
+        "jest-regex-util": "23.0.0",
+        "jest-resolve": "23.0.1",
+        "jest-snapshot": "23.0.1",
+        "jest-util": "23.0.1",
+        "jest-validate": "23.0.1",
+        "micromatch": "2.3.11",
+        "realpath-native": "1.0.0",
+        "slash": "1.0.0",
+        "strip-bom": "3.0.0",
+        "write-file-atomic": "2.3.0",
+        "yargs": "11.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz",
+          "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
+          "dev": true,
+          "requires": {
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "2.1.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "9.0.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "9.0.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+          "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0"
+          }
+        }
+      }
+    },
+    "jest-serializer": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-23.0.1.tgz",
+      "integrity": "sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=",
+      "dev": true
+    },
+    "jest-serializer-vue": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer-vue/-/jest-serializer-vue-0.3.0.tgz",
+      "integrity": "sha512-Id1x3XabYu2r6BnmTfGk2tY172BEqR+vAzSvPk4VF8HyVqwebxZQbqiZ/giAtCnRSqi6lzxuyvzQbwQ6bo6Hbg==",
+      "dev": true,
+      "requires": {
+        "pretty": "2.0.0"
+      }
+    },
+    "jest-snapshot": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.0.1.tgz",
+      "integrity": "sha1-ZnT6Gbnraamcq+zUFb3cQtavPn4=",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "jest-diff": "23.0.1",
+        "jest-matcher-utils": "23.0.1",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-util": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.0.1.tgz",
+      "integrity": "sha1-aOpb1+2xd9MFn5eXJZ+ODazOL5k=",
+      "dev": true,
+      "requires": {
+        "callsites": "2.0.0",
+        "chalk": "2.4.1",
+        "graceful-fs": "4.1.11",
+        "is-ci": "1.1.0",
+        "jest-message-util": "23.0.0",
+        "mkdirp": "0.5.1",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-validate": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.0.1.tgz",
+      "integrity": "sha1-zZ8BqJ0mu4hfEqhmdxXpyGWldU8=",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.1",
+        "jest-get-type": "22.4.3",
+        "leven": "2.1.0",
+        "pretty-format": "23.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "jest-worker": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.0.1.tgz",
+      "integrity": "sha1-nmSd2WP/QEYCb5HEAX8Dmmqkp7w=",
+      "dev": true,
+      "requires": {
+        "merge-stream": "1.0.1"
+      }
+    },
     "jimp": {
       "version": "0.2.28",
       "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz",
@@ -8932,6 +10595,18 @@
       "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==",
       "dev": true
     },
+    "js-beautify": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
+      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
+      "dev": true,
+      "requires": {
+        "config-chain": "1.1.11",
+        "editorconfig": "0.13.3",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6"
+      }
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -8953,6 +10628,68 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "optional": true
     },
+    "jsdom": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.11.0.tgz",
+      "integrity": "sha512-ou1VyfjwsSuWkudGxb03FotDajxAto6USAlmMZjE2lc0jCznt7sBWkhfRBRaWwbnmDqdMSTKTLT5d9sBFkkM7A==",
+      "dev": true,
+      "requires": {
+        "abab": "1.0.4",
+        "acorn": "5.3.0",
+        "acorn-globals": "4.1.0",
+        "array-equal": "1.0.0",
+        "cssom": "0.3.2",
+        "cssstyle": "0.3.1",
+        "data-urls": "1.0.0",
+        "domexception": "1.0.1",
+        "escodegen": "1.9.0",
+        "html-encoding-sniffer": "1.0.2",
+        "left-pad": "1.2.0",
+        "nwsapi": "2.0.1",
+        "parse5": "4.0.0",
+        "pn": "1.1.0",
+        "request": "2.85.0",
+        "request-promise-native": "1.0.5",
+        "sax": "1.2.4",
+        "symbol-tree": "3.2.2",
+        "tough-cookie": "2.3.3",
+        "w3c-hr-time": "1.0.1",
+        "webidl-conversions": "4.0.2",
+        "whatwg-encoding": "1.0.3",
+        "whatwg-mimetype": "2.1.0",
+        "whatwg-url": "6.4.1",
+        "ws": "4.0.0",
+        "xml-name-validator": "3.0.0"
+      },
+      "dependencies": {
+        "cssstyle": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz",
+          "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==",
+          "dev": true,
+          "requires": {
+            "cssom": "0.3.2"
+          }
+        },
+        "sax": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz",
+          "integrity": "sha512-FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw==",
+          "dev": true,
+          "requires": {
+            "lodash.sortby": "4.7.0",
+            "tr46": "1.0.1",
+            "webidl-conversions": "4.0.2"
+          }
+        }
+      }
+    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -9095,6 +10832,12 @@
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.2.0.tgz",
       "integrity": "sha1-0wpzxrggHY99jnlWupYWCHpo4O4="
     },
+    "leven": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
+      "dev": true
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -9459,6 +11202,15 @@
         "kind-of": "3.2.2"
       }
     },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "requires": {
+        "tmpl": "1.0.4"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -9615,6 +11367,15 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
     "memory-fs": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
@@ -9707,6 +11468,12 @@
         }
       }
     },
+    "merge": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
+      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
+      "dev": true
+    },
     "merge-defaults": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/merge-defaults/-/merge-defaults-0.2.1.tgz",
@@ -9747,6 +11514,15 @@
         }
       }
     },
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
     "merge2": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
@@ -10086,6 +11862,24 @@
         "lower-case": "1.1.4"
       }
     },
+    "node-cache": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz",
+      "integrity": "sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==",
+      "dev": true,
+      "requires": {
+        "clone": "2.1.1",
+        "lodash": "4.17.4"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+          "dev": true
+        }
+      }
+    },
     "node-gyp": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
@@ -10115,6 +11909,12 @@
         }
       }
     },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
     "node-libs-browser": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
@@ -10158,6 +11958,18 @@
         }
       }
     },
+    "node-notifier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
+      "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
+      "dev": true,
+      "requires": {
+        "growly": "1.3.0",
+        "semver": "5.5.0",
+        "shellwords": "0.1.1",
+        "which": "1.3.0"
+      }
+    },
     "node-rest-client": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/node-rest-client/-/node-rest-client-1.8.0.tgz",
@@ -10606,6 +12418,15 @@
         }
       }
     },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
@@ -10644,6 +12465,12 @@
       "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz",
       "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw=="
     },
+    "nwsapi": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.1.tgz",
+      "integrity": "sha512-xOJJb7kAAGy6UOklbaIPA0iu/27VMHfAbMUgYJlXz4qRXytIkPGM2vwfbxa+tbaqcqHNsP6RN4eDZlePelWKpQ==",
+      "dev": true
+    },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
@@ -11060,6 +12887,12 @@
         "os-tmpdir": "1.0.2"
       }
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
     "p-limit": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
@@ -11318,6 +13151,12 @@
       "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
       "dev": true
     },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
@@ -12177,6 +14016,17 @@
       "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=",
       "dev": true
     },
+    "pretty": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
+      "integrity": "sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU=",
+      "dev": true,
+      "requires": {
+        "condense-newlines": "0.2.1",
+        "extend-shallow": "2.0.1",
+        "js-beautify": "1.7.5"
+      }
+    },
     "pretty-error": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
@@ -12187,6 +14037,33 @@
         "utila": "0.4.0"
       }
     },
+    "pretty-format": {
+      "version": "23.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
+      "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "3.0.0",
+        "ansi-styles": "3.2.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        }
+      }
+    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -12231,6 +14108,12 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -12484,6 +14367,15 @@
         "set-immediate-shim": "1.0.1"
       }
     },
+    "realpath-native": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.0.tgz",
+      "integrity": "sha512-XJtlRJ9jf0E1H1SLeJyQ9PGzQD7S65h1pRXEcAeK48doKOnKxcgPeNohJvD5u/2sI9J1oke6E8bZHS/fmW1UiQ==",
+      "dev": true,
+      "requires": {
+        "util.promisify": "1.0.0"
+      }
+    },
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -12939,6 +14831,23 @@
         "path-parse": "1.0.5"
       }
     },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
+      }
+    },
     "resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
@@ -12998,6 +14907,12 @@
       "resolved": "https://registry.npmjs.org/rsa-pem-from-mod-exp/-/rsa-pem-from-mod-exp-0.8.4.tgz",
       "integrity": "sha1-NipCxtMEBW1JOz8SvOq7LGV2ptQ="
     },
+    "rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "dev": true
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -13036,6 +14951,920 @@
         "ret": "0.1.15"
       }
     },
+    "sane": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
+      "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
+      "dev": true,
+      "requires": {
+        "anymatch": "2.0.0",
+        "capture-exit": "1.2.0",
+        "exec-sh": "0.2.1",
+        "fb-watchman": "2.0.0",
+        "fsevents": "1.2.4",
+        "micromatch": "3.1.10",
+        "minimist": "1.2.0",
+        "walker": "1.0.7",
+        "watch": "0.18.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "3.1.10",
+            "normalize-path": "2.1.1"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.1",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2",
+            "isobject": "3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fsevents": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+          "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "nan": "2.10.0",
+            "node-pre-gyp": "0.10.0"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "1.0.0",
+                "readable-stream": "2.3.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "balanced-match": "1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "2.6.9",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "deep-extend": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "2.2.4"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "1.2.0",
+                "console-control-strings": "1.1.0",
+                "has-unicode": "2.0.1",
+                "object-assign": "4.1.1",
+                "signal-exit": "3.0.2",
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wide-align": "1.1.2"
+              }
+            },
+            "glob": {
+              "version": "7.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "1.0.0",
+                "inflight": "1.0.6",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4",
+                "once": "1.4.0",
+                "path-is-absolute": "1.0.1"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.21",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": "2.1.2"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "1.4.0",
+                "wrappy": "1.0.2"
+              }
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "dev": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "number-is-nan": "1.0.1"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "brace-expansion": "1.1.11"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true
+            },
+            "minipass": {
+              "version": "2.2.4",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "5.1.1",
+                "yallist": "3.0.2"
+              }
+            },
+            "minizlib": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "2.2.4"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "2.6.9",
+                "iconv-lite": "0.4.21",
+                "sax": "1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.10.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "1.0.3",
+                "mkdirp": "0.5.1",
+                "needle": "2.2.0",
+                "nopt": "4.0.1",
+                "npm-packlist": "1.1.10",
+                "npmlog": "4.1.2",
+                "rc": "1.2.7",
+                "rimraf": "2.6.2",
+                "semver": "5.5.0",
+                "tar": "4.4.1"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1.1.1",
+                "osenv": "0.1.5"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.1.10",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "3.0.1",
+                "npm-bundled": "1.0.3"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "1.1.4",
+                "console-control-strings": "1.1.0",
+                "gauge": "2.7.4",
+                "set-blocking": "2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "wrappy": "1.0.2"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "1.0.2",
+                "os-tmpdir": "1.0.2"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "0.5.1",
+                "ini": "1.3.5",
+                "minimist": "1.2.0",
+                "strip-json-comments": "2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.1",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "7.1.2"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.1",
+              "bundled": true,
+              "dev": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.5.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "5.1.1"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "ansi-regex": "2.1.1"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "1.0.1",
+                "fs-minipass": "1.2.5",
+                "minipass": "2.2.4",
+                "minizlib": "1.1.0",
+                "mkdirp": "0.5.1",
+                "safe-buffer": "5.1.1",
+                "yallist": "3.0.2"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "1.0.2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true
+            },
+            "yallist": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+              "dev": true
+            }
+          }
+        },
+        "is-windows": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+          "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "nan": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+          "dev": true,
+          "optional": true
+        },
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "to-regex": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+          "dev": true,
+          "requires": {
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "regex-not": "1.0.2",
+            "safe-regex": "1.1.0"
+          },
+          "dependencies": {
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "3.0.2",
+                "safe-regex": "1.1.0"
+              }
+            }
+          }
+        }
+      }
+    },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
@@ -13396,6 +16225,12 @@
         "rechoir": "0.6.2"
       }
     },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true
+    },
     "sigmund": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@@ -14403,6 +17238,12 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "stack-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz",
+      "integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=",
+      "dev": true
+    },
     "stackframe": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
@@ -14578,6 +17419,33 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string-length": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
+      "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+      "dev": true,
+      "requires": {
+        "astral-regex": "1.0.0",
+        "strip-ansi": "4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -14630,6 +17498,12 @@
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true
     },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
     "strip-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
@@ -15670,12 +18544,436 @@
         "inherits": "2.0.3"
       }
     },
+    "test-exclude": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz",
+      "integrity": "sha512-qpqlP/8Zl+sosLxBcVKl9vYy26T9NPalxSzzCP/OY6K7j938ui2oKgo+kRZYfxAeIpLqpbVnsHq1tyV70E4lWQ==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "micromatch": "3.1.10",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "require-main-filename": "1.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "1.1.0",
+            "array-unique": "0.3.2",
+            "extend-shallow": "2.0.1",
+            "fill-range": "4.0.0",
+            "isobject": "3.0.1",
+            "repeat-element": "1.1.2",
+            "snapdragon": "0.8.1",
+            "snapdragon-node": "2.1.1",
+            "split-string": "3.1.0",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2",
+            "isobject": "3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "define-property": "0.2.5",
+            "extend-shallow": "2.0.1",
+            "posix-character-classes": "0.1.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "0.1.6"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "0.3.2",
+            "define-property": "1.0.0",
+            "expand-brackets": "2.1.4",
+            "extend-shallow": "2.0.1",
+            "fragment-cache": "0.2.1",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "1.0.2"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-number": "3.0.0",
+            "repeat-string": "1.6.1",
+            "to-regex-range": "2.1.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "0.1.1"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-odd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+          "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "4.0.0"
+          },
+          "dependencies": {
+            "is-number": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+              "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+              "dev": true
+            }
+          }
+        },
+        "is-windows": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+          "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "strip-bom": "2.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "braces": "2.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "extglob": "2.0.4",
+            "fragment-cache": "0.2.1",
+            "kind-of": "6.0.2",
+            "nanomatch": "1.2.9",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "nanomatch": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+          "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "4.0.0",
+            "array-unique": "0.3.2",
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "fragment-cache": "0.2.1",
+            "is-odd": "2.0.0",
+            "is-windows": "1.0.2",
+            "kind-of": "6.0.2",
+            "object.pick": "1.3.0",
+            "regex-not": "1.0.0",
+            "snapdragon": "0.8.1",
+            "to-regex": "3.0.2"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "1.1.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "1.1.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "dev": true,
+          "requires": {
+            "find-up": "1.1.2",
+            "read-pkg": "1.1.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "0.2.1"
+          }
+        },
+        "to-regex": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+          "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+          "dev": true,
+          "requires": {
+            "define-property": "2.0.2",
+            "extend-shallow": "3.0.2",
+            "regex-not": "1.0.2",
+            "safe-regex": "1.1.0"
+          },
+          "dependencies": {
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+              "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "3.0.2",
+                "safe-regex": "1.1.0"
+              }
+            }
+          }
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "throat": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
+      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
+      "dev": true
+    },
     "throttleit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
@@ -15746,6 +19044,12 @@
         "os-tmpdir": "1.0.2"
       }
     },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -15978,6 +19282,18 @@
         }
       }
     },
+    "tsconfig": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
+      "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
+      "dev": true,
+      "requires": {
+        "@types/strip-bom": "3.0.0",
+        "@types/strip-json-comments": "0.0.30",
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1"
+      }
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -16756,6 +20072,67 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
+    "vue-jest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.4.0.tgz",
+      "integrity": "sha512-X5YXTXcpklijK3wXG/CiW8Frkz+YPBjR+//FD5rcmlnmEelz+8AQpKA8vhbAHJx3gOhA2tkWt8XEjvxq1S0heg==",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.3",
+        "babel-preset-vue-app": "1.3.2",
+        "chalk": "2.4.1",
+        "find-babel-config": "1.1.0",
+        "js-beautify": "1.7.5",
+        "node-cache": "4.2.0",
+        "object-assign": "4.1.1",
+        "source-map": "0.5.7",
+        "tsconfig": "7.0.0",
+        "vue-template-es2015-compiler": "1.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
     "vue-loader": {
       "version": "15.0.9",
       "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.0.9.tgz",
@@ -16840,6 +20217,33 @@
         "browser-process-hrtime": "0.1.2"
       }
     },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "requires": {
+        "makeerror": "1.0.11"
+      }
+    },
+    "watch": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
+      "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
+      "dev": true,
+      "requires": {
+        "exec-sh": "0.2.1",
+        "minimist": "1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -17289,6 +20693,17 @@
         "mkdirp": "0.5.1"
       }
     },
+    "write-file-atomic": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "signal-exit": "3.0.2"
+      }
+    },
     "ws": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-4.0.0.tgz",
diff --git a/package.json b/package.json
index 005e076b..4087ee1d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
     "build": "node build/build.js && npm run build-style",
     "build-style": "webpack --config build/webpack.style.conf.js",
     "lint": "eslint --ext .js,.vue src server",
-    "test": "npm run lint",
+    "unit": "jest --config test/unit/jest.conf.js --runInBand",
+    "unit-with-coverage": "jest --config test/unit/jest.conf.js --runInBand --coverage",
+    "test": "npm run lint && npm run unit",
     "preversion": "npm run test",
     "postversion": "git push origin master --tags && npm publish",
     "patch": "npm version patch -m \"Tag v%s\"",
@@ -22,7 +24,9 @@
     "major": "npm version major -m \"Tag v%s\""
   },
   "dependencies": {
+    "@vue/test-utils": "^1.0.0-beta.16",
     "aws-sdk": "^2.133.0",
+    "babel-runtime": "^6.26.0",
     "bezier-easing": "^1.1.0",
     "body-parser": "^1.18.2",
     "clipboard": "^1.7.1",
@@ -59,8 +63,11 @@
     "autoprefixer": "^6.7.2",
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.3",
+    "babel-jest": "^21.0.2",
     "babel-loader": "^7.1.4",
-    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-stage-2": "^6.22.0",
@@ -86,7 +93,11 @@
     "gulp-concat": "^2.6.1",
     "html-webpack-plugin": "^3.2.0",
     "http-proxy-middleware": "^0.18.0",
+    "identity-obj-proxy": "^3.0.0",
     "ignore-loader": "^0.1.2",
+    "jest": "^23.0.0",
+    "jest-raw-loader": "^1.0.1",
+    "jest-serializer-vue": "^0.3.0",
     "node-sass": "^4.9.0",
     "npm-bump": "^0.0.23",
     "offline-plugin": "^5.0.3",
@@ -103,6 +114,7 @@
     "stylelint-processor-html": "^1.0.0",
     "stylelint-webpack-plugin": "^0.10.4",
     "url-loader": "^1.0.1",
+    "vue-jest": "^1.0.2",
     "vue-loader": "^15.0.9",
     "vue-style-loader": "^4.1.0",
     "vue-template-compiler": "^2.5.16",
@@ -114,12 +126,12 @@
     "worker-loader": "^1.1.1"
   },
   "engines": {
-    "node": ">= 4.0.0",
-    "npm": ">= 3.0.0"
+    "node": ">= 8.0.0",
+    "npm": ">= 5.0.0"
   },
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not ie <= 8"
+    "not ie <= 10"
   ]
 }
diff --git a/src/components/App.vue b/src/components/App.vue
index fbd456a2..de12c39a 100644
--- a/src/components/App.vue
+++ b/src/components/App.vue
@@ -2,14 +2,13 @@
   <div class="app" :class="classes">
     <splash-screen v-if="!ready"></splash-screen>
     <layout v-else></layout>
-    <modal v-if="showModal"></modal>
+    <modal></modal>
     <notification></notification>
     <context-menu></context-menu>
   </div>
 </template>
 
 <script>
-import Vue from 'vue';
 import '../styles';
 import '../styles/markdownHighlighting.scss';
 import '../styles/app.scss';
@@ -22,50 +21,7 @@ import syncSvc from '../services/syncSvc';
 import networkSvc from '../services/networkSvc';
 import sponsorSvc from '../services/sponsorSvc';
 import tempFileSvc from '../services/tempFileSvc';
-import timeSvc from '../services/timeSvc';
-import store from '../store';
-
-// Global directives
-Vue.directive('focus', {
-  inserted(el) {
-    el.focus();
-    const { value } = el;
-    if (value && el.setSelectionRange) {
-      el.setSelectionRange(0, value.length);
-    }
-  },
-});
-
-const setVisible = (el, value) => {
-  el.style.display = value ? '' : 'none';
-  if (value) {
-    el.removeAttribute('aria-hidden');
-  } else {
-    el.setAttribute('aria-hidden', 'true');
-  }
-};
-Vue.directive('show', {
-  bind(el, { value }) {
-    setVisible(el, value);
-  },
-  update(el, { value, oldValue }) {
-    if (value !== oldValue) {
-      setVisible(el, value);
-    }
-  },
-});
-
-Vue.directive('title', {
-  bind(el, { value }) {
-    el.title = value;
-    el.setAttribute('aria-label', value);
-  },
-});
-
-// Global filters
-Vue.filter('formatTime', time =>
-  // Access the minute counter for reactive refresh
-  timeSvc.format(time, store.state.minuteCounter));
+import './common/globals';
 
 const themeClasses = {
   light: ['app--light'],
@@ -88,9 +44,6 @@ export default {
       const result = themeClasses[this.$store.getters['data/computedSettings'].colorTheme];
       return Array.isArray(result) ? result : themeClasses.light;
     },
-    showModal() {
-      return !!this.$store.getters['modal/config'];
-    },
   },
   async created() {
     try {
diff --git a/src/components/ButtonBar.vue b/src/components/ButtonBar.vue
index 0fdf288e..b3213109 100644
--- a/src/components/ButtonBar.vue
+++ b/src/components/ButtonBar.vue
@@ -1,24 +1,24 @@
 <template>
   <div class="button-bar">
     <div class="button-bar__inner button-bar__inner--top">
-      <button class="button-bar__button button" :class="{ 'button-bar__button--on': layoutSettings.showNavigationBar }" v-if="!light" @click="toggleNavigationBar()" v-title="'Toggle navigation bar'">
+      <button class="button-bar__button button-bar__button--navigation-bar-toggler button" :class="{ 'button-bar__button--on': layoutSettings.showNavigationBar }" v-if="!light" @click="toggleNavigationBar()" v-title="'Toggle navigation bar'">
         <icon-navigation-bar></icon-navigation-bar>
       </button>
-      <button class="button-bar__button button" :class="{ 'button-bar__button--on': layoutSettings.showSidePreview }" tour-step-anchor="editor" @click="toggleSidePreview()" v-title="'Toggle side preview'">
+      <button class="button-bar__button button-bar__button--side-preview-toggler button" :class="{ 'button-bar__button--on': layoutSettings.showSidePreview }" tour-step-anchor="editor" @click="toggleSidePreview()" v-title="'Toggle side preview'">
         <icon-side-preview></icon-side-preview>
       </button>
-      <button class="button-bar__button button" @click="toggleEditor(false)" v-title="'Reader mode'">
+      <button class="button-bar__button button-bar__button--editor-toggler button" @click="toggleEditor(false)" v-title="'Reader mode'">
         <icon-eye></icon-eye>
       </button>
     </div>
     <div class="button-bar__inner button-bar__inner--bottom">
-      <button class="button-bar__button button" :class="{ 'button-bar__button--on': layoutSettings.focusMode }" @click="toggleFocusMode()" v-title="'Toggle focus mode'">
+      <button class="button-bar__button button-bar__button--focus-mode-toggler button" :class="{ 'button-bar__button--on': layoutSettings.focusMode }" @click="toggleFocusMode()" v-title="'Toggle focus mode'">
         <icon-target></icon-target>
       </button>
-      <button class="button-bar__button button" :class="{ 'button-bar__button--on': layoutSettings.scrollSync }" @click="toggleScrollSync()" v-title="'Toggle scroll sync'">
+      <button class="button-bar__button button-bar__button--scroll-sync-toggler button" :class="{ 'button-bar__button--on': layoutSettings.scrollSync }" @click="toggleScrollSync()" v-title="'Toggle scroll sync'">
         <icon-scroll-sync></icon-scroll-sync>
       </button>
-      <button class="button-bar__button button" :class="{ 'button-bar__button--on': layoutSettings.showStatusBar }" @click="toggleStatusBar()" v-title="'Toggle status bar'">
+      <button class="button-bar__button button-bar__button--status-bar-toggler button" :class="{ 'button-bar__button--on': layoutSettings.showStatusBar }" @click="toggleStatusBar()" v-title="'Toggle status bar'">
         <icon-status-bar></icon-status-bar>
       </button>
     </div>
diff --git a/src/components/ContextMenu.vue b/src/components/ContextMenu.vue
index d0421696..4e770c7b 100644
--- a/src/components/ContextMenu.vue
+++ b/src/components/ContextMenu.vue
@@ -4,7 +4,7 @@
       <div v-for="(item, idx) in items" :key="idx">
         <div class="context-menu__separator" v-if="item.type === 'separator'"></div>
         <div class="context-menu__item context-menu__item--disabled" v-else-if="item.disabled">{{item.name}}</div>
-        <a class="context-menu__item" href="javascript:void(0)" v-else @click.stop="close(item)">{{item.name}}</a>
+        <a class="context-menu__item" href="javascript:void(0)" v-else @click="close(item)">{{item.name}}</a>
       </div>
     </div>
   </div>
@@ -22,10 +22,8 @@ export default {
     ]),
   },
   methods: {
-    close(item) {
-      if (item) {
-        this.resolve(item);
-      }
+    close(item = null) {
+      this.resolve(item);
       this.$store.dispatch('contextMenu/close');
     },
   },
diff --git a/src/components/Explorer.vue b/src/components/Explorer.vue
index e3671af4..c2684124 100644
--- a/src/components/Explorer.vue
+++ b/src/components/Explorer.vue
@@ -2,20 +2,20 @@
   <div class="explorer flex flex--column">
     <div class="side-title flex flex--row flex--space-between">
       <div class="flex flex--row">
-        <button class="side-title__button button" @click="newItem()" v-title="'New file'">
+        <button class="side-title__button side-title__button--new-file button" @click="newItem()" v-title="'New file'">
           <icon-file-plus></icon-file-plus>
         </button>
-        <button class="side-title__button button" @click="newItem(true)" v-title="'New folder'">
+        <button class="side-title__button side-title__button--new-folder button" @click="newItem(true)" v-title="'New folder'">
           <icon-folder-plus></icon-folder-plus>
         </button>
-        <button class="side-title__button button" @click="deleteItem()" v-title="'Delete'">
+        <button class="side-title__button side-title__button--delete button" @click="deleteItem()" v-title="'Delete'">
           <icon-delete></icon-delete>
         </button>
-        <button class="side-title__button button" @click="editItem()" v-title="'Rename'">
+        <button class="side-title__button side-title__button--rename button" @click="editItem()" v-title="'Rename'">
           <icon-pen></icon-pen>
         </button>
       </div>
-      <button class="side-title__button button" @click="toggleExplorer(false)" v-title="'Close explorer'">
+      <button class="side-title__button side-title__button--close button" @click="toggleExplorer(false)" v-title="'Close explorer'">
         <icon-close></icon-close>
       </button>
     </div>
diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index 1309048c..eb3cdd20 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -181,7 +181,9 @@ export default {
             perform: () => explorerSvc.deleteItem(),
           }],
         });
-        item.perform();
+        if (item) {
+          item.perform();
+        }
       }
     },
   },
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 176b9781..47367f0b 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="modal" @keydown.esc="onEscape" @keydown.tab="onTab">
+  <div class="modal" v-if="config" @keydown.esc="onEscape" @keydown.tab="onTab">
     <component v-if="currentModalComponent" :is="currentModalComponent"></component>
     <modal-inner v-else aria-label="Dialog">
-      <div class="modal__content" v-html="config.content"></div>
+      <div class="modal__content" v-html="simpleModal.contentHtml(config)"></div>
       <div class="modal__button-bar">
-        <button class="button" v-if="config.rejectText" @click="config.reject()">{{config.rejectText}}</button>
-        <button class="button" v-if="config.resolveText" @click="config.resolve()">{{config.resolveText}}</button>
+        <button class="button" v-if="simpleModal.rejectText" @click="config.reject()">{{simpleModal.rejectText}}</button>
+        <button class="button" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button>
       </div>
     </modal-inner>
   </div>
@@ -13,6 +13,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import simpleModals from '../data/simpleModals';
 import editorSvc from '../services/editorSvc';
 import ModalInner from './modals/common/ModalInner';
 import FilePropertiesModal from './modals/FilePropertiesModal';
@@ -112,6 +113,9 @@ export default {
       }
       return null;
     },
+    simpleModal() {
+      return simpleModals[this.config.type] || {};
+    },
   },
   methods: {
     onEscape() {
@@ -153,14 +157,22 @@ export default {
     },
   },
   mounted() {
-    window.addEventListener('focusin', this.onFocusInOut);
-    window.addEventListener('focusout', this.onFocusInOut);
-    const tabbables = getTabbables(this.$el);
-    tabbables[0].focus();
-  },
-  destroyed() {
-    window.removeEventListener('focusin', this.onFocusInOut);
-    window.removeEventListener('focusout', this.onFocusInOut);
+    this.$watch(
+      () => this.config,
+      () => {
+        if (this.$el) {
+          window.addEventListener('focusin', this.onFocusInOut);
+          window.addEventListener('focusout', this.onFocusInOut);
+          const tabbables = getTabbables(this.$el);
+          if (tabbables[0]) {
+            tabbables[0].focus();
+          }
+        } else {
+          window.removeEventListener('focusin', this.onFocusInOut);
+          window.removeEventListener('focusout', this.onFocusInOut);
+        }
+      },
+    );
   },
 };
 </script>
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
index 9ed152b9..2c1cfaf6 100644
--- a/src/components/NavigationBar.vue
+++ b/src/components/NavigationBar.vue
@@ -3,7 +3,7 @@
     <!-- Explorer -->
     <div class="navigation-bar__inner navigation-bar__inner--left navigation-bar__inner--button">
       <button class="navigation-bar__button button" v-if="light" @click="close()" v-title="'Close StackEdit'"><icon-close-circle></icon-close-circle></button>
-      <button class="navigation-bar__button button" v-else tour-step-anchor="explorer" @click="toggleExplorer()" v-title="'Toggle explorer'"><icon-folder></icon-folder></button>
+      <button class="navigation-bar__button navigation-bar__button--explorer-toggler button" v-else tour-step-anchor="explorer" @click="toggleExplorer()" v-title="'Toggle explorer'"><icon-folder></icon-folder></button>
     </div>
     <!-- Side bar -->
     <div class="navigation-bar__inner navigation-bar__inner--right navigation-bar__inner--button">
@@ -64,17 +64,16 @@ const mod = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Meta' : 'Ctrl';
 const getShortcut = (method) => {
   let result = '';
   Object.entries(store.getters['data/computedSettings'].shortcuts).some(([keys, shortcut]) => {
-    if (`${shortcut.method || shortcut}` !== method) {
-      return false;
+    if (`${shortcut.method || shortcut}` === method) {
+      result = keys.split('+').map(key => key.toLowerCase()).map((key) => {
+        if (key === 'mod') {
+          return mod;
+        }
+        // Capitalize
+        return key && `${key[0].toUpperCase()}${key.slice(1)}`;
+      }).join('+');
     }
-    result = keys.split('+').map(key => key.toLowerCase()).map((key) => {
-      if (key === 'mod') {
-        return mod;
-      }
-      // Capitalize
-      return key && `${key[0].toUpperCase()}${key.slice(1)}`;
-    }).join('+');
-    return true;
+    return result;
   });
   return result && ` – ${result}`;
 };
diff --git a/src/components/ProviderName.vue b/src/components/ProviderName.vue
deleted file mode 100644
index 79e7c2d1..00000000
--- a/src/components/ProviderName.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <span class="provider-name">{{name}}</span>
-</template>
-
-<script>
-export default {
-  props: ['providerId'],
-  computed: {
-    name() {
-      switch (this.userId) {
-        default:
-          return 'Google Drive';
-      }
-    },
-  },
-};
-</script>
diff --git a/src/components/common/globals.js b/src/components/common/globals.js
new file mode 100644
index 00000000..0ede56ad
--- /dev/null
+++ b/src/components/common/globals.js
@@ -0,0 +1,46 @@
+import Vue from 'vue';
+import timeSvc from '../../services/timeSvc';
+import store from '../../store';
+
+// Global directives
+Vue.directive('focus', {
+  inserted(el) {
+    el.focus();
+    const { value } = el;
+    if (value && el.setSelectionRange) {
+      el.setSelectionRange(0, value.length);
+    }
+  },
+});
+
+const setVisible = (el, value) => {
+  el.style.display = value ? '' : 'none';
+  if (value) {
+    el.removeAttribute('aria-hidden');
+  } else {
+    el.setAttribute('aria-hidden', 'true');
+  }
+};
+Vue.directive('show', {
+  bind(el, { value }) {
+    setVisible(el, value);
+  },
+  update(el, { value, oldValue }) {
+    if (value !== oldValue) {
+      setVisible(el, value);
+    }
+  },
+});
+
+Vue.directive('title', {
+  bind(el, { value }) {
+    el.title = value;
+    el.setAttribute('aria-label', value);
+  },
+});
+
+// Global filters
+Vue.filter('formatTime', time =>
+  // Access the minute counter for reactive refresh
+  timeSvc.format(time, store.state.minuteCounter));
+
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index b3e063ea..1651ac10 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -49,7 +49,7 @@ export default {
     ]),
     async removeComment() {
       try {
-        await this.$store.dispatch('modal/commentDeletion');
+        await this.$store.dispatch('modal/open', 'commentDeletion');
         this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment });
       } catch (e) {
         // Cancel
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index f14b68be..d2c0b783 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -95,7 +95,7 @@ export default {
     },
     async removeDiscussion() {
       try {
-        await this.$store.dispatch('modal/discussionDeletion');
+        await this.$store.dispatch('modal/open', 'discussionDeletion');
         this.$store.dispatch('discussion/cleanCurrentFile', {
           filterDiscussion: this.currentDiscussion,
         });
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 38735eb1..21f4ff2f 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -96,7 +96,7 @@ export default {
     },
     async reset() {
       try {
-        await this.$store.dispatch('modal/reset');
+        await this.$store.dispatch('modal/open', 'reset');
         window.location.href = '#reset=true';
         window.location.reload();
       } catch (e) {
diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue
index 7c787c36..cf59d2cc 100644
--- a/src/components/modals/PandocExportModal.vue
+++ b/src/components/modals/PandocExportModal.vue
@@ -68,7 +68,7 @@ export default modalTemplate({
         FileSaver.saveAs(body, `${currentFile.name}.${selectedFormat}`);
       } catch (err) {
         if (err.status === 401) {
-          this.$store.dispatch('modal/sponsorOnly');
+          this.$store.dispatch('modal/open', 'sponsorOnly');
         } else {
           console.error(err); // eslint-disable-line no-console
           this.$store.dispatch('notification/error', err);
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index 619373c4..2980d86d 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -65,7 +65,7 @@ export default modalTemplate({
         FileSaver.saveAs(body, `${currentFile.name}.pdf`);
       } catch (err) {
         if (err.status === 401) {
-          this.$store.dispatch('modal/sponsorOnly');
+          this.$store.dispatch('modal/open', 'sponsorOnly');
         } else {
           console.error(err); // eslint-disable-line no-console
           this.$store.dispatch('notification/error', err);
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 626777d3..69f07c36 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -77,7 +77,7 @@ export default {
     },
     async remove(id) {
       try {
-        await this.$store.dispatch('modal/removeWorkspace');
+        await this.$store.dispatch('modal/open', 'removeWorkspace');
         localDbSvc.removeWorkspace(id);
       } catch (e) {
         // Cancel
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index 14516990..cc43d310 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -33,7 +33,7 @@ export default {
       try {
         if (!this.$store.getters['workspace/sponsorToken']) {
           // User has to sign in
-          await this.$store.dispatch('modal/signInForSponsorship');
+          await this.$store.dispatch('modal/open', 'signInForSponsorship');
           await googleHelper.signin();
           syncSvc.requestSync();
         }
diff --git a/src/data/faq.md b/src/data/faq.md
index ad6add70..d27614dd 100644
--- a/src/data/faq.md
+++ b/src/data/faq.md
@@ -1,12 +1,12 @@
 **Where is my data stored?**
 
-If your workspace is not synced, your files are only stored inside your browser (using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)) and are not stored anywhere else.
+If your workspace is not synced, your files are only stored inside your browser using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) and are not stored anywhere else.
 
 We recommend syncing your workspace to make sure files won't be lost in case your browser data is cleared.
 
 **Where is my data stored once I sync my workspace?**
 
-If you sign in with Google, your main workspace will be stored in Google Drive (in your [app data folder](https://developers.google.com/drive/v3/web/appdata)).
+If you sign in with Google, your main workspace will be stored in Google Drive, in your [app data folder](https://developers.google.com/drive/v3/web/appdata).
 
 If you open a Google Drive workspace, the files in the workspace will be stored inside a Google Drive folder which you can share with other users.
 
diff --git a/src/data/pagedownButtons.js b/src/data/pagedownButtons.js
index 367827b4..cf5dc89e 100644
--- a/src/data/pagedownButtons.js
+++ b/src/data/pagedownButtons.js
@@ -1,4 +1,5 @@
-export default [{}, {
+export default [{
+}, {
   method: 'bold',
   title: 'Bold',
   icon: 'format-bold',
@@ -14,7 +15,8 @@ export default [{}, {
   method: 'strikethrough',
   title: 'Strikethrough',
   icon: 'format-strikethrough',
-}, {}, {
+}, {
+}, {
   method: 'ulist',
   title: 'Unordered list',
   icon: 'format-list-bulleted',
@@ -26,7 +28,8 @@ export default [{}, {
   method: 'clist',
   title: 'Check list',
   icon: 'format-list-checks',
-}, {}, {
+}, {
+}, {
   method: 'quote',
   title: 'Blockquote',
   icon: 'format-quote-close',
diff --git a/src/data/simpleModals.js b/src/data/simpleModals.js
new file mode 100644
index 00000000..aa1dfb9c
--- /dev/null
+++ b/src/data/simpleModals.js
@@ -0,0 +1,97 @@
+const simpleModal = (contentHtml, rejectText, resolveText) => ({
+  contentHtml: typeof contentHtml === 'function' ? contentHtml : () => contentHtml,
+  rejectText,
+  resolveText,
+});
+
+/* eslint sort-keys: "error" */
+export default {
+  commentDeletion: simpleModal(
+    '<p>You are about to delete a comment. Are you sure?</p>',
+    'No',
+    'Yes, delete',
+  ),
+  discussionDeletion: simpleModal(
+    '<p>You are about to delete a discussion. Are you sure?</p>',
+    'No',
+    'Yes, delete',
+  ),
+  fileRestoration: simpleModal(
+    '<p>You are about to revert some changes. Are you sure?</p>',
+    'No',
+    'Yes, revert',
+  ),
+  folderDeletion: simpleModal(
+    config => `<p>You are about to delete the folder <b>${config.item.name}</b>. Its files will be moved to Trash. Are you sure?</p>`,
+    'No',
+    'Yes, delete',
+  ),
+  pathConflict: simpleModal(
+    config => `<p><b>${config.item.name}</b> already exists. Do you want to add a suffix?</p>`,
+    'No',
+    'Yes, add suffix',
+  ),
+  paymentSuccess: simpleModal(
+    '<p>Thank you for your payment! Your sponsorship will be active in a minute.</p>',
+    'Ok',
+  ),
+  providerRedirection: simpleModal(
+    config => `<p>You are about to navigate to the <b>${config.name}</b> authorization page.</p>`,
+    'Cancel',
+    'Ok, go on',
+  ),
+  removeWorkspace: simpleModal(
+    '<p>You are about to remove a workspace locally. Are you sure?</p>',
+    'No',
+    'Yes, remove',
+  ),
+  reset: simpleModal(
+    '<p>This will clean all your workspaces locally. Are you sure?</p>',
+    'No',
+    'Yes, clean',
+  ),
+  signInForComment: simpleModal(
+    `<p>You have to sign in with Google to start commenting.</p>
+    <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
+    'Cancel',
+    'Ok, sign in',
+  ),
+  signInForSponsorship: simpleModal(
+    `<p>You have to sign in with Google to sponsor.</p>
+    <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
+    'Cancel',
+    'Ok, sign in',
+  ),
+  sponsorOnly: simpleModal(
+    '<p>This feature is restricted to sponsors as it relies on server resources.</p>',
+    'Ok, I understand',
+  ),
+  stripName: simpleModal(
+    config => `<p><b>${config.item.name}</b> contains illegal characters. Do you want to strip them?</p>`,
+    'No',
+    'Yes, strip',
+  ),
+  tempFileDeletion: simpleModal(
+    config => `<p>You are about to permanently delete the temporary file <b>${config.item.name}</b>. Are you sure?</p>`,
+    'No',
+    'Yes, delete',
+  ),
+  tempFolderDeletion: simpleModal(
+    '<p>You are about to permanently delete all the temporary files. Are you sure?</p>',
+    'No',
+    'Yes, delete all',
+  ),
+  trashDeletion: simpleModal(
+    '<p>Files in the trash are automatically deleted after 7 days of inactivity.</p>',
+    'Ok',
+  ),
+  unauthorizedName: simpleModal(
+    config => `<p><b>${config.item.name}</b> is an unauthorized name.</p>`,
+    'Ok',
+  ),
+  workspaceGoogleRedirection: simpleModal(
+    '<p>StackEdit needs full Google Drive access to open this workspace.</p>',
+    'Cancel',
+    'Ok, grant',
+  ),
+};
diff --git a/src/index.js b/src/index.js
index 418a5d0c..8b9c79cb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,9 +2,9 @@ import Vue from 'vue';
 import 'babel-polyfill';
 import 'indexeddbshim/dist/indexeddbshim';
 import * as OfflinePluginRuntime from 'offline-plugin/runtime';
-import './extensions/';
+import './extensions';
 import './services/optional';
-import './icons/';
+import './icons';
 import App from './components/App';
 import store from './store';
 import localDbSvc from './services/localDbSvc';
diff --git a/src/libs/clunderscore.js b/src/libs/clunderscore.js
index 0271f6b3..de2f2390 100644
--- a/src/libs/clunderscore.js
+++ b/src/libs/clunderscore.js
@@ -140,7 +140,8 @@ objectProperties.cl_extend = function (obj) {
 function build(properties) {
     return objectProperties.cl_reduce.call(properties, function (memo, value, key) {
         memo[key] = {
-            value: value
+            value: value,
+            configurable: true
         }
         return memo
     }, {})
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
index eb143d99..6827cca8 100644
--- a/src/services/explorerSvc.js
+++ b/src/services/explorerSvc.js
@@ -20,9 +20,10 @@ export default {
     if (selectedNode.isNil) {
       return;
     }
+
     if (selectedNode.isTrash || selectedNode.item.parentId === 'trash') {
       try {
-        await store.dispatch('modal/trashDeletion');
+        await store.dispatch('modal/open', 'trashDeletion');
       } catch (e) {
         // Cancel
       }
@@ -33,13 +34,19 @@ export default {
     let moveToTrash = true;
     try {
       if (selectedNode.isTemp) {
-        await store.dispatch('modal/tempFolderDeletion', selectedNode.item);
+        await store.dispatch('modal/open', 'tempFolderDeletion');
         moveToTrash = false;
       } else if (selectedNode.item.parentId === 'temp') {
-        await store.dispatch('modal/tempFileDeletion', selectedNode.item);
+        await store.dispatch('modal/open', {
+          type: 'tempFileDeletion',
+          item: selectedNode.item,
+        });
         moveToTrash = false;
       } else if (selectedNode.isFolder) {
-        await store.dispatch('modal/folderDeletion', selectedNode.item);
+        await store.dispatch('modal/open', {
+          type: 'folderDeletion',
+          item: selectedNode.item,
+        });
       }
     } catch (e) {
       return; // cancel
diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js
index 69830fbe..3194b796 100644
--- a/src/services/fileSvc.js
+++ b/src/services/fileSvc.js
@@ -16,7 +16,7 @@ export default {
     comments,
   } = {}, background = false) {
     const id = utils.uid();
-    const file = {
+    const item = {
       id,
       name: utils.sanitizeName(name),
       parentId: parentId || null,
@@ -34,23 +34,29 @@ export default {
     // Show warning dialogs
     if (!background) {
       // If name is being stripped
-      if (file.name !== utils.defaultName && file.name !== name) {
-        await store.dispatch('modal/stripName', name);
+      if (item.name !== utils.defaultName && item.name !== name) {
+        await store.dispatch('modal/open', {
+          type: 'stripName',
+          item,
+        });
       }
 
       // Check if there is already a file with that path
       if (workspaceUniquePaths) {
-        const parentPath = store.getters.itemPaths[file.parentId] || '';
-        const path = parentPath + file.name;
+        const parentPath = store.getters.itemPaths[item.parentId] || '';
+        const path = parentPath + item.name;
         if (store.getters.pathItems[path]) {
-          await store.dispatch('modal/pathConflict', name);
+          await store.dispatch('modal/open', {
+            type: 'pathConflict',
+            item,
+          });
         }
       }
     }
 
     // Save file and content in the store
     store.commit('content/setItem', content);
-    store.commit('file/setItem', file);
+    store.commit('file/setItem', item);
     if (workspaceUniquePaths) {
       this.makePathUnique(id);
     }
@@ -67,14 +73,20 @@ export default {
     const sanitizedName = utils.sanitizeName(item.name);
 
     if (item.type === 'folder' && forbiddenFolderNameMatcher.exec(sanitizedName)) {
-      await store.dispatch('modal/unauthorizedName', item.name);
+      await store.dispatch('modal/open', {
+        type: 'unauthorizedName',
+        item,
+      });
       throw new Error('Unauthorized name.');
     }
 
     // Show warning dialogs
     // If name has been stripped
     if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) {
-      await store.dispatch('modal/stripName', item.name);
+      await store.dispatch('modal/open', {
+        type: 'stripName',
+        item,
+      });
     }
     // Check if there is a path conflict
     if (store.getters['workspace/hasUniquePaths']) {
@@ -82,7 +94,10 @@ export default {
       const path = parentPath + sanitizedName;
       const pathItems = store.getters.pathItems[path] || [];
       if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) {
-        await store.dispatch('modal/pathConflict', item.name);
+        await store.dispatch('modal/open', {
+          type: 'pathConflict',
+          item,
+        });
       }
     }
 
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index cdb8f194..0e9123cd 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -399,7 +399,7 @@ const localDbSvc = {
     // Enable sponsorship
     if (utils.queryParams.paymentSuccess) {
       window.location.hash = ''; // PaymentSuccess param is always on its own
-      store.dispatch('modal/paymentSuccess')
+      store.dispatch('modal/open', 'paymentSuccess')
         .catch(() => { /* Cancel */ });
       const sponsorToken = store.getters['workspace/sponsorToken'];
       // Force check sponsorship after a few seconds
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index 394dc684..8bbb2358 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -215,13 +215,24 @@ export default {
 
     const attempt = async () => {
       try {
-        await new Promise((resolve, reject) => {
+        return await new Promise((resolve, reject) => {
           if (offlineCheck) {
             store.commit('updateLastOfflineCheck');
           }
+
           const xhr = new window.XMLHttpRequest();
           xhr.withCredentials = config.withCredentials || false;
-          let timeoutId;
+
+          const timeoutId = setTimeout(() => {
+            xhr.abort();
+            if (offlineCheck) {
+              isConnectionDown = true;
+              store.commit('setOffline', true);
+              reject(new Error('You are offline.'));
+            } else {
+              reject(new Error('Network request timeout.'));
+            }
+          }, config.timeout);
 
           xhr.onload = () => {
             if (offlineCheck) {
@@ -242,9 +253,9 @@ export default {
             }
             if (result.status >= 200 && result.status < 300) {
               resolve(result);
-              return;
+            } else {
+              reject(result);
             }
-            reject(result);
           };
 
           xhr.onerror = () => {
@@ -258,21 +269,13 @@ export default {
             }
           };
 
-          timeoutId = setTimeout(() => {
-            xhr.abort();
-            if (offlineCheck) {
-              isConnectionDown = true;
-              store.commit('setOffline', true);
-              reject(new Error('You are offline.'));
-            } else {
-              reject(new Error('Network request timeout.'));
-            }
-          }, config.timeout);
-
           const url = utils.addQueryParams(config.url, config.params);
           xhr.open(config.method || 'GET', url);
-          Object.entries(config.headers).forEach(([key, value]) =>
-            value && xhr.setRequestHeader(key, `${value}`));
+          Object.entries(config.headers).forEach(([key, value]) => {
+            if (value) {
+              xhr.setRequestHeader(key, `${value}`);
+            }
+          });
           if (config.blob) {
             xhr.responseType = 'blob';
           }
@@ -286,7 +289,7 @@ export default {
             // Exponential backoff
             retryAfter *= 2;
           });
-          attempt();
+          return attempt();
         }
         throw err;
       }
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index 20c3400b..99e1ebcf 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -91,7 +91,7 @@ export default new Provider({
       syncLastSeq,
     });
   },
-  async saveSimpleItem(item, syncData) {
+  async saveWorkspaceItem(item, syncData) {
     const syncToken = store.getters['workspace/syncToken'];
     const { id, rev } = couchdbHelper.uploadDocument({
       token: syncToken,
@@ -108,78 +108,85 @@ export default new Provider({
       rev,
     };
   },
-  removeItem(syncData) {
+  removeWorkspaceItem(syncData) {
     const syncToken = store.getters['workspace/syncToken'];
     return couchdbHelper.removeDocument(syncToken, syncData.id, syncData.rev);
   },
-  downloadContent(token, syncLocation) {
-    return this.downloadData(`${syncLocation.fileId}/content`);
-  },
-  async downloadData(dataId) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
-    if (!syncData) {
-      return Promise.resolve();
-    }
-    const syncToken = store.getters['workspace/syncToken'];
-    const body = await couchdbHelper.retrieveDocumentWithAttachments(syncToken, syncData.id);
-    let item;
-    if (body.item.type === 'content') {
-      item = Provider.parseContent(body.attachments.data, body.item.id);
-    } else {
-      item = utils.addItemHash(JSON.parse(body.attachments.data));
-    }
+  async downloadWorkspaceContent(token, syncData) {
+    const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id);
     const rev = body._rev; // eslint-disable-line no-underscore-dangle
-    if (item.hash !== syncData.hash || rev !== syncData.rev) {
-      store.dispatch('data/patchSyncData', {
-        [syncData.id]: {
-          ...syncData,
-          hash: item.hash,
-          rev,
-        },
-      });
-    }
-    return item;
+    const item = Provider.parseContent(body.attachments.data, body.item.id);
+    return {
+      item,
+      syncData: {
+        ...syncData,
+        hash: item.hash,
+        rev,
+      },
+    };
   },
-  async uploadContent(token, content, syncLocation) {
-    await this.uploadData(content);
-    return syncLocation;
-  },
-  async uploadData(item) {
-    const syncData = store.getters['data/syncDataByItemId'][item.id];
-    if (!syncData || syncData.hash !== item.hash) {
-      let data;
-      let dataType;
-      if (item.type === 'content') {
-        data = Provider.serializeContent(item);
-        dataType = 'text/plain';
-      } else {
-        data = JSON.stringify(item);
-        dataType = 'application/json';
-      }
-      const syncToken = store.getters['workspace/syncToken'];
-      const res = await couchdbHelper.uploadDocument({
-        token: syncToken,
-        item: {
-          id: item.id,
-          type: item.type,
-          hash: item.hash,
-        },
-        data,
-        dataType,
-        documentId: syncData && syncData.id,
-        rev: syncData && syncData.rev,
-      });
-      store.dispatch('data/patchSyncData', {
-        [res.id]: {
-          // Build sync data
-          id: res.id,
-          itemId: item.id,
-          type: item.type,
-          hash: item.hash,
-          rev: res.rev,
-        },
-      });
+  async downloadWorkspaceData(token, dataId, syncData) {
+    if (!syncData) {
+      return {};
     }
+
+    const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id);
+    const item = utils.addItemHash(JSON.parse(body.attachments.data));
+    const rev = body._rev; // eslint-disable-line no-underscore-dangle
+    return {
+      item,
+      syncData: {
+        ...syncData,
+        hash: item.hash,
+        rev,
+      },
+    };
+  },
+  async uploadWorkspaceContent(token, item, syncData) {
+    const res = await couchdbHelper.uploadDocument({
+      token,
+      item: {
+        id: item.id,
+        type: item.type,
+        hash: item.hash,
+      },
+      data: Provider.serializeContent(item),
+      dataType: 'text/plain',
+      documentId: syncData && syncData.id,
+      rev: syncData && syncData.rev,
+    });
+
+    // Return new sync data
+    return {
+      id: res.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+      rev: res.rev,
+    };
+  },
+  async uploadWorkspaceData(token, item, syncData) {
+    const res = await couchdbHelper.uploadDocument({
+      token,
+      item: {
+        id: item.id,
+        type: item.type,
+        hash: item.hash,
+      },
+      data: JSON.stringify(item),
+      dataType: 'application/json',
+      documentId: syncData && syncData.id,
+      rev: syncData && syncData.rev,
+    });
+
+    // Return new sync data
+    return {
+      id: res.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+      rev: res.rev,
+    };
   },
   async listRevisions(token, fileId) {
     const syncData = Provider.getContentSyncData(fileId);
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index b57ed3c1..375acffb 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -28,6 +28,7 @@ const endsWith = (str, suffix) => str.slice(-suffix.length) === suffix;
 
 export default new Provider({
   id: 'githubWorkspace',
+  isGit: true,
   getToken() {
     return store.getters['workspace/syncToken'];
   },
@@ -110,29 +111,31 @@ export default new Provider({
         const path = blobEntry.path.slice(workspacePath.length);
         // Collect blob sha
         treeShaMap[path] = blobEntry.sha;
-        // Collect parents path
-        let parentPath = '';
-        path.split('/').slice(0, -1).forEach((folderName) => {
-          const folderPath = `${parentPath}${folderName}/`;
-          treeFolderMap[folderPath] = parentPath;
-          parentPath = folderPath;
-        });
-        // Collect file path
         if (path.indexOf('.stackedit-data/') === 0) {
           treeDataMap[path] = true;
-        } else if (endsWith(path, '.md')) {
-          treeFileMap[path] = parentPath;
-        } else if (endsWith(path, '.sync')) {
-          treeSyncLocationMap[path] = true;
-        } else if (endsWith(path, '.publish')) {
-          treePublishLocationMap[path] = true;
+        } else {
+          // Collect parents path
+          let parentPath = '';
+          path.split('/').slice(0, -1).forEach((folderName) => {
+            const folderPath = `${parentPath}${folderName}/`;
+            treeFolderMap[folderPath] = parentPath;
+            parentPath = folderPath;
+          });
+          // Collect file path
+          if (endsWith(path, '.md')) {
+            treeFileMap[path] = parentPath;
+          } else if (endsWith(path, '.sync')) {
+            treeSyncLocationMap[path] = true;
+          } else if (endsWith(path, '.publish')) {
+            treePublishLocationMap[path] = true;
+          }
         }
       });
 
     // Collect changes
     const changes = [];
     const pathIds = {};
-    const syncDataToIgnore = Object.create(null);
+    const syncDataToKeep = Object.create(null);
     const getId = (path) => {
       const syncData = syncDataByPath[path];
       const id = syncData ? syncData.itemId : utils.uid();
@@ -185,7 +188,7 @@ export default new Provider({
       // Content creations/updates
       const contentSyncData = syncDataByItemId[`${id}/content`];
       if (contentSyncData) {
-        syncDataToIgnore[contentSyncData.id] = true;
+        syncDataToKeep[contentSyncData.id] = true;
       }
       if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
         // Use `/` as a prefix to get a unique syncData id
@@ -211,11 +214,12 @@ export default new Provider({
     // Data creations/updates
     Object.keys(treeDataMap).forEach((path) => {
       try {
-        const [, id] = path.match(/^\.stackedit-data\/([\s\S]+)\.json$/);
+        // Only template data are stored
+        const [, id] = path.match(/^\.stackedit-data\/(templates)\.json$/) || [];
         pathIds[path] = id;
         const syncData = syncDataByItemId[id];
         if (syncData) {
-          syncDataToIgnore[syncData.id] = true;
+          syncDataToKeep[syncData.id] = true;
         }
         if (!syncData || syncData.sha !== treeShaMap[path]) {
           changes.push({
@@ -281,40 +285,28 @@ export default new Provider({
 
     // Deletions
     Object.keys(syncDataByPath).forEach((path) => {
-      if (!pathIds[path] && !syncDataToIgnore[path]) {
+      if (!pathIds[path] && !syncDataToKeep[path]) {
         changes.push({ syncDataId: path });
       }
     });
 
     return changes;
   },
-  async saveSimpleItem(item) {
-    const path = store.getters.itemPaths[item.fileId || item.id];
-    const syncToken = store.getters['workspace/syncToken'];
+  async saveWorkspaceItem(item) {
     const syncData = {
+      id: store.getters.itemGitPaths[item.id],
       itemId: item.id,
       type: item.type,
       hash: item.hash,
     };
 
-    if (item.type === 'file') {
-      syncData.id = `${path}.md`;
-      return syncData;
-    }
-    if (item.type === 'folder') {
-      syncData.id = path;
+    // Files and folders are not in git, only contents
+    if (item.type === 'file' || item.type === 'folder') {
       return syncData;
     }
 
     // locations are stored as paths, so we upload an empty file
-    const data = utils.encodeBase64(utils.serializeObject({
-      ...item,
-      id: undefined,
-      type: undefined,
-      fileId: undefined,
-    }), true);
-    const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
-    syncData.id = `${path}.${data}.${extension}`;
+    const syncToken = store.getters['workspace/syncToken'];
     await githubHelper.uploadFile({
       ...getWorkspaceWithOwner(),
       token: syncToken,
@@ -324,9 +316,8 @@ export default new Provider({
     });
     return syncData;
   },
-  async removeItem(syncData) {
-    // Ignore content deletion
-    if (syncData.type !== 'content') {
+  async removeWorkspaceItem(syncData) {
+    if (treeShaMap[syncData.id]) {
       const syncToken = store.getters['workspace/syncToken'];
       await githubHelper.removeFile({
         ...getWorkspaceWithOwner(),
@@ -336,102 +327,91 @@ export default new Provider({
       });
     }
   },
-  async downloadContent(token, syncLocation) {
-    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (!syncData || !contentSyncData) {
-      return null;
+  async downloadWorkspaceContent(token, contentSyncData) {
+    const [fileId] = contentSyncData.itemId.split('/');
+    const path = store.getters.itemGitPaths[fileId];
+    const syncData = store.getters['data/syncData'][path];
+    if (!syncData) {
+      return {};
     }
     const { sha, content } = await githubHelper.downloadFile({
       ...getWorkspaceWithOwner(),
       token,
       path: getAbsolutePath(syncData),
     });
-    const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
-    if (item.hash !== contentSyncData.hash) {
-      store.dispatch('data/patchSyncData', {
-        [contentSyncData.id]: {
-          ...contentSyncData,
-          hash: item.hash,
-          sha,
-        },
-      });
-    }
-    return item;
+    treeShaMap[path] = sha;
+    const item = Provider.parseContent(content, `${fileId}/content`);
+    return {
+      item,
+      syncData: {
+        ...contentSyncData,
+        hash: item.hash,
+        sha,
+      },
+    };
   },
-  async downloadData(dataId) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
+  async downloadWorkspaceData(token, dataId, syncData) {
     if (!syncData) {
-      return null;
+      return {};
     }
-    const syncToken = store.getters['workspace/syncToken'];
+
     const { sha, content } = await githubHelper.downloadFile({
       ...getWorkspaceWithOwner(),
-      token: syncToken,
+      token,
       path: getAbsolutePath(syncData),
     });
+    treeShaMap[syncData.id] = sha;
     const item = JSON.parse(content);
-    if (item.hash !== syncData.hash) {
-      store.dispatch('data/patchSyncData', {
-        [syncData.id]: {
-          ...syncData,
-          hash: item.hash,
-          sha,
-        },
-      });
-    }
-    return item;
-  },
-  async uploadContent(token, content, syncLocation) {
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (!contentSyncData || contentSyncData.hash !== content.hash) {
-      const path = `${store.getters.itemPaths[syncLocation.fileId]}.md`;
-      const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
-      const id = `/${path}`;
-      const res = await githubHelper.uploadFile({
-        ...getWorkspaceWithOwner(),
-        token,
-        path: absolutePath,
-        content: Provider.serializeContent(content),
-        sha: treeShaMap[id],
-      });
-      store.dispatch('data/patchSyncData', {
-        [id]: {
-          // Build sync data
-          id,
-          itemId: content.id,
-          type: content.type,
-          hash: content.hash,
-          sha: res.content.sha,
-        },
-      });
-    }
-    return syncLocation;
-  },
-  async uploadData(item) {
-    const oldSyncData = store.getters['data/syncDataByItemId'][item.id];
-    if (!oldSyncData || oldSyncData.hash !== item.hash) {
-      const syncData = {
-        id: `.stackedit-data/${item.id}.json`,
-        itemId: item.id,
-        type: item.type,
+    return {
+      item,
+      syncData: {
+        ...syncData,
         hash: item.hash,
-      };
-      const syncToken = store.getters['workspace/syncToken'];
-      const res = await githubHelper.uploadFile({
-        ...getWorkspaceWithOwner(),
-        token: syncToken,
-        path: getAbsolutePath(syncData),
-        content: JSON.stringify(item),
-        sha: oldSyncData && oldSyncData.sha,
-      });
-      store.dispatch('data/patchSyncData', {
-        [syncData.id]: {
-          ...syncData,
-          sha: res.content.sha,
-        },
-      });
-    }
+        sha,
+      },
+    };
+  },
+  async uploadWorkspaceContent(token, item) {
+    const [fileId] = item.id.split('/');
+    const path = store.getters.itemGitPaths[fileId];
+    const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
+    const res = await githubHelper.uploadFile({
+      ...getWorkspaceWithOwner(),
+      token,
+      path: absolutePath,
+      content: Provider.serializeContent(item),
+      sha: treeShaMap[path],
+    });
+
+    // Return new sync data
+    return {
+      id: store.getters.itemGitPaths[item.id],
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+      sha: res.content.sha,
+    };
+  },
+  async uploadWorkspaceData(token, item) {
+    const path = store.getters.itemGitPaths[item.id];
+    const syncData = {
+      id: path,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
+    const res = await githubHelper.uploadFile({
+      ...getWorkspaceWithOwner(),
+      token,
+      path: getAbsolutePath(syncData),
+      content: JSON.stringify(item),
+      sha: treeShaMap[path],
+    });
+
+    return {
+      ...syncData,
+      sha: res.content.sha,
+    };
   },
   onSyncEnd() {
     // Clean up
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index d83a63b0..1f990c49 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -48,7 +48,7 @@ export default new Provider({
       syncStartPageToken,
     });
   },
-  async saveSimpleItem(item, syncData, ifNotTooLate) {
+  async saveWorkspaceItem(item, syncData, ifNotTooLate) {
     const syncToken = store.getters['workspace/syncToken'];
     const file = await googleHelper.uploadAppDataFile({
       token: syncToken,
@@ -64,60 +64,77 @@ export default new Provider({
       hash: item.hash,
     };
   },
-  removeItem(syncData, ifNotTooLate) {
+  removeWorkspaceItem(syncData, ifNotTooLate) {
     const syncToken = store.getters['workspace/syncToken'];
     return googleHelper.removeAppDataFile(syncToken, syncData.id, ifNotTooLate);
   },
-  downloadContent(token, syncLocation) {
-    return this.downloadData(`${syncLocation.fileId}/content`);
-  },
-  async downloadData(dataId) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
-    if (!syncData) {
-      return null;
-    }
-    const syncToken = store.getters['workspace/syncToken'];
-    const data = await googleHelper.downloadAppDataFile(syncToken, syncData.id);
+  async downloadWorkspaceContent(token, syncData) {
+    const data = await googleHelper.downloadAppDataFile(token, syncData.id);
     const item = utils.addItemHash(JSON.parse(data));
-    if (item.hash !== syncData.hash) {
-      store.dispatch('data/patchSyncData', {
-        [syncData.id]: {
-          ...syncData,
-          hash: item.hash,
-        },
-      });
-    }
-    return item;
+    return {
+      item,
+      syncData: {
+        ...syncData,
+        hash: item.hash,
+      },
+    };
   },
-  async uploadContent(token, content, syncLocation, ifNotTooLate) {
-    await this.uploadData(content, ifNotTooLate);
-    return syncLocation;
-  },
-  async uploadData(item, ifNotTooLate) {
-    const syncData = store.getters['data/syncDataByItemId'][item.id];
-    if (!syncData || syncData.hash !== item.hash) {
-      const syncToken = store.getters['workspace/syncToken'];
-      const file = await googleHelper.uploadAppDataFile({
-        token: syncToken,
-        name: JSON.stringify({
-          id: item.id,
-          type: item.type,
-          hash: item.hash,
-        }),
-        media: JSON.stringify(item),
-        fileId: syncData && syncData.id,
-        ifNotTooLate,
-      });
-      store.dispatch('data/patchSyncData', {
-        [file.id]: {
-          // Build sync data
-          id: file.id,
-          itemId: item.id,
-          type: item.type,
-          hash: item.hash,
-        },
-      });
+  async downloadWorkspaceData(token, dataId, syncData) {
+    if (!syncData) {
+      return {};
     }
+
+    const data = await googleHelper.downloadAppDataFile(token, syncData.id);
+    const item = utils.addItemHash(JSON.parse(data));
+    return {
+      item,
+      syncData: {
+        ...syncData,
+        hash: item.hash,
+      },
+    };
+  },
+  async uploadWorkspaceContent(token, item, syncData, ifNotTooLate) {
+    const file = await googleHelper.uploadAppDataFile({
+      token,
+      name: JSON.stringify({
+        id: item.id,
+        type: item.type,
+        hash: item.hash,
+      }),
+      media: JSON.stringify(item),
+      fileId: syncData && syncData.id,
+      ifNotTooLate,
+    });
+
+    // Return new sync data
+    return {
+      id: file.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
+  },
+  async uploadWorkspaceData(token, item, syncData, ifNotTooLate) {
+    const file = await googleHelper.uploadAppDataFile({
+      token,
+      name: JSON.stringify({
+        id: item.id,
+        type: item.type,
+        hash: item.hash,
+      }),
+      media: JSON.stringify(item),
+      fileId: syncData && syncData.id,
+      ifNotTooLate,
+    });
+
+    // Return new sync data
+    return {
+      id: file.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
   },
   async listRevisions(token, fileId) {
     const syncData = Provider.getContentSyncData(fileId);
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index 37552336..ee1f4f91 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -89,7 +89,7 @@ export default new Provider({
     let token = store.getters['data/googleTokens'][sub];
     // If no token has been found, popup an authorize window and get one
     if (!token || !token.isDrive || !token.driveFullAccess) {
-      await store.dispatch('modal/workspaceGoogleRedirection');
+      await store.dispatch('modal/open', 'workspaceGoogleRedirection');
       token = await googleHelper.addDriveAccount(true, utils.queryParams.sub);
     }
 
@@ -312,7 +312,7 @@ export default new Provider({
       syncStartPageToken,
     });
   },
-  async saveSimpleItem(item, syncData, ifNotTooLate) {
+  async saveWorkspaceItem(item, syncData, ifNotTooLate) {
     const workspace = store.getters['workspace/currentWorkspace'];
     const syncToken = store.getters['workspace/syncToken'];
     let file;
@@ -363,133 +363,88 @@ export default new Provider({
       hash: item.hash,
     };
   },
-  async removeItem(syncData, ifNotTooLate) {
+  async removeWorkspaceItem(syncData, ifNotTooLate) {
     // Ignore content deletion
     if (syncData.type !== 'content') {
       const syncToken = store.getters['workspace/syncToken'];
       await googleHelper.removeFile(syncToken, syncData.id, ifNotTooLate);
     }
   },
-  async downloadContent(token, syncLocation) {
-    const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (!syncData || !contentSyncData) {
-      return null;
+  async downloadWorkspaceContent(token, contentSyncData) {
+    const [fileId] = contentSyncData.itemId.split('/');
+    const syncData = store.getters['data/syncDataByItemId'][fileId];
+    if (!syncData) {
+      return {};
     }
     const content = await googleHelper.downloadFile(token, syncData.id);
-    const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
-    if (item.hash !== contentSyncData.hash) {
-      store.dispatch('data/patchSyncData', {
-        [contentSyncData.id]: {
-          ...contentSyncData,
-          hash: item.hash,
-        },
-      });
-    }
+    const item = Provider.parseContent(content, contentSyncData.itemId);
 
     // Open the file requested by action if it wasn't synced yet
     if (fileIdToOpen && fileIdToOpen === syncData.id) {
       fileIdToOpen = null;
       // Open the file once downloaded content has been stored
       setTimeout(() => {
-        store.commit('file/setCurrentId', syncData.itemId);
+        store.commit('file/setCurrentId', fileId);
       }, 10);
     }
-    return item;
+
+    return {
+      item,
+      syncData: {
+        ...contentSyncData,
+        hash: item.hash,
+      },
+    };
   },
-  async downloadData(dataId) {
-    const syncData = store.getters['data/syncDataByItemId'][dataId];
+  async downloadWorkspaceData(token, dataId, syncData) {
     if (!syncData) {
-      return null;
+      return {};
     }
-    const syncToken = store.getters['workspace/syncToken'];
-    const content = await googleHelper.downloadFile(syncToken, syncData.id);
+
+    const content = await googleHelper.downloadFile(token, syncData.id);
     const item = JSON.parse(content);
-    if (item.hash !== syncData.hash) {
-      store.dispatch('data/patchSyncData', {
-        [syncData.id]: {
-          ...syncData,
-          hash: item.hash,
-        },
-      });
-    }
-    return item;
+    return {
+      item,
+      syncData: {
+        ...syncData,
+        hash: item.hash,
+      },
+    };
   },
-  async uploadContent(token, content, syncLocation, ifNotTooLate) {
-    const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
-    if (!contentSyncData || contentSyncData.hash !== content.hash) {
-      const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
-      let file;
-      if (syncData) {
-        // Only update file media
-        file = await googleHelper.uploadFile({
-          token,
-          media: Provider.serializeContent(content),
-          fileId: syncData.id,
-          ifNotTooLate,
-        });
-      } else {
-        // Create file with media
-        const workspace = store.getters['workspace/currentWorkspace'];
-        // Use deepCopy to freeze objects
-        const item = utils.deepCopy(store.state.file.itemMap[syncLocation.fileId]);
-        const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
-        file = await googleHelper.uploadFile({
-          token,
-          name: item.name,
-          parents: [parentSyncData ? parentSyncData.id : workspace.folderId],
-          appProperties: {
-            id: item.id,
-            folderId: workspace.folderId,
-          },
-          media: Provider.serializeContent(content),
-          ifNotTooLate,
-        });
-        store.dispatch('data/patchSyncData', {
-          [file.id]: {
-            id: file.id,
-            itemId: item.id,
-            type: item.type,
-            hash: item.hash,
-          },
-        });
-      }
-      store.dispatch('data/patchSyncData', {
-        [`${file.id}/content`]: {
-          // Build sync data
-          id: `${file.id}/content`,
-          itemId: content.id,
-          type: content.type,
-          hash: content.hash,
-        },
-      });
-    }
-    return syncLocation;
-  },
-  async uploadData(item, ifNotTooLate) {
-    const syncData = store.getters['data/syncDataByItemId'][item.id];
-    if (!syncData || syncData.hash !== item.hash) {
-      const workspace = store.getters['workspace/currentWorkspace'];
-      const syncToken = store.getters['workspace/syncToken'];
-      const file = await googleHelper.uploadFile({
-        token: syncToken,
-        name: JSON.stringify({
-          id: item.id,
-          type: item.type,
-          hash: item.hash,
-        }),
-        parents: [workspace.dataFolderId],
-        appProperties: {
-          folderId: workspace.folderId,
-        },
-        media: JSON.stringify(item),
-        fileId: syncData && syncData.id,
-        oldParents: syncData && syncData.parentIds,
+  async uploadWorkspaceContent(token, content, contentSyncData, ifNotTooLate) {
+    const [fileId] = content.id.split('/');
+    const syncData = store.getters['data/syncDataByItemId'][fileId];
+    let file;
+
+    if (syncData) {
+      // Only update file media
+      file = await googleHelper.uploadFile({
+        token,
+        media: Provider.serializeContent(content),
+        fileId: syncData.id,
         ifNotTooLate,
       });
+    } else {
+      // Create file with media
+      const workspace = store.getters['workspace/currentWorkspace'];
+      // Use deepCopy to freeze objects
+      const item = utils.deepCopy(store.state.file.itemMap[fileId]);
+      const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
+      file = await googleHelper.uploadFile({
+        token,
+        name: item.name,
+        parents: [parentSyncData ? parentSyncData.id : workspace.folderId],
+        appProperties: {
+          id: item.id,
+          folderId: workspace.folderId,
+        },
+        media: Provider.serializeContent(content),
+        ifNotTooLate,
+      });
+
+      // Create file syncData
       store.dispatch('data/patchSyncData', {
         [file.id]: {
-          // Build sync data
           id: file.id,
           itemId: item.id,
           type: item.type,
@@ -497,6 +452,41 @@ export default new Provider({
         },
       });
     }
+
+    // Return new sync data
+    return {
+      id: `${file.id}/content`,
+      itemId: content.id,
+      type: content.type,
+      hash: content.hash,
+    };
+  },
+  async uploadWorkspaceData(token, item, syncData, ifNotTooLate) {
+    const workspace = store.getters['workspace/currentWorkspace'];
+    const file = await googleHelper.uploadFile({
+      token,
+      name: JSON.stringify({
+        id: item.id,
+        type: item.type,
+        hash: item.hash,
+      }),
+      parents: [workspace.dataFolderId],
+      appProperties: {
+        folderId: workspace.folderId,
+      },
+      media: JSON.stringify(item),
+      fileId: syncData && syncData.id,
+      oldParents: syncData && syncData.parentIds,
+      ifNotTooLate,
+    });
+
+    // Return new sync data
+    return {
+      id: file.id,
+      itemId: item.id,
+      type: item.type,
+      hash: item.hash,
+    };
   },
   async listRevisions(token, fileId) {
     const syncData = Provider.getContentSyncData(fileId);
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index 7668e9d3..41ac1e32 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -113,12 +113,12 @@ export default {
     repo,
     branch,
   }) {
-    const { commit } = (await repoRequest(token, owner, repo, {
+    const { commit } = await repoRequest(token, owner, repo, {
       url: `commits/${encodeURIComponent(branch)}`,
-    })).body;
-    const { tree, truncated } = (await repoRequest(token, owner, repo, {
+    });
+    const { tree, truncated } = await repoRequest(token, owner, repo, {
       url: `git/trees/${encodeURIComponent(commit.tree.sha)}?recursive=1`,
-    })).body;
+    });
     if (truncated) {
       throw new Error('Git tree too big. Please remove some files in the repository.');
     }
@@ -198,13 +198,13 @@ export default {
     branch,
     path,
   }) {
-    const body = await repoRequest(token, owner, repo, {
+    const { sha, content } = await repoRequest(token, owner, repo, {
       url: `contents/${encodeURIComponent(path)}`,
       params: { ref: branch },
     });
     return {
-      sha: body.sha,
-      content: utils.decodeBase64(body.content),
+      sha,
+      content: utils.decodeBase64(content),
     };
   },
 
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 9a19ab6f..2fbaa337 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -190,7 +190,10 @@ export default {
       if (store.state.offline) {
         throw err;
       }
-      await store.dispatch('modal/providerRedirection', { providerName: 'Google' });
+      await store.dispatch('modal/open', {
+        type: 'providerRedirection',
+        name: 'Google',
+      });
       return this.startOauth2(mergedScopes, sub);
     }
   },
@@ -231,7 +234,7 @@ export default {
     mediaType = null,
     fileId = null,
     oldParents = null,
-    ifNotTooLate = cb => res => cb(res),
+    ifNotTooLate = cb => cb(),
   }) {
     // Refreshing a token can take a while if an oauth window pops up, make sure it's not too late
     return ifNotTooLate(() => {
@@ -374,7 +377,7 @@ export default {
   /**
    * https://developers.google.com/drive/v3/reference/files/delete
    */
-  async $removeFile(refreshedToken, id, ifNotTooLate = cb => res => cb(res)) {
+  async $removeFile(refreshedToken, id, ifNotTooLate = cb => cb()) {
     // Refreshing a token can take a while if an oauth window pops up, so check if it's too late
     return ifNotTooLate(() => this.$request(refreshedToken, {
       method: 'DELETE',
@@ -388,7 +391,7 @@ export default {
     const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
     return this.$removeFile(refreshedToken, id, ifNotTooLate);
   },
-  async removeAppDataFile(token, id, ifNotTooLate = cb => res => cb(res)) {
+  async removeAppDataFile(token, id, ifNotTooLate = cb => cb()) {
     const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
     return this.$removeFile(refreshedToken, id, ifNotTooLate);
   },
@@ -599,7 +602,7 @@ export default {
     }
     const refreshedToken = await this.refreshToken(token, scopes);
     const { google } = window;
-    return Promise((resolve) => {
+    return new Promise((resolve) => {
       let picker;
       const pickerBuilder = new google.picker.PickerBuilder()
         .setOAuthToken(refreshedToken.accessToken)
diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js
index ad4c9a78..69cbd143 100644
--- a/src/services/providers/helpers/wordpressHelper.js
+++ b/src/services/providers/helpers/wordpressHelper.js
@@ -57,7 +57,10 @@ export default {
     }
     // Existing token is going to expire.
     // Try to get a new token in background
-    await store.dispatch('modal/providerRedirection', { providerName: 'WordPress' });
+    await store.dispatch('modal/open', {
+      type: 'providerRedirection',
+      name: 'WordPress',
+    });
     return this.startOauth2(sub);
   },
   addAccount(fullAccess = false) {
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index bbcbb1aa..8557135f 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -103,24 +103,22 @@ const requestPublish = () => {
     return;
   }
 
-  store.dispatch('queue/enqueuePublishRequest', () => new Promise((resolve, reject) => {
+  store.dispatch('queue/enqueuePublishRequest', async () => {
     let intervalId;
-    const attempt = () => {
+    const attempt = async () => {
       // Only start publishing when these conditions are met
       if (networkSvc.isUserActive()) {
         clearInterval(intervalId);
         if (!hasCurrentFilePublishLocations()) {
           // Cancel sync
-          reject(new Error('Publish not possible.'));
-          return;
+          throw new Error('Publish not possible.');
         }
-        publishFile(store.getters['file/current'].id)
-          .then(resolve, reject);
+        await publishFile(store.getters['file/current'].id);
       }
     };
     intervalId = utils.setInterval(() => attempt(), 1000);
-    attempt();
-  }));
+    return attempt();
+  });
 };
 
 const createPublishLocation = (publishLocation) => {
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 709cc266..84d98eeb 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -206,24 +206,30 @@ const createSyncLocation = (syncLocation) => {
   );
 };
 
-// Prevent from sending new data too long after old data has been fetched
+/**
+ * Prevent from sending new data too long after old data has been fetched.
+ */
 const tooLateChecker = (timeout) => {
   const tooLateAfter = Date.now() + timeout;
-  return cb => (res) => {
+  return (cb) => {
     if (tooLateAfter < Date.now()) {
       throw new Error('TOO_LATE');
     }
-    return cb(res);
+    return cb();
   };
 };
 
+/**
+ * Return true if file is in the temp folder or it's a welcome file.
+ */
 const isTempFile = (fileId) => {
-  if (store.getters['data/syncDataByItemId'][`${fileId}/content`]) {
+  const contentId = `${fileId}/content`;
+  if (store.getters['data/syncDataByItemId'][contentId]) {
     // If file has already been synced, it's not a temp file
     return false;
   }
   const file = store.state.file.itemMap[fileId];
-  const content = store.state.content.itemMap[`${fileId}/content`];
+  const content = store.state.content.itemMap[contentId];
   if (!file || !content) {
     return false;
   }
@@ -254,15 +260,17 @@ class SyncContext {
  * Sync one file with all its locations.
  */
 const syncFile = async (fileId, syncContext = new SyncContext()) => {
-  syncContext.attempted[`${fileId}/content`] = true;
+  const contentId = `${fileId}/content`;
+  syncContext.attempted[contentId] = true;
 
   await localDbSvc.loadSyncedContent(fileId);
   try {
-    await localDbSvc.loadItem(`${fileId}/content`);
+    await localDbSvc.loadItem(contentId);
   } catch (e) {
     // Item may not exist if content has not been downloaded yet
   }
-  const getContent = () => store.state.content.itemMap[`${fileId}/content`];
+
+  const getContent = () => store.state.content.itemMap[contentId];
   const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
   const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
 
@@ -288,28 +296,88 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
         return;
       }
 
+      const downloadContent = async () => {
+        // On simple provider, call simply downloadContent
+        if (syncLocation.id !== 'main') {
+          return provider.downloadContent(token, syncLocation);
+        }
+
+        // On workspace provider, call downloadWorkspaceContent
+        const oldSyncData = provider.isGit
+          ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]]
+          : store.getters['data/syncDataByItemId'][contentId];
+        if (!oldSyncData) {
+          return null;
+        }
+        const { item, syncData } = await provider.downloadWorkspaceContent(token, oldSyncData);
+        if (!item) {
+          return null;
+        }
+
+        // Update sync data if changed
+        if (syncData
+          && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
+        ) {
+          store.dispatch('data/patchSyncData', {
+            [syncData.id]: syncData,
+          });
+        }
+        return item;
+      };
+
+      const uploadContent = async (item, ifNotTooLate) => {
+        // On simple provider, call simply uploadContent
+        if (syncLocation.id !== 'main') {
+          return provider.uploadContent(token, item, syncLocation, ifNotTooLate);
+        }
+
+        // On workspace provider, call uploadWorkspaceContent
+        const oldSyncData = provider.isGit
+          ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]]
+          : store.getters['data/syncDataByItemId'][contentId];
+        if (oldSyncData && oldSyncData.hash === item.hash) {
+          return syncLocation;
+        }
+
+        const syncData = await provider.uploadWorkspaceContent(
+          token,
+          item,
+          oldSyncData,
+          ifNotTooLate,
+        );
+
+        // Update sync data if changed
+        if (syncData
+          && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
+        ) {
+          store.dispatch('data/patchSyncData', {
+            [syncData.id]: syncData,
+          });
+        }
+
+        // Return syncLocation
+        return syncLocation;
+      };
+
       const doSyncLocation = async () => {
-        const serverContent = await provider.downloadContent(token, syncLocation);
+        const serverContent = await downloadContent(token, syncLocation);
         const syncedContent = getSyncedContent();
         const syncHistoryItem = getSyncHistoryItem(syncLocation.id);
-        let mergedContent = (() => {
-          const clientContent = utils.deepCopy(getContent());
-          if (!clientContent) {
-            return utils.deepCopy(serverContent || null);
-          }
-          if (!serverContent) {
-            // Sync location has not been created yet
-            return clientContent;
-          }
-          if (serverContent.hash === clientContent.hash) {
-            // Server and client contents are synced
-            return clientContent;
-          }
-          if (syncedContent.historyData[serverContent.hash]) {
-            // Server content has not changed or has already been merged
-            return clientContent;
-          }
-          // Perform a merge with last merged content if any, or a simple fusion otherwise
+
+        // Merge content
+        let mergedContent;
+        const clientContent = utils.deepCopy(getContent());
+        if (!clientContent) {
+          mergedContent = utils.deepCopy(serverContent || null);
+        } else if (!serverContent // If sync location has not been created yet
+          // Or server and client contents are synced
+          || serverContent.hash === clientContent.hash
+          // Or server content has not changed or has already been merged
+          || syncedContent.historyData[serverContent.hash]
+        ) {
+          mergedContent = clientContent;
+        } else {
+          // Perform a merge with last merged content if any, or perform a simple fusion otherwise
           let lastMergedContent = utils.someResult(
             serverContent.history,
             hash => syncedContent.historyData[hash],
@@ -317,16 +385,15 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
           if (!lastMergedContent && syncHistoryItem) {
             lastMergedContent = syncedContent.historyData[syncHistoryItem[LAST_MERGED]];
           }
-          return diffUtils.mergeContent(serverContent, clientContent, lastMergedContent);
-        })();
-
+          mergedContent = diffUtils.mergeContent(serverContent, clientContent, lastMergedContent);
+        }
         if (!mergedContent) {
           return;
         }
 
         // Update or set content in store
         store.commit('content/setItem', {
-          id: `${fileId}/content`,
+          id: contentId,
           text: utils.sanitizeText(mergedContent.text),
           properties: utils.sanitizeText(mergedContent.properties),
           discussions: mergedContent.discussions,
@@ -356,8 +423,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
           }
         }
 
-        // Store last sent if it's in the server history,
-        // and merged content which will be sent if different
+        // Update synced content
         const newSyncedContent = utils.deepCopy(syncedContent);
         const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || [];
         newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
@@ -384,10 +450,14 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
         }
 
         // Upload merged content
-        const syncLocationToStore = await provider.uploadContent(token, {
+        const item = {
           ...mergedContent,
           history: mergedContentHistory.slice(0, maxContentHistory),
-        }, syncLocation, tooLateChecker(restartContentSyncAfter));
+        };
+        const syncLocationToStore = await uploadContent(
+          item,
+          tooLateChecker(restartContentSyncAfter),
+        );
 
         // Replace sync location if modified
         if (utils.serializeObject(syncLocation) !==
@@ -437,14 +507,30 @@ const syncDataItem = async (dataId) => {
   const getItem = () => store.state.data.itemMap[dataId]
     || store.state.data.lsItemMap[dataId];
 
-  const item = getItem();
-  const syncData = store.getters['data/syncDataByItemId'][dataId];
+  const oldItem = getItem();
+  const oldSyncData = store.getters['data/syncDataByItemId'][dataId];
   // Sync if item hash and syncData hash are out of sync
-  if (syncData && item && item.hash === syncData.hash) {
+  if (oldSyncData && oldItem && oldItem.hash === oldSyncData.hash) {
     return;
   }
 
-  const serverItem = await workspaceProvider.downloadData(dataId);
+  const token = workspaceProvider.getToken();
+  const { item, syncData } = await workspaceProvider.downloadWorkspaceData(
+    token,
+    dataId,
+    oldSyncData,
+  );
+
+  // Update sync data if changed
+  if (syncData
+    && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
+  ) {
+    store.dispatch('data/patchSyncData', {
+      [syncData.id]: syncData,
+    });
+  }
+
+  const serverItem = item;
   const dataSyncData = store.getters['data/dataSyncData'][dataId];
   let mergedItem = (() => {
     const clientItem = utils.deepCopy(getItem());
@@ -487,7 +573,25 @@ const syncDataItem = async (dataId) => {
   if (serverItem && serverItem.hash === mergedItem.hash) {
     return;
   }
-  await workspaceProvider.uploadData(mergedItem, tooLateChecker(restartContentSyncAfter));
+
+  // Upload merged data item
+  const newSyncData = await workspaceProvider.uploadWorkspaceData(
+    token,
+    mergedItem,
+    syncData,
+    tooLateChecker(restartContentSyncAfter),
+  );
+
+  // Update sync data if changed
+  if (newSyncData
+    && utils.serializeObject(syncData) !== utils.serializeObject(newSyncData)
+  ) {
+    store.dispatch('data/patchSyncData', {
+      [newSyncData.id]: newSyncData,
+    });
+  }
+
+  // Update data sync data
   store.dispatch('data/patchDataSyncData', {
     [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
   });
@@ -523,7 +627,7 @@ const syncWorkspace = async () => {
     const ifNotTooLate = tooLateChecker(restartSyncAfter);
 
     // Called until no item to save
-    const saveNextItem = ifNotTooLate(async () => {
+    const saveNextItem = () => ifNotTooLate(async () => {
       const storeItemMap = {
         ...store.state.file.itemMap,
         ...store.state.folder.itemMap,
@@ -531,16 +635,25 @@ const syncWorkspace = async () => {
         ...store.state.publishLocation.itemMap,
         // Deal with contents and data later
       };
-      const syncDataByItemId = store.getters['data/syncDataByItemId'];
+
+      let getSyncData;
+      if (workspaceProvider.isGit) {
+        const syncData = store.getters['data/syncData'];
+        getSyncData = id => syncData[store.getters.itemGitPaths[id]];
+      } else {
+        const syncDataByItemId = store.getters['data/syncDataByItemId'];
+        getSyncData = id => syncDataByItemId[id];
+      }
+
       const [changedItem, syncDataToUpdate] = utils.someResult(
         Object.entries(storeItemMap),
         ([id, item]) => {
-          const existingSyncData = syncDataByItemId[id];
+          const existingSyncData = getSyncData(id);
           if ((!existingSyncData || existingSyncData.hash !== item.hash)
             // Add file/folder if parent has been added
-            && (!storeItemMap[item.parentId] || syncDataByItemId[item.parentId])
+            && (!storeItemMap[item.parentId] || getSyncData(item.parentId))
             // Add file if content has been added
-            && (item.type !== 'file' || syncDataByItemId[`${id}/content`])
+            && (item.type !== 'file' || getSyncData(`${id}/content`))
           ) {
             return [item, existingSyncData];
           }
@@ -550,7 +663,7 @@ const syncWorkspace = async () => {
 
       if (changedItem) {
         const resultSyncData = await workspaceProvider
-          .saveSimpleItem(
+          .saveWorkspaceItem(
             // Use deepCopy to freeze objects
             utils.deepCopy(changedItem),
             utils.deepCopy(syncDataToUpdate),
@@ -565,29 +678,39 @@ const syncWorkspace = async () => {
     await saveNextItem();
 
     // Called until no item to remove
-    const removeNextItem = ifNotTooLate(async () => {
-      const storeItemMap = {
-        ...store.state.file.itemMap,
-        ...store.state.folder.itemMap,
-        ...store.state.syncLocation.itemMap,
-        ...store.state.publishLocation.itemMap,
-        ...store.state.content.itemMap,
-      };
+    const removeNextItem = () => ifNotTooLate(async () => {
+      let getItem;
+      let getFileItem;
+      if (workspaceProvider.isGit) {
+        const { gitPathItems } = store.getters;
+        getItem = syncData => gitPathItems[syncData.id];
+        getFileItem = syncData => gitPathItems[syncData.id.slice(1)]; // Remove leading /
+      } else {
+        const { allItemMap } = store.getters;
+        getItem = syncData => allItemMap[syncData.itemId];
+        getFileItem = syncData => allItemMap[syncData.itemId.split('/')[0]];
+      }
+
       const syncData = store.getters['data/syncData'];
       const syncDataToRemove = utils.deepCopy(utils.someResult(
         Object.values(syncData),
-        existingSyncData => !storeItemMap[existingSyncData.itemId]
-          // We don't want to delete data items, especially on first sync
-          && existingSyncData.type !== 'data'
-          // Remove content only if file has been removed
-          && (existingSyncData.type !== 'content'
-            || !storeItemMap[existingSyncData.itemId.split('/')[0]])
-          && existingSyncData,
+        (existingSyncData) => {
+          if (!getItem(existingSyncData)
+            // We don't want to delete data items, especially on first sync
+            && existingSyncData.type !== 'data'
+            // Remove content only if file has been removed
+            && (existingSyncData.type !== 'content'
+              || !getFileItem(existingSyncData))
+          ) {
+            return existingSyncData;
+          }
+          return null;
+        },
       ));
 
       if (syncDataToRemove) {
         // Use deepCopy to freeze objects
-        await workspaceProvider.removeItem(syncDataToRemove, ifNotTooLate);
+        await workspaceProvider.removeWorkspaceItem(syncDataToRemove, ifNotTooLate);
         const syncDataCopy = { ...store.getters['data/syncData'] };
         delete syncDataCopy[syncDataToRemove.id];
         store.dispatch('data/setSyncData', syncDataCopy);
@@ -608,11 +731,22 @@ const syncWorkspace = async () => {
         ...Object.keys(localDbSvc.hashMap.content),
         ...store.getters['file/items'].map(file => `${file.id}/content`),
       ])];
+      const contentMap = store.state.content.itemMap;
+      const syncDataById = store.getters['data/syncData'];
+      let getSyncData;
+      if (workspaceProvider.isGit) {
+        const { itemGitPaths } = store.getters;
+        getSyncData = contentId => syncDataById[itemGitPaths[contentId]];
+      } else {
+        const syncDataByItemId = store.getters['data/syncDataByItemId'];
+        getSyncData = contentId => syncDataByItemId[contentId];
+      }
+
       return utils.someResult(contentIds, (contentId) => {
         // Get content hash from itemMap or from localDbSvc if not loaded
-        const loadedContent = store.state.content.itemMap[contentId];
+        const loadedContent = contentMap[contentId];
         const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
-        const syncData = store.getters['data/syncDataByItemId'][contentId];
+        const syncData = getSyncData(contentId);
         if (
           // Sync if content syncing was not attempted yet
           !syncContext.attempted[contentId] &&
@@ -721,7 +855,7 @@ const requestSync = () => {
     };
 
     intervalId = utils.setInterval(() => attempt(), 1000);
-    attempt();
+    return attempt();
   });
 };
 
diff --git a/src/services/utils.js b/src/services/utils.js
index 6430c0e4..46c08e99 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -23,7 +23,6 @@ const parseQueryParams = (params) => {
   return result;
 };
 
-
 // For utils.computeProperties()
 const deepOverride = (obj, opt) => {
   if (obj === undefined) {
@@ -172,10 +171,12 @@ export default {
     return Math.abs(this.hash(this.serializeObject(params))).toString(36);
   },
   encodeBase64(str, urlSafe = false) {
-    const result = btoa(encodeURIComponent(str).replace(
+    const uriEncodedStr = encodeURIComponent(str);
+    const utf8Str = uriEncodedStr.replace(
       /%([0-9A-F]{2})/g,
       (match, p1) => String.fromCharCode(`0x${p1}`),
-    ));
+    );
+    const result = btoa(utf8Str);
     if (!urlSafe) {
       return result;
     }
@@ -187,10 +188,12 @@ export default {
   decodeBase64(str) {
     // In case of URL safe base64
     const sanitizedStr = str.replace(/_/g, '/').replace(/-/g, '+');
-    return decodeURIComponent(atob(sanitizedStr)
+    const utf8Str = atob(sanitizedStr);
+    const uriEncodedStr = utf8Str
       .split('')
       .map(c => `%${`00${c.charCodeAt(0).toString(16)}`.slice(-2)}`)
-      .join(''));
+      .join('');
+    return decodeURIComponent(uriEncodedStr);
   },
   computeProperties(yamlProperties) {
     let properties = {};
diff --git a/src/store/content.js b/src/store/content.js
index 57f901a8..89421b2b 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -82,7 +82,7 @@ module.actions = {
   }) {
     const { revisionContent } = state;
     if (revisionContent) {
-      await dispatch('modal/fileRestoration', null, { root: true });
+      await dispatch('modal/open', 'fileRestoration', { root: true });
       // Close revision
       commit('setRevisionContent');
       const currentContent = utils.deepCopy(getters.current);
diff --git a/src/store/contextMenu.js b/src/store/contextMenu.js
index ce1fbe7a..6b4180e4 100644
--- a/src/store/contextMenu.js
+++ b/src/store/contextMenu.js
@@ -26,21 +26,23 @@ export default {
       setTimeout(() => {
         // Take the size of the context menu and place it
         const elt = document.querySelector('.context-menu__inner');
-        const height = elt.offsetHeight;
-        if (coordinates.top + height > rootState.layout.bodyHeight) {
-          coordinates.top -= height;
+        if (elt) {
+          const height = elt.offsetHeight;
+          if (coordinates.top + height > rootState.layout.bodyHeight) {
+            coordinates.top -= height;
+          }
+          if (coordinates.top < 0) {
+            coordinates.top = 0;
+          }
+          const width = elt.offsetWidth;
+          if (coordinates.left + width > rootState.layout.bodyWidth) {
+            coordinates.left -= width;
+          }
+          if (coordinates.left < 0) {
+            coordinates.left = 0;
+          }
+          commit('setCoordinates', coordinates);
         }
-        if (coordinates.top < 0) {
-          coordinates.top = 0;
-        }
-        const width = elt.offsetWidth;
-        if (coordinates.left + width > rootState.layout.bodyWidth) {
-          coordinates.left -= width;
-        }
-        if (coordinates.left < 0) {
-          coordinates.left = 0;
-        }
-        commit('setCoordinates', coordinates);
       }, 1);
 
       return new Promise(resolve => commit('setResolve', resolve));
diff --git a/src/store/discussion.js b/src/store/discussion.js
index 1c1d1ab5..2171c148 100644
--- a/src/store/discussion.js
+++ b/src/store/discussion.js
@@ -135,7 +135,7 @@ export default {
       const loginToken = rootGetters['workspace/loginToken'];
       if (!loginToken) {
         try {
-          await dispatch('modal/signInForComment', null, { root: true });
+          await dispatch('modal/open', 'signInForComment', { root: true });
           await googleHelper.signin();
           syncSvc.requestSync();
           await dispatch('createNewDiscussion', selection);
diff --git a/src/store/explorer.js b/src/store/explorer.js
index c1ca2152..f9fdfc29 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -18,11 +18,10 @@ const collator = new Intl.Collator(undefined, { sensitivity: 'base' });
 const compare = (node1, node2) => collator.compare(node1.item.name, node2.item.name);
 
 class Node {
-  constructor(item, locations = [], isFolder = false, isRoot = false) {
+  constructor(item, locations = [], isFolder = false) {
     this.item = item;
     this.locations = locations;
     this.isFolder = isFolder;
-    this.isRoot = isRoot;
     if (isFolder) {
       this.folders = [];
       this.files = [];
@@ -84,7 +83,8 @@ export default {
   },
   getters: {
     nodeStructure: (state, getters, rootState, rootGetters) => {
-      const rootNode = new Node(emptyFolder(), [], true, true);
+      const rootNode = new Node(emptyFolder(), [], true);
+      rootNode.isRoot = true;
 
       // Create Trash node
       const trashFolderNode = new Node(emptyFolder(), [], true);
diff --git a/src/store/index.js b/src/store/index.js
index f811c287..bdc0d071 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -119,6 +119,41 @@ const store = new Vuex.Store({
       });
       return result;
     },
+    itemGitPaths: (state, { allItemMap, itemPaths }) => {
+      const result = {};
+      Object.entries(allItemMap).forEach(([id, item]) => {
+        if (item.type === 'data') {
+          result[id] = `.stackedit-data/${id}.json`;
+        } else if (item.type === 'file') {
+          result[id] = `${itemPaths[id]}.md`;
+        } else if (item.type === 'content') {
+          const [fileId] = id.split('/');
+          result[id] = `/${itemPaths[fileId]}.md`;
+        } else if (item.type === 'folder') {
+          result[id] = itemPaths[id];
+        } else if (item.type === 'syncLocation' || item.type === 'publishLocation') {
+          // locations are stored as paths
+          const encodedItem = utils.encodeBase64(utils.serializeObject({
+            ...item,
+            id: undefined,
+            type: undefined,
+            fileId: undefined,
+          }), true);
+          const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
+          result[id] = `${itemPaths[item.fileId]}.${encodedItem}.${extension}`;
+        }
+      });
+      return result;
+    },
+    gitPathItems: (state, { allItemMap, itemGitPaths }) => {
+      const result = {};
+      Object.entries(itemGitPaths).forEach(([id, path]) => {
+        const items = result[path] || [];
+        items.push(allItemMap[id]);
+        result[path] = items;
+      });
+      return result;
+    },
     isSponsor: ({ light, monetizeSponsor }, getters) => {
       const sponsorToken = getters['workspace/sponsorToken'];
       return light || monetizeSponsor || (sponsorToken && sponsorToken.isSponsor);
diff --git a/src/store/modal.js b/src/store/modal.js
index 5ec3ba32..632717d0 100644
--- a/src/store/modal.js
+++ b/src/store/modal.js
@@ -36,100 +36,5 @@ export default {
         commit('setHidden', false);
       }
     },
-    folderDeletion: ({ dispatch }, item) => dispatch('open', {
-      content: `<p>You are about to delete the folder <b>${item.name}</b>. Its files will be moved to Trash. Are you sure?</p>`,
-      resolveText: 'Yes, delete',
-      rejectText: 'No',
-    }),
-    tempFileDeletion: ({ dispatch }, item) => dispatch('open', {
-      content: `<p>You are about to permanently delete the temporary file <b>${item.name}</b>. Are you sure?</p>`,
-      resolveText: 'Yes, delete',
-      rejectText: 'No',
-    }),
-    tempFolderDeletion: ({ dispatch }) => dispatch('open', {
-      content: '<p>You are about to permanently delete all the temporary files. Are you sure?</p>',
-      resolveText: 'Yes, delete all',
-      rejectText: 'No',
-    }),
-    discussionDeletion: ({ dispatch }) => dispatch('open', {
-      content: '<p>You are about to delete a discussion. Are you sure?</p>',
-      resolveText: 'Yes, delete',
-      rejectText: 'No',
-    }),
-    commentDeletion: ({ dispatch }) => dispatch('open', {
-      content: '<p>You are about to delete a comment. Are you sure?</p>',
-      resolveText: 'Yes, delete',
-      rejectText: 'No',
-    }),
-    trashDeletion: ({ dispatch }) => dispatch('open', {
-      content: '<p>Files in the trash are automatically deleted after 7 days of inactivity.</p>',
-      rejectText: 'Ok',
-    }),
-    fileRestoration: ({ dispatch }) => dispatch('open', {
-      content: '<p>You are about to revert some changes. Are you sure?</p>',
-      resolveText: 'Yes, revert',
-      rejectText: 'No',
-    }),
-    unauthorizedName: ({ dispatch }, name) => dispatch('open', {
-      content: `<p><b>${name}</b> is not an authorized name.</p>`,
-      rejectText: 'Ok',
-    }),
-    stripName: ({ dispatch }, name) => dispatch('open', {
-      content: `<p><b>${name}</b> contains illegal characters. Do you want to strip them?</p>`,
-      resolveText: 'Yes, strip',
-      rejectText: 'No',
-    }),
-    pathConflict: ({ dispatch }, name) => dispatch('open', {
-      content: `<p><b>${name}</b> already exists. Do you want to add a suffix?</p>`,
-      resolveText: 'Yes, add suffix',
-      rejectText: 'No',
-    }),
-    removeWorkspace: ({ dispatch }) => dispatch('open', {
-      content: '<p>You are about to remove a workspace locally. Are you sure?</p>',
-      resolveText: 'Yes, remove',
-      rejectText: 'No',
-    }),
-    reset: ({ dispatch }) => dispatch('open', {
-      content: '<p>This will clean all your workspaces locally. Are you sure?</p>',
-      resolveText: 'Yes, clean',
-      rejectText: 'No',
-    }),
-    providerRedirection: ({ dispatch }, { providerName }) => dispatch('open', {
-      content: `<p>You are about to navigate to the <b>${providerName}</b> authorization page.</p>`,
-      resolveText: 'Ok, go on',
-      rejectText: 'Cancel',
-    }),
-    workspaceGoogleRedirection: ({ dispatch }) => dispatch('open', {
-      content: '<p>StackEdit needs full Google Drive access to open this workspace.</p>',
-      resolveText: 'Ok, grant',
-      rejectText: 'Cancel',
-    }),
-    signInForSponsorship: ({ dispatch }) => dispatch('open', {
-      type: 'signInForSponsorship',
-      content: `<p>You have to sign in with Google to sponsor.</p>
-      <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
-      resolveText: 'Ok, sign in',
-      rejectText: 'Cancel',
-    }),
-    signInForComment: ({ dispatch }) => dispatch('open', {
-      content: `<p>You have to sign in with Google to start commenting.</p>
-      <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
-      resolveText: 'Ok, sign in',
-      rejectText: 'Cancel',
-    }),
-    signInForHistory: ({ dispatch }) => dispatch('open', {
-      content: `<p>You have to sign in with Google to enable revision history.</p>
-      <div class="modal__info"><b>Note:</b> This will sync your main workspace.</div>`,
-      resolveText: 'Ok, sign in',
-      rejectText: 'Cancel',
-    }),
-    sponsorOnly: ({ dispatch }) => dispatch('open', {
-      content: '<p>This feature is restricted to sponsors as it relies on server resources.</p>',
-      rejectText: 'Ok, I understand',
-    }),
-    paymentSuccess: ({ dispatch }) => dispatch('open', {
-      content: '<p>Thank you for your payment! Your sponsorship will be active in a minute.</p>',
-      rejectText: 'Ok',
-    }),
   },
 };
diff --git a/src/store/notification.js b/src/store/notification.js
index e2fa1537..b69e3999 100644
--- a/src/store/notification.js
+++ b/src/store/notification.js
@@ -1,4 +1,4 @@
-const itemTimeout = 5000;
+const defaultTimeout = 5000;
 
 export default {
   namespaced: true,
@@ -14,8 +14,10 @@ export default {
     showItem({ state, commit }, item) {
       if (state.items.every(other => other.type !== item.type || other.content !== item.content)) {
         commit('setItems', [...state.items, item]);
-        setTimeout(() =>
-          commit('setItems', state.items.filter(otherItem => otherItem !== item)), itemTimeout);
+        setTimeout(
+          () => commit('setItems', state.items.filter(otherItem => otherItem !== item)),
+          item.timeout || defaultTimeout,
+        );
       }
     },
     info({ dispatch }, info) {
@@ -25,9 +27,7 @@ export default {
       });
     },
     error({ dispatch, rootState }, error) {
-      const item = {
-        type: 'error',
-      };
+      const item = { type: 'error' };
       if (error) {
         if (error.message) {
           item.content = error.message;
diff --git a/static/landing/index.html b/static/landing/index.html
index 6b0fa372..8eda4c35 100644
--- a/static/landing/index.html
+++ b/static/landing/index.html
@@ -15,6 +15,10 @@
     <meta name="google-site-verification" content="iWDn0T2r2_bDQWp_nW23MGePbO9X0M8wQSzbOU70pFQ" />
     <link rel="stylesheet" href="https://stackedit.io/style.css">
     <style>
+        body {
+            background-color: #fbfbfb;
+        }
+
         * {
             box-sizing: border-box;
         }
@@ -244,7 +248,14 @@
         .image {
             display: block;
             margin: 1em auto;
+            border: 2px solid #f3f3f3;
             border-radius: 2px;
+            background-color: #fff;
+        }
+
+        .image img {
+            display: block;
+            margin: 0.5em auto;
         }
     </style>
     <script>
@@ -295,7 +306,9 @@
                     </div>
                 </div>
                 <div class="column">
-                    <img class="image" width="230" src="static/landing/syntax-highlighting.gif">
+                    <div class="image" style="width: 260px">
+                        <img width="230" src="static/landing/syntax-highlighting.gif">
+                    </div>
                 </div>
             </div>
             <div class="row">
@@ -339,7 +352,7 @@
                 <div class="column">
                     <div class="feature">
                         <h3>Collaborate</h3>
-                        <p>With StackEdit, you can share collaborative workspaces, thanks to the Google Drive synchronization mechanism. If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.</p>
+                        <p>With StackEdit, you can share collaborative workspaces, thanks to the synchronization mechanism. If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.</p>
                     </div>
                     <img class="image" width="300" src="static/landing/workspace.png">
                 </div>
@@ -361,7 +374,9 @@
             <div class="row">
                 <div class="column">
                     <br>
-                    <img class="image" width="230" src="static/landing/gfm.png">
+                    <div class="image" style="width: 250px">
+                        <img width="230" src="static/landing/gfm.png">
+                    </div>
                 </div>
                 <div class="column">
                     <div class="feature">
@@ -373,7 +388,9 @@
             <div class="row">
                 <div class="column">
                     <br>
-                    <img class="image" width="250" src="static/landing/katex.gif">
+                    <div class="image" style="width: 270px">
+                        <img width="250" src="static/landing/katex.gif">
+                    </div>
                 </div>
                 <div class="column">
                     <div class="feature">
@@ -384,7 +401,9 @@
             </div>
             <div class="row">
                 <div class="column">
-                    <img class="image" width="280" src="static/landing/mermaid.gif">
+                    <div class="image" style="width: 300px">
+                        <img width="280" src="static/landing/mermaid.gif">
+                    </div>
                 </div>
                 <div class="column">
                     <div class="feature">
diff --git a/test/unit/.eslintrc b/test/unit/.eslintrc
new file mode 100644
index 00000000..9213c3ff
--- /dev/null
+++ b/test/unit/.eslintrc
@@ -0,0 +1,8 @@
+{
+  "env": {
+    "jest": true
+  },
+  "extends": [
+    "../../.eslintrc.js"
+  ]
+}
diff --git a/test/unit/jest.conf.js b/test/unit/jest.conf.js
new file mode 100644
index 00000000..a73d98d1
--- /dev/null
+++ b/test/unit/jest.conf.js
@@ -0,0 +1,35 @@
+const path = require('path');
+
+module.exports = {
+  rootDir: path.resolve(__dirname, '../../'),
+  moduleFileExtensions: [
+    'js',
+    'json',
+    'vue',
+  ],
+  moduleNameMapper: {
+    '\\.(css|scss)$': 'identity-obj-proxy',
+    '^!raw-loader!': 'identity-obj-proxy',
+    '^worker-loader!\\./templateWorker\\.js$': '<rootDir>/test/unit/mocks/templateWorkerMock',
+  },
+  transform: {
+    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
+    '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest',
+    '.*\\.(yml|html|md)$': 'jest-raw-loader',
+  },
+  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
+  setupFiles: [
+    '<rootDir>/test/unit/setup',
+  ],
+  coverageDirectory: '<rootDir>/test/unit/coverage',
+  collectCoverageFrom: [
+    'src/**/*.{js,vue}',
+    '!src/main.js',
+    '!**/node_modules/**',
+  ],
+  globals: {
+    GOOGLE_CLIENT_ID: 'GOOGLE_CLIENT_ID',
+    GITHUB_CLIENT_ID: 'GITHUB_CLIENT_ID',
+    NODE_ENV: 'production',
+  },
+};
diff --git a/test/unit/mocks/cryptoMock.js b/test/unit/mocks/cryptoMock.js
new file mode 100644
index 00000000..c4d8a925
--- /dev/null
+++ b/test/unit/mocks/cryptoMock.js
@@ -0,0 +1,7 @@
+window.crypto = {
+  getRandomValues(array) {
+    for (let i = 0; i < array.length; i += 1) {
+      array[i] = Math.floor(Math.random() * 1000000);
+    }
+  },
+};
diff --git a/test/unit/mocks/localStorageMock.js b/test/unit/mocks/localStorageMock.js
new file mode 100644
index 00000000..4247a6e0
--- /dev/null
+++ b/test/unit/mocks/localStorageMock.js
@@ -0,0 +1,9 @@
+const store = {};
+window.localStorage = {
+  getItem(key) {
+    return store[key] || null;
+  },
+  setItem(key, value) {
+    store[key] = value.toString();
+  },
+};
diff --git a/test/unit/mocks/mutationObserverMock.js b/test/unit/mocks/mutationObserverMock.js
new file mode 100644
index 00000000..6d55983f
--- /dev/null
+++ b/test/unit/mocks/mutationObserverMock.js
@@ -0,0 +1,6 @@
+/* eslint-disable class-methods-use-this */
+class MutationObserver {
+  observe() {
+  }
+}
+window.MutationObserver = MutationObserver;
diff --git a/test/unit/mocks/templateWorkerMock.js b/test/unit/mocks/templateWorkerMock.js
new file mode 100644
index 00000000..86059f36
--- /dev/null
+++ b/test/unit/mocks/templateWorkerMock.js
@@ -0,0 +1 @@
+module.exports = 'test-file-stub';
diff --git a/test/unit/setup.js b/test/unit/setup.js
new file mode 100644
index 00000000..b25a35e2
--- /dev/null
+++ b/test/unit/setup.js
@@ -0,0 +1,5 @@
+import Vue from 'vue';
+import './mocks/cryptoMock';
+import './mocks/mutationObserverMock';
+
+Vue.config.productionTip = false;
diff --git a/test/unit/specs/components/ButtonBar.spec.js b/test/unit/specs/components/ButtonBar.spec.js
new file mode 100644
index 00000000..5c9bf60c
--- /dev/null
+++ b/test/unit/specs/components/ButtonBar.spec.js
@@ -0,0 +1,41 @@
+import ButtonBar from '../../../../src/components/ButtonBar';
+import store from '../../../../src/store';
+import specUtils from '../specUtils';
+
+describe('ButtonBar.vue', () => {
+  it('should toggle the navigation bar', () => specUtils.checkToggler(
+    ButtonBar,
+    wrapper => wrapper.find('.button-bar__button--navigation-bar-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].showNavigationBar,
+  ));
+
+  it('should toggle the side preview', () => specUtils.checkToggler(
+    ButtonBar,
+    wrapper => wrapper.find('.button-bar__button--side-preview-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].showSidePreview,
+  ));
+
+  it('should toggle the editor', () => specUtils.checkToggler(
+    ButtonBar,
+    wrapper => wrapper.find('.button-bar__button--editor-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].showEditor,
+  ));
+
+  it('should toggle the focus mode', () => specUtils.checkToggler(
+    ButtonBar,
+    wrapper => wrapper.find('.button-bar__button--focus-mode-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].focusMode,
+  ));
+
+  it('should toggle the scroll sync', () => specUtils.checkToggler(
+    ButtonBar,
+    wrapper => wrapper.find('.button-bar__button--scroll-sync-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].scrollSync,
+  ));
+
+  it('should toggle the status bar', () => specUtils.checkToggler(
+    ButtonBar,
+    wrapper => wrapper.find('.button-bar__button--status-bar-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].showStatusBar,
+  ));
+});
diff --git a/test/unit/specs/components/ContextMenu.spec.js b/test/unit/specs/components/ContextMenu.spec.js
new file mode 100644
index 00000000..982e19e1
--- /dev/null
+++ b/test/unit/specs/components/ContextMenu.spec.js
@@ -0,0 +1,32 @@
+import { shallowMount } from '@vue/test-utils';
+import ContextMenu from '../../../../src/components/ContextMenu';
+import store from '../../../../src/store';
+import '../specUtils';
+
+const mount = () => shallowMount(ContextMenu, { store });
+
+describe('ContextMenu.vue', () => {
+  const name = 'Name';
+  const makeOptions = () => ({
+    coordinates: {
+      left: 0,
+      top: 0,
+    },
+    items: [{ name }],
+  });
+
+  it('should open/close itself', async () => {
+    const wrapper = mount();
+    expect(wrapper.contains('.context-menu__item')).toEqual(false);
+    setTimeout(() => wrapper.find('.context-menu__item').trigger('click'), 1);
+    const item = await store.dispatch('contextMenu/open', makeOptions());
+    expect(item.name).toEqual(name);
+  });
+
+  it('should cancel itself', async () => {
+    const wrapper = mount();
+    setTimeout(() => wrapper.trigger('click'), 1);
+    const item = await store.dispatch('contextMenu/open', makeOptions());
+    expect(item).toEqual(null);
+  });
+});
diff --git a/test/unit/specs/components/Explorer.spec.js b/test/unit/specs/components/Explorer.spec.js
new file mode 100644
index 00000000..2b1fa82f
--- /dev/null
+++ b/test/unit/specs/components/Explorer.spec.js
@@ -0,0 +1,186 @@
+import { shallowMount } from '@vue/test-utils';
+import Explorer from '../../../../src/components/Explorer';
+import store from '../../../../src/store';
+import fileSvc from '../../../../src/services/fileSvc';
+import specUtils from '../specUtils';
+
+const mount = () => shallowMount(Explorer, { store });
+const select = (id) => {
+  store.commit('explorer/setSelectedId', id);
+  expect(store.getters['explorer/selectedNode'].item.id).toEqual(id);
+};
+const ensureExists = file => expect(store.getters.allItemMap).toHaveProperty(file.id);
+const ensureNotExists = file => expect(store.getters.allItemMap).not.toHaveProperty(file.id);
+
+describe('Explorer.vue', () => {
+  it('should create new files in the root folder', () => {
+    expect(store.state.explorer.newChildNode.isNil).toBeTruthy();
+    const wrapper = mount();
+    wrapper.find('.side-title__button--new-file').trigger('click');
+    expect(store.state.explorer.newChildNode.isNil).toBeFalsy();
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'file',
+      parentId: null,
+    });
+  });
+
+  it('should create new files in a folder', async () => {
+    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const wrapper = mount();
+    select(folder.id);
+    wrapper.find('.side-title__button--new-file').trigger('click');
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'file',
+      parentId: folder.id,
+    });
+  });
+
+  it('should not create new files in the trash folder', () => {
+    const wrapper = mount();
+    select('trash');
+    wrapper.find('.side-title__button--new-file').trigger('click');
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'file',
+      parentId: null,
+    });
+  });
+
+  it('should create new folders in the root folder', () => {
+    expect(store.state.explorer.newChildNode.isNil).toBeTruthy();
+    const wrapper = mount();
+    wrapper.find('.side-title__button--new-folder').trigger('click');
+    expect(store.state.explorer.newChildNode.isNil).toBeFalsy();
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'folder',
+      parentId: null,
+    });
+  });
+
+  it('should create new folders in a folder', async () => {
+    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const wrapper = mount();
+    select(folder.id);
+    wrapper.find('.side-title__button--new-folder').trigger('click');
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'folder',
+      parentId: folder.id,
+    });
+  });
+
+  it('should not create new folders in the trash folder', () => {
+    const wrapper = mount();
+    select('trash');
+    wrapper.find('.side-title__button--new-folder').trigger('click');
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'folder',
+      parentId: null,
+    });
+  });
+
+  it('should not create new folders in the temp folder', () => {
+    const wrapper = mount();
+    select('temp');
+    wrapper.find('.side-title__button--new-folder').trigger('click');
+    expect(store.state.explorer.newChildNode.item).toMatchObject({
+      type: 'folder',
+      parentId: null,
+    });
+  });
+
+  it('should move file to the trash folder on delete', async () => {
+    const file = await fileSvc.createFile({}, true);
+    expect(file.parentId).toEqual(null);
+    const wrapper = mount();
+    select(file.id);
+    wrapper.find('.side-title__button--delete').trigger('click');
+    ensureExists(file);
+    expect(file.parentId).toEqual('trash');
+  });
+
+  it('should not delete the trash folder', async () => {
+    const wrapper = mount();
+    select('trash');
+    wrapper.find('.side-title__button--delete').trigger('click');
+    await specUtils.resolveModal('trashDeletion');
+  });
+
+  it('should not delete files in the trash folder', async () => {
+    const file = await fileSvc.createFile({ parentId: 'trash' }, true);
+    const wrapper = mount();
+    select(file.id);
+    wrapper.find('.side-title__button--delete').trigger('click');
+    await specUtils.resolveModal('trashDeletion');
+    ensureExists(file);
+  });
+
+  it('should delete the temp folder after confirmation', async () => {
+    const file = await fileSvc.createFile({ parentId: 'temp' }, true);
+    const wrapper = mount();
+    select('temp');
+    wrapper.find('.side-title__button--delete').trigger('click');
+    await specUtils.resolveModal('tempFolderDeletion');
+    ensureNotExists(file);
+  });
+
+  it('should delete temp files after confirmation', async () => {
+    const file = await fileSvc.createFile({ parentId: 'temp' }, true);
+    const wrapper = mount();
+    select(file.id);
+    wrapper.find('.side-title__button--delete').trigger('click');
+    ensureExists(file);
+    await specUtils.resolveModal('tempFileDeletion');
+    ensureNotExists(file);
+  });
+
+  it('should delete folder after confirmation', async () => {
+    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const file = await fileSvc.createFile({ parentId: folder.id }, true);
+    const wrapper = mount();
+    select(folder.id);
+    wrapper.find('.side-title__button--delete').trigger('click');
+    await specUtils.resolveModal('folderDeletion');
+    ensureNotExists(folder);
+    // Make sure file has been moved to Trash
+    ensureExists(file);
+    expect(file.parentId).toEqual('trash');
+  });
+
+  it('should rename files', async () => {
+    const file = await fileSvc.createFile({}, true);
+    const wrapper = mount();
+    select(file.id);
+    wrapper.find('.side-title__button--rename').trigger('click');
+    expect(store.getters['explorer/editingNode'].item.id).toEqual(file.id);
+  });
+
+  it('should rename folders', async () => {
+    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const wrapper = mount();
+    select(folder.id);
+    wrapper.find('.side-title__button--rename').trigger('click');
+    expect(store.getters['explorer/editingNode'].item.id).toEqual(folder.id);
+  });
+
+  it('should not rename the trash folder', async () => {
+    const wrapper = mount();
+    select('trash');
+    wrapper.find('.side-title__button--rename').trigger('click');
+    expect(store.getters['explorer/editingNode'].isNil).toBeTruthy();
+  });
+
+  it('should not rename the temp folder', async () => {
+    const wrapper = mount();
+    select('temp');
+    wrapper.find('.side-title__button--rename').trigger('click');
+    expect(store.getters['explorer/editingNode'].isNil).toBeTruthy();
+  });
+
+  it('should close itself', async () => {
+    store.dispatch('data/toggleExplorer', true);
+    specUtils.checkToggler(
+      Explorer,
+      wrapper => wrapper.find('.side-title__button--close').trigger('click'),
+      () => store.getters['data/layoutSettings'].showExplorer,
+    );
+  });
+});
diff --git a/test/unit/specs/components/ExplorerNode.spec.js b/test/unit/specs/components/ExplorerNode.spec.js
new file mode 100644
index 00000000..2acb7c67
--- /dev/null
+++ b/test/unit/specs/components/ExplorerNode.spec.js
@@ -0,0 +1,273 @@
+import { shallowMount } from '@vue/test-utils';
+import ExplorerNode from '../../../../src/components/ExplorerNode';
+import store from '../../../../src/store';
+import fileSvc from '../../../../src/services/fileSvc';
+import explorerSvc from '../../../../src/services/explorerSvc';
+import specUtils from '../specUtils';
+
+const makeFileNode = async () => {
+  const file = await fileSvc.createFile({}, true);
+  const node = store.getters['explorer/nodeMap'][file.id];
+  expect(node.item.id).toEqual(file.id);
+  return node;
+};
+
+const makeFolderNode = async () => {
+  const folder = await fileSvc.storeItem({ type: 'folder' });
+  const node = store.getters['explorer/nodeMap'][folder.id];
+  expect(node.item.id).toEqual(folder.id);
+  return node;
+};
+
+const mount = node => shallowMount(ExplorerNode, {
+  store,
+  propsData: { node, depth: 1 },
+});
+const mountAndSelect = (node) => {
+  const wrapper = mount(node);
+  wrapper.find('.explorer-node__item').trigger('click');
+  expect(store.getters['explorer/selectedNode'].item.id).toEqual(node.item.id);
+  expect(wrapper.classes()).toContain('explorer-node--selected');
+  return wrapper;
+};
+
+const dragAndDrop = (sourceItem, targetItem) => {
+  const sourceNode = store.getters['explorer/nodeMap'][sourceItem.id];
+  mountAndSelect(sourceNode).find('.explorer-node__item').trigger('dragstart', {
+    dataTransfer: { setData: () => {} },
+  });
+  expect(store.state.explorer.dragSourceId).toEqual(sourceItem.id);
+  const targetNode = store.getters['explorer/nodeMap'][targetItem.id];
+  const wrapper = mount(targetNode);
+  wrapper.trigger('dragenter');
+  expect(store.state.explorer.dragTargetId).toEqual(targetItem.id);
+  wrapper.trigger('drop');
+  const expectedParentId = targetItem.type === 'file' ? targetItem.parentId : targetItem.id;
+  expect(store.getters['explorer/selectedNode'].item.parentId).toEqual(expectedParentId);
+};
+
+describe('ExplorerNode.vue', () => {
+  const modifiedName = 'Name';
+
+  it('should open files on select after a timeout', async () => {
+    const node = await makeFileNode();
+    mountAndSelect(node);
+    expect(store.getters['file/current'].id).not.toEqual(node.item.id);
+    await new Promise(resolve => setTimeout(resolve, 10));
+    expect(store.getters['file/current'].id).toEqual(node.item.id);
+  });
+
+  it('should open folders on select after a timeout', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mountAndSelect(node);
+    expect(wrapper.classes()).not.toContain('explorer-node--open');
+    await new Promise(resolve => setTimeout(resolve, 10));
+    expect(wrapper.classes()).toContain('explorer-node--open');
+  });
+
+  it('should open folders on new child', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mountAndSelect(node);
+    // Close the folder
+    wrapper.find('.explorer-node__item').trigger('click');
+    await new Promise(resolve => setTimeout(resolve, 10));
+    expect(wrapper.classes()).not.toContain('explorer-node--open');
+    explorerSvc.newItem();
+    expect(wrapper.classes()).toContain('explorer-node--open');
+  });
+
+  it('should create new files in a folder', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('New file');
+    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(true);
+    store.commit('explorer/setNewItemName', modifiedName);
+    wrapper.find('.explorer-node__new-child--file .text-input').trigger('blur');
+    await new Promise(resolve => setTimeout(resolve, 1));
+    expect(store.getters['explorer/selectedNode'].item).toMatchObject({
+      name: modifiedName,
+      type: 'file',
+      parentId: node.item.id,
+    });
+    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(false);
+  });
+
+  it('should cancel a file creation on escape', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('New file');
+    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(true);
+    store.commit('explorer/setNewItemName', modifiedName);
+    wrapper.find('.explorer-node__new-child--file .text-input').trigger('keydown', {
+      keyCode: 27,
+    });
+    await new Promise(resolve => setTimeout(resolve, 1));
+    expect(store.getters['explorer/selectedNode'].item).not.toMatchObject({
+      name: 'modifiedName',
+      type: 'file',
+      parentId: node.item.id,
+    });
+    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(false);
+  });
+
+  it('should not create new files in a file', async () => {
+    const node = await makeFileNode();
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('New file').disabled).toBe(true);
+  });
+
+  it('should not create new files in the trash folder', async () => {
+    const node = store.getters['explorer/nodeMap'].trash;
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('New file').disabled).toBe(true);
+  });
+
+  it('should create new folder in folder', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('New folder');
+    expect(wrapper.contains('.explorer-node__new-child--folder')).toBe(true);
+    store.commit('explorer/setNewItemName', modifiedName);
+    wrapper.find('.explorer-node__new-child--folder .text-input').trigger('blur');
+    await new Promise(resolve => setTimeout(resolve, 1));
+    expect(store.getters['explorer/selectedNode'].item).toMatchObject({
+      name: modifiedName,
+      type: 'folder',
+      parentId: node.item.id,
+    });
+    expect(wrapper.contains('.explorer-node__new-child--folder')).toBe(false);
+  });
+
+  it('should cancel a folder creation on escape', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('New folder');
+    expect(wrapper.contains('.explorer-node__new-child--folder')).toBe(true);
+    store.commit('explorer/setNewItemName', modifiedName);
+    wrapper.find('.explorer-node__new-child--folder .text-input').trigger('keydown', {
+      keyCode: 27,
+    });
+    await new Promise(resolve => setTimeout(resolve, 1));
+    expect(store.getters['explorer/selectedNode'].item).not.toMatchObject({
+      name: modifiedName,
+      type: 'folder',
+      parentId: node.item.id,
+    });
+    expect(wrapper.contains('.explorer-node__new-child--folder')).toBe(false);
+  });
+
+  it('should not create new folders in a file', async () => {
+    const node = await makeFileNode();
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('New folder').disabled).toBe(true);
+  });
+
+  it('should not create new folders in the trash folder', async () => {
+    const node = store.getters['explorer/nodeMap'].trash;
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('New folder').disabled).toBe(true);
+  });
+
+  it('should not create new folders in the temp folder', async () => {
+    const node = store.getters['explorer/nodeMap'].temp;
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('New folder').disabled).toBe(true);
+  });
+
+  it('should rename files', async () => {
+    const node = await makeFileNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('Rename');
+    expect(wrapper.contains('.explorer-node__item-editor')).toBe(true);
+    wrapper.setData({ editingValue: modifiedName });
+    wrapper.find('.explorer-node__item-editor .text-input').trigger('blur');
+    expect(store.getters['explorer/selectedNode'].item.name).toEqual(modifiedName);
+  });
+
+  it('should rename folders', async () => {
+    const node = await makeFolderNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('Rename');
+    expect(wrapper.contains('.explorer-node__item-editor')).toBe(true);
+    wrapper.setData({ editingValue: modifiedName });
+    wrapper.find('.explorer-node__item-editor .text-input').trigger('blur');
+    expect(store.getters['explorer/selectedNode'].item.name).toEqual(modifiedName);
+  });
+
+  it('should cancel rename on escape', async () => {
+    const node = await makeFileNode();
+    const wrapper = mount(node);
+    wrapper.trigger('contextmenu');
+    await specUtils.resolveContextMenu('Rename');
+    expect(wrapper.contains('.explorer-node__item-editor')).toBe(true);
+    wrapper.setData({ editingValue: modifiedName });
+    wrapper.find('.explorer-node__item-editor .text-input').trigger('keydown', {
+      keyCode: 27,
+    });
+    expect(store.getters['explorer/selectedNode'].item.name).not.toEqual(modifiedName);
+  });
+
+  it('should not rename the trash folder', async () => {
+    const node = store.getters['explorer/nodeMap'].trash;
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('Rename').disabled).toBe(true);
+  });
+
+  it('should not rename the temp folder', async () => {
+    const node = store.getters['explorer/nodeMap'].temp;
+    mount(node).trigger('contextmenu');
+    expect(specUtils.getContextMenuItem('Rename').disabled).toBe(true);
+  });
+
+  it('should move a file into a folder', async () => {
+    const sourceItem = await fileSvc.createFile({}, true);
+    const targetItem = await fileSvc.storeItem({ type: 'folder' });
+    dragAndDrop(sourceItem, targetItem);
+  });
+
+  it('should move a folder into a folder', async () => {
+    const sourceItem = await fileSvc.storeItem({ type: 'folder' });
+    const targetItem = await fileSvc.storeItem({ type: 'folder' });
+    dragAndDrop(sourceItem, targetItem);
+  });
+
+  it('should move a file into a file parent folder', async () => {
+    const targetItem = await fileSvc.storeItem({ type: 'folder' });
+    const file = await fileSvc.createFile({ parentId: targetItem.id }, true);
+    const sourceItem = await fileSvc.createFile({}, true);
+    dragAndDrop(sourceItem, file);
+  });
+
+  it('should not move the trash folder', async () => {
+    const sourceNode = store.getters['explorer/nodeMap'].trash;
+    mountAndSelect(sourceNode).find('.explorer-node__item').trigger('dragstart');
+    expect(store.state.explorer.dragSourceId).not.toEqual('trash');
+  });
+
+  it('should not move the temp folder', async () => {
+    const sourceNode = store.getters['explorer/nodeMap'].temp;
+    mountAndSelect(sourceNode).find('.explorer-node__item').trigger('dragstart');
+    expect(store.state.explorer.dragSourceId).not.toEqual('temp');
+  });
+
+  it('should not move a file to the temp folder', async () => {
+    const targetNode = store.getters['explorer/nodeMap'].temp;
+    const wrapper = mount(targetNode);
+    wrapper.trigger('dragenter');
+    expect(store.state.explorer.dragTargetId).not.toEqual('temp');
+  });
+
+  it('should not move a file to a file in the temp folder', async () => {
+    const file = await fileSvc.createFile({ parentId: 'temp' }, true);
+    const targetNode = store.getters['explorer/nodeMap'][file.id];
+    const wrapper = mount(targetNode);
+    wrapper.trigger('dragenter');
+    expect(store.state.explorer.dragTargetId).not.toEqual(file.id);
+  });
+});
diff --git a/test/unit/specs/components/NavigationBar.spec.js b/test/unit/specs/components/NavigationBar.spec.js
new file mode 100644
index 00000000..94c2216a
--- /dev/null
+++ b/test/unit/specs/components/NavigationBar.spec.js
@@ -0,0 +1,17 @@
+import NavigationBar from '../../../../src/components/NavigationBar';
+import store from '../../../../src/store';
+import specUtils from '../specUtils';
+
+describe('NavigationBar.vue', () => {
+  it('should toggle the explorer', () => specUtils.checkToggler(
+    NavigationBar,
+    wrapper => wrapper.find('.navigation-bar__button--explorer-toggler').trigger('click'),
+    () => store.getters['data/layoutSettings'].showExplorer,
+  ));
+
+  it('should toggle the side bar', () => specUtils.checkToggler(
+    NavigationBar,
+    wrapper => wrapper.find('.navigation-bar__button--stackedit').trigger('click'),
+    () => store.getters['data/layoutSettings'].showSideBar,
+  ));
+});
diff --git a/test/unit/specs/components/Notification.spec.js b/test/unit/specs/components/Notification.spec.js
new file mode 100644
index 00000000..4ac3cf33
--- /dev/null
+++ b/test/unit/specs/components/Notification.spec.js
@@ -0,0 +1,38 @@
+import { shallowMount } from '@vue/test-utils';
+import Notification from '../../../../src/components/Notification';
+import store from '../../../../src/store';
+import '../specUtils';
+
+const mount = () => shallowMount(Notification, { store });
+
+describe('Notification.vue', () => {
+  it('should autoclose itself', async () => {
+    const wrapper = mount();
+    expect(wrapper.contains('.notification__item')).toBe(false);
+    store.dispatch('notification/showItem', {
+      type: 'info',
+      content: 'Test',
+      timeout: 10,
+    });
+    expect(wrapper.contains('.notification__item')).toBe(true);
+    await new Promise(resolve => setTimeout(resolve, 10));
+    expect(wrapper.contains('.notification__item')).toBe(false);
+  });
+
+  it('should show messages from top to bottom', async () => {
+    const wrapper = mount();
+    store.dispatch('notification/info', 'Test 1');
+    store.dispatch('notification/info', 'Test 2');
+    const items = wrapper.findAll('.notification__item');
+    expect(items.length).toEqual(2);
+    expect(items.at(0).text()).toMatch(/Test 1/);
+    expect(items.at(1).text()).toMatch(/Test 2/);
+  });
+
+  it('should not open the same message twice', async () => {
+    const wrapper = mount();
+    store.dispatch('notification/info', 'Test');
+    store.dispatch('notification/info', 'Test');
+    expect(wrapper.findAll('.notification__item').length).toEqual(1);
+  });
+});
diff --git a/test/unit/specs/specUtils.js b/test/unit/specs/specUtils.js
new file mode 100644
index 00000000..d4e315b9
--- /dev/null
+++ b/test/unit/specs/specUtils.js
@@ -0,0 +1,51 @@
+import { shallowMount } from '@vue/test-utils';
+import store from '../../../src/store';
+import utils from '../../../src/services/utils';
+import '../../../src/icons';
+import '../../../src/components/common/globals';
+
+const clone = object => JSON.parse(JSON.stringify(object));
+
+const deepAssign = (target, origin) => {
+  Object.entries(origin).forEach(([key, value]) => {
+    const type = Object.prototype.toString.call(value);
+    if (type === '[object Object]' && Object.keys(value).length) {
+      deepAssign(target[key], value);
+    } else {
+      target[key] = value;
+    }
+  });
+};
+
+const freshState = clone(store.state);
+
+beforeEach(() => {
+  // Restore store state before each test
+  deepAssign(store.state, clone(freshState));
+});
+
+export default {
+  checkToggler(Component, toggler, checker) {
+    const wrapper = shallowMount(Component, { store });
+    const valueBefore = checker();
+    toggler(wrapper);
+    const valueAfter = checker();
+    expect(valueAfter).toEqual(!valueBefore);
+  },
+  async resolveModal(type) {
+    const config = store.getters['modal/config'];
+    expect(config).toBeTruthy();
+    expect(config.type).toEqual(type);
+    config.resolve();
+    await new Promise(resolve => setTimeout(resolve, 1));
+  },
+  getContextMenuItem(name) {
+    return utils.someResult(store.state.contextMenu.items, item => item.name === name && item);
+  },
+  async resolveContextMenu(name) {
+    const item = this.getContextMenuItem(name);
+    expect(item).toBeTruthy();
+    store.state.contextMenu.resolve(item);
+    await new Promise(resolve => setTimeout(resolve, 1));
+  }
+};

From 7a87015af15fc63e094766f795983175e87a3727 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Thu, 21 Jun 2018 20:16:33 +0100
Subject: [PATCH 07/19] store renamings

---
 src/components/ExplorerNode.vue               |  26 +-
 src/components/Modal.vue                      |  16 +-
 src/components/UserImage.vue                  |   2 +-
 src/components/UserName.vue                   |   2 +-
 src/components/menus/MoreMenu.vue             |   2 +-
 src/components/menus/PublishMenu.vue          |  12 +-
 src/components/menus/SyncMenu.vue             |   6 +-
 src/components/menus/WorkspacesMenu.vue       |   4 +-
 src/components/modals/HtmlExportModal.vue     |   6 +-
 src/components/modals/ImageModal.vue          |   2 +-
 src/components/modals/PdfExportModal.vue      |   4 +-
 src/components/modals/TemplatesModal.vue      |   6 +-
 .../modals/WorkspaceManagementModal.vue       |  12 +-
 src/components/modals/common/ModalInner.vue   |  10 +-
 src/components/modals/common/modalTemplate.js |  14 +-
 .../providers/BloggerPagePublishModal.vue     |   2 +-
 .../modals/providers/BloggerPublishModal.vue  |   2 +-
 .../providers/CouchdbCredentialsModal.vue     |   2 +-
 .../modals/providers/DropboxPublishModal.vue  |   2 +-
 .../modals/providers/GistPublishModal.vue     |   2 +-
 .../modals/providers/GithubAccountModal.vue   |   2 +-
 .../modals/providers/GithubPublishModal.vue   |   2 +-
 .../providers/GoogleDrivePublishModal.vue     |   2 +-
 .../providers/WordpressPublishModal.vue       |   2 +-
 .../modals/providers/ZendeskPublishModal.vue  |   2 +-
 src/data/defaultWorkspaces.js                 |   2 +-
 src/services/explorerSvc.js                   |   2 +-
 src/services/exportSvc.js                     |   4 +-
 src/services/fileSvc.js                       |  42 +--
 src/services/localDbSvc.js                    |  22 +-
 src/services/providers/bloggerPageProvider.js |   2 +-
 src/services/providers/bloggerProvider.js     |   2 +-
 src/services/providers/common/Provider.js     |   7 +-
 .../providers/couchdbWorkspaceProvider.js     |  70 +++--
 src/services/providers/dropboxProvider.js     |   2 +-
 src/services/providers/gistProvider.js        |   4 +-
 src/services/providers/githubProvider.js      |   6 +-
 .../providers/githubWorkspaceProvider.js      | 175 ++++++-----
 .../providers/googleDriveAppDataProvider.js   |  68 ++--
 src/services/providers/googleDriveProvider.js |  10 +-
 .../providers/googleDriveWorkspaceProvider.js | 137 ++++----
 .../providers/helpers/couchdbHelper.js        |   2 +-
 .../providers/helpers/dropboxHelper.js        |   4 +-
 .../providers/helpers/githubHelper.js         |   6 +-
 .../providers/helpers/googleHelper.js         |  10 +-
 .../providers/helpers/wordpressHelper.js      |   6 +-
 .../providers/helpers/zendeskHelper.js        |   4 +-
 src/services/providers/wordpressProvider.js   |   2 +-
 src/services/providers/zendeskProvider.js     |   2 +-
 src/services/publishSvc.js                    |   6 +-
 src/services/syncSvc.js                       | 294 +++++++++---------
 src/services/tempFileSvc.js                   |   5 +-
 src/services/userSvc.js                       |   2 +-
 src/store/content.js                          |   6 +-
 src/store/contentState.js                     |   4 +-
 src/store/data.js                             | 125 ++++----
 src/store/file.js                             |   6 +-
 src/store/index.js                            |  48 +--
 src/store/moduleTemplate.js                   |  12 +-
 src/store/syncedContent.js                    |   4 +-
 src/store/userInfo.js                         |   6 +-
 src/store/workspace.js                        |   9 +-
 test/unit/specs/components/Explorer.spec.js   |   4 +-
 63 files changed, 672 insertions(+), 594 deletions(-)

diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index eb3cdd20..039ea28b 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -1,15 +1,15 @@
 <template>
-  <div class="explorer-node" :class="{'explorer-node--selected': isSelected, 'explorer-node--open': isOpen, 'explorer-node--drag-target': isDragTargetFolder}" @dragover.prevent @dragenter.stop="node.noDrop || setDragTarget(node.item.id)" @dragleave.stop="isDragTarget && setDragTargetId()" @drop.prevent.stop="onDrop" @contextmenu="onContextMenu">
-    <div class="explorer-node__item-editor" v-if="isEditing" :class="['explorer-node__item-editor--' + node.item.type]" :style="{paddingLeft: leftPadding}" draggable="true" @dragstart.stop.prevent>
+  <div class="explorer-node" :class="{'explorer-node--selected': isSelected, 'explorer-node--folder': node.isFolder, 'explorer-node--open': isOpen, 'explorer-node--trash': node.isTrash, 'explorer-node--temp': node.isTemp, 'explorer-node--drag-target': isDragTargetFolder}" @dragover.prevent @dragenter.stop="node.noDrop || setDragTarget(node.item.id)" @dragleave.stop="isDragTarget && setDragTargetId()" @drop.prevent.stop="onDrop" @contextmenu="onContextMenu">
+    <div class="explorer-node__item-editor" v-if="isEditing" :style="{paddingLeft: leftPadding}" draggable="true" @dragstart.stop.prevent>
       <input type="text" class="text-input" v-focus @blur="submitEdit()" @keydown.stop @keydown.enter="submitEdit()" @keydown.esc="submitEdit(true)" v-model="editingNodeName">
     </div>
-    <div class="explorer-node__item" v-else :class="['explorer-node__item--' + node.item.type]" :style="{paddingLeft: leftPadding}" @click="select()" draggable="true" @dragstart.stop="setDragSourceId" @dragend.stop="setDragTargetId()">
+    <div class="explorer-node__item" v-else :style="{paddingLeft: leftPadding}" @click="select()" draggable="true" @dragstart.stop="setDragSourceId" @dragend.stop="setDragTargetId()">
       {{node.item.name}}
       <icon-provider class="explorer-node__location" v-for="location in node.locations" :key="location.id" :provider-id="location.providerId"></icon-provider>
     </div>
     <div class="explorer-node__children" v-if="node.isFolder && isOpen">
       <explorer-node v-for="node in node.folders" :key="node.item.id" :node="node" :depth="depth + 1"></explorer-node>
-      <div v-if="newChild" class="explorer-node__new-child" :class="['explorer-node__new-child--' + newChild.item.type]" :style="{paddingLeft: childLeftPadding}">
+      <div v-if="newChild" class="explorer-node__new-child" :class="{'explorer-node__new-child--folder': newChild.isFolder}" :style="{paddingLeft: childLeftPadding}">
         <input type="text" class="text-input" v-focus @blur="submitNewChild()" @keydown.stop @keydown.enter="submitNewChild()" @keydown.esc="submitNewChild(true)" v-model.trim="newChildName">
       </div>
       <explorer-node v-for="node in node.files" :key="node.item.id" :node="node" :depth="depth + 1"></explorer-node>
@@ -227,17 +227,25 @@ $item-font-size: 14px;
   }
 }
 
-.explorer-node__item--folder,
-.explorer-node__item-editor--folder,
+.explorer-node--trash,
+.explorer-node--temp {
+  color: rgba(0, 0, 0, 0.5);
+}
+
+.explorer-node--folder > .explorer-node__item,
+.explorer-node--folder > .explorer-node__item-editor,
 .explorer-node__new-child--folder {
   &::before {
     content: '▹';
     position: absolute;
     margin-left: -13px;
+  }
+}
 
-    .explorer-node--open > & {
-      content: '▾';
-    }
+.explorer-node--folder.explorer-node--open > .explorer-node__item,
+.explorer-node--folder.explorer-node--open > .explorer-node__item-editor {
+  &::before {
+    content: '▾';
   }
 }
 
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 47367f0b..24b8a652 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="modal" v-if="config" @keydown.esc="onEscape" @keydown.tab="onTab">
+  <div class="modal" v-if="config" @keydown.esc="onEscape" @keydown.tab="onTab" @focusin="onFocusInOut" @focusout="onFocusInOut">
     <component v-if="currentModalComponent" :is="currentModalComponent"></component>
     <modal-inner v-else aria-label="Dialog">
       <div class="modal__content" v-html="simpleModal.contentHtml(config)"></div>
@@ -138,8 +138,8 @@ export default {
       const isFocusIn = evt.type === 'focusin';
       if (evt.target.parentNode && evt.target.parentNode.parentNode) {
         // Focus effect
-        if (evt.target.parentNode.classList.contains('form-entry__field') &&
-          evt.target.parentNode.parentNode.classList.contains('form-entry')) {
+        if (evt.target.parentNode.classList.contains('form-entry__field')
+          && evt.target.parentNode.parentNode.classList.contains('form-entry')) {
           evt.target.parentNode.parentNode.classList.toggle('form-entry--focused', isFocusIn);
         }
       }
@@ -159,19 +159,15 @@ export default {
   mounted() {
     this.$watch(
       () => this.config,
-      () => {
-        if (this.$el) {
-          window.addEventListener('focusin', this.onFocusInOut);
-          window.addEventListener('focusout', this.onFocusInOut);
+      (isOpen) => {
+        if (isOpen) {
           const tabbables = getTabbables(this.$el);
           if (tabbables[0]) {
             tabbables[0].focus();
           }
-        } else {
-          window.removeEventListener('focusin', this.onFocusInOut);
-          window.removeEventListener('focusout', this.onFocusInOut);
         }
       },
+      { immediate: true },
     );
   },
 };
diff --git a/src/components/UserImage.vue b/src/components/UserImage.vue
index cf73f96a..4a7b1020 100644
--- a/src/components/UserImage.vue
+++ b/src/components/UserImage.vue
@@ -10,7 +10,7 @@ export default {
   props: ['userId'],
   computed: {
     url() {
-      const userInfo = this.$store.state.userInfo.itemMap[this.userId];
+      const userInfo = this.$store.state.userInfo.itemsById[this.userId];
       return userInfo && userInfo.imageUrl && `url('${userInfo.imageUrl}')`;
     },
   },
diff --git a/src/components/UserName.vue b/src/components/UserName.vue
index e26a8a7f..b191d0a1 100644
--- a/src/components/UserName.vue
+++ b/src/components/UserName.vue
@@ -9,7 +9,7 @@ export default {
   props: ['userId'],
   computed: {
     name() {
-      const userInfo = this.$store.state.userInfo.itemMap[this.userId];
+      const userInfo = this.$store.state.userInfo.itemsById[this.userId];
       return userInfo ? userInfo.name : 'Someone';
     },
   },
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 21f4ff2f..9e5444ff 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -89,7 +89,7 @@ export default {
     async templates() {
       try {
         const { templates } = await this.$store.dispatch('modal/open', 'templates');
-        this.$store.dispatch('data/setTemplates', templates);
+        this.$store.dispatch('data/setTemplatesById', templates);
       } catch (e) {
         // Cancel
       }
diff --git a/src/components/menus/PublishMenu.vue b/src/components/menus/PublishMenu.vue
index cadb3a40..deca76f3 100644
--- a/src/components/menus/PublishMenu.vue
+++ b/src/components/menus/PublishMenu.vue
@@ -146,22 +146,22 @@ export default {
       return this.$store.getters['file/current'].name;
     },
     googleDriveTokens() {
-      return tokensToArray(this.$store.getters['data/googleTokens'], token => token.isDrive);
+      return tokensToArray(this.$store.getters['data/googleTokensBySub'], token => token.isDrive);
     },
     dropboxTokens() {
-      return tokensToArray(this.$store.getters['data/dropboxTokens']);
+      return tokensToArray(this.$store.getters['data/dropboxTokensBySub']);
     },
     githubTokens() {
-      return tokensToArray(this.$store.getters['data/githubTokens']);
+      return tokensToArray(this.$store.getters['data/githubTokensBySub']);
     },
     wordpressTokens() {
-      return tokensToArray(this.$store.getters['data/wordpressTokens']);
+      return tokensToArray(this.$store.getters['data/wordpressTokensBySub']);
     },
     bloggerTokens() {
-      return tokensToArray(this.$store.getters['data/googleTokens'], token => token.isBlogger);
+      return tokensToArray(this.$store.getters['data/googleTokensBySub'], token => token.isBlogger);
     },
     zendeskTokens() {
-      return tokensToArray(this.$store.getters['data/zendeskTokens']);
+      return tokensToArray(this.$store.getters['data/zendeskTokensBySub']);
     },
     noToken() {
       return !this.googleDriveTokens.length
diff --git a/src/components/menus/SyncMenu.vue b/src/components/menus/SyncMenu.vue
index 89d36e8c..20ffdabd 100644
--- a/src/components/menus/SyncMenu.vue
+++ b/src/components/menus/SyncMenu.vue
@@ -122,13 +122,13 @@ export default {
       return this.$store.getters['file/current'].name;
     },
     googleDriveTokens() {
-      return tokensToArray(this.$store.getters['data/googleTokens'], token => token.isDrive);
+      return tokensToArray(this.$store.getters['data/googleTokensBySub'], token => token.isDrive);
     },
     dropboxTokens() {
-      return tokensToArray(this.$store.getters['data/dropboxTokens']);
+      return tokensToArray(this.$store.getters['data/dropboxTokensBySub']);
     },
     githubTokens() {
-      return tokensToArray(this.$store.getters['data/githubTokens']);
+      return tokensToArray(this.$store.getters['data/githubTokensBySub']);
     },
     noToken() {
       return !this.googleDriveTokens.length
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index 5457e463..bbb2f497 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="side-bar__panel side-bar__panel--menu">
-    <div class="workspace" v-for="(workspace, id) in sanitizedWorkspaces" :key="id">
+    <div class="workspace" v-for="(workspace, id) in sanitizedWorkspacesById" :key="id">
       <menu-entry :href="workspace.url" target="_blank">
         <icon-provider slot="icon" :provider-id="workspace.providerId"></icon-provider>
         <div class="workspace__name"><div class="menu-entry__label" v-if="currentWorkspace === workspace">current</div>{{workspace.name}}</div>
@@ -37,7 +37,7 @@ export default {
   },
   computed: {
     ...mapGetters('data', [
-      'sanitizedWorkspaces',
+      'sanitizedWorkspaceById',
     ]),
     ...mapGetters('workspace', [
       'currentWorkspace',
diff --git a/src/components/modals/HtmlExportModal.vue b/src/components/modals/HtmlExportModal.vue
index 6fcc1352..7bb21229 100644
--- a/src/components/modals/HtmlExportModal.vue
+++ b/src/components/modals/HtmlExportModal.vue
@@ -4,7 +4,7 @@
       <p>Please choose a template for your <b>HTML export</b>.</p>
       <form-entry label="Template">
         <select class="textfield" slot="field" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
@@ -41,7 +41,7 @@ export default modalTemplate({
         const currentFile = this.$store.getters['file/current'];
         const html = await exportSvc.applyTemplate(
           currentFile.id,
-          this.allTemplates[selectedTemplate],
+          this.allTemplatesById[selectedTemplate],
         );
         this.result = html;
       }, 10);
@@ -60,7 +60,7 @@ export default modalTemplate({
       const { config } = this;
       const currentFile = this.$store.getters['file/current'];
       config.resolve();
-      exportSvc.exportToDisk(currentFile.id, 'html', this.allTemplates[this.selectedTemplate]);
+      exportSvc.exportToDisk(currentFile.id, 'html', this.allTemplatesById[this.selectedTemplate]);
     },
   },
 });
diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue
index af0767cf..751d9461 100644
--- a/src/components/modals/ImageModal.vue
+++ b/src/components/modals/ImageModal.vue
@@ -36,7 +36,7 @@ export default modalTemplate({
   }),
   computed: {
     googlePhotosTokens() {
-      const googleTokens = this.$store.getters['data/googleTokens'];
+      const googleTokens = this.$store.getters['data/googleTokensBySub'];
       return Object.entries(googleTokens)
         .map(([, token]) => token)
         .filter(token => token.isPhotos)
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index 2980d86d..e0674da3 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -4,7 +4,7 @@
       <p>Please choose a template for your <b>PDF export</b>.</p>
       <form-entry label="Template">
         <select class="textfield" slot="field" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
@@ -45,7 +45,7 @@ export default modalTemplate({
           sponsorSvc.getToken(),
           exportSvc.applyTemplate(
             currentFile.id,
-            this.allTemplates[this.selectedTemplate],
+            this.allTemplatesById[this.selectedTemplate],
             true,
           ),
         ]));
diff --git a/src/components/modals/TemplatesModal.vue b/src/components/modals/TemplatesModal.vue
index bc9af75d..ea3f915f 100644
--- a/src/components/modals/TemplatesModal.vue
+++ b/src/components/modals/TemplatesModal.vue
@@ -91,11 +91,11 @@ export default {
   },
   created() {
     this.$watch(
-      () => this.$store.getters['data/allTemplates'],
-      (allTemplates) => {
+      () => this.$store.getters['data/allTemplatesById'],
+      (allTemplatesById) => {
         const templates = {};
         // Sort templates by name
-        Object.entries(allTemplates)
+        Object.entries(allTemplatesById)
           .sort(([, template1], [, template2]) => collator.compare(template1.name, template2.name))
           .forEach(([id, template]) => {
             const templateClone = utils.deepCopy(template);
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 69f07c36..cc1101f8 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -1,7 +1,7 @@
 <template>
   <modal-inner class="modal__inner-1--workspace-management" aria-label="Manage workspaces">
     <div class="modal__content">
-      <div class="workspace-entry flex flex--row flex--align-center" v-for="(workspace, id) in sanitizedWorkspaces" :key="id">
+      <div class="workspace-entry flex flex--row flex--align-center" v-for="(workspace, id) in sanitizedWorkspacesById" :key="id">
         <div class="workspace-entry__icon flex flex--column flex--center">
           <icon-provider :provider-id="workspace.providerId"></icon-provider>
         </div>
@@ -48,8 +48,8 @@ export default {
       'config',
     ]),
     ...mapGetters('data', [
-      'workspaces',
-      'sanitizedWorkspaces',
+      'workspacesById',
+      'sanitizedWorkspacesById',
     ]),
     ...mapGetters('workspace', [
       'mainWorkspace',
@@ -59,12 +59,12 @@ export default {
   methods: {
     edit(id) {
       this.editedId = id;
-      this.editingName = this.workspaces[id].name;
+      this.editingName = this.workspacesById[id].name;
     },
     submitEdit(cancel) {
-      const workspace = this.workspaces[this.editedId];
+      const workspace = this.workspacesById[this.editedId];
       if (workspace && !cancel && this.editingName) {
-        this.$store.dispatch('data/patchWorkspaces', {
+        this.$store.dispatch('data/patchWorkspacesById', {
           [this.editedId]: {
             ...workspace,
             name: this.editingName,
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index cc43d310..81f14d84 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -5,7 +5,7 @@
         <icon-close></icon-close>
       </button>
       <div class="modal__sponsor-button" v-if="showSponsorButton">
-        StackEdit is <a class="not-tabbable" target="_blank" href="https://github.com/benweet/stackedit/">open source</a>. Please consider
+        StackEdit is <a class="not-tabbable" target="_blank" href="https://github.com/benweet/stackedit/">open source</a>, please consider
         <a class="not-tabbable" href="javascript:void(0)" @click="sponsor">sponsoring</a> for just $5.
       </div>
       <slot></slot>
@@ -51,11 +51,11 @@ export default {
 
 .modal__close-button {
   position: absolute;
-  top: 8px;
-  right: 8px;
+  top: 7px;
+  right: 7px;
   color: rgba(0, 0, 0, 0.5);
-  width: 30px;
-  height: 30px;
+  width: 28px;
+  height: 28px;
   padding: 2px;
 
   &:active,
diff --git a/src/components/modals/common/modalTemplate.js b/src/components/modals/common/modalTemplate.js
index 600b94ed..e43e6b16 100644
--- a/src/components/modals/common/modalTemplate.js
+++ b/src/components/modals/common/modalTemplate.js
@@ -52,15 +52,15 @@ export default (desc) => {
       },
     };
     if (key === 'selectedTemplate') {
-      component.computed.allTemplates = () => {
-        const allTemplates = store.getters['data/allTemplates'];
-        const sortedTemplates = {};
-        Object.entries(allTemplates)
+      component.computed.allTemplatesById = () => {
+        const allTemplatesById = store.getters['data/allTemplatesById'];
+        const sortedTemplatesById = {};
+        Object.entries(allTemplatesById)
           .sort(([, template1], [, template2]) => collator.compare(template1.name, template2.name))
           .forEach(([templateId, template]) => {
-            sortedTemplates[templateId] = template;
+            sortedTemplatesById[templateId] = template;
           });
-        return sortedTemplates;
+        return sortedTemplatesById;
       };
       // Make use of `function` to have `this` bound to the component
       component.methods.configureTemplates = async function () { // eslint-disable-line func-names
@@ -68,7 +68,7 @@ export default (desc) => {
           type: 'templates',
           selectedId: this.selectedTemplate,
         });
-        store.dispatch('data/setTemplates', templates);
+        store.dispatch('data/setTemplatesById', templates);
         store.dispatch('data/patchLocalSettings', {
           [id]: selectedId,
         });
diff --git a/src/components/modals/providers/BloggerPagePublishModal.vue b/src/components/modals/providers/BloggerPagePublishModal.vue
index 4ddea0e2..457436f8 100644
--- a/src/components/modals/providers/BloggerPagePublishModal.vue
+++ b/src/components/modals/providers/BloggerPagePublishModal.vue
@@ -16,7 +16,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/BloggerPublishModal.vue b/src/components/modals/providers/BloggerPublishModal.vue
index 749db92f..78bdc93a 100644
--- a/src/components/modals/providers/BloggerPublishModal.vue
+++ b/src/components/modals/providers/BloggerPublishModal.vue
@@ -16,7 +16,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/CouchdbCredentialsModal.vue b/src/components/modals/providers/CouchdbCredentialsModal.vue
index a55ad95e..69ffc046 100644
--- a/src/components/modals/providers/CouchdbCredentialsModal.vue
+++ b/src/components/modals/providers/CouchdbCredentialsModal.vue
@@ -45,7 +45,7 @@ export default modalTemplate({
           name: this.name,
           password: this.password,
         };
-        this.$store.dispatch('data/setCouchdbToken', token);
+        this.$store.dispatch('data/addCouchdbToken', token);
         this.config.resolve();
       }
     },
diff --git a/src/components/modals/providers/DropboxPublishModal.vue b/src/components/modals/providers/DropboxPublishModal.vue
index d79137bd..84162be0 100644
--- a/src/components/modals/providers/DropboxPublishModal.vue
+++ b/src/components/modals/providers/DropboxPublishModal.vue
@@ -14,7 +14,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/GistPublishModal.vue b/src/components/modals/providers/GistPublishModal.vue
index 2bcf5a92..4f65a52c 100644
--- a/src/components/modals/providers/GistPublishModal.vue
+++ b/src/components/modals/providers/GistPublishModal.vue
@@ -23,7 +23,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/GithubAccountModal.vue b/src/components/modals/providers/GithubAccountModal.vue
index 661db086..c0fdc5f9 100644
--- a/src/components/modals/providers/GithubAccountModal.vue
+++ b/src/components/modals/providers/GithubAccountModal.vue
@@ -8,7 +8,7 @@
       <div class="form-entry">
         <div class="form-entry__checkbox">
           <label>
-            <input type="checkbox" v-model="repoFullAccess"> Grant access to my <b>private repositories</b>
+            <input type="checkbox" v-model="repoFullAccess"> Grant access to your private repositories
           </label>
         </div>
       </div>
diff --git a/src/components/modals/providers/GithubPublishModal.vue b/src/components/modals/providers/GithubPublishModal.vue
index 4b8b609c..3ae03d92 100644
--- a/src/components/modals/providers/GithubPublishModal.vue
+++ b/src/components/modals/providers/GithubPublishModal.vue
@@ -26,7 +26,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/GoogleDrivePublishModal.vue b/src/components/modals/providers/GoogleDrivePublishModal.vue
index 2e793104..c3dd424f 100644
--- a/src/components/modals/providers/GoogleDrivePublishModal.vue
+++ b/src/components/modals/providers/GoogleDrivePublishModal.vue
@@ -34,7 +34,7 @@
       </div>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/WordpressPublishModal.vue b/src/components/modals/providers/WordpressPublishModal.vue
index 732310cb..2c82739a 100644
--- a/src/components/modals/providers/WordpressPublishModal.vue
+++ b/src/components/modals/providers/WordpressPublishModal.vue
@@ -17,7 +17,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/components/modals/providers/ZendeskPublishModal.vue b/src/components/modals/providers/ZendeskPublishModal.vue
index f9b875a9..342c74b8 100644
--- a/src/components/modals/providers/ZendeskPublishModal.vue
+++ b/src/components/modals/providers/ZendeskPublishModal.vue
@@ -22,7 +22,7 @@
       </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
-          <option v-for="(template, id) in allTemplates" :key="id" :value="id">
+          <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
           </option>
         </select>
diff --git a/src/data/defaultWorkspaces.js b/src/data/defaultWorkspaces.js
index bc66bfa9..84c92cc6 100644
--- a/src/data/defaultWorkspaces.js
+++ b/src/data/defaultWorkspaces.js
@@ -1,6 +1,6 @@
 export default () => ({
   main: {
     name: 'Main workspace',
-    // The rest will be filled by the data/sanitizedWorkspaces getter
+    // The rest will be filled by the data/sanitizedWorkspacesById getter
   },
 });
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
index 6827cca8..24b0ddf5 100644
--- a/src/services/explorerSvc.js
+++ b/src/services/explorerSvc.js
@@ -82,7 +82,7 @@ export default {
       if (doClose) {
         // Close the current file by opening the last opened, not deleted one
         store.getters['data/lastOpenedIds'].some((id) => {
-          const file = store.state.file.itemMap[id];
+          const file = store.state.file.itemsById[id];
           if (file.parentId === 'trash') {
             return false;
           }
diff --git a/src/services/exportSvc.js b/src/services/exportSvc.js
index b4d1addc..877376d4 100644
--- a/src/services/exportSvc.js
+++ b/src/services/exportSvc.js
@@ -46,7 +46,7 @@ export default {
     value: '{{{files.0.content.text}}}',
     helpers: '',
   }, pdf = false) {
-    const file = store.state.file.itemMap[fileId];
+    const file = store.state.file.itemsById[fileId];
     const content = await localDbSvc.loadItem(`${fileId}/content`);
     const properties = utils.computeProperties(content.properties);
     const options = extensionSvc.getOptions(properties);
@@ -114,7 +114,7 @@ export default {
    * Export a file to disk.
    */
   async exportToDisk(fileId, type, template) {
-    const file = store.state.file.itemMap[fileId];
+    const file = store.state.file.itemsById[fileId];
     const html = await this.applyTemplate(fileId, template);
     const blob = new Blob([html], {
       type: 'text/plain;charset=utf-8',
diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js
index 3194b796..8f6d44b2 100644
--- a/src/services/fileSvc.js
+++ b/src/services/fileSvc.js
@@ -43,9 +43,9 @@ export default {
 
       // Check if there is already a file with that path
       if (workspaceUniquePaths) {
-        const parentPath = store.getters.itemPaths[item.parentId] || '';
+        const parentPath = store.getters.pathsByItemId[item.parentId] || '';
         const path = parentPath + item.name;
-        if (store.getters.pathItems[path]) {
+        if (store.getters.itemsByPath[path]) {
           await store.dispatch('modal/open', {
             type: 'pathConflict',
             item,
@@ -62,7 +62,7 @@ export default {
     }
 
     // Return the new file item
-    return store.state.file.itemMap[id];
+    return store.state.file.itemsById[id];
   },
 
   /**
@@ -88,12 +88,13 @@ export default {
         item,
       });
     }
+
     // Check if there is a path conflict
     if (store.getters['workspace/hasUniquePaths']) {
-      const parentPath = store.getters.itemPaths[item.parentId] || '';
+      const parentPath = store.getters.pathsByItemId[item.parentId] || '';
       const path = parentPath + sanitizedName;
-      const pathItems = store.getters.pathItems[path] || [];
-      if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) {
+      const items = store.getters.itemsByPath[path] || [];
+      if (items.some(itemWithSamePath => itemWithSamePath.id !== id)) {
         await store.dispatch('modal/open', {
           type: 'pathConflict',
           item,
@@ -112,7 +113,7 @@ export default {
    */
   setOrPatchItem(patch) {
     const item = {
-      ...store.getters.allItemMap[patch.id] || patch,
+      ...store.getters.allItemsById[patch.id] || patch,
     };
     if (!item.id) {
       return null;
@@ -136,7 +137,7 @@ export default {
       this.makePathUnique(item.id);
     }
 
-    return store.getters.allItemMap[item.id];
+    return store.getters.allItemsById[item.id];
   },
 
   /**
@@ -160,12 +161,15 @@ export default {
   },
 
   /**
-   * Ensure two files/folders don't have the same path if the workspace doesn't support it.
+   * Ensure two files/folders don't have the same path if the workspace doesn't allow it.
    */
-  ensureUniquePaths() {
+  ensureUniquePaths(idsToKeep = {}) {
     if (store.getters['workspace/hasUniquePaths']) {
-      if (Object.keys(store.getters.itemPaths).some(id => this.makePathUnique(id))) {
-        this.ensureUniquePaths();
+      if (Object.keys(store.getters.pathsByItemId)
+        .some(id => !idsToKeep[id] && this.makePathUnique(id))
+      ) {
+        // Just changed one item path, restart
+        this.ensureUniquePaths(idsToKeep);
       }
     }
   },
@@ -175,13 +179,13 @@ export default {
    * Add a prefix to its name and return true otherwise.
    */
   makePathUnique(id) {
-    const { pathItems, allItemMap, itemPaths } = store.getters;
-    const item = allItemMap[id];
+    const { itemsByPath, allItemsById, pathsByItemId } = store.getters;
+    const item = allItemsById[id];
     if (!item) {
       return false;
     }
-    let path = itemPaths[id];
-    if (pathItems[path].length === 1) {
+    let path = pathsByItemId[id];
+    if (itemsByPath[path].length === 1) {
       return false;
     }
     const isFolder = item.type === 'folder';
@@ -190,11 +194,11 @@ export default {
       path = path.slice(0, -1);
     }
     for (let suffix = 1; ; suffix += 1) {
-      let pathWithPrefix = `${path}.${suffix}`;
+      let pathWithSuffix = `${path}.${suffix}`;
       if (isFolder) {
-        pathWithPrefix += '/';
+        pathWithSuffix += '/';
       }
-      if (!pathItems[pathWithPrefix]) {
+      if (!itemsByPath[pathWithSuffix]) {
         store.commit(`${item.type}/patchItem`, {
           id: item.id,
           name: `${item.name}.${suffix}`,
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index 0e9123cd..1b055234 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -123,7 +123,7 @@ const localDbSvc = {
       }
 
       // Write item if different from stored one
-      const item = store.state.data.lsItemMap[id];
+      const item = store.state.data.lsItemsById[id];
       if (item && item.hash !== lsHashMap[id]) {
         localStorage.setItem(key, JSON.stringify(item));
         lsHashMap[id] = item.hash;
@@ -178,7 +178,7 @@ const localDbSvc = {
         changes.push(item);
         cursor.continue();
       } else {
-        const storeItemMap = { ...store.getters.allItemMap };
+        const storeItemMap = { ...store.getters.allItemsById };
         changes.forEach((item) => {
           this.readDbItem(item, storeItemMap);
           // If item is an old delete marker, remove it from the DB
@@ -213,7 +213,7 @@ const localDbSvc = {
         checker = cb => (id) => {
           if (!storeItemMap[id]) {
             const [fileId] = id.split('/');
-            if (!store.state.file.itemMap[fileId]) {
+            if (!store.state.file.itemsById[fileId]) {
               cb(id);
             }
           }
@@ -277,7 +277,7 @@ const localDbSvc = {
    */
   async loadItem(id) {
     // Check if item is in the store
-    const itemInStore = store.getters.allItemMap[id];
+    const itemInStore = store.getters.allItemsById[id];
     if (itemInStore) {
       // Use deepCopy to freeze item
       return Promise.resolve(itemInStore);
@@ -326,11 +326,11 @@ const localDbSvc = {
    * Drop the database and clean the localStorage for the specified workspaceId.
    */
   async removeWorkspace(id) {
-    const workspaces = {
-      ...store.getters['data/workspaces'],
+    const workspacesById = {
+      ...store.getters['data/workspacesById'],
     };
-    delete workspaces[id];
-    store.dispatch('data/setWorkspaces', workspaces);
+    delete workspacesById[id];
+    store.dispatch('data/setWorkspacesById', workspacesById);
     this.syncLocalStorage();
     await new Promise((resolve, reject) => {
       const dbName = getDbName(id);
@@ -348,7 +348,7 @@ const localDbSvc = {
   async init() {
     // Reset the app if reset flag was passed
     if (resetApp) {
-      await Promise.all(Object.keys(store.getters['data/workspaces'])
+      await Promise.all(Object.keys(store.getters['data/workspacesById'])
         .map(workspaceId => localDbSvc.removeWorkspace(workspaceId)));
       utils.localStorageDataIds.forEach((id) => {
         // Clean data stored in localStorage
@@ -366,7 +366,7 @@ const localDbSvc = {
 
     // If exportWorkspace parameter was provided
     if (exportWorkspace) {
-      const backup = JSON.stringify(store.getters.allItemMap);
+      const backup = JSON.stringify(store.getters.allItemsById);
       const blob = new Blob([backup], {
         type: 'text/plain;charset=utf-8',
       });
@@ -405,7 +405,7 @@ const localDbSvc = {
       // Force check sponsorship after a few seconds
       const currentDate = Date.now();
       if (sponsorToken && sponsorToken.expiresOn > currentDate - checkSponsorshipAfter) {
-        store.dispatch('data/setGoogleToken', {
+        store.dispatch('data/addGoogleToken', {
           ...sponsorToken,
           expiresOn: currentDate - checkSponsorshipAfter,
         });
diff --git a/src/services/providers/bloggerPageProvider.js b/src/services/providers/bloggerPageProvider.js
index 1e4121e3..9a6c55a0 100644
--- a/src/services/providers/bloggerPageProvider.js
+++ b/src/services/providers/bloggerPageProvider.js
@@ -5,7 +5,7 @@ import Provider from './common/Provider';
 export default new Provider({
   id: 'bloggerPage',
   getToken(location) {
-    const token = store.getters['data/googleTokens'][location.sub];
+    const token = store.getters['data/googleTokensBySub'][location.sub];
     return token && token.isBlogger ? token : null;
   },
   getUrl(location) {
diff --git a/src/services/providers/bloggerProvider.js b/src/services/providers/bloggerProvider.js
index 020ab2b9..9a788c71 100644
--- a/src/services/providers/bloggerProvider.js
+++ b/src/services/providers/bloggerProvider.js
@@ -5,7 +5,7 @@ import Provider from './common/Provider';
 export default new Provider({
   id: 'blogger',
   getToken(location) {
-    const token = store.getters['data/googleTokens'][location.sub];
+    const token = store.getters['data/googleTokensBySub'][location.sub];
     return token && token.isBlogger ? token : null;
   },
   getUrl(location) {
diff --git a/src/services/providers/common/Provider.js b/src/services/providers/common/Provider.js
index 15684a01..b2a582ba 100644
--- a/src/services/providers/common/Provider.js
+++ b/src/services/providers/common/Provider.js
@@ -7,6 +7,9 @@ import fileSvc from '../../fileSvc';
 const dataExtractor = /<!--stackedit_data:([A-Za-z0-9+/=\s]+)-->$/;
 
 export default class Provider {
+  prepareChanges = changes => changes
+  onChangesApplied = () => {}
+
   constructor(props) {
     Object.assign(this, props);
     providerRegistry.register(this);
@@ -41,7 +44,7 @@ export default class Provider {
    * Parse content serialized with serializeContent()
    */
   static parseContent(serializedContent, id) {
-    const result = utils.deepCopy(store.state.content.itemMap[id]) || emptyContent(id);
+    const result = utils.deepCopy(store.state.content.itemsById[id]) || emptyContent(id);
     result.text = utils.sanitizeText(serializedContent);
     result.history = [];
     const extractedData = dataExtractor.exec(serializedContent);
@@ -82,7 +85,7 @@ export default class Provider {
     const location = utils.search(allLocations, criteria);
     if (location) {
       // Found one, open it if it exists
-      const item = store.state.file.itemMap[location.fileId];
+      const item = store.state.file.itemsById[location.fileId];
       if (item) {
         store.commit('file/setCurrentId', item.id);
         // If file is in the trash, restore it
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index 99e1ebcf..11d7468f 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -17,12 +17,12 @@ export default new Provider({
       dbUrl,
     };
     const workspaceId = utils.makeWorkspaceId(workspaceParams);
-    const getToken = () => store.getters['data/couchdbTokens'][workspaceId];
-    const getWorkspace = () => store.getters['data/sanitizedWorkspaces'][workspaceId];
+    const getToken = () => store.getters['data/couchdbTokensBySub'][workspaceId];
+    const getWorkspace = () => store.getters['data/sanitizedWorkspacesById'][workspaceId];
 
     if (!getToken()) {
       // Create token
-      store.dispatch('data/setCouchdbToken', {
+      store.dispatch('data/addCouchdbToken', {
         sub: workspaceId,
         dbUrl,
       });
@@ -38,7 +38,7 @@ export default new Provider({
       } catch (e) {
         throw new Error(`${dbUrl} is not accessible. Make sure you have the proper permissions.`);
       }
-      store.dispatch('data/patchWorkspaces', {
+      store.dispatch('data/patchWorkspacesById', {
         [workspaceId]: {
           id: workspaceId,
           name: db.db_name,
@@ -52,7 +52,7 @@ export default new Provider({
     // Fix the URL hash
     utils.setQueryParams(workspaceParams);
     if (workspace.url !== window.location.href) {
-      store.dispatch('data/patchWorkspaces', {
+      store.dispatch('data/patchWorkspacesById', {
         [workspace.id]: {
           ...workspace,
           url: window.location.href,
@@ -91,7 +91,7 @@ export default new Provider({
       syncLastSeq,
     });
   },
-  async saveWorkspaceItem(item, syncData) {
+  async saveWorkspaceItem({ item, syncData }) {
     const syncToken = store.getters['workspace/syncToken'];
     const { id, rev } = couchdbHelper.uploadDocument({
       token: syncToken,
@@ -108,24 +108,24 @@ export default new Provider({
       rev,
     };
   },
-  removeWorkspaceItem(syncData) {
+  removeWorkspaceItem({ syncData }) {
     const syncToken = store.getters['workspace/syncToken'];
     return couchdbHelper.removeDocument(syncToken, syncData.id, syncData.rev);
   },
-  async downloadWorkspaceContent(token, syncData) {
-    const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id);
+  async downloadWorkspaceContent({ token, contentSyncData }) {
+    const body = await couchdbHelper.retrieveDocumentWithAttachments(token, contentSyncData.id);
     const rev = body._rev; // eslint-disable-line no-underscore-dangle
-    const item = Provider.parseContent(body.attachments.data, body.item.id);
+    const content = Provider.parseContent(body.attachments.data, body.item.id);
     return {
-      item,
-      syncData: {
-        ...syncData,
-        hash: item.hash,
+      content,
+      contentSyncData: {
+        ...contentSyncData,
+        hash: content.hash,
         rev,
       },
     };
   },
-  async downloadWorkspaceData(token, dataId, syncData) {
+  async downloadWorkspaceData({ token, syncData }) {
     if (!syncData) {
       return {};
     }
@@ -142,30 +142,32 @@ export default new Provider({
       },
     };
   },
-  async uploadWorkspaceContent(token, item, syncData) {
+  async uploadWorkspaceContent({ token, content, contentSyncData }) {
     const res = await couchdbHelper.uploadDocument({
       token,
       item: {
-        id: item.id,
-        type: item.type,
-        hash: item.hash,
+        id: content.id,
+        type: content.type,
+        hash: content.hash,
       },
-      data: Provider.serializeContent(item),
+      data: Provider.serializeContent(content),
       dataType: 'text/plain',
-      documentId: syncData && syncData.id,
-      rev: syncData && syncData.rev,
+      documentId: contentSyncData && contentSyncData.id,
+      rev: contentSyncData && contentSyncData.rev,
     });
 
     // Return new sync data
     return {
-      id: res.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
-      rev: res.rev,
+      contentSyncData: {
+        id: res.id,
+        itemId: content.id,
+        type: content.type,
+        hash: content.hash,
+        rev: res.rev,
+      },
     };
   },
-  async uploadWorkspaceData(token, item, syncData) {
+  async uploadWorkspaceData({ token, item, syncData }) {
     const res = await couchdbHelper.uploadDocument({
       token,
       item: {
@@ -181,11 +183,13 @@ export default new Provider({
 
     // Return new sync data
     return {
-      id: res.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
-      rev: res.rev,
+      syncData: {
+        id: res.id,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+        rev: res.rev,
+      },
     };
   },
   async listRevisions(token, fileId) {
diff --git a/src/services/providers/dropboxProvider.js b/src/services/providers/dropboxProvider.js
index c47a829e..839a7a62 100644
--- a/src/services/providers/dropboxProvider.js
+++ b/src/services/providers/dropboxProvider.js
@@ -20,7 +20,7 @@ const makePathRelative = (token, path) => {
 export default new Provider({
   id: 'dropbox',
   getToken(location) {
-    return store.getters['data/dropboxTokens'][location.sub];
+    return store.getters['data/dropboxTokensBySub'][location.sub];
   },
   getUrl(location) {
     const pathComponents = location.path.split('/').map(encodeURIComponent);
diff --git a/src/services/providers/gistProvider.js b/src/services/providers/gistProvider.js
index 762fb4cb..327f490c 100644
--- a/src/services/providers/gistProvider.js
+++ b/src/services/providers/gistProvider.js
@@ -6,7 +6,7 @@ import utils from '../utils';
 export default new Provider({
   id: 'gist',
   getToken(location) {
-    return store.getters['data/githubTokens'][location.sub];
+    return store.getters['data/githubTokensBySub'][location.sub];
   },
   getUrl(location) {
     return `https://gist.github.com/${location.gistId}`;
@@ -23,7 +23,7 @@ export default new Provider({
     return Provider.parseContent(content, `${syncLocation.fileId}/content`);
   },
   async uploadContent(token, content, syncLocation) {
-    const file = store.state.file.itemMap[syncLocation.fileId];
+    const file = store.state.file.itemsById[syncLocation.fileId];
     const description = utils.sanitizeName(file && file.name);
     const gist = await githubHelper.uploadGist({
       ...syncLocation,
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index 63d5bf13..45307af3 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -9,7 +9,7 @@ const savedSha = {};
 export default new Provider({
   id: 'github',
   getToken(location) {
-    return store.getters['data/githubTokens'][location.sub];
+    return store.getters['data/githubTokensBySub'][location.sub];
   },
   getUrl(location) {
     return `https://github.com/${encodeURIComponent(location.owner)}/${encodeURIComponent(location.repo)}/blob/${encodeURIComponent(location.branch)}/${encodeURIComponent(location.path)}`;
@@ -20,12 +20,12 @@ export default new Provider({
   },
   async downloadContent(token, syncLocation) {
     try {
-      const { sha, content } = await githubHelper.downloadFile({
+      const { sha, data } = await githubHelper.downloadFile({
         ...syncLocation,
         token,
       });
       savedSha[syncLocation.id] = sha;
-      return Provider.parseContent(content, `${syncLocation.fileId}/content`);
+      return Provider.parseContent(data, `${syncLocation.fileId}/content`);
     } catch (e) {
       // Ignore error, upload is going to fail anyway
       return null;
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 375acffb..9cf446b7 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -28,7 +28,6 @@ const endsWith = (str, suffix) => str.slice(-suffix.length) === suffix;
 
 export default new Provider({
   id: 'githubWorkspace',
-  isGit: true,
   getToken() {
     return store.getters['workspace/syncToken'];
   },
@@ -47,13 +46,13 @@ export default new Provider({
       workspaceParams.path = path;
     }
     const workspaceId = utils.makeWorkspaceId(workspaceParams);
-    let workspace = store.getters['data/sanitizedWorkspaces'][workspaceId];
+    let workspace = store.getters['data/sanitizedWorkspacesById'][workspaceId];
 
     // See if we already have a token
     let token;
     if (workspace) {
       // Token sub is in the workspace
-      token = store.getters['data/githubTokens'][workspace.sub];
+      token = store.getters['data/githubTokensBySub'][workspace.sub];
     }
     if (!token) {
       await store.dispatch('modal/open', { type: 'githubAccount' });
@@ -74,27 +73,27 @@ export default new Provider({
     // Fix the URL hash
     utils.setQueryParams(workspaceParams);
     if (workspace.url !== window.location.href) {
-      store.dispatch('data/patchWorkspaces', {
+      store.dispatch('data/patchWorkspacesById', {
         [workspaceId]: {
           ...workspace,
           url: window.location.href,
         },
       });
     }
-    return store.getters['data/sanitizedWorkspaces'][workspaceId];
+    return store.getters['data/sanitizedWorkspacesById'][workspaceId];
   },
-  async getChanges() {
+  getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
     const { owner, repo, branch } = getWorkspaceWithOwner();
-    const tree = await githubHelper.getTree({
+    return githubHelper.getTree({
       token: syncToken,
       owner,
       repo,
       branch,
     });
+  },
+  prepareChanges(tree) {
     const workspacePath = store.getters['workspace/currentWorkspace'].path || '';
-    const syncDataByPath = store.getters['data/syncData'];
-    const syncDataByItemId = store.getters['data/syncDataByItemId'];
 
     // Store all blobs sha
     treeShaMap = Object.create(null);
@@ -136,9 +135,20 @@ export default new Provider({
     const changes = [];
     const pathIds = {};
     const syncDataToKeep = Object.create(null);
+    const syncDataByPath = store.getters['data/syncDataById'];
+    const { itemsByGitPath } = store.getters;
     const getId = (path) => {
-      const syncData = syncDataByPath[path];
-      const id = syncData ? syncData.itemId : utils.uid();
+      const existingItem = itemsByGitPath[path];
+      // Use the item ID only if the item was already synced
+      if (existingItem && syncDataByPath[path]) {
+        pathIds[path] = existingItem.id;
+        return existingItem.id;
+      }
+      // Generate a new ID
+      let id = utils.uid();
+      if (path[0] === '/') {
+        id += '/content';
+      }
       pathIds[path] = id;
       return id;
     };
@@ -146,9 +156,8 @@ export default new Provider({
     // Folder creations/updates
     // Assume map entries are sorted from top to bottom
     Object.entries(treeFolderMap).forEach(([path, parentPath]) => {
-      const id = getId(path);
       const item = utils.addItemHash({
-        id,
+        id: getId(path),
         type: 'folder',
         name: path.slice(parentPath.length, -1),
         parentId: pathIds[parentPath] || null,
@@ -158,18 +167,22 @@ export default new Provider({
         item,
         syncData: {
           id: path,
-          itemId: id,
           type: item.type,
           hash: item.hash,
         },
       });
     });
 
-    // File creations/updates
+    // File/content creations/updates
     Object.entries(treeFileMap).forEach(([path, parentPath]) => {
-      const id = getId(path);
+      // Look for content sync data as it's created before file sync data
+      const contentPath = `/${path}`;
+      const contentId = getId(contentPath);
+
+      // File creations/updates
+      const [fileId] = contentId.split('/');
       const item = utils.addItemHash({
-        id,
+        id: fileId,
         type: 'file',
         name: path.slice(parentPath.length, -'.md'.length),
         parentId: pathIds[parentPath] || null,
@@ -179,31 +192,31 @@ export default new Provider({
         item,
         syncData: {
           id: path,
-          itemId: id,
           type: item.type,
           hash: item.hash,
         },
       });
 
       // Content creations/updates
-      const contentSyncData = syncDataByItemId[`${id}/content`];
+      const contentSyncData = syncDataByPath[contentPath];
       if (contentSyncData) {
-        syncDataToKeep[contentSyncData.id] = true;
+        syncDataToKeep[path] = true;
+        syncDataToKeep[contentPath] = true;
       }
       if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
+        const type = 'content';
         // Use `/` as a prefix to get a unique syncData id
         changes.push({
-          syncDataId: `/${path}`,
+          syncDataId: contentPath,
           item: {
-            id: `${id}/content`,
-            type: 'content',
-            // Need a truthy value to force saving sync data
+            id: contentId,
+            type,
+            // Need a truthy value to force downloading the content
             hash: 1,
           },
           syncData: {
-            id: `/${path}`,
-            itemId: `${id}/content`,
-            type: 'content',
+            id: contentPath,
+            type,
             // Need a truthy value to force downloading the content
             hash: 1,
           },
@@ -212,35 +225,34 @@ export default new Provider({
     });
 
     // Data creations/updates
+    const syncDataByItemId = store.getters['data/syncDataByItemId'];
     Object.keys(treeDataMap).forEach((path) => {
-      try {
-        // Only template data are stored
-        const [, id] = path.match(/^\.stackedit-data\/(templates)\.json$/) || [];
+      // Only template data are stored
+      const [, id] = path.match(/^\.stackedit-data\/(templates)\.json$/) || [];
+      if (id) {
         pathIds[path] = id;
         const syncData = syncDataByItemId[id];
         if (syncData) {
           syncDataToKeep[syncData.id] = true;
         }
         if (!syncData || syncData.sha !== treeShaMap[path]) {
+          const type = 'data';
           changes.push({
             syncDataId: path,
             item: {
               id,
-              type: 'data',
+              type,
               // Need a truthy value to force saving sync data
               hash: 1,
             },
             syncData: {
               id: path,
-              itemId: id,
-              type: 'data',
+              type,
               // Need a truthy value to force downloading the content
               hash: 1,
             },
           });
         }
-      } catch (e) {
-        // Ignore parsing errors
       }
     });
 
@@ -255,12 +267,18 @@ export default new Provider({
       pathMatcher: /^([\s\S]+)\.([\w-]+)\.publish$/,
     }]
       .forEach(({ type, map, pathMatcher }) => Object.keys(map).forEach((path) => {
-        try {
-          const [, filePath, data] = path.match(pathMatcher);
+        const [, filePath, data] = path.match(pathMatcher) || [];
+        if (filePath) {
           // If there is a corresponding md file in the tree
           const fileId = pathIds[`${filePath}.md`];
           if (fileId) {
-            const id = getId(path);
+            // Reuse existing ID or create a new one
+            const existingItem = itemsByGitPath[path];
+            const id = existingItem
+              ? existingItem.id
+              : utils.uid();
+            pathIds[path] = id;
+
             const item = utils.addItemHash({
               ...JSON.parse(utils.decodeBase64(data)),
               id,
@@ -272,14 +290,11 @@ export default new Provider({
               item,
               syncData: {
                 id: path,
-                itemId: id,
                 type: item.type,
                 hash: item.hash,
               },
             });
           }
-        } catch (e) {
-          // Ignore parsing errors
         }
       }));
 
@@ -292,10 +307,9 @@ export default new Provider({
 
     return changes;
   },
-  async saveWorkspaceItem(item) {
+  async saveWorkspaceItem({ item }) {
     const syncData = {
-      id: store.getters.itemGitPaths[item.id],
-      itemId: item.id,
+      id: store.getters.gitPathsByItemId[item.id],
       type: item.type,
       hash: item.hash,
     };
@@ -316,7 +330,7 @@ export default new Provider({
     });
     return syncData;
   },
-  async removeWorkspaceItem(syncData) {
+  async removeWorkspaceItem({ syncData }) {
     if (treeShaMap[syncData.id]) {
       const syncToken = store.getters['workspace/syncToken'];
       await githubHelper.removeFile({
@@ -327,41 +341,40 @@ export default new Provider({
       });
     }
   },
-  async downloadWorkspaceContent(token, contentSyncData) {
-    const [fileId] = contentSyncData.itemId.split('/');
-    const path = store.getters.itemGitPaths[fileId];
-    const syncData = store.getters['data/syncData'][path];
-    if (!syncData) {
-      return {};
-    }
-    const { sha, content } = await githubHelper.downloadFile({
+  async downloadWorkspaceContent({
+    token,
+    contentId,
+    contentSyncData,
+    fileSyncData,
+  }) {
+    const { sha, data } = await githubHelper.downloadFile({
       ...getWorkspaceWithOwner(),
       token,
-      path: getAbsolutePath(syncData),
+      path: getAbsolutePath(fileSyncData),
     });
-    treeShaMap[path] = sha;
-    const item = Provider.parseContent(content, `${fileId}/content`);
+    treeShaMap[fileSyncData.id] = sha;
+    const content = Provider.parseContent(data, contentId);
     return {
-      item,
-      syncData: {
+      content,
+      contentSyncData: {
         ...contentSyncData,
-        hash: item.hash,
+        hash: content.hash,
         sha,
       },
     };
   },
-  async downloadWorkspaceData(token, dataId, syncData) {
+  async downloadWorkspaceData({ token, syncData }) {
     if (!syncData) {
       return {};
     }
 
-    const { sha, content } = await githubHelper.downloadFile({
+    const { sha, data } = await githubHelper.downloadFile({
       ...getWorkspaceWithOwner(),
       token,
       path: getAbsolutePath(syncData),
     });
     treeShaMap[syncData.id] = sha;
-    const item = JSON.parse(content);
+    const item = JSON.parse(data);
     return {
       item,
       syncData: {
@@ -371,32 +384,36 @@ export default new Provider({
       },
     };
   },
-  async uploadWorkspaceContent(token, item) {
-    const [fileId] = item.id.split('/');
-    const path = store.getters.itemGitPaths[fileId];
+  async uploadWorkspaceContent({ token, content, file }) {
+    const path = store.getters.gitPathsByItemId[file.id];
     const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
     const res = await githubHelper.uploadFile({
       ...getWorkspaceWithOwner(),
       token,
       path: absolutePath,
-      content: Provider.serializeContent(item),
+      content: Provider.serializeContent(content),
       sha: treeShaMap[path],
     });
 
     // Return new sync data
     return {
-      id: store.getters.itemGitPaths[item.id],
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
-      sha: res.content.sha,
+      contentSyncData: {
+        id: store.getters.gitPathsByItemId[content.id],
+        type: content.type,
+        hash: content.hash,
+        sha: res.content.sha,
+      },
+      fileSyncData: {
+        id: path,
+        type: 'file',
+        hash: file.hash,
+      },
     };
   },
-  async uploadWorkspaceData(token, item) {
-    const path = store.getters.itemGitPaths[item.id];
+  async uploadWorkspaceData({ token, item }) {
+    const path = store.getters.gitPathsByItemId[item.id];
     const syncData = {
       id: path,
-      itemId: item.id,
       type: item.type,
       hash: item.hash,
     };
@@ -409,8 +426,10 @@ export default new Provider({
     });
 
     return {
-      ...syncData,
-      sha: res.content.sha,
+      syncData: {
+        ...syncData,
+        sha: res.content.sha,
+      },
     };
   },
   onSyncEnd() {
@@ -458,12 +477,12 @@ export default new Provider({
   },
   async getRevisionContent(token, fileId, revisionId) {
     const syncData = Provider.getContentSyncData(fileId);
-    const { content } = await githubHelper.downloadFile({
+    const { data } = await githubHelper.downloadFile({
       ...getWorkspaceWithOwner(),
       token,
       branch: revisionId,
       path: getAbsolutePath(syncData),
     });
-    return Provider.parseContent(content, `${fileId}/content`);
+    return Provider.parseContent(data, `${fileId}/content`);
   },
 });
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index 1f990c49..b6e953fc 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -15,7 +15,7 @@ export default new Provider({
     // Remove the URL hash
     utils.setQueryParams();
     // Return the main workspace
-    return store.getters['data/workspaces'].main;
+    return store.getters['data/workspacesById'].main;
   },
   async getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
@@ -48,7 +48,7 @@ export default new Provider({
       syncStartPageToken,
     });
   },
-  async saveWorkspaceItem(item, syncData, ifNotTooLate) {
+  async saveWorkspaceItem({ item, syncData, ifNotTooLate }) {
     const syncToken = store.getters['workspace/syncToken'];
     const file = await googleHelper.uploadAppDataFile({
       token: syncToken,
@@ -64,22 +64,22 @@ export default new Provider({
       hash: item.hash,
     };
   },
-  removeWorkspaceItem(syncData, ifNotTooLate) {
+  removeWorkspaceItem({ syncData, ifNotTooLate }) {
     const syncToken = store.getters['workspace/syncToken'];
     return googleHelper.removeAppDataFile(syncToken, syncData.id, ifNotTooLate);
   },
-  async downloadWorkspaceContent(token, syncData) {
-    const data = await googleHelper.downloadAppDataFile(token, syncData.id);
-    const item = utils.addItemHash(JSON.parse(data));
+  async downloadWorkspaceContent({ token, contentSyncData }) {
+    const data = await googleHelper.downloadAppDataFile(token, contentSyncData.id);
+    const content = utils.addItemHash(JSON.parse(data));
     return {
-      item,
-      syncData: {
-        ...syncData,
-        hash: item.hash,
+      content,
+      contentSyncData: {
+        ...contentSyncData,
+        hash: content.hash,
       },
     };
   },
-  async downloadWorkspaceData(token, dataId, syncData) {
+  async downloadWorkspaceData({ token, syncData }) {
     if (!syncData) {
       return {};
     }
@@ -94,28 +94,40 @@ export default new Provider({
       },
     };
   },
-  async uploadWorkspaceContent(token, item, syncData, ifNotTooLate) {
-    const file = await googleHelper.uploadAppDataFile({
+  async uploadWorkspaceContent({
+    token,
+    content,
+    contentSyncData,
+    ifNotTooLate,
+  }) {
+    const gdriveFile = await googleHelper.uploadAppDataFile({
       token,
       name: JSON.stringify({
-        id: item.id,
-        type: item.type,
-        hash: item.hash,
+        id: content.id,
+        type: content.type,
+        hash: content.hash,
       }),
-      media: JSON.stringify(item),
-      fileId: syncData && syncData.id,
+      media: JSON.stringify(content),
+      fileId: contentSyncData && contentSyncData.id,
       ifNotTooLate,
     });
 
     // Return new sync data
     return {
-      id: file.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
+      contentSyncData: {
+        id: gdriveFile.id,
+        itemId: content.id,
+        type: content.type,
+        hash: content.hash,
+      },
     };
   },
-  async uploadWorkspaceData(token, item, syncData, ifNotTooLate) {
+  async uploadWorkspaceData({
+    token,
+    item,
+    syncData,
+    ifNotTooLate,
+  }) {
     const file = await googleHelper.uploadAppDataFile({
       token,
       name: JSON.stringify({
@@ -130,10 +142,12 @@ export default new Provider({
 
     // Return new sync data
     return {
-      id: file.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
+      syncData: {
+        id: file.id,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+      },
     };
   },
   async listRevisions(token, fileId) {
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index 82dca036..08302dce 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -7,7 +7,7 @@ import fileSvc from '../fileSvc';
 export default new Provider({
   id: 'googleDrive',
   getToken(location) {
-    const token = store.getters['data/googleTokens'][location.sub];
+    const token = store.getters['data/googleTokensBySub'][location.sub];
     return token && token.isDrive ? token : null;
   },
   getUrl(location) {
@@ -21,7 +21,7 @@ export default new Provider({
     const state = googleHelper.driveState || {};
     if (state.userId) {
       // Try to find the token corresponding to the user ID
-      let token = store.getters['data/googleTokens'][state.userId];
+      let token = store.getters['data/googleTokensBySub'][state.userId];
       // If not found or not enough permission, popup an OAuth2 window
       if (!token || !token.isDrive) {
         await store.dispatch('modal/open', { type: 'googleDriveAccount' });
@@ -42,7 +42,7 @@ export default new Provider({
             folderId,
           };
           const workspaceId = utils.makeWorkspaceId(workspaceParams);
-          const workspace = store.getters['data/sanitizedWorkspaces'][workspaceId];
+          const workspace = store.getters['data/sanitizedWorkspacesById'][workspaceId];
           // If we have the workspace, open it by changing the current URL
           if (workspace) {
             utils.setQueryParams(workspaceParams);
@@ -83,7 +83,7 @@ export default new Provider({
   },
   async performAction() {
     const state = googleHelper.driveState || {};
-    const token = store.getters['data/googleTokens'][state.userId];
+    const token = store.getters['data/googleTokensBySub'][state.userId];
     switch (token && state.action) {
       case 'create': {
         const file = await fileSvc.createFile({}, true);
@@ -106,7 +106,7 @@ export default new Provider({
     return Provider.parseContent(content, `${syncLocation.fileId}/content`);
   },
   async uploadContent(token, content, syncLocation, ifNotTooLate) {
-    const file = store.state.file.itemMap[syncLocation.fileId];
+    const file = store.state.file.itemsById[syncLocation.fileId];
     const name = utils.sanitizeName(file && file.name);
     const parents = [];
     if (syncLocation.driveParentId) {
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index ee1f4f91..8ffb2b1f 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -22,7 +22,7 @@ export default new Provider({
       && utils.makeWorkspaceId(makeWorkspaceParams(folderId));
 
     const getWorkspace = folderId =>
-      store.getters['data/sanitizedWorkspaces'][makeWorkspaceId(folderId)];
+      store.getters['data/sanitizedWorkspacesById'][makeWorkspaceId(folderId)];
 
     const initFolder = async (token, folder) => {
       const appProperties = {
@@ -68,7 +68,7 @@ export default new Provider({
 
       // Update workspace in the store
       const workspaceId = makeWorkspaceId(folder.id);
-      store.dispatch('data/patchWorkspaces', {
+      store.dispatch('data/patchWorkspacesById', {
         [workspaceId]: {
           id: workspaceId,
           sub: token.sub,
@@ -86,7 +86,7 @@ export default new Provider({
     // Token sub is in the workspace or in the url if workspace is about to be created
     const { sub } = getWorkspace(utils.queryParams.folderId) || utils.queryParams;
     // See if we already have a token
-    let token = store.getters['data/googleTokens'][sub];
+    let token = store.getters['data/googleTokensBySub'][sub];
     // If no token has been found, popup an authorize window and get one
     if (!token || !token.isDrive || !token.driveFullAccess) {
       await store.dispatch('modal/open', 'workspaceGoogleRedirection');
@@ -130,14 +130,14 @@ export default new Provider({
     // Fix the URL hash
     utils.setQueryParams(makeWorkspaceParams(workspace.folderId));
     if (workspace.url !== window.location.href) {
-      store.dispatch('data/patchWorkspaces', {
+      store.dispatch('data/patchWorkspacesById', {
         [workspace.id]: {
           ...workspace,
           url: window.location.href,
         },
       });
     }
-    return store.getters['data/sanitizedWorkspaces'][workspace.id];
+    return store.getters['data/sanitizedWorkspacesById'][workspace.id];
   },
   async performAction() {
     const state = googleHelper.driveState || {};
@@ -145,21 +145,21 @@ export default new Provider({
     switch (token && state.action) {
       case 'create': {
         const driveFolder = googleHelper.driveActionFolder;
-        let syncData = store.getters['data/syncData'][driveFolder.id];
+        let syncData = store.getters['data/syncDataById'][driveFolder.id];
         if (!syncData && driveFolder.appProperties.id) {
           // Create folder if not already synced
           store.commit('folder/setItem', {
             id: driveFolder.appProperties.id,
             name: driveFolder.name,
           });
-          const item = store.state.folder.itemMap[driveFolder.appProperties.id];
+          const item = store.state.folder.itemsById[driveFolder.appProperties.id];
           syncData = {
             id: driveFolder.id,
             itemId: item.id,
             type: item.type,
             hash: item.hash,
           };
-          store.dispatch('data/patchSyncData', {
+          store.dispatch('data/patchSyncDataById', {
             [syncData.id]: syncData,
           });
         }
@@ -173,7 +173,7 @@ export default new Provider({
       case 'open': {
         // open first file only
         const firstFile = googleHelper.driveActionFiles[0];
-        const syncData = store.getters['data/syncData'][firstFile.id];
+        const syncData = store.getters['data/syncDataById'][firstFile.id];
         if (!syncData) {
           fileIdToOpen = firstFile.id;
         } else {
@@ -191,6 +191,10 @@ export default new Provider({
     const { changes, startPageToken } = await googleHelper
       .getChanges(syncToken, lastStartPageToken, false, workspace.teamDriveId);
 
+    syncStartPageToken = startPageToken;
+    return changes;
+  },
+  prepareChanges(changes) {
     // Collect possible parent IDs
     const parentIds = {};
     Object.entries(store.getters['data/syncDataByItemId']).forEach(([id, syncData]) => {
@@ -204,6 +208,7 @@ export default new Provider({
     });
 
     // Collect changes
+    const workspace = store.getters['workspace/currentWorkspace'];
     const result = [];
     changes.forEach((change) => {
       // Ignore changes on StackEdit own folders
@@ -259,21 +264,23 @@ export default new Provider({
 
           if (type === 'file') {
             // create a fake change as a file content change
+            const id = `${appProperties.id}/content`;
+            const syncDataId = `${change.fileId}/content`;
             contentChange = {
               item: {
-                id: `${appProperties.id}/content`,
+                id,
                 type: 'content',
                 // Need a truthy value to force saving sync data
                 hash: 1,
               },
               syncData: {
-                id: `${change.fileId}/content`,
-                itemId: `${appProperties.id}/content`,
+                id: syncDataId,
+                itemId: id,
                 type: 'content',
                 // Need a truthy value to force downloading the content
                 hash: 1,
               },
-              syncDataId: `${change.fileId}/content`,
+              syncDataId,
             };
           }
         }
@@ -288,7 +295,7 @@ export default new Provider({
         };
       } else {
         // Item was removed
-        const syncData = store.getters['data/syncData'][change.fileId];
+        const syncData = store.getters['data/syncDataById'][change.fileId];
         if (syncData && syncData.type === 'file') {
           // create a fake change as a file content change
           contentChange = {
@@ -304,7 +311,7 @@ export default new Provider({
         result.push(contentChange);
       }
     });
-    syncStartPageToken = startPageToken;
+
     return result;
   },
   onChangesApplied() {
@@ -312,7 +319,7 @@ export default new Provider({
       syncStartPageToken,
     });
   },
-  async saveWorkspaceItem(item, syncData, ifNotTooLate) {
+  async saveWorkspaceItem({ item, syncData, ifNotTooLate }) {
     const workspace = store.getters['workspace/currentWorkspace'];
     const syncToken = store.getters['workspace/syncToken'];
     let file;
@@ -363,40 +370,35 @@ export default new Provider({
       hash: item.hash,
     };
   },
-  async removeWorkspaceItem(syncData, ifNotTooLate) {
+  async removeWorkspaceItem({ syncData, ifNotTooLate }) {
     // Ignore content deletion
     if (syncData.type !== 'content') {
       const syncToken = store.getters['workspace/syncToken'];
       await googleHelper.removeFile(syncToken, syncData.id, ifNotTooLate);
     }
   },
-  async downloadWorkspaceContent(token, contentSyncData) {
-    const [fileId] = contentSyncData.itemId.split('/');
-    const syncData = store.getters['data/syncDataByItemId'][fileId];
-    if (!syncData) {
-      return {};
-    }
-    const content = await googleHelper.downloadFile(token, syncData.id);
-    const item = Provider.parseContent(content, contentSyncData.itemId);
+  async downloadWorkspaceContent({ token, contentSyncData, fileSyncData }) {
+    const data = await googleHelper.downloadFile(token, fileSyncData.id);
+    const content = Provider.parseContent(data, contentSyncData.itemId);
 
     // Open the file requested by action if it wasn't synced yet
-    if (fileIdToOpen && fileIdToOpen === syncData.id) {
+    if (fileIdToOpen && fileIdToOpen === fileSyncData.id) {
       fileIdToOpen = null;
       // Open the file once downloaded content has been stored
       setTimeout(() => {
-        store.commit('file/setCurrentId', fileId);
+        store.commit('file/setCurrentId', fileSyncData.itemId);
       }, 10);
     }
 
     return {
-      item,
-      syncData: {
+      content,
+      contentSyncData: {
         ...contentSyncData,
-        hash: item.hash,
+        hash: content.hash,
       },
     };
   },
-  async downloadWorkspaceData(token, dataId, syncData) {
+  async downloadWorkspaceData({ token, syncData }) {
     if (!syncData) {
       return {};
     }
@@ -411,57 +413,66 @@ export default new Provider({
       },
     };
   },
-  async uploadWorkspaceContent(token, content, contentSyncData, ifNotTooLate) {
-    const [fileId] = content.id.split('/');
-    const syncData = store.getters['data/syncDataByItemId'][fileId];
-    let file;
+  async uploadWorkspaceContent({
+    token,
+    content,
+    file,
+    fileSyncData,
+    ifNotTooLate,
+  }) {
+    let gdriveFile;
+    let newFileSyncData;
 
-    if (syncData) {
+    if (fileSyncData) {
       // Only update file media
-      file = await googleHelper.uploadFile({
+      gdriveFile = await googleHelper.uploadFile({
         token,
         media: Provider.serializeContent(content),
-        fileId: syncData.id,
+        fileId: fileSyncData.id,
         ifNotTooLate,
       });
     } else {
       // Create file with media
       const workspace = store.getters['workspace/currentWorkspace'];
-      // Use deepCopy to freeze objects
-      const item = utils.deepCopy(store.state.file.itemMap[fileId]);
-      const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
-      file = await googleHelper.uploadFile({
+      const parentSyncData = store.getters['data/syncDataByItemId'][file.parentId];
+      gdriveFile = await googleHelper.uploadFile({
         token,
-        name: item.name,
+        name: file.name,
         parents: [parentSyncData ? parentSyncData.id : workspace.folderId],
         appProperties: {
-          id: item.id,
+          id: file.id,
           folderId: workspace.folderId,
         },
         media: Provider.serializeContent(content),
         ifNotTooLate,
       });
 
-      // Create file syncData
-      store.dispatch('data/patchSyncData', {
-        [file.id]: {
-          id: file.id,
-          itemId: item.id,
-          type: item.type,
-          hash: item.hash,
-        },
-      });
+      // Create file sync data
+      newFileSyncData = {
+        id: gdriveFile.id,
+        itemId: file.id,
+        type: file.type,
+        hash: file.hash,
+      };
     }
 
     // Return new sync data
     return {
-      id: `${file.id}/content`,
-      itemId: content.id,
-      type: content.type,
-      hash: content.hash,
+      contentSyncData: {
+        id: `${gdriveFile.id}/content`,
+        itemId: content.id,
+        type: content.type,
+        hash: content.hash,
+      },
+      fileSyncData: newFileSyncData,
     };
   },
-  async uploadWorkspaceData(token, item, syncData, ifNotTooLate) {
+  async uploadWorkspaceData({
+    token,
+    item,
+    syncData,
+    ifNotTooLate,
+  }) {
     const workspace = store.getters['workspace/currentWorkspace'];
     const file = await googleHelper.uploadFile({
       token,
@@ -482,10 +493,12 @@ export default new Provider({
 
     // Return new sync data
     return {
-      id: file.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
+      syncData: {
+        id: file.id,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+      },
     };
   },
   async listRevisions(token, fileId) {
diff --git a/src/services/providers/helpers/couchdbHelper.js b/src/services/providers/helpers/couchdbHelper.js
index f78c9eeb..bf14f4ca 100644
--- a/src/services/providers/helpers/couchdbHelper.js
+++ b/src/services/providers/helpers/couchdbHelper.js
@@ -4,7 +4,7 @@ import store from '../../../store';
 
 const request = async (token, options = {}) => {
   const baseUrl = `${token.dbUrl}/`;
-  const getLastToken = () => store.getters['data/couchdbTokens'][token.sub];
+  const getLastToken = () => store.getters['data/couchdbTokensBySub'][token.sub];
 
   const assertUnauthorized = (err) => {
     if (err.status !== 401) {
diff --git a/src/services/providers/helpers/dropboxHelper.js b/src/services/providers/helpers/dropboxHelper.js
index a8f4baed..c66df2c3 100644
--- a/src/services/providers/helpers/dropboxHelper.js
+++ b/src/services/providers/helpers/dropboxHelper.js
@@ -53,8 +53,8 @@ export default {
       fullAccess,
     };
 
-    // Add token to dropboxTokens
-    store.dispatch('data/setDropboxToken', token);
+    // Add token to dropbox tokens
+    store.dispatch('data/addDropboxToken', token);
     return token;
   },
   addAccount(fullAccess = false) {
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index 41ac1e32..0b53877a 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -76,8 +76,8 @@ export default {
       repoFullAccess: scopes.indexOf('repo') !== -1,
     };
 
-    // Add token to githubTokens
-    store.dispatch('data/setGithubToken', token);
+    // Add token to github tokens
+    store.dispatch('data/addGithubToken', token);
     return token;
   },
   async addAccount(repoFullAccess = false) {
@@ -204,7 +204,7 @@ export default {
     });
     return {
       sha,
-      content: utils.decodeBase64(content),
+      data: utils.decodeBase64(content),
     };
   },
 
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 2fbaa337..b203c1f0 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -52,7 +52,7 @@ export default {
       const { reason } = (((err.body || {}).error || {}).errors || [])[0] || {};
       if (reason === 'authError') {
         // Mark the token as revoked and get a new one
-        store.dispatch('data/setGoogleToken', {
+        store.dispatch('data/addGoogleToken', {
           ...token,
           expiresOn: 0,
         });
@@ -101,7 +101,7 @@ export default {
     }
 
     // Build token object including scopes and sub
-    const existingToken = store.getters['data/googleTokens'][body.sub];
+    const existingToken = store.getters['data/googleTokensBySub'][body.sub];
     const token = {
       scopes,
       accessToken,
@@ -158,13 +158,13 @@ export default {
       }
     }
 
-    // Add token to googleTokens
-    store.dispatch('data/setGoogleToken', token);
+    // Add token to google tokens
+    store.dispatch('data/addGoogleToken', token);
     return token;
   },
   async refreshToken(token, scopes = []) {
     const { sub } = token;
-    const lastToken = store.getters['data/googleTokens'][sub];
+    const lastToken = store.getters['data/googleTokensBySub'][sub];
     const mergedScopes = [...new Set([
       ...scopes,
       ...lastToken.scopes,
diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js
index 69cbd143..3747730b 100644
--- a/src/services/providers/helpers/wordpressHelper.js
+++ b/src/services/providers/helpers/wordpressHelper.js
@@ -44,13 +44,13 @@ export default {
       name: body.display_name,
       sub: `${body.ID}`,
     };
-    // Add token to wordpressTokens
-    store.dispatch('data/setWordpressToken', token);
+    // Add token to wordpress tokens
+    store.dispatch('data/addWordpressToken', token);
     return token;
   },
   async refreshToken(token) {
     const { sub } = token;
-    const lastToken = store.getters['data/wordpressTokens'][sub];
+    const lastToken = store.getters['data/wordpressTokensBySub'][sub];
 
     if (lastToken.expiresOn > Date.now() + tokenExpirationMargin) {
       return lastToken;
diff --git a/src/services/providers/helpers/zendeskHelper.js b/src/services/providers/helpers/zendeskHelper.js
index ed22eb97..f08d48fc 100644
--- a/src/services/providers/helpers/zendeskHelper.js
+++ b/src/services/providers/helpers/zendeskHelper.js
@@ -45,8 +45,8 @@ export default {
       sub: uniqueSub,
     };
 
-    // Add token to zendeskTokens
-    store.dispatch('data/setZendeskToken', token);
+    // Add token to zendesk tokens
+    store.dispatch('data/addZendeskToken', token);
     return token;
   },
   addAccount(subdomain, clientId) {
diff --git a/src/services/providers/wordpressProvider.js b/src/services/providers/wordpressProvider.js
index 554220a9..5b1203d9 100644
--- a/src/services/providers/wordpressProvider.js
+++ b/src/services/providers/wordpressProvider.js
@@ -5,7 +5,7 @@ import Provider from './common/Provider';
 export default new Provider({
   id: 'wordpress',
   getToken(location) {
-    return store.getters['data/wordpressTokens'][location.sub];
+    return store.getters['data/wordpressTokensBySub'][location.sub];
   },
   getUrl(location) {
     return `https://wordpress.com/post/${location.siteId}/${location.postId}`;
diff --git a/src/services/providers/zendeskProvider.js b/src/services/providers/zendeskProvider.js
index 7f0406cc..1ec5c9cf 100644
--- a/src/services/providers/zendeskProvider.js
+++ b/src/services/providers/zendeskProvider.js
@@ -5,7 +5,7 @@ import Provider from './common/Provider';
 export default new Provider({
   id: 'zendesk',
   getToken(location) {
-    return store.getters['data/zendeskTokens'][location.sub];
+    return store.getters['data/zendeskTokensBySub'][location.sub];
   },
   getUrl(location) {
     const token = this.getToken(location);
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index 8557135f..71c13605 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -40,10 +40,10 @@ const ensureDate = (value, defaultValue) => {
 
 const publish = async (publishLocation) => {
   const { fileId } = publishLocation;
-  const template = store.getters['data/allTemplates'][publishLocation.templateId];
+  const template = store.getters['data/allTemplatesById'][publishLocation.templateId];
   const html = await exportSvc.applyTemplate(fileId, template);
   const content = await localDbSvc.loadItem(`${fileId}/content`);
-  const file = store.state.file.itemMap[fileId];
+  const file = store.state.file.itemsById[fileId];
   const properties = utils.computeProperties(content.properties);
   const provider = providerRegistry.providers[publishLocation.providerId];
   const token = provider.getToken(publishLocation);
@@ -90,7 +90,7 @@ const publishFile = async (fileId) => {
         },
       });
     });
-    const file = store.state.file.itemMap[fileId];
+    const file = store.state.file.itemsById[fileId];
     store.dispatch('notification/info', `"${file.name}" was published to ${counter} location(s).`);
   } finally {
     await localDbSvc.unloadContents();
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 84d98eeb..0953a36f 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -108,7 +108,7 @@ const upgradeSyncedContent = (syncedContent) => {
 const cleanSyncedContent = (syncedContent) => {
   // Clean syncHistory from removed syncLocations
   Object.keys(syncedContent.syncHistory).forEach((syncLocationId) => {
-    if (syncLocationId !== 'main' && !store.state.syncLocation.itemMap[syncLocationId]) {
+    if (syncLocationId !== 'main' && !store.state.syncLocation.itemsById[syncLocationId]) {
       delete syncedContent.syncHistory[syncLocationId];
     }
   });
@@ -129,28 +129,43 @@ const cleanSyncedContent = (syncedContent) => {
  * Apply changes retrieved from the main provider. Update sync data accordingly.
  */
 const applyChanges = (changes) => {
-  const storeItemMap = { ...store.getters.allItemMap };
-  const syncData = { ...store.getters['data/syncData'] };
+  const allItemsById = { ...store.getters.allItemsById };
+  const syncDataById = { ...store.getters['data/syncDataById'] };
+  let getExistingItem;
+  if (workspaceProvider.isGit) {
+    const { itemsByGitPath } = store.getters;
+    getExistingItem = (existingSyncData) => {
+      const items = existingSyncData && itemsByGitPath[existingSyncData.id];
+      return items ? items[0] : null;
+    };
+  } else {
+    getExistingItem = existingSyncData => existingSyncData && allItemsById[existingSyncData.itemId];
+  }
+
+  const idsToKeep = {};
   let saveSyncData = false;
 
+  // Process each change
   changes.forEach((change) => {
-    const existingSyncData = syncData[change.syncDataId];
-    const existingItem = existingSyncData && storeItemMap[existingSyncData.itemId];
+    const existingSyncData = syncDataById[change.syncDataId];
+    const existingItem = getExistingItem(existingSyncData);
+    // If item was removed
     if (!change.item && existingSyncData) {
-      // Item was removed
-      if (syncData[change.syncDataId]) {
-        delete syncData[change.syncDataId];
+      if (syncDataById[change.syncDataId]) {
+        delete syncDataById[change.syncDataId];
         saveSyncData = true;
       }
       if (existingItem) {
         // Remove object from the store
         store.commit(`${existingItem.type}/deleteItem`, existingItem.id);
-        delete storeItemMap[existingItem.id];
+        delete allItemsById[existingItem.id];
       }
+    // If item was modified
     } else if (change.item && change.item.hash) {
-      // Item was modifed
+      idsToKeep[change.item.id] = true;
+
       if ((existingSyncData || {}).hash !== change.syncData.hash) {
-        syncData[change.syncDataId] = change.syncData;
+        syncDataById[change.syncDataId] = change.syncData;
         saveSyncData = true;
       }
       if (
@@ -162,13 +177,14 @@ const applyChanges = (changes) => {
         && change.item.type !== 'content' && change.item.type !== 'data'
       ) {
         store.commit(`${change.item.type}/setItem`, change.item);
-        storeItemMap[change.item.id] = change.item;
+        allItemsById[change.item.id] = change.item;
       }
     }
   });
 
   if (saveSyncData) {
-    store.dispatch('data/setSyncData', syncData);
+    store.dispatch('data/setSyncDataById', syncDataById);
+    fileSvc.ensureUniquePaths(idsToKeep);
   }
 };
 
@@ -192,7 +208,7 @@ const createSyncLocation = (syncLocation) => {
         history: [content.hash],
       }, syncLocation);
       await localDbSvc.loadSyncedContent(fileId);
-      const newSyncedContent = utils.deepCopy(upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]));
+      const newSyncedContent = utils.deepCopy(upgradeSyncedContent(store.state.syncedContent.itemsById[`${fileId}/syncedContent`]));
       const newSyncHistoryItem = [];
       newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
       newSyncHistoryItem[LAST_SEEN] = content.hash;
@@ -220,7 +236,7 @@ const tooLateChecker = (timeout) => {
 };
 
 /**
- * Return true if file is in the temp folder or it's a welcome file.
+ * Return true if file is in the temp folder or is a welcome file.
  */
 const isTempFile = (fileId) => {
   const contentId = `${fileId}/content`;
@@ -228,8 +244,8 @@ const isTempFile = (fileId) => {
     // If file has already been synced, it's not a temp file
     return false;
   }
-  const file = store.state.file.itemMap[fileId];
-  const content = store.state.content.itemMap[contentId];
+  const file = store.state.file.itemsById[fileId];
+  const content = store.state.content.itemsById[contentId];
   if (!file || !content) {
     return false;
   }
@@ -251,6 +267,24 @@ const isTempFile = (fileId) => {
   return file.name === 'Welcome file' && welcomeFileHashes[hash] && !hasDiscussions;
 };
 
+/**
+ * Patch sync data if some have changed in the result.
+ */
+const updateSyncData = (result) => {
+  ['syncData', 'contentSyncData', 'fileSyncData'].forEach((field) => {
+    const syncData = result[field];
+    if (syncData) {
+      const oldSyncData = store.getters['data/syncDataById'][syncData.id];
+      if (utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)) {
+        store.dispatch('data/patchSyncDataById', {
+          [syncData.id]: syncData,
+        });
+      }
+    }
+  });
+  return result;
+};
+
 class SyncContext {
   restart = false;
   attempted = {};
@@ -270,8 +304,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
     // Item may not exist if content has not been downloaded yet
   }
 
-  const getContent = () => store.state.content.itemMap[contentId];
-  const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
+  const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemsById[`${fileId}/syncedContent`]);
   const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
 
   try {
@@ -303,57 +336,45 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
         }
 
         // On workspace provider, call downloadWorkspaceContent
-        const oldSyncData = provider.isGit
-          ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]]
-          : store.getters['data/syncDataByItemId'][contentId];
-        if (!oldSyncData) {
-          return null;
-        }
-        const { item, syncData } = await provider.downloadWorkspaceContent(token, oldSyncData);
-        if (!item) {
+        const oldContentSyncData = store.getters['data/syncDataByItemId'][contentId];
+        const oldFileSyncData = store.getters['data/syncDataByItemId'][fileId];
+        if (!oldContentSyncData || !oldFileSyncData) {
           return null;
         }
 
-        // Update sync data if changed
-        if (syncData
-          && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
-        ) {
-          store.dispatch('data/patchSyncData', {
-            [syncData.id]: syncData,
-          });
-        }
-        return item;
+        const { content } = updateSyncData(await provider.downloadWorkspaceContent({
+          token,
+          contentId,
+          contentSyncData: oldContentSyncData,
+          fileSyncData: oldFileSyncData,
+        }));
+
+        // Return the downloaded content
+        return content;
       };
 
-      const uploadContent = async (item, ifNotTooLate) => {
+      const uploadContent = async (content, ifNotTooLate) => {
         // On simple provider, call simply uploadContent
         if (syncLocation.id !== 'main') {
-          return provider.uploadContent(token, item, syncLocation, ifNotTooLate);
+          return provider.uploadContent(token, content, syncLocation, ifNotTooLate);
         }
 
         // On workspace provider, call uploadWorkspaceContent
-        const oldSyncData = provider.isGit
-          ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]]
-          : store.getters['data/syncDataByItemId'][contentId];
-        if (oldSyncData && oldSyncData.hash === item.hash) {
+        const oldContentSyncData = store.getters['data/syncDataByItemId'][contentId];
+        if (oldContentSyncData && oldContentSyncData.hash === content.hash) {
           return syncLocation;
         }
+        const oldFileSyncData = store.getters['data/syncDataByItemId'][fileId];
 
-        const syncData = await provider.uploadWorkspaceContent(
+        updateSyncData(await provider.uploadWorkspaceContent({
           token,
-          item,
-          oldSyncData,
+          content,
+          // Use deepCopy to freeze item
+          file: utils.deepCopy(store.state.file.itemsById[fileId]),
+          contentSyncData: oldContentSyncData,
+          fileSyncData: oldFileSyncData,
           ifNotTooLate,
-        );
-
-        // Update sync data if changed
-        if (syncData
-          && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
-        ) {
-          store.dispatch('data/patchSyncData', {
-            [syncData.id]: syncData,
-          });
-        }
+        }));
 
         // Return syncLocation
         return syncLocation;
@@ -366,7 +387,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
 
         // Merge content
         let mergedContent;
-        const clientContent = utils.deepCopy(getContent());
+        const clientContent = utils.deepCopy(store.state.content.itemsById[contentId]);
         if (!clientContent) {
           mergedContent = utils.deepCopy(serverContent || null);
         } else if (!serverContent // If sync location has not been created yet
@@ -401,7 +422,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
         });
 
         // Retrieve content with its new hash value and freeze it
-        mergedContent = utils.deepCopy(getContent());
+        mergedContent = utils.deepCopy(store.state.content.itemsById[contentId]);
 
         // Make merged content history
         const mergedContentHistory = serverContent ? serverContent.history.slice() : [];
@@ -504,8 +525,8 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
  * Sync a data item, typically settings, workspaces and templates.
  */
 const syncDataItem = async (dataId) => {
-  const getItem = () => store.state.data.itemMap[dataId]
-    || store.state.data.lsItemMap[dataId];
+  const getItem = () => store.state.data.itemsById[dataId]
+    || store.state.data.lsItemsById[dataId];
 
   const oldItem = getItem();
   const oldSyncData = store.getters['data/syncDataByItemId'][dataId];
@@ -515,23 +536,13 @@ const syncDataItem = async (dataId) => {
   }
 
   const token = workspaceProvider.getToken();
-  const { item, syncData } = await workspaceProvider.downloadWorkspaceData(
+  const { item } = updateSyncData(await workspaceProvider.downloadWorkspaceData({
     token,
-    dataId,
-    oldSyncData,
-  );
-
-  // Update sync data if changed
-  if (syncData
-    && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
-  ) {
-    store.dispatch('data/patchSyncData', {
-      [syncData.id]: syncData,
-    });
-  }
+    syncData: oldSyncData,
+  }));
 
   const serverItem = item;
-  const dataSyncData = store.getters['data/dataSyncData'][dataId];
+  const dataSyncData = store.getters['data/dataSyncDataById'][dataId];
   let mergedItem = (() => {
     const clientItem = utils.deepCopy(getItem());
     if (!clientItem) {
@@ -575,24 +586,15 @@ const syncDataItem = async (dataId) => {
   }
 
   // Upload merged data item
-  const newSyncData = await workspaceProvider.uploadWorkspaceData(
+  updateSyncData(await workspaceProvider.uploadWorkspaceData({
     token,
-    mergedItem,
-    syncData,
-    tooLateChecker(restartContentSyncAfter),
-  );
-
-  // Update sync data if changed
-  if (newSyncData
-    && utils.serializeObject(syncData) !== utils.serializeObject(newSyncData)
-  ) {
-    store.dispatch('data/patchSyncData', {
-      [newSyncData.id]: newSyncData,
-    });
-  }
+    item: mergedItem,
+    syncData: store.getters['data/syncDataByItemId'][dataId],
+    ifNotTooLate: tooLateChecker(restartContentSyncAfter),
+  }));
 
   // Update data sync data
-  store.dispatch('data/patchDataSyncData', {
+  store.dispatch('data/patchDataSyncDataById', {
     [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
   });
 };
@@ -617,11 +619,10 @@ const syncWorkspace = async () => {
     }
 
     const changes = await workspaceProvider.getChanges();
+
     // Apply changes
-    applyChanges(changes);
-    if (workspaceProvider.onChangesApplied) {
-      workspaceProvider.onChangesApplied();
-    }
+    applyChanges(workspaceProvider.prepareChanges(changes));
+    workspaceProvider.onChangesApplied();
 
     // Prevent from sending items too long after changes have been retrieved
     const ifNotTooLate = tooLateChecker(restartSyncAfter);
@@ -629,33 +630,25 @@ const syncWorkspace = async () => {
     // Called until no item to save
     const saveNextItem = () => ifNotTooLate(async () => {
       const storeItemMap = {
-        ...store.state.file.itemMap,
-        ...store.state.folder.itemMap,
-        ...store.state.syncLocation.itemMap,
-        ...store.state.publishLocation.itemMap,
+        ...store.state.file.itemsById,
+        ...store.state.folder.itemsById,
+        ...store.state.syncLocation.itemsById,
+        ...store.state.publishLocation.itemsById,
         // Deal with contents and data later
       };
 
-      let getSyncData;
-      if (workspaceProvider.isGit) {
-        const syncData = store.getters['data/syncData'];
-        getSyncData = id => syncData[store.getters.itemGitPaths[id]];
-      } else {
-        const syncDataByItemId = store.getters['data/syncDataByItemId'];
-        getSyncData = id => syncDataByItemId[id];
-      }
-
+      const syncDataByItemId = store.getters['data/syncDataByItemId'];
       const [changedItem, syncDataToUpdate] = utils.someResult(
         Object.entries(storeItemMap),
         ([id, item]) => {
-          const existingSyncData = getSyncData(id);
-          if ((!existingSyncData || existingSyncData.hash !== item.hash)
+          const syncData = syncDataByItemId[id];
+          if ((!syncData || syncData.hash !== item.hash)
             // Add file/folder if parent has been added
-            && (!storeItemMap[item.parentId] || getSyncData(item.parentId))
+            && (!storeItemMap[item.parentId] || syncDataByItemId[item.parentId])
             // Add file if content has been added
-            && (item.type !== 'file' || getSyncData(`${id}/content`))
+            && (item.type !== 'file' || syncDataByItemId[`${id}/content`])
           ) {
-            return [item, existingSyncData];
+            return [item, syncData];
           }
           return null;
         },
@@ -663,13 +656,13 @@ const syncWorkspace = async () => {
 
       if (changedItem) {
         const resultSyncData = await workspaceProvider
-          .saveWorkspaceItem(
+          .saveWorkspaceItem({
             // Use deepCopy to freeze objects
-            utils.deepCopy(changedItem),
-            utils.deepCopy(syncDataToUpdate),
+            item: utils.deepCopy(changedItem),
+            syncData: utils.deepCopy(syncDataToUpdate),
             ifNotTooLate,
-          );
-        store.dispatch('data/patchSyncData', {
+          });
+        store.dispatch('data/patchSyncDataById', {
           [resultSyncData.id]: resultSyncData,
         });
         await saveNextItem();
@@ -682,38 +675,40 @@ const syncWorkspace = async () => {
       let getItem;
       let getFileItem;
       if (workspaceProvider.isGit) {
-        const { gitPathItems } = store.getters;
-        getItem = syncData => gitPathItems[syncData.id];
-        getFileItem = syncData => gitPathItems[syncData.id.slice(1)]; // Remove leading /
+        const { itemsByGitPath } = store.getters;
+        getItem = syncData => itemsByGitPath[syncData.id];
+        getFileItem = syncData => itemsByGitPath[syncData.id.slice(1)]; // Remove leading /
       } else {
-        const { allItemMap } = store.getters;
-        getItem = syncData => allItemMap[syncData.itemId];
-        getFileItem = syncData => allItemMap[syncData.itemId.split('/')[0]];
+        const { allItemsById } = store.getters;
+        getItem = syncData => allItemsById[syncData.itemId];
+        getFileItem = syncData => allItemsById[syncData.itemId.split('/')[0]];
       }
 
-      const syncData = store.getters['data/syncData'];
+      const syncDataById = store.getters['data/syncDataById'];
       const syncDataToRemove = utils.deepCopy(utils.someResult(
-        Object.values(syncData),
-        (existingSyncData) => {
-          if (!getItem(existingSyncData)
+        Object.values(syncDataById),
+        (syncData) => {
+          if (!getItem(syncData)
             // We don't want to delete data items, especially on first sync
-            && existingSyncData.type !== 'data'
+            && syncData.type !== 'data'
             // Remove content only if file has been removed
-            && (existingSyncData.type !== 'content'
-              || !getFileItem(existingSyncData))
+            && (syncData.type !== 'content'
+              || !getFileItem(syncData))
           ) {
-            return existingSyncData;
+            return syncData;
           }
           return null;
         },
       ));
 
       if (syncDataToRemove) {
-        // Use deepCopy to freeze objects
-        await workspaceProvider.removeWorkspaceItem(syncDataToRemove, ifNotTooLate);
-        const syncDataCopy = { ...store.getters['data/syncData'] };
+        await workspaceProvider.removeWorkspaceItem({
+          syncData: syncDataToRemove,
+          ifNotTooLate,
+        });
+        const syncDataCopy = { ...store.getters['data/syncDataById'] };
         delete syncDataCopy[syncDataToRemove.id];
-        store.dispatch('data/setSyncData', syncDataCopy);
+        store.dispatch('data/setSyncDataById', syncDataCopy);
         await removeNextItem();
       }
     });
@@ -727,33 +722,38 @@ const syncWorkspace = async () => {
     await syncDataItem('templates');
 
     const getOneFileIdToSync = () => {
-      const contentIds = [...new Set([
-        ...Object.keys(localDbSvc.hashMap.content),
-        ...store.getters['file/items'].map(file => `${file.id}/content`),
-      ])];
-      const contentMap = store.state.content.itemMap;
-      const syncDataById = store.getters['data/syncData'];
       let getSyncData;
       if (workspaceProvider.isGit) {
-        const { itemGitPaths } = store.getters;
-        getSyncData = contentId => syncDataById[itemGitPaths[contentId]];
+        const { gitPathsByItemId } = store.getters;
+        const syncDataById = store.getters['data/syncDataById'];
+        // Use file git path as content may not exist or not be loaded
+        getSyncData = fileId => syncDataById[`/${gitPathsByItemId[fileId]}`];
       } else {
         const syncDataByItemId = store.getters['data/syncDataByItemId'];
-        getSyncData = contentId => syncDataByItemId[contentId];
+        getSyncData = (fileId, contentId) => syncDataByItemId[contentId];
       }
 
-      return utils.someResult(contentIds, (contentId) => {
-        // Get content hash from itemMap or from localDbSvc if not loaded
+      // Collect all [fileId, contentId]
+      const ids = [
+        ...Object.keys(localDbSvc.hashMap.content)
+          .map(contentId => [contentId.split('/')[0], contentId]),
+        ...store.getters['file/items']
+          .map(file => [file.id, `${file.id}/content`]),
+      ];
+
+      // Find the first content out of sync
+      const contentMap = store.state.content.itemsById;
+      return utils.someResult(ids, ([fileId, contentId]) => {
+        // Get content hash from itemsById or from localDbSvc if not loaded
         const loadedContent = contentMap[contentId];
         const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
-        const syncData = getSyncData(contentId);
+        const syncData = getSyncData(fileId, contentId);
         if (
           // Sync if content syncing was not attempted yet
           !syncContext.attempted[contentId] &&
           // And if syncData does not exist or if content hash and syncData hash are inconsistent
           (!syncData || syncData.hash !== hash)
         ) {
-          const [fileId] = contentId.split('/');
           return fileId;
         }
         return null;
@@ -843,7 +843,7 @@ const requestSync = () => {
 
           // Clean files
           Object.entries(fileHashesToClean).forEach(([fileId, fileHash]) => {
-            const file = store.state.file.itemMap[fileId];
+            const file = store.state.file.itemsById[fileId];
             if (file && file.hash === fileHash) {
               fileSvc.deleteFile(fileId);
             }
diff --git a/src/services/tempFileSvc.js b/src/services/tempFileSvc.js
index 1a6ef961..fa5df045 100644
--- a/src/services/tempFileSvc.js
+++ b/src/services/tempFileSvc.js
@@ -38,12 +38,11 @@ export default {
       parentId: 'temp',
     }, true);
 
-    const fileItemMap = store.state.file.itemMap;
-
     // Sanitize file creations
     const lastCreated = {};
+    const fileItemsById = store.state.file.itemsById;
     Object.entries(store.getters['data/lastCreated']).forEach(([id, createdOn]) => {
-      if (fileItemMap[id] && fileItemMap[id].parentId === 'temp') {
+      if (fileItemsById[id] && fileItemsById[id].parentId === 'temp') {
         lastCreated[id] = createdOn;
       }
     });
diff --git a/src/services/userSvc.js b/src/services/userSvc.js
index 537d6ba0..65f6fb78 100644
--- a/src/services/userSvc.js
+++ b/src/services/userSvc.js
@@ -21,7 +21,7 @@ export default {
       const [type, sub] = parseUserId(userId);
 
       // Try to find a token with this sub
-      const token = store.getters[`data/${type}Tokens`][sub];
+      const token = store.getters[`data/${type}TokensBySub`][sub];
       if (token) {
         store.commit('userInfo/addItem', {
           id: userId,
diff --git a/src/store/content.js b/src/store/content.js
index 89421b2b..7f7df571 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -31,11 +31,11 @@ module.mutations = {
 
 module.getters = {
   ...module.getters,
-  current: ({ itemMap, revisionContent }, getters, rootState, rootGetters) => {
+  current: ({ itemsById, revisionContent }, getters, rootState, rootGetters) => {
     if (revisionContent) {
       return revisionContent;
     }
-    return itemMap[`${rootGetters['file/current'].id}/content`] || empty();
+    return itemsById[`${rootGetters['file/current'].id}/content`] || empty();
   },
   currentChangeTrigger: (state, getters) => {
     const { current } = getters;
@@ -63,7 +63,7 @@ module.actions = {
   },
   setRevisionContent({ state, rootGetters, commit }, value) {
     const currentFile = rootGetters['file/current'];
-    const currentContent = state.itemMap[`${currentFile.id}/content`];
+    const currentContent = state.itemsById[`${currentFile.id}/content`];
     if (currentContent) {
       const diffs = diffMatchPatch.diff_main(currentContent.text, value.text);
       diffMatchPatch.diff_cleanupSemantic(diffs);
diff --git a/src/store/contentState.js b/src/store/contentState.js
index dc3bbbcf..7e3d485b 100644
--- a/src/store/contentState.js
+++ b/src/store/contentState.js
@@ -5,8 +5,8 @@ const module = moduleTemplate(empty, true);
 
 module.getters = {
   ...module.getters,
-  current: ({ itemMap }, getters, rootState, rootGetters) =>
-    itemMap[`${rootGetters['file/current'].id}/contentState`] || empty(),
+  current: ({ itemsById }, getters, rootState, rootGetters) =>
+    itemsById[`${rootGetters['file/current'].id}/contentState`] || empty(),
 };
 
 module.actions = {
diff --git a/src/store/data.js b/src/store/data.js
index d85586f1..90f19cba 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -37,13 +37,13 @@ const lsItemIdSet = new Set(utils.localStorageDataIds);
 
 // Getter/setter/patcher factories
 const getter = id => state => ((lsItemIdSet.has(id)
-  ? state.lsItemMap
-  : state.itemMap)[id] || {}).data || empty(id).data;
+  ? state.lsItemsById
+  : state.itemsById)[id] || {}).data || empty(id).data;
 const setter = id => ({ commit }, data) => commit('setItem', itemTemplate(id, data));
 const patcher = id => ({ state, commit }, data) => {
   const item = Object.assign(empty(id), (lsItemIdSet.has(id)
-    ? state.lsItemMap
-    : state.itemMap)[id]);
+    ? state.lsItemsById
+    : state.itemsById)[id]);
   commit('setItem', {
     ...empty(id),
     data: typeof data === 'object' ? {
@@ -83,10 +83,10 @@ const additionalTemplates = {
 };
 
 // For tokens
-const tokenSetter = providerId => ({ getters, dispatch }, token) => {
-  dispatch('patchTokens', {
+const tokenAdder = providerId => ({ getters, dispatch }, token) => {
+  dispatch('patchTokensByProviderId', {
     [providerId]: {
-      ...getters[`${providerId}Tokens`],
+      ...getters[`${providerId}TokensBySub`],
       [token.sub]: token,
     },
   });
@@ -99,12 +99,12 @@ export default {
   namespaced: true,
   state: {
     // Data items stored in the DB
-    itemMap: {},
+    itemsById: {},
     // Data items stored in the localStorage
-    lsItemMap: {},
+    lsItemsById: {},
   },
   mutations: {
-    setItem: ({ itemMap, lsItemMap }, value) => {
+    setItem: ({ itemsById, lsItemsById }, value) => {
       // Create an empty item and override its data field
       const emptyItem = empty(value.id);
       const data = typeof value.data === 'object'
@@ -117,20 +117,20 @@ export default {
         data,
       });
 
-      // Store item in itemMap or lsItemMap if its stored in the localStorage
-      Vue.set(lsItemIdSet.has(item.id) ? lsItemMap : itemMap, item.id, item);
+      // Store item in itemsById or lsItemsById if its stored in the localStorage
+      Vue.set(lsItemIdSet.has(item.id) ? lsItemsById : itemsById, item.id, item);
     },
-    deleteItem({ itemMap }, id) {
-      // Only used by localDbSvc to clean itemMap from object moved to localStorage
-      Vue.delete(itemMap, id);
+    deleteItem({ itemsById }, id) {
+      // Only used by localDbSvc to clean itemsById from object moved to localStorage
+      Vue.delete(itemsById, id);
     },
   },
   getters: {
-    workspaces: getter('workspaces'),
-    sanitizedWorkspaces: (state, { workspaces }, rootState, rootGetters) => {
-      const sanitizedWorkspaces = {};
+    workspacesById: getter('workspaces'),
+    sanitizedWorkspacesById: (state, { workspacesById }, rootState, rootGetters) => {
+      const sanitizedWorkspacesById = {};
       const mainWorkspaceToken = rootGetters['workspace/mainWorkspaceToken'];
-      Object.entries(workspaces).forEach(([id, workspace]) => {
+      Object.entries(workspacesById).forEach(([id, workspace]) => {
         const sanitizedWorkspace = {
           id,
           providerId: mainWorkspaceToken && 'googleDriveAppData',
@@ -141,9 +141,9 @@ export default {
         urlParser.href = workspace.url || 'app';
         const params = utils.parseQueryParams(urlParser.hash.slice(1));
         sanitizedWorkspace.url = utils.addQueryParams('app', params, true);
-        sanitizedWorkspaces[id] = sanitizedWorkspace;
+        sanitizedWorkspacesById[id] = sanitizedWorkspace;
       });
-      return sanitizedWorkspaces;
+      return sanitizedWorkspacesById;
     },
     settings: getter('settings'),
     computedSettings: (state, { settings }) => {
@@ -170,9 +170,9 @@ export default {
     },
     localSettings: getter('localSettings'),
     layoutSettings: getter('layoutSettings'),
-    templates: getter('templates'),
-    allTemplates: (state, { templates }) => ({
-      ...templates,
+    templatesById: getter('templates'),
+    allTemplatesById: (state, { templatesById }) => ({
+      ...templatesById,
       ...additionalTemplates,
     }),
     lastCreated: getter('lastCreated'),
@@ -186,42 +186,51 @@ export default {
         result[currentFileId] = Date.now();
       }
       return Object.keys(result)
-        .filter(id => rootState.file.itemMap[id])
+        .filter(id => rootState.file.itemsById[id])
         .sort((id1, id2) => result[id2] - result[id1])
         .slice(0, 20);
     },
-    syncData: getter('syncData'),
-    syncDataByItemId: (state, { syncData }) => {
+    syncDataById: getter('syncData'),
+    syncDataByItemId: (state, { syncDataById }, rootState, rootGetters) => {
       const result = {};
-      Object.entries(syncData).forEach(([, value]) => {
-        result[value.itemId] = value;
-      });
+      if (rootGetters['workspace/currentWorkspaceIsGit']) {
+        Object.entries(rootGetters.gitPathsByItemId).forEach(([id, path]) => {
+          const syncDataEntry = syncDataById[path];
+          if (syncDataEntry) {
+            result[id] = syncDataEntry;
+          }
+        });
+      } else {
+        Object.entries(syncDataById).forEach(([, syncDataEntry]) => {
+          result[syncDataEntry.itemId] = syncDataEntry;
+        });
+      }
       return result;
     },
-    syncDataByType: (state, { syncData }) => {
+    syncDataByType: (state, { syncDataById }) => {
       const result = {};
       utils.types.forEach((type) => {
         result[type] = {};
       });
-      Object.entries(syncData).forEach(([, item]) => {
+      Object.entries(syncDataById).forEach(([, item]) => {
         if (result[item.type]) {
           result[item.type][item.itemId] = item;
         }
       });
       return result;
     },
-    dataSyncData: getter('dataSyncData'),
-    tokens: getter('tokens'),
-    googleTokens: (state, { tokens }) => tokens.google || {},
-    couchdbTokens: (state, { tokens }) => tokens.couchdb || {},
-    dropboxTokens: (state, { tokens }) => tokens.dropbox || {},
-    githubTokens: (state, { tokens }) => tokens.github || {},
-    wordpressTokens: (state, { tokens }) => tokens.wordpress || {},
-    zendeskTokens: (state, { tokens }) => tokens.zendesk || {},
+    dataSyncDataById: getter('dataSyncData'),
+    tokensByProviderId: getter('tokens'),
+    googleTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.google || {},
+    couchdbTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.couchdb || {},
+    dropboxTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.dropbox || {},
+    githubTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.github || {},
+    wordpressTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.wordpress || {},
+    zendeskTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.zendesk || {},
   },
   actions: {
-    setWorkspaces: setter('workspaces'),
-    patchWorkspaces: patcher('workspaces'),
+    setWorkspacesById: setter('workspaces'),
+    patchWorkspacesById: patcher('workspaces'),
     setSettings: setter('settings'),
     patchLocalSettings: patcher('localSettings'),
     patchLayoutSettings: patcher('layoutSettings'),
@@ -257,15 +266,15 @@ export default {
     setSideBarPanel: ({ dispatch }, value) => dispatch('patchLayoutSettings', {
       sideBarPanel: value === undefined ? 'menu' : value,
     }),
-    setTemplates: ({ commit }, data) => {
-      const dataToCommit = {
-        ...data,
+    setTemplatesById: ({ commit }, templatesById) => {
+      const templatesToCommit = {
+        ...templatesById,
       };
       // We don't store additional templates
       Object.keys(additionalTemplates).forEach((id) => {
-        delete dataToCommit[id];
+        delete templatesToCommit[id];
       });
-      commit('setItem', itemTemplate('templates', dataToCommit));
+      commit('setItem', itemTemplate('templates', templatesToCommit));
     },
     setLastCreated: setter('lastCreated'),
     setLastOpenedId: ({ getters, commit, rootState }, fileId) => {
@@ -274,21 +283,21 @@ export default {
       // Remove entries that don't exist anymore
       const cleanedLastOpened = {};
       Object.entries(lastOpened).forEach(([id, value]) => {
-        if (rootState.file.itemMap[id]) {
+        if (rootState.file.itemsById[id]) {
           cleanedLastOpened[id] = value;
         }
       });
       commit('setItem', itemTemplate('lastOpened', cleanedLastOpened));
     },
-    setSyncData: setter('syncData'),
-    patchSyncData: patcher('syncData'),
-    patchDataSyncData: patcher('dataSyncData'),
-    patchTokens: patcher('tokens'),
-    setGoogleToken: tokenSetter('google'),
-    setCouchdbToken: tokenSetter('couchdb'),
-    setDropboxToken: tokenSetter('dropbox'),
-    setGithubToken: tokenSetter('github'),
-    setWordpressToken: tokenSetter('wordpress'),
-    setZendeskToken: tokenSetter('zendesk'),
+    setSyncDataById: setter('syncData'),
+    patchSyncDataById: patcher('syncData'),
+    patchDataSyncDataById: patcher('dataSyncData'),
+    patchTokensByProviderId: patcher('tokens'),
+    addGoogleToken: tokenAdder('google'),
+    addCouchdbToken: tokenAdder('couchdb'),
+    addDropboxToken: tokenAdder('dropbox'),
+    addGithubToken: tokenAdder('github'),
+    addWordpressToken: tokenAdder('wordpress'),
+    addZendeskToken: tokenAdder('zendesk'),
   },
 };
diff --git a/src/store/file.js b/src/store/file.js
index ffaaf4a3..896da0e0 100644
--- a/src/store/file.js
+++ b/src/store/file.js
@@ -10,10 +10,10 @@ module.state = {
 
 module.getters = {
   ...module.getters,
-  current: ({ itemMap, currentId }) => itemMap[currentId] || empty(),
+  current: ({ itemsById, currentId }) => itemsById[currentId] || empty(),
   isCurrentTemp: (state, { current }) => current.parentId === 'temp',
-  lastOpened: ({ itemMap }, { items }, rootState, rootGetters) =>
-    itemMap[rootGetters['data/lastOpenedIds'][0]] || items[0] || empty(),
+  lastOpened: ({ itemsById }, { items }, rootState, rootGetters) =>
+    itemsById[rootGetters['data/lastOpenedIds'][0]] || items[0] || empty(),
 };
 
 module.mutations = {
diff --git a/src/store/index.js b/src/store/index.js
index bdc0d071..3f6d9f82 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -75,14 +75,14 @@ const store = new Vuex.Store({
     },
   },
   getters: {
-    allItemMap: (state) => {
+    allItemsById: (state) => {
       const result = {};
-      utils.types.forEach(type => Object.assign(result, state[type].itemMap));
+      utils.types.forEach(type => Object.assign(result, state[type].itemsById));
       return result;
     },
-    itemPaths: (state, getters) => {
+    pathsByItemId: (state, getters) => {
       const result = {};
-      const folderMap = state.folder.itemMap;
+      const foldersById = state.folder.itemsById;
       const getPath = (item) => {
         let itemPath = result[item.id];
         if (!itemPath) {
@@ -90,10 +90,10 @@ const store = new Vuex.Store({
             itemPath = `.stackedit-trash/${item.name}`;
           } else {
             let { name } = item;
-            if (folderMap[item.id]) {
+            if (foldersById[item.id]) {
               name += '/';
             }
-            const parentFolder = folderMap[item.parentId];
+            const parentFolder = foldersById[item.parentId];
             if (parentFolder) {
               itemPath = getPath(parentFolder) + name;
             } else {
@@ -104,33 +104,38 @@ const store = new Vuex.Store({
         result[item.id] = itemPath;
         return itemPath;
       };
+
       [
         ...getters['folder/items'],
         ...getters['file/items'],
       ].forEach(item => getPath(item));
       return result;
     },
-    pathItems: (state, { allItemMap, itemPaths }) => {
+    itemsByPath: (state, { allItemsById, pathsByItemId }) => {
       const result = {};
-      Object.entries(itemPaths).forEach(([id, path]) => {
+      Object.entries(pathsByItemId).forEach(([id, path]) => {
         const items = result[path] || [];
-        items.push(allItemMap[id]);
+        items.push(allItemsById[id]);
         result[path] = items;
       });
       return result;
     },
-    itemGitPaths: (state, { allItemMap, itemPaths }) => {
+    gitPathsByItemId: (state, { allItemsById, pathsByItemId }) => {
       const result = {};
-      Object.entries(allItemMap).forEach(([id, item]) => {
+      Object.entries(allItemsById).forEach(([id, item]) => {
         if (item.type === 'data') {
           result[id] = `.stackedit-data/${id}.json`;
         } else if (item.type === 'file') {
-          result[id] = `${itemPaths[id]}.md`;
+          const filePath = pathsByItemId[id];
+          result[id] = `${filePath}.md`;
+          result[`${id}/content`] = `/${filePath}.md`;
         } else if (item.type === 'content') {
           const [fileId] = id.split('/');
-          result[id] = `/${itemPaths[fileId]}.md`;
+          const filePath = pathsByItemId[fileId];
+          result[fileId] = `${filePath}.md`;
+          result[id] = `/${filePath}.md`;
         } else if (item.type === 'folder') {
-          result[id] = itemPaths[id];
+          result[id] = pathsByItemId[id];
         } else if (item.type === 'syncLocation' || item.type === 'publishLocation') {
           // locations are stored as paths
           const encodedItem = utils.encodeBase64(utils.serializeObject({
@@ -140,17 +145,20 @@ const store = new Vuex.Store({
             fileId: undefined,
           }), true);
           const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
-          result[id] = `${itemPaths[item.fileId]}.${encodedItem}.${extension}`;
+          result[id] = `${pathsByItemId[item.fileId]}.${encodedItem}.${extension}`;
         }
       });
       return result;
     },
-    gitPathItems: (state, { allItemMap, itemGitPaths }) => {
+    itemsByGitPath: (state, { allItemsById, gitPathsByItemId }) => {
       const result = {};
-      Object.entries(itemGitPaths).forEach(([id, path]) => {
-        const items = result[path] || [];
-        items.push(allItemMap[id]);
-        result[path] = items;
+      Object.entries(gitPathsByItemId).forEach(([id, path]) => {
+        const item = allItemsById[id];
+        if (item) {
+          const items = result[path] || [];
+          items.push(item);
+          result[path] = items;
+        }
       });
       return result;
     },
diff --git a/src/store/moduleTemplate.js b/src/store/moduleTemplate.js
index 4f4a78f4..90fcfa65 100644
--- a/src/store/moduleTemplate.js
+++ b/src/store/moduleTemplate.js
@@ -8,10 +8,10 @@ export default (empty, simpleHash = false) => {
   return {
     namespaced: true,
     state: {
-      itemMap: {},
+      itemsById: {},
     },
     getters: {
-      items: ({ itemMap }) => Object.values(itemMap),
+      items: ({ itemsById }) => Object.values(itemsById),
     },
     mutations: {
       setItem(state, value) {
@@ -19,20 +19,20 @@ export default (empty, simpleHash = false) => {
         if (!item.hash || !simpleHash) {
           item.hash = hashFunc(item);
         }
-        Vue.set(state.itemMap, item.id, item);
+        Vue.set(state.itemsById, item.id, item);
       },
       patchItem(state, patch) {
-        const item = state.itemMap[patch.id];
+        const item = state.itemsById[patch.id];
         if (item) {
           Object.assign(item, patch);
           item.hash = hashFunc(item);
-          Vue.set(state.itemMap, item.id, item);
+          Vue.set(state.itemsById, item.id, item);
           return true;
         }
         return false;
       },
       deleteItem(state, id) {
-        Vue.delete(state.itemMap, id);
+        Vue.delete(state.itemsById, id);
       },
     },
     actions: {},
diff --git a/src/store/syncedContent.js b/src/store/syncedContent.js
index 1388fb02..6f3efc79 100644
--- a/src/store/syncedContent.js
+++ b/src/store/syncedContent.js
@@ -5,8 +5,8 @@ const module = moduleTemplate(empty, true);
 
 module.getters = {
   ...module.getters,
-  current: ({ itemMap }, getters, rootState, rootGetters) =>
-    itemMap[`${rootGetters['file/current'].id}/syncedContent`] || empty(),
+  current: ({ itemsById }, getters, rootState, rootGetters) =>
+    itemsById[`${rootGetters['file/current'].id}/syncedContent`] || empty(),
 };
 
 export default module;
diff --git a/src/store/userInfo.js b/src/store/userInfo.js
index a7aaf474..f83eece4 100644
--- a/src/store/userInfo.js
+++ b/src/store/userInfo.js
@@ -3,11 +3,11 @@ import Vue from 'vue';
 export default {
   namespaced: true,
   state: {
-    itemMap: {},
+    itemsById: {},
   },
   mutations: {
-    addItem: ({ itemMap }, item) => {
-      Vue.set(itemMap, item.id, item);
+    addItem: ({ itemsById }, item) => {
+      Vue.set(itemsById, item.id, item);
     },
   },
 };
diff --git a/src/store/workspace.js b/src/store/workspace.js
index cad751d6..7d80483a 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -16,13 +16,14 @@ export default {
   },
   getters: {
     mainWorkspace: (state, getters, rootState, rootGetters) => {
-      const workspaces = rootGetters['data/sanitizedWorkspaces'];
-      return workspaces.main;
+      const sanitizedWorkspacesById = rootGetters['data/sanitizedWorkspacesById'];
+      return sanitizedWorkspacesById.main;
     },
     currentWorkspace: ({ currentWorkspaceId }, { mainWorkspace }, rootState, rootGetters) => {
-      const workspaces = rootGetters['data/sanitizedWorkspaces'];
-      return workspaces[currentWorkspaceId] || mainWorkspace;
+      const sanitizedWorkspacesById = rootGetters['data/sanitizedWorkspacesById'];
+      return sanitizedWorkspacesById[currentWorkspaceId] || mainWorkspace;
     },
+    currentWorkspaceIsGit: (state, { currentWorkspace }) => currentWorkspace.providerId === 'githubWorkspace',
     hasUniquePaths: (state, { currentWorkspace }) =>
       currentWorkspace.providerId === 'githubWorkspace',
     lastSyncActivityKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastSyncActivity`,
diff --git a/test/unit/specs/components/Explorer.spec.js b/test/unit/specs/components/Explorer.spec.js
index 2b1fa82f..08c7cafb 100644
--- a/test/unit/specs/components/Explorer.spec.js
+++ b/test/unit/specs/components/Explorer.spec.js
@@ -9,8 +9,8 @@ const select = (id) => {
   store.commit('explorer/setSelectedId', id);
   expect(store.getters['explorer/selectedNode'].item.id).toEqual(id);
 };
-const ensureExists = file => expect(store.getters.allItemMap).toHaveProperty(file.id);
-const ensureNotExists = file => expect(store.getters.allItemMap).not.toHaveProperty(file.id);
+const ensureExists = file => expect(store.getters.allItemsById).toHaveProperty(file.id);
+const ensureNotExists = file => expect(store.getters.allItemsById).not.toHaveProperty(file.id);
 
 describe('Explorer.vue', () => {
   it('should create new files in the root folder', () => {

From a1673d3e87a38f1f5164a37f315899a941640bf1 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Wed, 4 Jul 2018 00:41:24 +0100
Subject: [PATCH 08/19] New workspace and sync management modals. UI
 enhancements

---
 src/components/App.vue                        |   4 +-
 src/components/CodeEditor.vue                 |   2 +-
 src/components/ExplorerNode.vue               |  10 +-
 src/components/FindReplace.vue                |   2 +-
 src/components/Modal.vue                      |  10 +-
 src/components/NavigationBar.vue              |   4 +-
 src/components/SideBar.vue                    |  10 +-
 src/components/Toc.vue                        |   2 +-
 src/components/common/EditorClassApplier.js   |   2 +-
 src/components/common/PreviewClassApplier.js  |   2 +-
 .../common/{globals.js => vueGlobals.js}      |  38 ++-
 src/components/gutters/CurrentDiscussion.vue  |   7 +-
 src/components/gutters/NewComment.vue         |   2 +-
 src/components/menus/ExportMenu.vue           |   6 +-
 src/components/menus/HistoryMenu.vue          |   2 +-
 src/components/menus/ImportMenu.vue           |   6 +-
 src/components/menus/MainMenu.vue             |  19 +-
 src/components/menus/PublishMenu.vue          |  14 +-
 src/components/menus/SyncMenu.vue             |  38 ++-
 src/components/menus/WorkspacesMenu.vue       |  20 +-
 src/components/menus/common/MenuEntry.vue     |  28 +-
 src/components/modals/AboutModal.vue          |   2 +-
 src/components/modals/FilePropertiesModal.vue |   2 +-
 src/components/modals/HtmlExportModal.vue     |  15 +-
 src/components/modals/ImageModal.vue          |   7 +-
 src/components/modals/LinkModal.vue           |   2 +-
 src/components/modals/PandocExportModal.vue   |   2 +-
 src/components/modals/PdfExportModal.vue      |   2 +-
 .../modals/PublishManagementModal.vue         |  11 +-
 src/components/modals/SettingsModal.vue       |   2 +-
 src/components/modals/SyncManagementModal.vue | 115 +++++---
 src/components/modals/TemplatesModal.vue      |   2 +-
 .../modals/WorkspaceManagementModal.vue       | 180 +++++++-----
 .../providers/BloggerPagePublishModal.vue     |   2 +-
 .../modals/providers/BloggerPublishModal.vue  |   2 +-
 .../providers/CouchdbCredentialsModal.vue     |   2 +-
 .../providers/CouchdbWorkspaceModal.vue       |   6 +-
 .../modals/providers/DropboxAccountModal.vue  |   2 +-
 .../modals/providers/DropboxPublishModal.vue  |   2 +-
 .../modals/providers/DropboxSaveModal.vue     |   4 +-
 .../modals/providers/GistPublishModal.vue     |   2 +-
 .../modals/providers/GistSyncModal.vue        |   4 +-
 .../modals/providers/GithubAccountModal.vue   |   2 +-
 .../modals/providers/GithubOpenModal.vue      |   7 +-
 .../modals/providers/GithubPublishModal.vue   |   2 +-
 .../modals/providers/GithubSaveModal.vue      |   7 +-
 .../modals/providers/GithubWorkspaceModal.vue |   9 +-
 .../providers/GoogleDriveAccountModal.vue     |   2 +-
 .../providers/GoogleDrivePublishModal.vue     |  10 +-
 .../modals/providers/GoogleDriveSaveModal.vue |  12 +-
 .../providers/GoogleDriveWorkspaceModal.vue   |  12 +-
 .../modals/providers/GooglePhotoModal.vue     |   2 +-
 .../providers/WordpressPublishModal.vue       |   2 +-
 .../modals/providers/ZendeskAccountModal.vue  |   2 +-
 .../modals/providers/ZendeskPublishModal.vue  |   2 +-
 src/data/defaultWorkspaces.js                 |   2 +-
 src/data/faq.md                               |   8 -
 src/icons/ContentCopy.vue                     |   5 +
 src/icons/index.js                            |   2 +
 src/services/backupSvc.js                     |   6 +-
 .../{ => editor}/cledit/cleditCore.js         |   4 +-
 .../{ => editor}/cledit/cleditHighlighter.js  |   0
 .../{ => editor}/cledit/cleditKeystroke.js    |   0
 .../{ => editor}/cledit/cleditMarker.js       |   0
 .../{ => editor}/cledit/cleditSelectionMgr.js |   8 +-
 .../{ => editor}/cledit/cleditUndoMgr.js      |   0
 .../{ => editor}/cledit/cleditUtils.js        |   0
 .../{ => editor}/cledit/cleditWatcher.js      |   0
 src/services/{ => editor}/cledit/index.js     |   2 +-
 .../{ => editor}/editorSvcDiscussions.js      |  10 +-
 src/services/{ => editor}/editorSvcUtils.js   |   4 +-
 src/services/editor/sectionUtils.js           | 114 ++++++++
 src/services/editorSvc.js                     |   8 +-
 src/services/explorerSvc.js                   |   4 +-
 src/services/localDbSvc.js                    |  80 +++---
 src/services/optional/keystrokes.js           |   2 +-
 src/services/providers/bloggerPageProvider.js |  13 +-
 src/services/providers/bloggerProvider.js     |  13 +-
 src/services/providers/common/Provider.js     |   8 +-
 .../providers/common/providerRegistry.js      |   4 +-
 .../providers/couchdbWorkspaceProvider.js     |  64 +++--
 src/services/providers/dropboxProvider.js     |  22 +-
 src/services/providers/gistProvider.js        |  13 +-
 src/services/providers/githubProvider.js      |  34 +--
 .../providers/githubWorkspaceProvider.js      | 102 ++++---
 .../providers/googleDriveAppDataProvider.js   |  21 +-
 src/services/providers/googleDriveProvider.js |  26 +-
 .../providers/googleDriveWorkspaceProvider.js |  58 ++--
 .../providers/helpers/dropboxHelper.js        |   5 +-
 .../providers/helpers/googleHelper.js         |   2 +-
 src/services/providers/wordpressProvider.js   |   7 +-
 src/services/providers/zendeskProvider.js     |   7 +-
 src/services/publishSvc.js                    |   7 +-
 src/services/sectionUtils.js                  | 113 --------
 src/services/syncSvc.js                       | 263 +++++++++---------
 src/services/tempFileSvc.js                   |   8 +-
 src/services/utils.js                         |  23 ++
 src/services/{fileSvc.js => workspaceSvc.js}  |  64 ++++-
 src/store/content.js                          |   2 +-
 src/store/data.js                             |  37 +--
 src/store/locationTemplate.js                 |  63 ++++-
 src/store/workspace.js                        | 122 +++++---
 src/styles/app.scss                           |  25 +-
 static/landing/index.html                     |   3 +-
 test/unit/specs/components/Explorer.spec.js   |  20 +-
 .../specs/components/ExplorerNode.spec.js     |  22 +-
 test/unit/specs/specUtils.js                  |   2 +-
 107 files changed, 1210 insertions(+), 889 deletions(-)
 rename src/components/common/{globals.js => vueGlobals.js} (53%)
 create mode 100644 src/icons/ContentCopy.vue
 rename src/services/{ => editor}/cledit/cleditCore.js (99%)
 rename src/services/{ => editor}/cledit/cleditHighlighter.js (100%)
 rename src/services/{ => editor}/cledit/cleditKeystroke.js (100%)
 rename src/services/{ => editor}/cledit/cleditMarker.js (100%)
 rename src/services/{ => editor}/cledit/cleditSelectionMgr.js (98%)
 rename src/services/{ => editor}/cledit/cleditUndoMgr.js (100%)
 rename src/services/{ => editor}/cledit/cleditUtils.js (100%)
 rename src/services/{ => editor}/cledit/cleditWatcher.js (100%)
 rename src/services/{ => editor}/cledit/index.js (87%)
 rename src/services/{ => editor}/editorSvcDiscussions.js (97%)
 rename src/services/{ => editor}/editorSvcUtils.js (98%)
 create mode 100644 src/services/editor/sectionUtils.js
 delete mode 100644 src/services/sectionUtils.js
 rename src/services/{fileSvc.js => workspaceSvc.js} (74%)

diff --git a/src/components/App.vue b/src/components/App.vue
index de12c39a..a38bc58b 100644
--- a/src/components/App.vue
+++ b/src/components/App.vue
@@ -21,7 +21,7 @@ import syncSvc from '../services/syncSvc';
 import networkSvc from '../services/networkSvc';
 import sponsorSvc from '../services/sponsorSvc';
 import tempFileSvc from '../services/tempFileSvc';
-import './common/globals';
+import './common/vueGlobals';
 
 const themeClasses = {
   light: ['app--light'],
@@ -53,7 +53,7 @@ export default {
       this.ready = true;
       tempFileSvc.setReady();
     } catch (err) {
-      if (err && err.message !== 'reload') {
+      if (err && err.message !== 'RELOAD') {
         console.error(err); // eslint-disable-line no-console
         this.$store.dispatch('notification/error', err);
       }
diff --git a/src/components/CodeEditor.vue b/src/components/CodeEditor.vue
index 33370470..1ea9596b 100644
--- a/src/components/CodeEditor.vue
+++ b/src/components/CodeEditor.vue
@@ -4,7 +4,7 @@
 
 <script>
 import Prism from 'prismjs';
-import cledit from '../services/cledit';
+import cledit from '../services/editor/cledit';
 
 export default {
   props: ['value', 'lang', 'disabled'],
diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index 039ea28b..f69d23e2 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -19,7 +19,7 @@
 
 <script>
 import { mapMutations, mapActions } from 'vuex';
-import fileSvc from '../services/fileSvc';
+import workspaceSvc from '../services/workspaceSvc';
 import explorerSvc from '../services/explorerSvc';
 
 export default {
@@ -102,10 +102,10 @@ export default {
       if (!cancel && !newChildNode.isNil && newChildNode.item.name) {
         try {
           if (newChildNode.isFolder) {
-            const item = await fileSvc.storeItem(newChildNode.item);
+            const item = await workspaceSvc.storeItem(newChildNode.item);
             this.select(item.id);
           } else {
-            const item = await fileSvc.createFile(newChildNode.item);
+            const item = await workspaceSvc.createFile(newChildNode.item);
             this.select(item.id);
           }
         } catch (e) {
@@ -120,7 +120,7 @@ export default {
       this.setEditingId(null);
       if (!cancel && item.id && value) {
         try {
-          await fileSvc.storeItem({
+          await workspaceSvc.storeItem({
             ...item,
             name: value,
           });
@@ -147,7 +147,7 @@ export default {
         && !targetNode.isNil
         && sourceNode.item.id !== targetNode.item.id
       ) {
-        fileSvc.storeItem({
+        workspaceSvc.storeItem({
           ...sourceNode.item,
           parentId: targetNode.item.id,
         });
diff --git a/src/components/FindReplace.vue b/src/components/FindReplace.vue
index 8e3eb0e6..7e2d5672 100644
--- a/src/components/FindReplace.vue
+++ b/src/components/FindReplace.vue
@@ -34,7 +34,7 @@
 <script>
 import { mapState } from 'vuex';
 import editorSvc from '../services/editorSvc';
-import cledit from '../services/cledit';
+import cledit from '../services/editor/cledit';
 import store from '../store';
 import EditorClassApplier from './common/EditorClassApplier';
 
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 24b8a652..ece267f0 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -5,7 +5,7 @@
       <div class="modal__content" v-html="simpleModal.contentHtml(config)"></div>
       <div class="modal__button-bar">
         <button class="button" v-if="simpleModal.rejectText" @click="config.reject()">{{simpleModal.rejectText}}</button>
-        <button class="button" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button>
+        <button class="button button--resolve" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button>
       </div>
     </modal-inner>
   </div>
@@ -250,7 +250,7 @@ export default {
 }
 
 .modal__sub-title {
-  opacity: 0.5;
+  opacity: 0.6;
   font-size: 0.75rem;
   margin-bottom: 1.5rem;
 }
@@ -278,8 +278,10 @@ export default {
 }
 
 .modal__button-bar {
-  margin-top: 1.75rem;
-  text-align: right;
+  margin-top: 2rem;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
 }
 
 .form-entry {
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
index 2c1cfaf6..6d4634ef 100644
--- a/src/components/NavigationBar.vue
+++ b/src/components/NavigationBar.vue
@@ -56,7 +56,7 @@ import tempFileSvc from '../services/tempFileSvc';
 import utils from '../services/utils';
 import pagedownButtons from '../data/pagedownButtons';
 import store from '../store';
-import fileSvc from '../services/fileSvc';
+import workspaceSvc from '../services/workspaceSvc';
 
 // According to mousetrap
 const mod = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Meta' : 'Ctrl';
@@ -200,7 +200,7 @@ export default {
         this.title = this.$store.getters['file/current'].name;
         if (title) {
           try {
-            await fileSvc.storeItem({
+            await workspaceSvc.storeItem({
               ...this.$store.getters['file/current'],
               name: title,
             });
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
index f0015f4c..4e52d7fa 100644
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -13,7 +13,7 @@
     </div>
     <div class="side-bar__inner">
       <main-menu v-if="panel === 'menu'"></main-menu>
-      <workspaces-menu v-if="panel === 'workspaces'"></workspaces-menu>
+      <workspaces-menu v-else-if="panel === 'workspaces'"></workspaces-menu>
       <sync-menu v-else-if="panel === 'sync'"></sync-menu>
       <publish-menu v-else-if="panel === 'publish'"></publish-menu>
       <history-menu v-else-if="panel === 'history'"></history-menu>
@@ -75,7 +75,11 @@ export default {
   }),
   computed: {
     panel() {
-      return !this.$store.state.light && this.$store.getters['data/layoutSettings'].sideBarPanel;
+      if (this.$store.state.light) {
+        return null; // No menu in light mode
+      }
+      const result = this.$store.getters['data/layoutSettings'].sideBarPanel;
+      return panelNames[result] ? result : 'menu';
     },
     panelName() {
       return panelNames[this.panel];
@@ -164,7 +168,7 @@ export default {
   padding: 10px;
   margin: -10px -10px 10px;
   background-color: $info-bg;
-  font-size: 0.95em;
+  font-size: 0.9em;
 
   p {
     margin: 10px;
diff --git a/src/components/Toc.vue b/src/components/Toc.vue
index 47548b04..0db98b6d 100644
--- a/src/components/Toc.vue
+++ b/src/components/Toc.vue
@@ -64,7 +64,7 @@ export default {
     const updateMaskY = () => {
       const scrollPosition = editorSvc.getScrollPosition();
       if (scrollPosition) {
-        const sectionDesc = editorSvc.previewCtx.sectionDescList[scrollPosition.sectionIdx];
+        const sectionDesc = editorSvc.previewCtxMeasured.sectionDescList[scrollPosition.sectionIdx];
         this.maskY = sectionDesc.tocDimension.startOffset +
           (scrollPosition.posInSection * sectionDesc.tocDimension.height);
       }
diff --git a/src/components/common/EditorClassApplier.js b/src/components/common/EditorClassApplier.js
index a5a9e1fb..bc9bf9db 100644
--- a/src/components/common/EditorClassApplier.js
+++ b/src/components/common/EditorClassApplier.js
@@ -1,4 +1,4 @@
-import cledit from '../../services/cledit';
+import cledit from '../../services/editor/cledit';
 import editorSvc from '../../services/editorSvc';
 import utils from '../../services/utils';
 
diff --git a/src/components/common/PreviewClassApplier.js b/src/components/common/PreviewClassApplier.js
index 4530ceff..58d9bd59 100644
--- a/src/components/common/PreviewClassApplier.js
+++ b/src/components/common/PreviewClassApplier.js
@@ -1,4 +1,4 @@
-import cledit from '../../services/cledit';
+import cledit from '../../services/editor/cledit';
 import editorSvc from '../../services/editorSvc';
 import utils from '../../services/utils';
 
diff --git a/src/components/common/globals.js b/src/components/common/vueGlobals.js
similarity index 53%
rename from src/components/common/globals.js
rename to src/components/common/vueGlobals.js
index 0ede56ad..961bc91d 100644
--- a/src/components/common/globals.js
+++ b/src/components/common/vueGlobals.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import Clipboard from 'clipboard';
 import timeSvc from '../../services/timeSvc';
 import store from '../../store';
 
@@ -32,10 +33,43 @@ Vue.directive('show', {
   },
 });
 
+const setElTitle = (el, title) => {
+  el.title = title;
+  el.setAttribute('aria-label', title);
+};
 Vue.directive('title', {
   bind(el, { value }) {
-    el.title = value;
-    el.setAttribute('aria-label', value);
+    setElTitle(el, value);
+  },
+  update(el, { value, oldValue }) {
+    if (value !== oldValue) {
+      setElTitle(el, value);
+    }
+  },
+});
+
+// Clipboard directive
+const createClipboard = (el, value) => {
+  el.seClipboard = new Clipboard(el, { text: () => value });
+};
+const destroyClipboard = (el) => {
+  if (el.seClipboard) {
+    el.seClipboard.destroy();
+    el.seClipboard = null;
+  }
+};
+Vue.directive('clipboard', {
+  bind(el, { value }) {
+    createClipboard(el, value);
+  },
+  update(el, { value, oldValue }) {
+    if (value !== oldValue) {
+      destroyClipboard(el);
+      createClipboard(el, value);
+    }
+  },
+  unbind(el) {
+    destroyClipboard(el);
   },
 });
 
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index d2c0b783..523c4c6d 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters, mapMutations } from 'vuex';
+import { mapState, mapGetters, mapMutations, mapActions } from 'vuex';
 import editorSvc from '../../services/editorSvc';
 import animationSvc from '../../services/animationSvc';
 import markdownConversionSvc from '../../services/markdownConversionSvc';
@@ -67,6 +67,9 @@ export default {
     ...mapMutations('discussion', [
       'setCurrentDiscussionId',
     ]),
+    ...mapActions('notification', [
+      'info',
+    ]),
     goToDiscussion(discussionId = this.currentDiscussionId) {
       this.setCurrentDiscussionId(discussionId);
       const layoutSettings = this.$store.getters['data/layoutSettings'];
@@ -75,7 +78,7 @@ export default {
         ? editorSvc.clEditor.selectionMgr.getCoordinates(discussion.end)
         : editorSvc.getPreviewOffsetCoordinates(editorSvc.getPreviewOffset(discussion.end));
       if (!coordinates) {
-        this.$store.dispatch('notification/info', "Discussion can't be located in the file.");
+        this.info("Discussion can't be located in the file.");
       } else {
         const scrollerElt = layoutSettings.showEditor
           ? editorSvc.editorElt.parentNode
diff --git a/src/components/gutters/NewComment.vue b/src/components/gutters/NewComment.vue
index 1f143d89..0c6665fc 100644
--- a/src/components/gutters/NewComment.vue
+++ b/src/components/gutters/NewComment.vue
@@ -24,7 +24,7 @@
 import { mapGetters, mapMutations, mapActions } from 'vuex';
 import Prism from 'prismjs';
 import UserImage from '../UserImage';
-import cledit from '../../services/cledit';
+import cledit from '../../services/editor/cledit';
 import editorSvc from '../../services/editorSvc';
 import markdownConversionSvc from '../../services/markdownConversionSvc';
 import utils from '../../services/utils';
diff --git a/src/components/menus/ExportMenu.vue b/src/components/menus/ExportMenu.vue
index 5a9f8d95..9137a695 100644
--- a/src/components/menus/ExportMenu.vue
+++ b/src/components/menus/ExportMenu.vue
@@ -12,18 +12,19 @@
     </menu-entry>
     <menu-entry @click.native="exportPdf">
       <icon-download slot="icon"></icon-download>
-      <div><div class="menu-entry__label">sponsor</div> Export as PDF</div>
+      <div><div class="menu-entry__label" :class="{'menu-entry__label--warning': !isSponsor}">sponsor</div> Export as PDF</div>
       <span>Produce a PDF from an HTML template.</span>
     </menu-entry>
     <menu-entry @click.native="exportPandoc">
       <icon-download slot="icon"></icon-download>
-      <div><div class="menu-entry__label">sponsor</div> Export with Pandoc</div>
+      <div><div class="menu-entry__label" :class="{'menu-entry__label--warning': !isSponsor}">sponsor</div> Export with Pandoc</div>
       <span>Convert to PDF, Word, EPUB...</span>
     </menu-entry>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import MenuEntry from './common/MenuEntry';
 import exportSvc from '../../services/exportSvc';
 
@@ -31,6 +32,7 @@ export default {
   components: {
     MenuEntry,
   },
+  computed: mapGetters(['isSponsor']),
   methods: {
     exportMarkdown() {
       const currentFile = this.$store.getters['file/current'];
diff --git a/src/components/menus/HistoryMenu.vue b/src/components/menus/HistoryMenu.vue
index 57a63139..e0b1e842 100644
--- a/src/components/menus/HistoryMenu.vue
+++ b/src/components/menus/HistoryMenu.vue
@@ -169,7 +169,7 @@ export default {
   created() {
     // Find the workspace provider
     const workspace = this.$store.getters['workspace/currentWorkspace'];
-    this.workspaceProvider = providerRegistry.providers[workspace.providerId];
+    this.workspaceProvider = providerRegistry.providersById[workspace.providerId];
 
     // Watch file changes
     this.$watch(
diff --git a/src/components/menus/ImportMenu.vue b/src/components/menus/ImportMenu.vue
index b6060753..39b80635 100644
--- a/src/components/menus/ImportMenu.vue
+++ b/src/components/menus/ImportMenu.vue
@@ -29,7 +29,7 @@ import htmlSanitizer from '../../libs/htmlSanitizer';
 import MenuEntry from './common/MenuEntry';
 import Provider from '../../services/providers/common/Provider';
 import store from '../../store';
-import fileSvc from '../../services/fileSvc';
+import workspaceSvc from '../../services/workspaceSvc';
 
 const turndownService = new TurndownService(store.getters['data/computedSettings'].turndown);
 
@@ -56,7 +56,7 @@ export default {
     async onImportMarkdown(evt) {
       const file = evt.target.files[0];
       const content = await readFile(file);
-      const item = await fileSvc.createFile({
+      const item = await workspaceSvc.createFile({
         ...Provider.parseContent(content),
         name: file.name,
       });
@@ -67,7 +67,7 @@ export default {
       const content = await readFile(file);
       const sanitizedContent = htmlSanitizer.sanitizeHtml(content)
         .replace(/&#160;/g, ' '); // Replace non-breaking spaces with classic spaces
-      const item = await fileSvc.createFile({
+      const item = await workspaceSvc.createFile({
         ...Provider.parseContent(turndownService.turndown(sanitizedContent)),
         name: file.name,
       });
diff --git a/src/components/menus/MainMenu.vue b/src/components/menus/MainMenu.vue
index 9d4eccde..560b02e2 100644
--- a/src/components/menus/MainMenu.vue
+++ b/src/components/menus/MainMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="side-bar__panel side-bar__panel--menu">
-    <div class="menu-info-entries">
+    <div class="side-bar__info">
       <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-if="loginToken">
         <div class="menu-entry__icon menu-entry__icon--image">
           <user-image :user-id="userId"></user-image>
@@ -11,7 +11,15 @@
         <div class="menu-entry__icon menu-entry__icon--image">
           <icon-provider :provider-id="currentWorkspace.providerId"></icon-provider>
         </div>
-        <span><b>{{currentWorkspace.name}}</b> synced.</span>
+        <span v-if="currentWorkspace.providerId === 'googleDriveAppData'">
+          <b>{{currentWorkspace.name}}</b> synced with your Google Drive app data folder.
+        </span>
+        <span v-else-if="currentWorkspace.providerId === 'googleDriveWorkspace'">
+          <b>{{currentWorkspace.name}}</b> synced with a <a :href="currentWorkspaceUrl" target="_blank">Google Drive folder</a>.
+        </span>
+        <span v-else-if="currentWorkspace.providerId === 'couchdbWorkspace'">
+          <b>{{currentWorkspace.name}}</b> synced with a <a :href="currentWorkspaceUrl" target="_blank">CouchDB database</a>.
+        </span>
       </div>
       <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else>
         <div class="menu-entry__icon menu-entry__icon--disabled">
@@ -27,7 +35,7 @@
     </menu-entry>
     <menu-entry @click.native="setPanel('workspaces')">
       <icon-database slot="icon"></icon-database>
-      <div>Workspaces</div>
+      <div><div class="menu-entry__label menu-entry__label--warning">new</div> Workspaces</div>
       <span>Switch to another workspace.</span>
     </menu-entry>
     <hr>
@@ -83,6 +91,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import MenuEntry from './common/MenuEntry';
+import providerRegistry from '../../services/providers/common/providerRegistry';
 import UserImage from '../UserImage';
 import googleHelper from '../../services/providers/helpers/googleHelper';
 import syncSvc from '../../services/syncSvc';
@@ -99,6 +108,10 @@ export default {
       'loginToken',
       'userId',
     ]),
+    currentWorkspaceUrl() {
+      const provider = providerRegistry.providersById[this.currentWorkspace.providerId];
+      return provider.getWorkspaceLocationUrl(this.currentWorkspace);
+    },
   },
   methods: {
     ...mapActions('data', {
diff --git a/src/components/menus/PublishMenu.vue b/src/components/menus/PublishMenu.vue
index deca76f3..44bd2604 100644
--- a/src/components/menus/PublishMenu.vue
+++ b/src/components/menus/PublishMenu.vue
@@ -16,7 +16,7 @@
         </menu-entry>
         <menu-entry @click.native="managePublish">
           <icon-view-list slot="icon"></icon-view-list>
-          <div>File publication</div>
+          <div><div class="menu-entry__label menu-entry__label--count">{{locationCount}}</div> File publication</div>
           <span>Manage current file publication locations.</span>
         </menu-entry>
       </div>
@@ -113,8 +113,7 @@ import zendeskHelper from '../../services/providers/helpers/zendeskHelper';
 import publishSvc from '../../services/publishSvc';
 import store from '../../store';
 
-const tokensToArray = (tokens, filter = () => true) => Object.keys(tokens)
-  .map(sub => tokens[sub])
+const tokensToArray = (tokens, filter = () => true) => Object.values(tokens)
   .filter(token => filter(token))
   .sort((token1, token2) => token1.name.localeCompare(token2.name));
 
@@ -142,6 +141,9 @@ export default {
     ...mapGetters('publishLocation', {
       publishLocations: 'current',
     }),
+    locationCount() {
+      return Object.keys(this.publishLocations).length;
+    },
     currentFileName() {
       return this.$store.getters['file/current'].name;
     },
@@ -178,8 +180,10 @@ export default {
         publishSvc.requestPublish();
       }
     },
-    managePublish() {
-      return this.$store.dispatch('modal/open', 'publishManagement');
+    async managePublish() {
+      try {
+        await this.$store.dispatch('modal/open', 'publishManagement');
+      } catch (e) { /* cancel */ }
     },
     async addGoogleDriveAccount() {
       try {
diff --git a/src/components/menus/SyncMenu.vue b/src/components/menus/SyncMenu.vue
index 20ffdabd..c6f2070f 100644
--- a/src/components/menus/SyncMenu.vue
+++ b/src/components/menus/SyncMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="side-bar__panel side-bar__panel--menu">
     <div class="side-bar__info" v-if="isCurrentTemp">
-      <p><b>{{currentFileName}}</b> can not be synchronized as it's a temporary file.</p>
+      <p><b>{{currentFileName}}</b> can not be synced as it's a temporary file.</p>
     </div>
     <div v-else>
       <div class="side-bar__info" v-if="noToken">
@@ -16,7 +16,7 @@
         </menu-entry>
         <menu-entry @click.native="manageSync">
           <icon-view-list slot="icon"></icon-view-list>
-          <div>File synchronization</div>
+          <div><div class="menu-entry__label menu-entry__label--count">{{locationCount}}</div> File synchronization</div>
           <span>Manage current file synchronized locations.</span>
         </menu-entry>
       </div>
@@ -91,8 +91,7 @@ import githubProvider from '../../services/providers/githubProvider';
 import syncSvc from '../../services/syncSvc';
 import store from '../../store';
 
-const tokensToArray = (tokens, filter = () => true) => Object.keys(tokens)
-  .map(sub => tokens[sub])
+const tokensToArray = (tokens, filter = () => true) => Object.values(tokens)
   .filter(token => filter(token))
   .sort((token1, token2) => token1.name.localeCompare(token2.name));
 
@@ -116,8 +115,11 @@ export default {
       'isCurrentTemp',
     ]),
     ...mapGetters('syncLocation', {
-      syncLocations: 'current',
+      syncLocations: 'currentWithWorkspaceSyncLocation',
     }),
+    locationCount() {
+      return Object.keys(this.syncLocations).length;
+    },
     currentFileName() {
       return this.$store.getters['file/current'].name;
     },
@@ -142,8 +144,10 @@ export default {
         syncSvc.requestSync();
       }
     },
-    manageSync() {
-      return this.$store.dispatch('modal/open', 'syncManagement');
+    async manageSync() {
+      try {
+        await this.$store.dispatch('modal/open', 'syncManagement');
+      } catch (e) { /* cancel */ }
     },
     async addGoogleDriveAccount() {
       try {
@@ -180,16 +184,12 @@ export default {
     async saveGoogleDrive(token) {
       try {
         await openSyncModal(token, 'googleDriveSave');
-      } catch (e) {
-        // Cancel
-      }
+      } catch (e) { /* cancel */ }
     },
     async saveDropbox(token) {
       try {
         await openSyncModal(token, 'dropboxSave');
-      } catch (e) {
-        // Cancel
-      }
+      } catch (e) { /* cancel */ }
     },
     async openGithub(token) {
       try {
@@ -201,23 +201,17 @@ export default {
           'queue/enqueue',
           () => githubProvider.openFile(token, syncLocation),
         );
-      } catch (e) {
-        // Cancel
-      }
+      } catch (e) { /* cancel */ }
     },
     async saveGithub(token) {
       try {
         await openSyncModal(token, 'githubSave');
-      } catch (e) {
-        // Cancel
-      }
+      } catch (e) { /* cancel */ }
     },
     async saveGist(token) {
       try {
         await openSyncModal(token, 'gistSync');
-      } catch (e) {
-        // Cancel
-      }
+      } catch (e) { /* cancel */ }
     },
   },
 };
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index bbb2f497..24b230da 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="side-bar__panel side-bar__panel--menu">
-    <div class="workspace" v-for="(workspace, id) in sanitizedWorkspacesById" :key="id">
+    <div class="workspace" v-for="(workspace, id) in workspacesById" :key="id">
       <menu-entry :href="workspace.url" target="_blank">
         <icon-provider slot="icon" :provider-id="workspace.providerId"></icon-provider>
         <div class="workspace__name"><div class="menu-entry__label" v-if="currentWorkspace === workspace">current</div>{{workspace.name}}</div>
@@ -9,19 +9,22 @@
     <hr>
     <menu-entry @click.native="addCouchdbWorkspace">
       <icon-provider slot="icon" provider-id="couchdbWorkspace"></icon-provider>
-      <span>Add CouchDB workspace</span>
+      <div>CouchDB workspace</div>
+      <span>Add a workspace synced with your CouchDB database.</span>
     </menu-entry>
     <menu-entry @click.native="addGithubWorkspace">
       <icon-provider slot="icon" provider-id="githubWorkspace"></icon-provider>
-      <span>Add GitHub workspace</span>
+      <div>GitHub workspace</div>
+      <span>Add a workspace synced with a GitHub repository.</span>
     </menu-entry>
     <menu-entry @click.native="addGoogleDriveWorkspace">
       <icon-provider slot="icon" provider-id="googleDriveWorkspace"></icon-provider>
-      <span>Add Google Drive workspace</span>
+      <div>Google Drive workspace</div>
+      <span>Add a workspace synced with a Google Drive folder.</span>
     </menu-entry>
     <menu-entry @click.native="manageWorkspaces">
       <icon-database slot="icon"></icon-database>
-      <span>Manage workspaces</span>
+      <span><div class="menu-entry__label menu-entry__label--count">{{workspaceCount}}</div> Manage workspaces</span>
     </menu-entry>
   </div>
 </template>
@@ -36,12 +39,13 @@ export default {
     MenuEntry,
   },
   computed: {
-    ...mapGetters('data', [
-      'sanitizedWorkspaceById',
-    ]),
     ...mapGetters('workspace', [
+      'workspacesById',
       'currentWorkspace',
     ]),
+    workspaceCount() {
+      return Object.keys(this.workspacesById).length;
+    },
   },
   methods: {
     async addCouchdbWorkspace() {
diff --git a/src/components/menus/common/MenuEntry.vue b/src/components/menus/common/MenuEntry.vue
index 8b5d44ce..bde5c7d1 100644
--- a/src/components/menus/common/MenuEntry.vue
+++ b/src/components/menus/common/MenuEntry.vue
@@ -24,9 +24,13 @@
   span {
     display: inline-block;
     font-size: 0.75rem;
-    opacity: 0.5;
+    opacity: 0.6;
     line-height: 1.3;
 
+    .menu-entry__label {
+      opacity: 1;
+    }
+
     span {
       display: inline;
       opacity: 1;
@@ -34,12 +38,6 @@
   }
 }
 
-.menu-info-entries {
-  padding: 10px;
-  margin: -10px -10px 10px;
-  background-color: rgba(255, 255, 255, 0.2);
-}
-
 .menu-entry--info {
   padding-top: 3px;
   padding-bottom: 3px;
@@ -70,10 +68,22 @@
   float: right;
   font-size: 0.6rem;
   font-weight: 600;
-  padding: 0.05em 0.25em;
-  background-color: darken($error-color, 10);
+  line-height: 1;
+  padding: 0.15em 0.25em;
+  background-color: #fff;
   border-radius: 3px;
+  opacity: 0.6;
+}
+
+.menu-entry__label--warning {
   color: #fff;
+  background-color: darken($error-color, 10);
+  opacity: 1;
+}
+
+.menu-entry__label--count {
+  font-size: 0.75rem;
+  font-weight: 400;
 }
 
 .menu-entry__text {
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index 3d1550bd..5ffdc89b 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -24,7 +24,7 @@
       <a target="_blank" href="privacy_policy.html">Privacy Policy</a>
     </div>
     <div class="modal__button-bar">
-      <button class="button" @click="config.resolve()">Close</button>
+      <button class="button button--resolve" @click="config.resolve()">Close</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/FilePropertiesModal.vue b/src/components/modals/FilePropertiesModal.vue
index 66b8403b..efc4bcd6 100644
--- a/src/components/modals/FilePropertiesModal.vue
+++ b/src/components/modals/FilePropertiesModal.vue
@@ -78,7 +78,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/HtmlExportModal.vue b/src/components/modals/HtmlExportModal.vue
index 7bb21229..60ab0c7d 100644
--- a/src/components/modals/HtmlExportModal.vue
+++ b/src/components/modals/HtmlExportModal.vue
@@ -14,15 +14,15 @@
       </form-entry>
     </div>
     <div class="modal__button-bar">
-      <button class="button button--copy">Copy to clipboard</button>
+      <button class="button button--copy" v-clipboard="result" @click="info('HTML copied to clipboard!')">Copy</button>
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
 
 <script>
-import Clipboard from 'clipboard';
+import { mapActions } from 'vuex';
 import exportSvc from '../../services/exportSvc';
 import modalTemplate from './common/modalTemplate';
 
@@ -48,14 +48,11 @@ export default modalTemplate({
     }, {
       immediate: true,
     });
-    this.clipboard = new Clipboard(this.$el.querySelector('.button--copy'), {
-      text: () => this.result,
-    });
-  },
-  destroyed() {
-    this.clipboard.destroy();
   },
   methods: {
+    ...mapActions('notification', [
+      'info',
+    ]),
     resolve() {
       const { config } = this;
       const currentFile = this.$store.getters['file/current'];
diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue
index 751d9461..7011d7f4 100644
--- a/src/components/modals/ImageModal.vue
+++ b/src/components/modals/ImageModal.vue
@@ -17,7 +17,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
@@ -36,9 +36,8 @@ export default modalTemplate({
   }),
   computed: {
     googlePhotosTokens() {
-      const googleTokens = this.$store.getters['data/googleTokensBySub'];
-      return Object.entries(googleTokens)
-        .map(([, token]) => token)
+      const googleTokensBySub = this.$store.getters['data/googleTokensBySub'];
+      return Object.values(googleTokensBySub)
         .filter(token => token.isPhotos)
         .sort((token1, token2) => token1.name.localeCompare(token2.name));
     },
diff --git a/src/components/modals/LinkModal.vue b/src/components/modals/LinkModal.vue
index c12ba23e..6145a03e 100644
--- a/src/components/modals/LinkModal.vue
+++ b/src/components/modals/LinkModal.vue
@@ -8,7 +8,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue
index cf59d2cc..8cac3cec 100644
--- a/src/components/modals/PandocExportModal.vue
+++ b/src/components/modals/PandocExportModal.vue
@@ -20,7 +20,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index e0674da3..abc59518 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -15,7 +15,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/PublishManagementModal.vue b/src/components/modals/PublishManagementModal.vue
index 5641a987..1bcec7b5 100644
--- a/src/components/modals/PublishManagementModal.vue
+++ b/src/components/modals/PublishManagementModal.vue
@@ -1,6 +1,9 @@
 <template>
   <modal-inner class="modal__inner-1--publish-management" aria-label="Manage publication locations">
     <div class="modal__content">
+      <div class="modal__image">
+        <icon-upload></icon-upload>
+      </div>
       <p v-if="publishLocations.length"><b>{{currentFileName}}</b> is published to the following location(s):</p>
       <p v-else><b>{{currentFileName}}</b> is not published yet.</p>
       <div>
@@ -12,21 +15,21 @@
             {{location.description}}
           </div>
           <div class="publish-entry__buttons flex flex--row flex--center">
-            <a class="publish-entry__button button" :href="location.url" target="_blank">
+            <a class="publish-entry__button button" :href="location.url" target="_blank" v-title="'Open location'">
               <icon-open-in-new></icon-open-in-new>
             </a>
-            <button class="publish-entry__button button" @click="remove(location)">
+            <button class="publish-entry__button button" @click="remove(location)" v-title="'Remove location'">
               <icon-delete></icon-delete>
             </button>
           </div>
         </div>
       </div>
       <div class="modal__info" v-if="publishLocations.length">
-        <b>Note:</b> Removing a synchronized location won't delete any file.
+        <b>Tip:</b> Removing a location won't delete any file.
       </div>
     </div>
     <div class="modal__button-bar">
-      <button class="button" @click="config.resolve()">Close</button>
+      <button class="button button--resolve" @click="config.resolve()">Close</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/SettingsModal.vue b/src/components/modals/SettingsModal.vue
index 86540718..2723d76d 100644
--- a/src/components/modals/SettingsModal.vue
+++ b/src/components/modals/SettingsModal.vue
@@ -25,7 +25,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="!error && config.resolve(strippedCustomSettings)">Ok</button>
+      <button class="button button--resolve" @click="!error && config.resolve(strippedCustomSettings)">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/SyncManagementModal.vue b/src/components/modals/SyncManagementModal.vue
index 8ff6f077..19060d42 100644
--- a/src/components/modals/SyncManagementModal.vue
+++ b/src/components/modals/SyncManagementModal.vue
@@ -1,38 +1,53 @@
 <template>
   <modal-inner class="modal__inner-1--sync-management" aria-label="Manage synchronized locations">
     <div class="modal__content">
+      <div class="modal__image">
+        <icon-sync></icon-sync>
+      </div>
       <p v-if="syncLocations.length"><b>{{currentFileName}}</b> is synchronized with the following location(s):</p>
       <p v-else><b>{{currentFileName}}</b> is not synchronized yet.</p>
       <div>
-        <div class="sync-entry flex flex--row flex--align-center" v-for="location in syncLocations" :key="location.id">
-          <div class="sync-entry__icon flex flex--column flex--center">
-            <icon-provider :provider-id="location.providerId"></icon-provider>
+        <div class="sync-entry flex flex--column" v-for="location in syncLocations" :key="location.id">
+          <div class="sync-entry__header flex flex--row flex--align-center">
+            <div class="sync-entry__icon flex flex--column flex--center">
+              <icon-provider :provider-id="location.providerId"></icon-provider>
+            </div>
+            <div class="sync-entry__description">
+              {{location.description}}
+            </div>
+            <div class="sync-entry__buttons flex flex--row flex--center">
+              <button class="sync-entry__button button" @click="remove(location)" v-title="'Remove location'">
+                <icon-delete></icon-delete>
+              </button>
+            </div>
           </div>
-          <div class="sync-entry__description">
-            {{location.description}}
-          </div>
-          <div class="sync-entry__buttons flex flex--row flex--center">
-            <a class="sync-entry__button button" :href="location.url" target="_blank">
-              <icon-open-in-new></icon-open-in-new>
-            </a>
-            <button class="sync-entry__button button" @click="remove(location)">
-              <icon-delete></icon-delete>
-            </button>
+          <div class="sync-entry__row flex flex--row flex--align-center">
+            <div class="sync-entry__url">
+              {{location.url || 'Workspace location'}}
+            </div>
+            <div class="sync-entry__buttons flex flex--row flex--center" v-if="location.url">
+              <button class="sync-entry__button button" v-clipboard="location.url" @click="info('Location URL copied to clipboard!')" v-title="'Copy URL'">
+                <icon-content-copy></icon-content-copy>
+              </button>
+              <a class="sync-entry__button button" v-if="location.url" :href="location.url" target="_blank" v-title="'Open location'">
+                <icon-open-in-new></icon-open-in-new>
+              </a>
+            </div>
           </div>
         </div>
       </div>
       <div class="modal__info" v-if="syncLocations.length">
-        <b>Note:</b> Removing a synchronized location won't delete any file.
+        <b>Tip:</b> Removing a location won't delete any file.
       </div>
     </div>
     <div class="modal__button-bar">
-      <button class="button" @click="config.resolve()">Close</button>
+      <button class="button button--resolve" @click="config.resolve()">Close</button>
     </div>
   </modal-inner>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import ModalInner from './common/ModalInner';
 
 export default {
@@ -44,15 +59,22 @@ export default {
       'config',
     ]),
     ...mapGetters('syncLocation', {
-      syncLocations: 'current',
+      syncLocations: 'currentWithWorkspaceSyncLocation',
     }),
     currentFileName() {
       return this.$store.getters['file/current'].name;
     },
   },
   methods: {
+    ...mapActions('notification', [
+      'info',
+    ]),
     remove(location) {
-      this.$store.commit('syncLocation/deleteItem', location.id);
+      if (location.id === 'main') {
+        this.info('This location can not be removed.');
+      } else {
+        this.$store.commit('syncLocation/deleteItem', location.id);
+      }
     },
   },
 };
@@ -66,44 +88,75 @@ export default {
 }
 
 .sync-entry {
-  padding: 0.5rem 0.25rem;
-  border-bottom: 1px solid $hr-color;
+  margin: 1.5em 0;
+  height: auto;
+  font-size: 17px;
+  line-height: 1.5;
+}
 
-  &:last-child {
-    border-bottom: none;
-  }
+$button-size: 30px;
+$small-button-size: 22px;
+
+.sync-entry__header {
+  line-height: $button-size;
+}
+
+.sync-entry__row {
+  margin-top: 1px;
+  padding-top: 1px;
+  border-top: 1px solid rgba(128, 128, 128, 0.15);
+  line-height: $small-button-size;
 }
 
 .sync-entry__icon {
-  height: 30px;
-  width: 30px;
+  height: 22px;
+  width: 22px;
   margin-right: 0.75rem;
   flex: none;
 }
 
 .sync-entry__description {
-  opacity: 0.5;
-  line-height: 1.4;
-  font-size: 0.9em;
   width: 100%;
   overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.sync-entry__url {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  opacity: 0.5;
+  font-size: 0.67em;
 }
 
 .sync-entry__buttons {
   margin-left: 0.75rem;
+
+  .sync-entry__row & {
+    margin-left: 0.5rem;
+  }
 }
 
 .sync-entry__button {
-  width: 38px;
-  height: 38px;
-  padding: 6px;
+  width: $button-size;
+  height: $button-size;
+  padding: 4px;
   background-color: transparent;
   opacity: 0.75;
 
+  .sync-entry__row & {
+    width: $small-button-size;
+    height: $small-button-size;
+    padding: 4px;
+  }
+
   &:active,
   &:focus,
   &:hover {
     opacity: 1;
+    background-color: rgba(0, 0, 0, 0.1);
   }
 }
 </style>
diff --git a/src/components/modals/TemplatesModal.vue b/src/components/modals/TemplatesModal.vue
index ea3f915f..01215ca5 100644
--- a/src/components/modals/TemplatesModal.vue
+++ b/src/components/modals/TemplatesModal.vue
@@ -45,7 +45,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index cc1101f8..4192c7a0 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -1,39 +1,69 @@
 <template>
   <modal-inner class="modal__inner-1--workspace-management" aria-label="Manage workspaces">
     <div class="modal__content">
-      <div class="workspace-entry flex flex--row flex--align-center" v-for="(workspace, id) in sanitizedWorkspacesById" :key="id">
-        <div class="workspace-entry__icon flex flex--column flex--center">
-          <icon-provider :provider-id="workspace.providerId"></icon-provider>
-        </div>
-        <div class="workspace-entry__description flex flex--column">
-          <input class="text-input" type="text" v-if="editedId === id" v-focus @blur="submitEdit()" @keydown.enter="submitEdit()" @keydown.esc.stop="submitEdit(true)" v-model="editingName">
-          <div class="workspace-entry__name" v-else>
-            {{workspace.name}}
+      <div class="modal__image">
+        <icon-database></icon-database>
+      </div>
+      <p>The following workspaces are locally available:</p>
+      <div class="workspace-entry flex flex--column" v-for="(workspace, id) in workspacesById" :key="id">
+        <div class="flex flex--column">
+          <div class="workspace-entry__header flex flex--row flex--align-center">
+            <div class="workspace-entry__icon">
+              <icon-provider :provider-id="workspace.providerId"></icon-provider>
+            </div>
+            <input class="text-input" type="text" v-if="editedId === id" v-focus @blur="submitEdit()" @keydown.enter="submitEdit()" @keydown.esc.stop="submitEdit(true)" v-model="editingName">
+            <div class="workspace-entry__name" v-else>{{workspace.name}}</div>
+            <div class="workspace-entry__buttons flex flex--row">
+              <button class="workspace-entry__button button" @click="edit(id)" v-title="'Edit name'">
+                <icon-pen></icon-pen>
+              </button>
+              <button class="workspace-entry__button button" @click="remove(id)" v-title="'Remove'">
+                <icon-delete></icon-delete>
+              </button>
+            </div>
           </div>
-          <div class="workspace-entry__url">
-            {{workspace.url}}
+          <div class="workspace-entry__row flex flex--row flex--align-center">
+            <div class="workspace-entry__url">
+              {{workspace.url}}
+            </div>
+            <div class="workspace-entry__buttons flex flex--row">
+              <button class="workspace-entry__button button" v-clipboard="workspace.url" @click="info('Workspace URL copied to clipboard!')" v-title="'Copy URL'">
+                <icon-content-copy></icon-content-copy>
+              </button>
+              <a class="workspace-entry__button button" :href="workspace.url" target="_blank" v-title="'Open workspace'">
+                <icon-open-in-new></icon-open-in-new>
+              </a>
+            </div>
+          </div>
+          <div class="workspace-entry__row flex flex--row flex--align-center" v-if="workspace.locationUrl">
+            <div class="workspace-entry__url">
+              {{workspace.locationUrl}}
+            </div>
+            <div class="workspace-entry__buttons flex flex--row">
+              <button class="workspace-entry__button button" v-clipboard="workspace.locationUrl" @click="info('Workspace URL copied to clipboard!')" v-title="'Copy URL'">
+                <icon-content-copy></icon-content-copy>
+              </button>
+              <a class="workspace-entry__button button" :href="workspace.locationUrl" target="_blank" v-title="'Open workspace location'">
+                <icon-open-in-new></icon-open-in-new>
+              </a>
+            </div>
           </div>
         </div>
-        <div class="workspace-entry__buttons flex flex--row flex--center">
-          <button class="workspace-entry__button button" @click="edit(id)">
-            <icon-pen></icon-pen>
-          </button>
-          <button class="workspace-entry__button button" v-if="id !== currentWorkspace.id && id !== mainWorkspace.id" @click="remove(id)">
-            <icon-delete></icon-delete>
-          </button>
-        </div>
+      </div>
+      <div class="modal__info">
+        <b>ProTip:</b> Workspaces are accessible <b>offline</b> after their first use.
       </div>
     </div>
     <div class="modal__button-bar">
-      <button class="button" @click="config.resolve()">Close</button>
+      <button class="button button--resolve" @click="config.resolve()">Close</button>
     </div>
   </modal-inner>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import ModalInner from './common/ModalInner';
-import localDbSvc from '../../services/localDbSvc';
+import workspaceSvc from '../../services/workspaceSvc';
 
 export default {
   components: {
@@ -47,40 +77,46 @@ export default {
     ...mapGetters('modal', [
       'config',
     ]),
-    ...mapGetters('data', [
-      'workspacesById',
-      'sanitizedWorkspacesById',
-    ]),
     ...mapGetters('workspace', [
+      'workspacesById',
       'mainWorkspace',
       'currentWorkspace',
     ]),
   },
   methods: {
+    ...mapActions('notification', [
+      'info',
+    ]),
     edit(id) {
       this.editedId = id;
       this.editingName = this.workspacesById[id].name;
     },
     submitEdit(cancel) {
       const workspace = this.workspacesById[this.editedId];
-      if (workspace && !cancel && this.editingName) {
-        this.$store.dispatch('data/patchWorkspacesById', {
-          [this.editedId]: {
-            ...workspace,
-            name: this.editingName,
-          },
-        });
-      } else {
-        this.editingName = workspace.name;
+      if (workspace) {
+        if (!cancel && this.editingName) {
+          this.$store.dispatch('workspace/patchWorkspacesById', {
+            [this.editedId]: {
+              ...workspace,
+              name: this.editingName,
+            },
+          });
+        } else {
+          this.editingName = workspace.name;
+        }
       }
       this.editedId = null;
     },
     async remove(id) {
-      try {
-        await this.$store.dispatch('modal/open', 'removeWorkspace');
-        localDbSvc.removeWorkspace(id);
-      } catch (e) {
-        // Cancel
+      if (id === this.mainWorkspace.id) {
+        this.info('Your main workspace can not be removed.');
+      } else if (id === this.currentWorkspace.id) {
+        this.info('Please close the workspace before removing it.');
+      } else {
+        try {
+          await this.$store.dispatch('modal/open', 'removeWorkspace');
+          workspaceSvc.removeWorkspace(id);
+        } catch (e) { /* Cancel */ }
       }
     },
   },
@@ -95,58 +131,78 @@ export default {
 }
 
 .workspace-entry {
-  text-align: left;
-  padding-left: 10px;
-  margin: 15px 0;
+  margin: 1.75em 0;
   height: auto;
   font-size: 17px;
   line-height: 1.5;
-  text-transform: none;
+}
 
-  &:last-child {
-    border-bottom: none;
-  }
+$button-size: 30px;
+$small-button-size: 22px;
 
-  span {
-    text-overflow: ellipsis;
-    overflow: hidden;
+.workspace-entry__header {
+  line-height: $button-size;
+
+  .text-input {
+    border: 1px solid $link-color;
+    padding: 0 5px;
+    line-height: $button-size;
+    height: $button-size;
   }
 }
 
+.workspace-entry__row {
+  margin-top: 1px;
+  padding-top: 1px;
+  border-top: 1px solid rgba(128, 128, 128, 0.15);
+  line-height: $small-button-size;
+}
+
 .workspace-entry__icon {
-  height: 20px;
-  width: 20px;
-  margin-right: 12px;
+  height: 22px;
+  width: 22px;
+  margin-right: 0.75rem;
   flex: none;
 }
 
-.workspace-entry__description {
-  width: 100%;
-  word-wrap: break-word;
-  overflow: hidden;
-}
-
 .workspace-entry__name {
+  width: 100%;
   overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   font-weight: bold;
 }
 
 .workspace-entry__url {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   opacity: 0.5;
-  font-size: 0.75em;
+  font-size: 0.67em;
 }
 
 .workspace-entry__buttons {
   margin-left: 0.75rem;
+
+  .workspace-entry__row & {
+    margin-left: 0.5rem;
+  }
 }
 
 .workspace-entry__button {
-  width: 36px;
-  height: 36px;
-  padding: 6px;
+  width: $button-size;
+  height: $button-size;
+  padding: 4px;
   background-color: transparent;
   opacity: 0.75;
 
+  .workspace-entry__row & {
+    width: $small-button-size;
+    height: $small-button-size;
+    padding: 4px;
+  }
+
   &:active,
   &:focus,
   &:hover {
diff --git a/src/components/modals/providers/BloggerPagePublishModal.vue b/src/components/modals/providers/BloggerPagePublishModal.vue
index 457436f8..76afd5ab 100644
--- a/src/components/modals/providers/BloggerPagePublishModal.vue
+++ b/src/components/modals/providers/BloggerPagePublishModal.vue
@@ -30,7 +30,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/BloggerPublishModal.vue b/src/components/modals/providers/BloggerPublishModal.vue
index 78bdc93a..9bf4e7b7 100644
--- a/src/components/modals/providers/BloggerPublishModal.vue
+++ b/src/components/modals/providers/BloggerPublishModal.vue
@@ -31,7 +31,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/CouchdbCredentialsModal.vue b/src/components/modals/providers/CouchdbCredentialsModal.vue
index 69ffc046..c9bf7270 100644
--- a/src/components/modals/providers/CouchdbCredentialsModal.vue
+++ b/src/components/modals/providers/CouchdbCredentialsModal.vue
@@ -14,7 +14,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/CouchdbWorkspaceModal.vue b/src/components/modals/providers/CouchdbWorkspaceModal.vue
index 8172316d..9a59fa02 100644
--- a/src/components/modals/providers/CouchdbWorkspaceModal.vue
+++ b/src/components/modals/providers/CouchdbWorkspaceModal.vue
@@ -4,20 +4,20 @@
       <div class="modal__image">
         <icon-provider provider-id="couchdb"></icon-provider>
       </div>
-      <p>Create a workspace synchronized with a <b>CouchDB</b> database.</p>
+      <p>Create a workspace synced with a <b>CouchDB</b> database.</p>
       <form-entry label="Database URL" error="dbUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="dbUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
           <b>Example:</b> https://instance.smileupps.com/stackedit-workspace
         </div>
         <div class="form-entry__actions">
-          <a href="https://community.stackedit.io/t/couchdb-workspace-setup/" target="_blank">More info</a>
+          <a href="https://community.stackedit.io/t/couchdb-workspace-setup/" target="_blank">How to setup?</a>
         </div>
       </form-entry>
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/DropboxAccountModal.vue b/src/components/modals/providers/DropboxAccountModal.vue
index a1d0babf..a29a7838 100644
--- a/src/components/modals/providers/DropboxAccountModal.vue
+++ b/src/components/modals/providers/DropboxAccountModal.vue
@@ -18,7 +18,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="config.resolve()">Ok</button>
+      <button class="button button--resolve" @click="config.resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/DropboxPublishModal.vue b/src/components/modals/providers/DropboxPublishModal.vue
index 84162be0..1330529b 100644
--- a/src/components/modals/providers/DropboxPublishModal.vue
+++ b/src/components/modals/providers/DropboxPublishModal.vue
@@ -25,7 +25,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/DropboxSaveModal.vue b/src/components/modals/providers/DropboxSaveModal.vue
index 39eb2f81..2fbec2f5 100644
--- a/src/components/modals/providers/DropboxSaveModal.vue
+++ b/src/components/modals/providers/DropboxSaveModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="dropbox"></icon-provider>
       </div>
-      <p>Save <b>{{currentFileName}}</b> to your <b>Dropbox</b> and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to your <b>Dropbox</b> and keep it synced.</p>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -15,7 +15,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/GistPublishModal.vue b/src/components/modals/providers/GistPublishModal.vue
index 4f65a52c..e135a79b 100644
--- a/src/components/modals/providers/GistPublishModal.vue
+++ b/src/components/modals/providers/GistPublishModal.vue
@@ -37,7 +37,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/GistSyncModal.vue b/src/components/modals/providers/GistSyncModal.vue
index 86ebaa48..5db762c8 100644
--- a/src/components/modals/providers/GistSyncModal.vue
+++ b/src/components/modals/providers/GistSyncModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="gist"></icon-provider>
       </div>
-      <p>Save <b>{{currentFileName}}</b> to a <b>Gist</b> and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to a <b>Gist</b> and keep it synced.</p>
       <form-entry label="Filename" error="filename">
         <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
       </form-entry>
@@ -24,7 +24,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/GithubAccountModal.vue b/src/components/modals/providers/GithubAccountModal.vue
index c0fdc5f9..b5f4aa57 100644
--- a/src/components/modals/providers/GithubAccountModal.vue
+++ b/src/components/modals/providers/GithubAccountModal.vue
@@ -15,7 +15,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="config.resolve()">Ok</button>
+      <button class="button button--resolve" @click="config.resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/GithubOpenModal.vue b/src/components/modals/providers/GithubOpenModal.vue
index 138f5eb1..1ffbf4f9 100644
--- a/src/components/modals/providers/GithubOpenModal.vue
+++ b/src/components/modals/providers/GithubOpenModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>Open a file from your <b>GitHub</b> repository and keep it synchronized.</p>
+      <p>Open a file from your <b>GitHub</b> repository and keep it synced.</p>
       <form-entry label="Repository URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -26,7 +26,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
@@ -34,6 +34,7 @@
 <script>
 import githubProvider from '../../../services/providers/githubProvider';
 import modalTemplate from '../common/modalTemplate';
+import utils from '../../../services/utils';
 
 export default modalTemplate({
   data: () => ({
@@ -52,7 +53,7 @@ export default modalTemplate({
         this.setError('path');
       }
       if (this.repoUrl && this.path) {
-        const parsedRepo = githubProvider.parseRepoUrl(this.repoUrl);
+        const parsedRepo = utils.parseGithubRepoUrl(this.repoUrl);
         if (!parsedRepo) {
           this.setError('repoUrl');
         } else {
diff --git a/src/components/modals/providers/GithubPublishModal.vue b/src/components/modals/providers/GithubPublishModal.vue
index 3ae03d92..35338647 100644
--- a/src/components/modals/providers/GithubPublishModal.vue
+++ b/src/components/modals/providers/GithubPublishModal.vue
@@ -37,7 +37,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/GithubSaveModal.vue b/src/components/modals/providers/GithubSaveModal.vue
index 993913f6..97291eef 100644
--- a/src/components/modals/providers/GithubSaveModal.vue
+++ b/src/components/modals/providers/GithubSaveModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>Save <b>{{currentFileName}}</b> to your <b>GitHub</b> repository and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to your <b>GitHub</b> repository and keep it synced.</p>
       <form-entry label="Repository URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -27,7 +27,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
@@ -35,6 +35,7 @@
 <script>
 import githubProvider from '../../../services/providers/githubProvider';
 import modalTemplate from '../common/modalTemplate';
+import utils from '../../../services/utils';
 
 export default modalTemplate({
   data: () => ({
@@ -49,7 +50,7 @@ export default modalTemplate({
   },
   methods: {
     resolve() {
-      const parsedRepo = githubProvider.parseRepoUrl(this.repoUrl);
+      const parsedRepo = utils.parseGithubRepoUrl(this.repoUrl);
       if (!parsedRepo) {
         this.setError('repoUrl');
       }
diff --git a/src/components/modals/providers/GithubWorkspaceModal.vue b/src/components/modals/providers/GithubWorkspaceModal.vue
index 0ec143ff..c4842359 100644
--- a/src/components/modals/providers/GithubWorkspaceModal.vue
+++ b/src/components/modals/providers/GithubWorkspaceModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="github"></icon-provider>
       </div>
-      <p>Create a workspace synchronized with a <b>GitHub</b> repository folder.</p>
+      <p>Create a workspace synced with a <b>GitHub</b> repository folder.</p>
       <form-entry label="Repository URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -26,13 +26,12 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
 
 <script>
-import githubProvider from '../../../services/providers/githubProvider';
 import utils from '../../../services/utils';
 import modalTemplate from '../common/modalTemplate';
 
@@ -46,14 +45,14 @@ export default modalTemplate({
   },
   methods: {
     resolve() {
-      const parsedRepo = githubProvider.parseRepoUrl(this.repoUrl);
+      const parsedRepo = utils.parseGithubRepoUrl(this.repoUrl);
       if (!parsedRepo) {
         this.setError('repoUrl');
       } else {
         const path = this.path && this.path.replace(/^\//, '');
         const url = utils.addQueryParams('app', {
+          ...parsedRepo,
           providerId: 'githubWorkspace',
-          repo: `${parsedRepo.owner}/${parsedRepo.repo}`,
           branch: this.branch || 'master',
           path: path || undefined,
         }, true);
diff --git a/src/components/modals/providers/GoogleDriveAccountModal.vue b/src/components/modals/providers/GoogleDriveAccountModal.vue
index 7d695540..76b290f4 100644
--- a/src/components/modals/providers/GoogleDriveAccountModal.vue
+++ b/src/components/modals/providers/GoogleDriveAccountModal.vue
@@ -18,7 +18,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="config.resolve()">Ok</button>
+      <button class="button button--resolve" @click="config.resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/GoogleDrivePublishModal.vue b/src/components/modals/providers/GoogleDrivePublishModal.vue
index c3dd424f..a425ece8 100644
--- a/src/components/modals/providers/GoogleDrivePublishModal.vue
+++ b/src/components/modals/providers/GoogleDrivePublishModal.vue
@@ -48,7 +48,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
@@ -73,9 +73,11 @@ export default modalTemplate({
         'modal/hideUntil',
         googleHelper.openPicker(this.config.token, 'folder')
           .then((folders) => {
-            this.$store.dispatch('data/patchLocalSettings', {
-              googleDriveFolderId: folders[0].id,
-            });
+            if (folders[0]) {
+              this.$store.dispatch('data/patchLocalSettings', {
+                googleDriveFolderId: folders[0].id,
+              });
+            }
           }),
       );
     },
diff --git a/src/components/modals/providers/GoogleDriveSaveModal.vue b/src/components/modals/providers/GoogleDriveSaveModal.vue
index 992bf835..07a9d622 100644
--- a/src/components/modals/providers/GoogleDriveSaveModal.vue
+++ b/src/components/modals/providers/GoogleDriveSaveModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="googleDrive"></icon-provider>
       </div>
-      <p>Save <b>{{currentFileName}}</b> to your <b>Google Drive</b> account and keep it synchronized.</p>
+      <p>Save <b>{{currentFileName}}</b> to your <b>Google Drive</b> account and keep it synced.</p>
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -23,7 +23,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
@@ -46,9 +46,11 @@ export default modalTemplate({
         'modal/hideUntil',
         googleHelper.openPicker(this.config.token, 'folder')
           .then((folders) => {
-            this.$store.dispatch('data/patchLocalSettings', {
-              googleDriveFolderId: folders[0].id,
-            });
+            if (folders[0]) {
+              this.$store.dispatch('data/patchLocalSettings', {
+                googleDriveFolderId: folders[0].id,
+              });
+            }
           }),
       );
     },
diff --git a/src/components/modals/providers/GoogleDriveWorkspaceModal.vue b/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
index 3ebc85d3..fd173f2a 100644
--- a/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
+++ b/src/components/modals/providers/GoogleDriveWorkspaceModal.vue
@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="googleDrive"></icon-provider>
       </div>
-      <p>Create a workspace synchronized with a <b>Google Drive</b> folder.</p>
+      <p>Create a workspace synced with a <b>Google Drive</b> folder.</p>
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -17,7 +17,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
@@ -37,9 +37,11 @@ export default modalTemplate({
         'modal/hideUntil',
         googleHelper.openPicker(this.config.token, 'folder')
           .then((folders) => {
-            this.$store.dispatch('data/patchLocalSettings', {
-              googleDriveWorkspaceFolderId: folders[0].id,
-            });
+            if (folders[0]) {
+              this.$store.dispatch('data/patchLocalSettings', {
+                googleDriveWorkspaceFolderId: folders[0].id,
+              });
+            }
           }),
       );
     },
diff --git a/src/components/modals/providers/GooglePhotoModal.vue b/src/components/modals/providers/GooglePhotoModal.vue
index 205547fc..82f4cca3 100644
--- a/src/components/modals/providers/GooglePhotoModal.vue
+++ b/src/components/modals/providers/GooglePhotoModal.vue
@@ -11,7 +11,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/WordpressPublishModal.vue b/src/components/modals/providers/WordpressPublishModal.vue
index 2c82739a..fdc85871 100644
--- a/src/components/modals/providers/WordpressPublishModal.vue
+++ b/src/components/modals/providers/WordpressPublishModal.vue
@@ -33,7 +33,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/ZendeskAccountModal.vue b/src/components/modals/providers/ZendeskAccountModal.vue
index 0516c6ac..7edccbd7 100644
--- a/src/components/modals/providers/ZendeskAccountModal.vue
+++ b/src/components/modals/providers/ZendeskAccountModal.vue
@@ -21,7 +21,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/components/modals/providers/ZendeskPublishModal.vue b/src/components/modals/providers/ZendeskPublishModal.vue
index 342c74b8..2f6f7ddf 100644
--- a/src/components/modals/providers/ZendeskPublishModal.vue
+++ b/src/components/modals/providers/ZendeskPublishModal.vue
@@ -37,7 +37,7 @@
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
-      <button class="button" @click="resolve()">Ok</button>
+      <button class="button button--resolve" @click="resolve()">Ok</button>
     </div>
   </modal-inner>
 </template>
diff --git a/src/data/defaultWorkspaces.js b/src/data/defaultWorkspaces.js
index 84c92cc6..b2e605ad 100644
--- a/src/data/defaultWorkspaces.js
+++ b/src/data/defaultWorkspaces.js
@@ -1,6 +1,6 @@
 export default () => ({
   main: {
     name: 'Main workspace',
-    // The rest will be filled by the data/sanitizedWorkspacesById getter
+    // The rest will be filled by the workspace/workspacesById getter
   },
 });
diff --git a/src/data/faq.md b/src/data/faq.md
index d27614dd..634255c8 100644
--- a/src/data/faq.md
+++ b/src/data/faq.md
@@ -4,14 +4,6 @@ If your workspace is not synced, your files are only stored inside your browser
 
 We recommend syncing your workspace to make sure files won't be lost in case your browser data is cleared.
 
-**Where is my data stored once I sync my workspace?**
-
-If you sign in with Google, your main workspace will be stored in Google Drive, in your [app data folder](https://developers.google.com/drive/v3/web/appdata).
-
-If you open a Google Drive workspace, the files in the workspace will be stored inside a Google Drive folder which you can share with other users.
-
-If you open a CouchDB workspace, the files in the workspace will be stored in the CouchDB database which can be hosted on premises for privacy concerns.
-
 **Can StackEdit access my data without telling me?**
 
 StackEdit is a frontend application. The access tokens issued by Google, Dropbox, GitHub... are stored in your browser and are not sent to any backend or 3^rd^ parties so your data won't be accessed by anyone.
diff --git a/src/icons/ContentCopy.vue b/src/icons/ContentCopy.vue
new file mode 100644
index 00000000..6aacf0c8
--- /dev/null
+++ b/src/icons/ContentCopy.vue
@@ -0,0 +1,5 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">
+    <path d="M 19,21L 8,21L 8,7L 19,7M 19,5L 8,5C 6.9,5 6,5.9 6,7L 6,21C 6,22.1 6.9,23 8,23L 19,23C 20.1,23 21,22.1 21,21L 21,7C 21,5.9 20.1,5 19,5 Z M 16,1L 4,1C 2.9,1 2,1.9 2,3L 2,17L 4,17L 4,3L 16,3L 16,1 Z " />
+  </svg>
+</template>
diff --git a/src/icons/index.js b/src/icons/index.js
index dd39a57f..66f9634a 100644
--- a/src/icons/index.js
+++ b/src/icons/index.js
@@ -50,6 +50,7 @@ import Database from './Database';
 import Magnify from './Magnify';
 import FormatListChecks from './FormatListChecks';
 import CloseCircle from './CloseCircle';
+import ContentCopy from './ContentCopy';
 
 Vue.component('iconProvider', Provider);
 Vue.component('iconFormatBold', FormatBold);
@@ -102,3 +103,4 @@ Vue.component('iconDatabase', Database);
 Vue.component('iconMagnify', Magnify);
 Vue.component('iconFormatListChecks', FormatListChecks);
 Vue.component('iconCloseCircle', CloseCircle);
+Vue.component('iconContentCopy', ContentCopy);
diff --git a/src/services/backupSvc.js b/src/services/backupSvc.js
index 783370b7..3d9070fb 100644
--- a/src/services/backupSvc.js
+++ b/src/services/backupSvc.js
@@ -1,4 +1,4 @@
-import fileSvc from './fileSvc';
+import workspaceSvc from './workspaceSvc';
 import utils from './utils';
 
 export default {
@@ -51,7 +51,7 @@ export default {
 
     await utils.awaitSequence(
       Object.keys(folderNameMap),
-      async externalId => fileSvc.setOrPatchItem({
+      async externalId => workspaceSvc.setOrPatchItem({
         id: folderIdMap[externalId],
         type: 'folder',
         name: folderNameMap[externalId],
@@ -61,7 +61,7 @@ export default {
 
     await utils.awaitSequence(
       Object.keys(fileNameMap),
-      async externalId => fileSvc.createFile({
+      async externalId => workspaceSvc.createFile({
         name: fileNameMap[externalId],
         parentId: folderIdMap[parentIdMap[externalId]],
         text: textMap[externalId],
diff --git a/src/services/cledit/cleditCore.js b/src/services/editor/cledit/cleditCore.js
similarity index 99%
rename from src/services/cledit/cleditCore.js
rename to src/services/editor/cledit/cleditCore.js
index 8c501af1..2f738b52 100644
--- a/src/services/cledit/cleditCore.js
+++ b/src/services/editor/cledit/cleditCore.js
@@ -1,7 +1,7 @@
 import DiffMatchPatch from 'diff-match-patch';
 import TurndownService from 'turndown/lib/turndown.browser.umd';
-import htmlSanitizer from '../../libs/htmlSanitizer';
-import store from '../../store';
+import htmlSanitizer from '../../../libs/htmlSanitizer';
+import store from '../../../store';
 
 function cledit(contentElt, scrollEltOpt, isMarkdown = false) {
   const scrollElt = scrollEltOpt || contentElt;
diff --git a/src/services/cledit/cleditHighlighter.js b/src/services/editor/cledit/cleditHighlighter.js
similarity index 100%
rename from src/services/cledit/cleditHighlighter.js
rename to src/services/editor/cledit/cleditHighlighter.js
diff --git a/src/services/cledit/cleditKeystroke.js b/src/services/editor/cledit/cleditKeystroke.js
similarity index 100%
rename from src/services/cledit/cleditKeystroke.js
rename to src/services/editor/cledit/cleditKeystroke.js
diff --git a/src/services/cledit/cleditMarker.js b/src/services/editor/cledit/cleditMarker.js
similarity index 100%
rename from src/services/cledit/cleditMarker.js
rename to src/services/editor/cledit/cleditMarker.js
diff --git a/src/services/cledit/cleditSelectionMgr.js b/src/services/editor/cledit/cleditSelectionMgr.js
similarity index 98%
rename from src/services/cledit/cleditSelectionMgr.js
rename to src/services/editor/cledit/cleditSelectionMgr.js
index 202e49ff..56a81707 100644
--- a/src/services/cledit/cleditSelectionMgr.js
+++ b/src/services/editor/cledit/cleditSelectionMgr.js
@@ -29,10 +29,14 @@ function SelectionMgr(editor) {
 
   this.createRange = (start, end) => {
     const range = document.createRange();
-    const startContainer = Number.isNaN(start) ? start : this.findContainer(start < 0 ? 0 : start);
+    const startContainer = typeof start === 'number'
+      ? this.findContainer(start < 0 ? 0 : start)
+      : start;
     let endContainer = startContainer;
     if (start !== end) {
-      endContainer = Number.isNaN(end) ? end : this.findContainer(end < 0 ? 0 : end);
+      endContainer = typeof end === 'number'
+        ? this.findContainer(end < 0 ? 0 : end)
+        : end;
     }
     range.setStart(startContainer.container, startContainer.offsetInContainer);
     range.setEnd(endContainer.container, endContainer.offsetInContainer);
diff --git a/src/services/cledit/cleditUndoMgr.js b/src/services/editor/cledit/cleditUndoMgr.js
similarity index 100%
rename from src/services/cledit/cleditUndoMgr.js
rename to src/services/editor/cledit/cleditUndoMgr.js
diff --git a/src/services/cledit/cleditUtils.js b/src/services/editor/cledit/cleditUtils.js
similarity index 100%
rename from src/services/cledit/cleditUtils.js
rename to src/services/editor/cledit/cleditUtils.js
diff --git a/src/services/cledit/cleditWatcher.js b/src/services/editor/cledit/cleditWatcher.js
similarity index 100%
rename from src/services/cledit/cleditWatcher.js
rename to src/services/editor/cledit/cleditWatcher.js
diff --git a/src/services/cledit/index.js b/src/services/editor/cledit/index.js
similarity index 87%
rename from src/services/cledit/index.js
rename to src/services/editor/cledit/index.js
index ab671476..ba5167bc 100644
--- a/src/services/cledit/index.js
+++ b/src/services/editor/cledit/index.js
@@ -1,4 +1,4 @@
-import '../../libs/clunderscore';
+import '../../../libs/clunderscore';
 import cledit from './cleditCore';
 import './cleditHighlighter';
 import './cleditKeystroke';
diff --git a/src/services/editorSvcDiscussions.js b/src/services/editor/editorSvcDiscussions.js
similarity index 97%
rename from src/services/editorSvcDiscussions.js
rename to src/services/editor/editorSvcDiscussions.js
index 9f4948c2..3805e1e2 100644
--- a/src/services/editorSvcDiscussions.js
+++ b/src/services/editor/editorSvcDiscussions.js
@@ -1,10 +1,10 @@
 import DiffMatchPatch from 'diff-match-patch';
 import cledit from './cledit';
-import utils from './utils';
-import diffUtils from './diffUtils';
-import store from '../store';
-import EditorClassApplier from '../components/common/EditorClassApplier';
-import PreviewClassApplier from '../components/common/PreviewClassApplier';
+import utils from '../utils';
+import diffUtils from '../diffUtils';
+import store from '../../store';
+import EditorClassApplier from '../../components/common/EditorClassApplier';
+import PreviewClassApplier from '../../components/common/PreviewClassApplier';
 
 let clEditor;
 // let discussionIds = {};
diff --git a/src/services/editorSvcUtils.js b/src/services/editor/editorSvcUtils.js
similarity index 98%
rename from src/services/editorSvcUtils.js
rename to src/services/editor/editorSvcUtils.js
index e17da493..6edc584f 100644
--- a/src/services/editorSvcUtils.js
+++ b/src/services/editor/editorSvcUtils.js
@@ -1,7 +1,7 @@
 import DiffMatchPatch from 'diff-match-patch';
 import cledit from './cledit';
-import animationSvc from './animationSvc';
-import store from '../store';
+import animationSvc from '../animationSvc';
+import store from '../../store';
 
 const diffMatchPatch = new DiffMatchPatch();
 
diff --git a/src/services/editor/sectionUtils.js b/src/services/editor/sectionUtils.js
new file mode 100644
index 00000000..86fe1209
--- /dev/null
+++ b/src/services/editor/sectionUtils.js
@@ -0,0 +1,114 @@
+class SectionDimension {
+  constructor(startOffset, endOffset) {
+    this.startOffset = startOffset;
+    this.endOffset = endOffset;
+    this.height = endOffset - startOffset;
+  }
+}
+
+const dimensionNormalizer = dimensionName => (editorSvc) => {
+  const dimensionList = editorSvc.previewCtx.sectionDescList
+    .map(sectionDesc => sectionDesc[dimensionName]);
+  let dimension;
+  let i;
+  let j;
+  for (i = 0; i < dimensionList.length; i += 1) {
+    dimension = dimensionList[i];
+    if (dimension.height) {
+      for (j = i + 1; j < dimensionList.length && dimensionList[j].height === 0; j += 1) {
+        // Loop
+      }
+      const normalizeFactor = j - i;
+      if (normalizeFactor !== 1) {
+        const normalizedHeight = dimension.height / normalizeFactor;
+        dimension.height = normalizedHeight;
+        dimension.endOffset = dimension.startOffset + dimension.height;
+        for (j = i + 1; j < i + normalizeFactor; j += 1) {
+          const startOffset = dimension.endOffset;
+          dimension = dimensionList[j];
+          dimension.startOffset = startOffset;
+          dimension.height = normalizedHeight;
+          dimension.endOffset = dimension.startOffset + dimension.height;
+        }
+        i = j - 1;
+      }
+    }
+  }
+};
+
+const normalizeEditorDimensions = dimensionNormalizer('editorDimension');
+const normalizePreviewDimensions = dimensionNormalizer('previewDimension');
+const normalizeTocDimensions = dimensionNormalizer('tocDimension');
+
+export default {
+  measureSectionDimensions(editorSvc) {
+    let editorSectionOffset = 0;
+    let previewSectionOffset = 0;
+    let tocSectionOffset = 0;
+    let sectionDesc = editorSvc.previewCtx.sectionDescList[0];
+    let nextSectionDesc;
+    let i = 1;
+    for (; i < editorSvc.previewCtx.sectionDescList.length; i += 1) {
+      nextSectionDesc = editorSvc.previewCtx.sectionDescList[i];
+
+      // Measure editor section
+      let newEditorSectionOffset = nextSectionDesc.editorElt
+        ? nextSectionDesc.editorElt.offsetTop
+        : editorSectionOffset;
+      newEditorSectionOffset = newEditorSectionOffset > editorSectionOffset
+        ? newEditorSectionOffset
+        : editorSectionOffset;
+      sectionDesc.editorDimension = new SectionDimension(
+        editorSectionOffset,
+        newEditorSectionOffset,
+      );
+      editorSectionOffset = newEditorSectionOffset;
+
+      // Measure preview section
+      let newPreviewSectionOffset = nextSectionDesc.previewElt
+        ? nextSectionDesc.previewElt.offsetTop
+        : previewSectionOffset;
+      newPreviewSectionOffset = newPreviewSectionOffset > previewSectionOffset
+        ? newPreviewSectionOffset
+        : previewSectionOffset;
+      sectionDesc.previewDimension = new SectionDimension(
+        previewSectionOffset,
+        newPreviewSectionOffset,
+      );
+      previewSectionOffset = newPreviewSectionOffset;
+
+      // Measure TOC section
+      let newTocSectionOffset = nextSectionDesc.tocElt
+        ? nextSectionDesc.tocElt.offsetTop + (nextSectionDesc.tocElt.offsetHeight / 2)
+        : tocSectionOffset;
+      newTocSectionOffset = newTocSectionOffset > tocSectionOffset
+        ? newTocSectionOffset
+        : tocSectionOffset;
+      sectionDesc.tocDimension = new SectionDimension(tocSectionOffset, newTocSectionOffset);
+      tocSectionOffset = newTocSectionOffset;
+
+      sectionDesc = nextSectionDesc;
+    }
+
+    // Last section
+    sectionDesc = editorSvc.previewCtx.sectionDescList[i - 1];
+    if (sectionDesc) {
+      sectionDesc.editorDimension = new SectionDimension(
+        editorSectionOffset,
+        editorSvc.editorElt.scrollHeight,
+      );
+      sectionDesc.previewDimension = new SectionDimension(
+        previewSectionOffset,
+        editorSvc.previewElt.scrollHeight,
+      );
+      sectionDesc.tocDimension = new SectionDimension(
+        tocSectionOffset,
+        editorSvc.tocElt.scrollHeight,
+      );
+    }
+
+    normalizeEditorDimensions(editorSvc);
+    normalizePreviewDimensions(editorSvc);
+    normalizeTocDimensions(editorSvc);
+  },
+};
diff --git a/src/services/editorSvc.js b/src/services/editorSvc.js
index d940ae89..c5f034e8 100644
--- a/src/services/editorSvc.js
+++ b/src/services/editorSvc.js
@@ -2,15 +2,15 @@ import Vue from 'vue';
 import DiffMatchPatch from 'diff-match-patch';
 import Prism from 'prismjs';
 import markdownItPandocRenderer from 'markdown-it-pandoc-renderer';
-import cledit from './cledit';
+import cledit from './editor/cledit';
 import pagedown from '../libs/pagedown';
 import htmlSanitizer from '../libs/htmlSanitizer';
 import markdownConversionSvc from './markdownConversionSvc';
 import markdownGrammarSvc from './markdownGrammarSvc';
-import sectionUtils from './sectionUtils';
+import sectionUtils from './editor/sectionUtils';
 import extensionSvc from './extensionSvc';
-import editorSvcDiscussions from './editorSvcDiscussions';
-import editorSvcUtils from './editorSvcUtils';
+import editorSvcDiscussions from './editor/editorSvcDiscussions';
+import editorSvcUtils from './editor/editorSvcUtils';
 import utils from './utils';
 import store from '../store';
 
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
index 24b0ddf5..747dd6bf 100644
--- a/src/services/explorerSvc.js
+++ b/src/services/explorerSvc.js
@@ -1,5 +1,5 @@
 import store from '../store';
-import fileSvc from './fileSvc';
+import workspaceSvc from './workspaceSvc';
 
 export default {
   newItem(isFolder = false) {
@@ -59,7 +59,7 @@ export default {
           parentId: 'trash',
         });
       } else {
-        fileSvc.deleteFile(id);
+        workspaceSvc.deleteFile(id);
       }
     };
 
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index 1b055234..55d7e217 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -2,7 +2,7 @@ import FileSaver from 'file-saver';
 import utils from './utils';
 import store from '../store';
 import welcomeFile from '../data/welcomeFile.md';
-import fileSvc from './fileSvc';
+import workspaceSvc from './workspaceSvc';
 
 const dbVersion = 1;
 const dbStoreName = 'objects';
@@ -12,21 +12,13 @@ const resetApp = utils.queryParams.reset;
 const deleteMarkerMaxAge = 1000;
 const checkSponsorshipAfter = (5 * 60 * 1000) + (30 * 1000); // tokenExpirationMargin + 30 sec
 
-const getDbName = (workspaceId) => {
-  let dbName = 'stackedit-db';
-  if (workspaceId !== 'main') {
-    dbName += `-${workspaceId}`;
-  }
-  return dbName;
-};
-
 class Connection {
   constructor() {
     this.getTxCbs = [];
 
     // Make the DB name
     const workspaceId = store.getters['workspace/currentWorkspace'].id;
-    this.dbName = getDbName(workspaceId);
+    this.dbName = utils.getDbName(workspaceId);
 
     // Init connection
     const request = indexedDB.open(this.dbName, dbVersion);
@@ -142,9 +134,12 @@ const localDbSvc = {
       this.connection.createTx((tx) => {
         // Look for DB changes and apply them to the store
         this.readAll(tx, (storeItemMap) => {
+          // Sanitize the workspace
+          workspaceSvc.ensureUniquePaths();
+          workspaceSvc.ensureUniqueLocations();
           // Persist all the store changes into the DB
           this.writeAll(storeItemMap, tx);
-          // Sync localStorage
+          // Sync the localStorage
           this.syncLocalStorage();
           // Done
           resolve();
@@ -177,19 +172,21 @@ const localDbSvc = {
         // Collect change
         changes.push(item);
         cursor.continue();
-      } else {
-        const storeItemMap = { ...store.getters.allItemsById };
-        changes.forEach((item) => {
-          this.readDbItem(item, storeItemMap);
-          // If item is an old delete marker, remove it from the DB
-          if (!item.hash && lastTx - item.tx > deleteMarkerMaxAge) {
-            dbStore.delete(item.id);
-          }
-        });
-        fileSvc.ensureUniquePaths();
-        this.lastTx = lastTx;
-        cb(storeItemMap);
+        return;
       }
+
+      // Read the collected changes
+      const storeItemMap = { ...store.getters.allItemsById };
+      changes.forEach((item) => {
+        this.readDbItem(item, storeItemMap);
+        // If item is an old delete marker, remove it from the DB
+        if (!item.hash && lastTx - item.tx > deleteMarkerMaxAge) {
+          dbStore.delete(item.id);
+        }
+      });
+
+      this.lastTx = lastTx;
+      cb(storeItemMap);
     };
   },
 
@@ -322,40 +319,20 @@ const localDbSvc = {
     });
   },
 
-  /**
-   * Drop the database and clean the localStorage for the specified workspaceId.
-   */
-  async removeWorkspace(id) {
-    const workspacesById = {
-      ...store.getters['data/workspacesById'],
-    };
-    delete workspacesById[id];
-    store.dispatch('data/setWorkspacesById', workspacesById);
-    this.syncLocalStorage();
-    await new Promise((resolve, reject) => {
-      const dbName = getDbName(id);
-      const request = indexedDB.deleteDatabase(dbName);
-      request.onerror = reject;
-      request.onsuccess = resolve;
-    });
-    localStorage.removeItem(`${id}/lastSyncActivity`);
-    localStorage.removeItem(`${id}/lastWindowFocus`);
-  },
-
   /**
    * Create the connection and start syncing.
    */
   async init() {
     // Reset the app if reset flag was passed
     if (resetApp) {
-      await Promise.all(Object.keys(store.getters['data/workspacesById'])
-        .map(workspaceId => localDbSvc.removeWorkspace(workspaceId)));
+      await Promise.all(Object.keys(store.getters['workspace/workspacesById'])
+        .map(workspaceId => workspaceSvc.removeWorkspace(workspaceId)));
       utils.localStorageDataIds.forEach((id) => {
         // Clean data stored in localStorage
         localStorage.removeItem(`data/${id}`);
       });
       window.location.reload();
-      throw new Error('reload');
+      throw new Error('RELOAD');
     }
 
     // Create the connection
@@ -374,6 +351,13 @@ const localDbSvc = {
       return;
     }
 
+    // Watch workspace deletions and persist them as soon as possible
+    // to make the changes available to reloading workspace tabs.
+    store.watch(
+      () => store.getters['data/workspaces'],
+      () => this.syncLocalStorage(),
+    );
+
     // Save welcome file content hash if not done already
     const hash = utils.hash(welcomeFile);
     const { welcomeFileHashes } = store.getters['data/localSettings'];
@@ -393,7 +377,7 @@ const localDbSvc = {
       // Clean files
       store.getters['file/items']
         .filter(file => file.parentId === 'trash') // If file is in the trash
-        .forEach(file => fileSvc.deleteFile(file.id));
+        .forEach(file => workspaceSvc.deleteFile(file.id));
     }
 
     // Enable sponsorship
@@ -429,7 +413,7 @@ const localDbSvc = {
             store.commit('file/setCurrentId', recentFile.id);
           } else {
             // If still no ID, create a new file
-            const newFile = await fileSvc.createFile({
+            const newFile = await workspaceSvc.createFile({
               name: 'Welcome file',
               text: welcomeFile,
             }, true);
diff --git a/src/services/optional/keystrokes.js b/src/services/optional/keystrokes.js
index 6368886a..0d347a45 100644
--- a/src/services/optional/keystrokes.js
+++ b/src/services/optional/keystrokes.js
@@ -1,4 +1,4 @@
-import cledit from '../cledit';
+import cledit from '../editor/cledit';
 import editorSvc from '../editorSvc';
 import store from '../../store';
 
diff --git a/src/services/providers/bloggerPageProvider.js b/src/services/providers/bloggerPageProvider.js
index 9a6c55a0..69b956e2 100644
--- a/src/services/providers/bloggerPageProvider.js
+++ b/src/services/providers/bloggerPageProvider.js
@@ -4,16 +4,15 @@ import Provider from './common/Provider';
 
 export default new Provider({
   id: 'bloggerPage',
-  getToken(location) {
-    const token = store.getters['data/googleTokensBySub'][location.sub];
+  getToken({ sub }) {
+    const token = store.getters['data/googleTokensBySub'][sub];
     return token && token.isBlogger ? token : null;
   },
-  getUrl(location) {
-    return `https://www.blogger.com/blogger.g?blogID=${location.blogId}#editor/target=page;pageID=${location.pageId}`;
+  getLocationUrl({ blogId, pageId }) {
+    return `https://www.blogger.com/blogger.g?blogID=${blogId}#editor/target=page;pageID=${pageId}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.pageId} — ${location.blogUrl} — ${token.name}`;
+  getLocationDescription({ pageId }) {
+    return pageId;
   },
   async publish(token, html, metadata, publishLocation) {
     const page = await googleHelper.uploadBlogger({
diff --git a/src/services/providers/bloggerProvider.js b/src/services/providers/bloggerProvider.js
index 9a788c71..0b6413c4 100644
--- a/src/services/providers/bloggerProvider.js
+++ b/src/services/providers/bloggerProvider.js
@@ -4,16 +4,15 @@ import Provider from './common/Provider';
 
 export default new Provider({
   id: 'blogger',
-  getToken(location) {
-    const token = store.getters['data/googleTokensBySub'][location.sub];
+  getToken({ sub }) {
+    const token = store.getters['data/googleTokensBySub'][sub];
     return token && token.isBlogger ? token : null;
   },
-  getUrl(location) {
-    return `https://www.blogger.com/blogger.g?blogID=${location.blogId}#editor/target=post;postID=${location.postId}`;
+  getLocationUrl({ blogId, postId }) {
+    return `https://www.blogger.com/blogger.g?blogID=${blogId}#editor/target=post;postID=${postId}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.postId} — ${location.blogUrl} — ${token.name}`;
+  getLocationDescription({ postId }) {
+    return postId;
   },
   async publish(token, html, metadata, publishLocation) {
     const post = await googleHelper.uploadBlogger({
diff --git a/src/services/providers/common/Provider.js b/src/services/providers/common/Provider.js
index b2a582ba..42a58ce2 100644
--- a/src/services/providers/common/Provider.js
+++ b/src/services/providers/common/Provider.js
@@ -2,7 +2,7 @@ import providerRegistry from './providerRegistry';
 import emptyContent from '../../../data/emptyContent';
 import utils from '../../utils';
 import store from '../../../store';
-import fileSvc from '../../fileSvc';
+import workspaceSvc from '../../workspaceSvc';
 
 const dataExtractor = /<!--stackedit_data:([A-Za-z0-9+/=\s]+)-->$/;
 
@@ -81,8 +81,8 @@ export default class Provider {
   /**
    * Find and open a file with location that meets the criteria
    */
-  static openFileWithLocation(allLocations, criteria) {
-    const location = utils.search(allLocations, criteria);
+  static openFileWithLocation(criteria) {
+    const location = utils.search(store.getters['syncLocation/items'], criteria);
     if (location) {
       // Found one, open it if it exists
       const item = store.state.file.itemsById[location.fileId];
@@ -90,7 +90,7 @@ export default class Provider {
         store.commit('file/setCurrentId', item.id);
         // If file is in the trash, restore it
         if (item.parentId === 'trash') {
-          fileSvc.setOrPatchItem({
+          workspaceSvc.setOrPatchItem({
             ...item,
             parentId: null,
           });
diff --git a/src/services/providers/common/providerRegistry.js b/src/services/providers/common/providerRegistry.js
index 1e48ce70..d3b90212 100644
--- a/src/services/providers/common/providerRegistry.js
+++ b/src/services/providers/common/providerRegistry.js
@@ -1,7 +1,7 @@
 export default {
-  providers: {},
+  providersById: {},
   register(provider) {
-    this.providers[provider.id] = provider;
+    this.providersById[provider.id] = provider;
     return provider;
   },
 };
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index 11d7468f..7db9903d 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -10,56 +10,54 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  async initWorkspace() {
-    const dbUrl = (utils.queryParams.dbUrl || '').replace(/\/?$/, ''); // Remove trailing /
-    const workspaceParams = {
+  getWorkspaceParams({ dbUrl }) {
+    return {
       providerId: this.id,
       dbUrl,
     };
+  },
+  getWorkspaceLocationUrl({ dbUrl }) {
+    return dbUrl;
+  },
+  getSyncDataUrl(fileSyncData, { id }) {
+    const { dbUrl } = this.getToken();
+    return `${dbUrl}/${id}/data`;
+  },
+  getSyncDataDescription(fileSyncData, { id }) {
+    return id;
+  },
+  async initWorkspace() {
+    const dbUrl = (utils.queryParams.dbUrl || '').replace(/\/?$/, ''); // Remove trailing /
+    const workspaceParams = this.getWorkspaceParams({ dbUrl });
     const workspaceId = utils.makeWorkspaceId(workspaceParams);
-    const getToken = () => store.getters['data/couchdbTokensBySub'][workspaceId];
-    const getWorkspace = () => store.getters['data/sanitizedWorkspacesById'][workspaceId];
 
-    if (!getToken()) {
-      // Create token
+    // Create the token if it doesn't exist
+    if (!store.getters['data/couchdbTokensBySub'][workspaceId]) {
       store.dispatch('data/addCouchdbToken', {
         sub: workspaceId,
         dbUrl,
       });
     }
 
-    // Create the workspace
-    let workspace = getWorkspace();
-    if (!workspace) {
-      // Make sure the database exists and retrieve its name
-      let db;
+    // Create the workspace if it doesn't exist
+    if (!store.getters['workspace/workspacesById'][workspaceId]) {
       try {
-        db = await couchdbHelper.getDb(getToken());
+        // Make sure the database exists and retrieve its name
+        const db = await couchdbHelper.getDb(store.getters['data/couchdbTokensBySub'][workspaceId]);
+        store.dispatch('workspace/patchWorkspacesById', {
+          [workspaceId]: {
+            id: workspaceId,
+            name: db.db_name,
+            providerId: this.id,
+            dbUrl,
+          },
+        });
       } catch (e) {
         throw new Error(`${dbUrl} is not accessible. Make sure you have the proper permissions.`);
       }
-      store.dispatch('data/patchWorkspacesById', {
-        [workspaceId]: {
-          id: workspaceId,
-          name: db.db_name,
-          providerId: this.id,
-          dbUrl,
-        },
-      });
-      workspace = getWorkspace();
     }
 
-    // Fix the URL hash
-    utils.setQueryParams(workspaceParams);
-    if (workspace.url !== window.location.href) {
-      store.dispatch('data/patchWorkspacesById', {
-        [workspace.id]: {
-          ...workspace,
-          url: window.location.href,
-        },
-      });
-    }
-    return getWorkspace();
+    return store.getters['workspace/workspacesById'][workspaceId];
   },
   async getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
diff --git a/src/services/providers/dropboxProvider.js b/src/services/providers/dropboxProvider.js
index 839a7a62..e082b751 100644
--- a/src/services/providers/dropboxProvider.js
+++ b/src/services/providers/dropboxProvider.js
@@ -2,7 +2,7 @@ import store from '../../store';
 import dropboxHelper from './helpers/dropboxHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
-import fileSvc from '../fileSvc';
+import workspaceSvc from '../workspaceSvc';
 
 const makePathAbsolute = (token, path) => {
   if (!token.fullAccess) {
@@ -19,17 +19,16 @@ const makePathRelative = (token, path) => {
 
 export default new Provider({
   id: 'dropbox',
-  getToken(location) {
-    return store.getters['data/dropboxTokensBySub'][location.sub];
+  getToken({ sub }) {
+    return store.getters['data/dropboxTokensBySub'][sub];
   },
-  getUrl(location) {
-    const pathComponents = location.path.split('/').map(encodeURIComponent);
+  getLocationUrl({ path }) {
+    const pathComponents = path.split('/').map(encodeURIComponent);
     const filename = pathComponents.pop();
     return `https://www.dropbox.com/home${pathComponents.join('/')}?preview=${filename}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.path} — ${location.dropboxFileId} — ${token.name}`;
+  getLocationDescription({ path }) {
+    return path;
   },
   checkPath(path) {
     return path && path.match(/^\/[^\\<>:"|?*]+$/);
@@ -71,7 +70,7 @@ export default new Provider({
   async openFiles(token, paths) {
     await utils.awaitSequence(paths, async (path) => {
       // Check if the file exists and open it
-      if (!Provider.openFileWithLocation(store.getters['syncLocation/items'], {
+      if (!Provider.openFileWithLocation({
         providerId: this.id,
         path,
       })) {
@@ -99,7 +98,7 @@ export default new Provider({
         if (dotPos > 0 && slashPos < name.length) {
           name = name.slice(0, dotPos);
         }
-        const item = await fileSvc.createFile({
+        const item = await workspaceSvc.createFile({
           name,
           parentId: store.getters['file/current'].parentId,
           text: content.text,
@@ -108,9 +107,8 @@ export default new Provider({
           comments: content.comments,
         }, true);
         store.commit('file/setCurrentId', item.id);
-        store.commit('syncLocation/setItem', {
+        workspaceSvc.addSyncLocation({
           ...syncLocation,
-          id: utils.uid(),
           fileId: item.id,
         });
         store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Dropbox.`);
diff --git a/src/services/providers/gistProvider.js b/src/services/providers/gistProvider.js
index 327f490c..60968deb 100644
--- a/src/services/providers/gistProvider.js
+++ b/src/services/providers/gistProvider.js
@@ -5,15 +5,14 @@ import utils from '../utils';
 
 export default new Provider({
   id: 'gist',
-  getToken(location) {
-    return store.getters['data/githubTokensBySub'][location.sub];
+  getToken({ sub }) {
+    return store.getters['data/githubTokensBySub'][sub];
   },
-  getUrl(location) {
-    return `https://gist.github.com/${location.gistId}`;
+  getLocationUrl({ gistId }) {
+    return `https://gist.github.com/${gistId}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.filename} — ${location.gistId} — ${token.name}`;
+  getLocationDescription({ filename }) {
+    return filename;
   },
   async downloadContent(token, syncLocation) {
     const content = await githubHelper.downloadGist({
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index 45307af3..88f7a339 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -2,21 +2,25 @@ import store from '../../store';
 import githubHelper from './helpers/githubHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
-import fileSvc from '../fileSvc';
+import workspaceSvc from '../workspaceSvc';
 
 const savedSha = {};
 
 export default new Provider({
   id: 'github',
-  getToken(location) {
-    return store.getters['data/githubTokensBySub'][location.sub];
+  getToken({ sub }) {
+    return store.getters['data/githubTokensBySub'][sub];
   },
-  getUrl(location) {
-    return `https://github.com/${encodeURIComponent(location.owner)}/${encodeURIComponent(location.repo)}/blob/${encodeURIComponent(location.branch)}/${encodeURIComponent(location.path)}`;
+  getLocationUrl({
+    owner,
+    repo,
+    branch,
+    path,
+  }) {
+    return `https://github.com/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/tree/${encodeURIComponent(branch)}/${utils.encodeUrlPath(path)}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.path} — ${location.owner}/${location.repo} — ${token.name}`;
+  getLocationDescription({ path }) {
+    return path;
   },
   async downloadContent(token, syncLocation) {
     try {
@@ -59,7 +63,7 @@ export default new Provider({
   },
   async openFile(token, syncLocation) {
     // Check if the file exists and open it
-    if (!Provider.openFileWithLocation(store.getters['syncLocation/items'], syncLocation)) {
+    if (!Provider.openFileWithLocation(syncLocation)) {
       // Download content from GitHub
       let content;
       try {
@@ -79,7 +83,7 @@ export default new Provider({
       if (dotPos > 0 && slashPos < name.length) {
         name = name.slice(0, dotPos);
       }
-      const item = await fileSvc.createFile({
+      const item = await workspaceSvc.createFile({
         name,
         parentId: store.getters['file/current'].parentId,
         text: content.text,
@@ -88,21 +92,13 @@ export default new Provider({
         comments: content.comments,
       }, true);
       store.commit('file/setCurrentId', item.id);
-      store.commit('syncLocation/setItem', {
+      workspaceSvc.addSyncLocation({
         ...syncLocation,
-        id: utils.uid(),
         fileId: item.id,
       });
       store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from GitHub.`);
     }
   },
-  parseRepoUrl(url) {
-    const parsedRepo = url && url.match(/([^/:]+)\/([^/]+?)(?:\.git|\/)?$/);
-    return parsedRepo && {
-      owner: parsedRepo[1],
-      repo: parsedRepo[2],
-    };
-  },
   makeLocation(token, owner, repo, branch, path) {
     return {
       providerId: this.id,
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 9cf446b7..4105e28b 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -4,18 +4,8 @@ import Provider from './common/Provider';
 import utils from '../utils';
 import userSvc from '../userSvc';
 
-const getAbsolutePath = syncData =>
-  `${store.getters['workspace/currentWorkspace'].path || ''}${syncData.id}`;
-
-const getWorkspaceWithOwner = () => {
-  const workspace = store.getters['workspace/currentWorkspace'];
-  const [owner, repo] = workspace.repo.split('/');
-  return {
-    ...workspace,
-    owner,
-    repo,
-  };
-};
+const getAbsolutePath = ({ id }) =>
+  `${store.getters['workspace/currentWorkspace'].path || ''}${id}`;
 
 let treeShaMap;
 let treeFolderMap;
@@ -31,14 +21,38 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  async initWorkspace() {
-    const [owner, repo] = (utils.queryParams.repo || '').split('/');
-    const { branch } = utils.queryParams;
-    const workspaceParams = {
+  getWorkspaceParams({
+    owner,
+    repo,
+    branch,
+    path,
+  }) {
+    return {
       providerId: this.id,
-      repo: `${owner}/${repo}`,
+      owner,
+      repo,
       branch,
+      path,
     };
+  },
+  getWorkspaceLocationUrl({
+    owner,
+    repo,
+    branch,
+    path,
+  }) {
+    return `https://github.com/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/tree/${encodeURIComponent(branch)}/${utils.encodeUrlPath(path)}`;
+  },
+  getSyncDataUrl({ id }) {
+    const { owner, repo, branch } = store.getters['workspace/currentWorkspace'];
+    return `https://github.com/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/tree/${encodeURIComponent(branch)}/${utils.encodeUrlPath(getAbsolutePath({ id }))}`;
+  },
+  getSyncDataDescription({ id }) {
+    return getAbsolutePath({ id });
+  },
+  async initWorkspace() {
+    const { owner, repo, branch } = utils.queryParams;
+    const workspaceParams = this.getWorkspaceParams({ owner, repo, branch });
     const path = (utils.queryParams.path || '')
       .replace(/^\/*/, '') // Remove leading `/`
       .replace(/\/*$/, '/'); // Add trailing `/`
@@ -46,7 +60,7 @@ export default new Provider({
       workspaceParams.path = path;
     }
     const workspaceId = utils.makeWorkspaceId(workspaceParams);
-    let workspace = store.getters['data/sanitizedWorkspacesById'][workspaceId];
+    const workspace = store.getters['workspace/workspacesById'][workspaceId];
 
     // See if we already have a token
     let token;
@@ -62,34 +76,23 @@ export default new Provider({
     if (!workspace) {
       const pathEntries = (path || '').split('/');
       const name = pathEntries[pathEntries.length - 2] || repo; // path ends with `/`
-      workspace = {
-        ...workspaceParams,
-        id: workspaceId,
-        sub: token.sub,
-        name,
-      };
-    }
-
-    // Fix the URL hash
-    utils.setQueryParams(workspaceParams);
-    if (workspace.url !== window.location.href) {
-      store.dispatch('data/patchWorkspacesById', {
+      store.dispatch('workspace/patchWorkspacesById', {
         [workspaceId]: {
-          ...workspace,
-          url: window.location.href,
+          ...workspaceParams,
+          id: workspaceId,
+          sub: token.sub,
+          name,
         },
       });
     }
-    return store.getters['data/sanitizedWorkspacesById'][workspaceId];
+
+    return store.getters['workspace/workspacesById'][workspaceId];
   },
   getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
-    const { owner, repo, branch } = getWorkspaceWithOwner();
     return githubHelper.getTree({
+      ...store.getters['workspace/currentWorkspace'],
       token: syncToken,
-      owner,
-      repo,
-      branch,
     });
   },
   prepareChanges(tree) {
@@ -322,7 +325,7 @@ export default new Provider({
     // locations are stored as paths, so we upload an empty file
     const syncToken = store.getters['workspace/syncToken'];
     await githubHelper.uploadFile({
-      ...getWorkspaceWithOwner(),
+      ...store.getters['workspace/currentWorkspace'],
       token: syncToken,
       path: getAbsolutePath(syncData),
       content: '',
@@ -334,7 +337,7 @@ export default new Provider({
     if (treeShaMap[syncData.id]) {
       const syncToken = store.getters['workspace/syncToken'];
       await githubHelper.removeFile({
-        ...getWorkspaceWithOwner(),
+        ...store.getters['workspace/currentWorkspace'],
         token: syncToken,
         path: getAbsolutePath(syncData),
         sha: treeShaMap[syncData.id],
@@ -348,7 +351,7 @@ export default new Provider({
     fileSyncData,
   }) {
     const { sha, data } = await githubHelper.downloadFile({
-      ...getWorkspaceWithOwner(),
+      ...store.getters['workspace/currentWorkspace'],
       token,
       path: getAbsolutePath(fileSyncData),
     });
@@ -369,7 +372,7 @@ export default new Provider({
     }
 
     const { sha, data } = await githubHelper.downloadFile({
-      ...getWorkspaceWithOwner(),
+      ...store.getters['workspace/currentWorkspace'],
       token,
       path: getAbsolutePath(syncData),
     });
@@ -388,7 +391,7 @@ export default new Provider({
     const path = store.getters.gitPathsByItemId[file.id];
     const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
     const res = await githubHelper.uploadFile({
-      ...getWorkspaceWithOwner(),
+      ...store.getters['workspace/currentWorkspace'],
       token,
       path: absolutePath,
       content: Provider.serializeContent(content),
@@ -418,7 +421,7 @@ export default new Provider({
       hash: item.hash,
     };
     const res = await githubHelper.uploadFile({
-      ...getWorkspaceWithOwner(),
+      ...store.getters['workspace/currentWorkspace'],
       token,
       path: getAbsolutePath(syncData),
       content: JSON.stringify(item),
@@ -432,17 +435,8 @@ export default new Provider({
       },
     };
   },
-  onSyncEnd() {
-    // Clean up
-    treeShaMap = null;
-    treeFolderMap = null;
-    treeFileMap = null;
-    treeDataMap = null;
-    treeSyncLocationMap = null;
-    treePublishLocationMap = null;
-  },
   async listRevisions(token, fileId) {
-    const { owner, repo, branch } = getWorkspaceWithOwner();
+    const { owner, repo, branch } = store.getters['workspace/currentWorkspace'];
     const syncData = Provider.getContentSyncData(fileId);
     const entries = await githubHelper.getCommits({
       token,
@@ -478,7 +472,7 @@ export default new Provider({
   async getRevisionContent(token, fileId, revisionId) {
     const syncData = Provider.getContentSyncData(fileId);
     const { data } = await githubHelper.downloadFile({
-      ...getWorkspaceWithOwner(),
+      ...store.getters['workspace/currentWorkspace'],
       token,
       branch: revisionId,
       path: getAbsolutePath(syncData),
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index b6e953fc..edf2e446 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -10,12 +10,25 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
+  getWorkspaceParams() {
+    // No param as it's the main workspace
+    return {};
+  },
+  getWorkspaceLocationUrl() {
+    // No direct link to app data
+    return null;
+  },
+  getSyncDataUrl() {
+    // No direct link to app data
+    return null;
+  },
+  getSyncDataDescription({ id }) {
+    return id;
+  },
   async initWorkspace() {
     // Nothing much to do since the main workspace isn't necessarily synchronized
-    // Remove the URL hash
-    utils.setQueryParams();
     // Return the main workspace
-    return store.getters['data/workspacesById'].main;
+    return store.getters['workspace/workspacesById'].main;
   },
   async getChanges() {
     const syncToken = store.getters['workspace/syncToken'];
@@ -155,7 +168,7 @@ export default new Provider({
     const revisions = await googleHelper.getAppDataFileRevisions(token, syncData.id);
     return revisions.map(revision => ({
       id: revision.id,
-      sub: revision.lastModifyingUser && `go:${revision.lastModifyingUser.permissionId}`,
+      sub: `go:${revision.lastModifyingUser.permissionId}`,
       created: new Date(revision.modifiedTime).getTime(),
     }))
       .sort((revision1, revision2) => revision2.created - revision1.created);
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index 08302dce..bee6bded 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -2,20 +2,19 @@ import store from '../../store';
 import googleHelper from './helpers/googleHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
-import fileSvc from '../fileSvc';
+import workspaceSvc from '../workspaceSvc';
 
 export default new Provider({
   id: 'googleDrive',
-  getToken(location) {
-    const token = store.getters['data/googleTokensBySub'][location.sub];
+  getToken({ sub }) {
+    const token = store.getters['data/googleTokensBySub'][sub];
     return token && token.isDrive ? token : null;
   },
-  getUrl(location) {
-    return `https://docs.google.com/file/d/${location.driveFileId}/edit`;
+  getLocationUrl({ driveFileId }) {
+    return `https://docs.google.com/file/d/${driveFileId}/edit`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.driveFileId} — ${token.name}`;
+  getLocationDescription({ driveFileId }) {
+    return driveFileId;
   },
   async initAction() {
     const state = googleHelper.driveState || {};
@@ -42,7 +41,7 @@ export default new Provider({
             folderId,
           };
           const workspaceId = utils.makeWorkspaceId(workspaceParams);
-          const workspace = store.getters['data/sanitizedWorkspacesById'][workspaceId];
+          const workspace = store.getters['workspace/workspacesById'][workspaceId];
           // If we have the workspace, open it by changing the current URL
           if (workspace) {
             utils.setQueryParams(workspaceParams);
@@ -86,7 +85,7 @@ export default new Provider({
     const token = store.getters['data/googleTokensBySub'][state.userId];
     switch (token && state.action) {
       case 'create': {
-        const file = await fileSvc.createFile({}, true);
+        const file = await workspaceSvc.createFile({}, true);
         store.commit('file/setCurrentId', file.id);
         // Return a new syncLocation
         return this.makeLocation(token, null, googleHelper.driveActionFolder.id);
@@ -142,7 +141,7 @@ export default new Provider({
   async openFiles(token, driveFiles) {
     return utils.awaitSequence(driveFiles, async (driveFile) => {
       // Check if the file exists and open it
-      if (!Provider.openFileWithLocation(store.getters['syncLocation/items'], {
+      if (!Provider.openFileWithLocation({
         providerId: this.id,
         driveFileId: driveFile.id,
       })) {
@@ -161,7 +160,7 @@ export default new Provider({
         }
 
         // Create the file
-        const item = await fileSvc.createFile({
+        const item = await workspaceSvc.createFile({
           name: driveFile.name,
           parentId: store.getters['file/current'].parentId,
           text: content.text,
@@ -170,9 +169,8 @@ export default new Provider({
           comments: content.comments,
         }, true);
         store.commit('file/setCurrentId', item.id);
-        store.commit('syncLocation/setItem', {
+        workspaceSvc.addSyncLocation({
           ...syncLocation,
-          id: utils.uid(),
           fileId: item.id,
         });
         store.dispatch('notification/info', `${store.getters['file/current'].name} was imported from Google Drive.`);
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index 8ffb2b1f..1cd6f363 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -2,7 +2,7 @@ import store from '../../store';
 import googleHelper from './helpers/googleHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
-import fileSvc from '../fileSvc';
+import workspaceSvc from '../workspaceSvc';
 
 let fileIdToOpen;
 let syncStartPageToken;
@@ -12,17 +12,27 @@ export default new Provider({
   getToken() {
     return store.getters['workspace/syncToken'];
   },
-  async initWorkspace() {
-    const makeWorkspaceParams = folderId => ({
+  getWorkspaceParams({ folderId }) {
+    return {
       providerId: this.id,
       folderId,
-    });
-
+    };
+  },
+  getWorkspaceLocationUrl({ folderId }) {
+    return `https://docs.google.com/folder/d/${folderId}`;
+  },
+  getSyncDataUrl({ id }) {
+    return `https://docs.google.com/file/d/${id}/edit`;
+  },
+  getSyncDataDescription({ id }) {
+    return id;
+  },
+  async initWorkspace() {
     const makeWorkspaceId = folderId => folderId
-      && utils.makeWorkspaceId(makeWorkspaceParams(folderId));
+      && utils.makeWorkspaceId(this.getWorkspaceParams({ folderId }));
 
     const getWorkspace = folderId =>
-      store.getters['data/sanitizedWorkspacesById'][makeWorkspaceId(folderId)];
+      store.getters['workspace/workspacesById'][makeWorkspaceId(folderId)];
 
     const initFolder = async (token, folder) => {
       const appProperties = {
@@ -33,24 +43,26 @@ export default new Provider({
 
       // Make sure data folder exists
       if (!appProperties.dataFolderId) {
-        appProperties.dataFolderId = (await googleHelper.uploadFile({
+        const dataFolder = await googleHelper.uploadFile({
           token,
           name: '.stackedit-data',
           parents: [folder.id],
           appProperties: { folderId: folder.id },
           mediaType: googleHelper.folderMimeType,
-        })).id;
+        });
+        appProperties.dataFolderId = dataFolder.id;
       }
 
       // Make sure trash folder exists
       if (!appProperties.trashFolderId) {
-        appProperties.trashFolderId = (await googleHelper.uploadFile({
+        const trashFolder = await googleHelper.uploadFile({
           token,
           name: '.stackedit-trash',
           parents: [folder.id],
           appProperties: { folderId: folder.id },
           mediaType: googleHelper.folderMimeType,
-        })).id;
+        });
+        appProperties.trashFolderId = trashFolder.id;
       }
 
       // Update workspace if some properties are missing
@@ -68,13 +80,12 @@ export default new Provider({
 
       // Update workspace in the store
       const workspaceId = makeWorkspaceId(folder.id);
-      store.dispatch('data/patchWorkspacesById', {
+      store.dispatch('workspace/patchWorkspacesById', {
         [workspaceId]: {
           id: workspaceId,
           sub: token.sub,
           name: folder.name,
           providerId: this.id,
-          url: window.location.href,
           folderId: folder.id,
           teamDriveId: folder.teamDriveId,
           dataFolderId: appProperties.dataFolderId,
@@ -110,11 +121,10 @@ export default new Provider({
     }
 
     // Init workspace
-    let workspace = getWorkspace(folderId);
-    if (!workspace) {
+    if (!getWorkspace(folderId)) {
       let folder;
       try {
-        folder = googleHelper.getFile(token, folderId);
+        folder = await googleHelper.getFile(token, folderId);
       } catch (err) {
         throw new Error(`Folder ${folderId} is not accessible. Make sure you have the right permissions.`);
       }
@@ -124,20 +134,9 @@ export default new Provider({
         throw new Error(`Folder ${folderId} is part of another workspace.`);
       }
       await initFolder(token, folder);
-      workspace = getWorkspace(folderId);
     }
 
-    // Fix the URL hash
-    utils.setQueryParams(makeWorkspaceParams(workspace.folderId));
-    if (workspace.url !== window.location.href) {
-      store.dispatch('data/patchWorkspacesById', {
-        [workspace.id]: {
-          ...workspace,
-          url: window.location.href,
-        },
-      });
-    }
-    return store.getters['data/sanitizedWorkspacesById'][workspace.id];
+    return getWorkspace(folderId);
   },
   async performAction() {
     const state = googleHelper.driveState || {};
@@ -163,7 +162,7 @@ export default new Provider({
             [syncData.id]: syncData,
           });
         }
-        const file = await fileSvc.createFile({
+        const file = await workspaceSvc.createFile({
           parentId: syncData && syncData.itemId,
         }, true);
         store.commit('file/setCurrentId', file.id);
@@ -486,6 +485,7 @@ export default new Provider({
         folderId: workspace.folderId,
       },
       media: JSON.stringify(item),
+      mediaType: 'application/json',
       fileId: syncData && syncData.id,
       oldParents: syncData && syncData.parentIds,
       ifNotTooLate,
diff --git a/src/services/providers/helpers/dropboxHelper.js b/src/services/providers/helpers/dropboxHelper.js
index c66df2c3..4e1cf9fd 100644
--- a/src/services/providers/helpers/dropboxHelper.js
+++ b/src/services/providers/helpers/dropboxHelper.js
@@ -8,13 +8,16 @@ const getAppKey = (fullAccess) => {
   return 'sw0hlixhr8q1xk0';
 };
 
+const httpHeaderSafeJson = args => args && JSON.stringify(args)
+  .replace(/[\u007f-\uffff]/g, c => `\\u${`000${c.charCodeAt(0).toString(16)}`.slice(-4)}`);
+
 const request = (token, options, args) => networkSvc.request({
   ...options,
   headers: {
     ...options.headers || {},
     'Content-Type': options.body && (typeof options.body === 'string'
       ? 'application/octet-stream' : 'application/json; charset=utf-8'),
-    'Dropbox-API-Arg': args && JSON.stringify(args),
+    'Dropbox-API-Arg': httpHeaderSafeJson(args),
     Authorization: `Bearer ${token.accessToken}`,
   },
 });
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index b203c1f0..b92c7524 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -413,7 +413,7 @@ export default {
       });
       revisions.forEach((revision) => {
         store.commit('userInfo/addItem', {
-          id: revision.lastModifyingUser.permissionId,
+          id: `go:${revision.lastModifyingUser.permissionId}`,
           name: revision.lastModifyingUser.displayName,
           imageUrl: revision.lastModifyingUser.photoLink,
         });
diff --git a/src/services/providers/wordpressProvider.js b/src/services/providers/wordpressProvider.js
index 5b1203d9..19e117fc 100644
--- a/src/services/providers/wordpressProvider.js
+++ b/src/services/providers/wordpressProvider.js
@@ -7,12 +7,11 @@ export default new Provider({
   getToken(location) {
     return store.getters['data/wordpressTokensBySub'][location.sub];
   },
-  getUrl(location) {
+  getLocationUrl(location) {
     return `https://wordpress.com/post/${location.siteId}/${location.postId}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.postId} — ${location.domain} — ${token.name}`;
+  getLocationDescription({ postId }) {
+    return postId;
   },
   async publish(token, html, metadata, publishLocation) {
     const post = await wordpressHelper.uploadPost({
diff --git a/src/services/providers/zendeskProvider.js b/src/services/providers/zendeskProvider.js
index 1ec5c9cf..b5ce5d61 100644
--- a/src/services/providers/zendeskProvider.js
+++ b/src/services/providers/zendeskProvider.js
@@ -7,13 +7,12 @@ export default new Provider({
   getToken(location) {
     return store.getters['data/zendeskTokensBySub'][location.sub];
   },
-  getUrl(location) {
+  getLocationUrl(location) {
     const token = this.getToken(location);
     return `https://${token.subdomain}.zendesk.com/hc/${location.locale}/articles/${location.articleId}`;
   },
-  getDescription(location) {
-    const token = this.getToken(location);
-    return `${location.articleId} — ${token.name} — ${token.subdomain}`;
+  getLocationDescription({ articleId }) {
+    return articleId;
   },
   async publish(token, html, metadata, publishLocation) {
     const articleId = await zendeskHelper.uploadArticle({
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index 71c13605..d4f8042f 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -4,6 +4,7 @@ import utils from './utils';
 import networkSvc from './networkSvc';
 import exportSvc from './exportSvc';
 import providerRegistry from './providers/common/providerRegistry';
+import workspaceSvc from './workspaceSvc';
 
 const hasCurrentFilePublishLocations = () => !!store.getters['publishLocation/current'].length;
 
@@ -45,7 +46,7 @@ const publish = async (publishLocation) => {
   const content = await localDbSvc.loadItem(`${fileId}/content`);
   const file = store.state.file.itemsById[fileId];
   const properties = utils.computeProperties(content.properties);
-  const provider = providerRegistry.providers[publishLocation.providerId];
+  const provider = providerRegistry.providersById[publishLocation.providerId];
   const token = provider.getToken(publishLocation);
   const metadata = {
     title: ensureString(properties.title, file.name),
@@ -122,14 +123,12 @@ const requestPublish = () => {
 };
 
 const createPublishLocation = (publishLocation) => {
-  publishLocation.id = utils.uid();
   const currentFile = store.getters['file/current'];
   publishLocation.fileId = currentFile.id;
   store.dispatch(
     'queue/enqueue',
     async () => {
-      const publishLocationToStore = await publish(publishLocation);
-      store.commit('publishLocation/setItem', publishLocationToStore);
+      workspaceSvc.addPublishLocation(await publish(publishLocation));
       store.dispatch('notification/info', `A new publication location was added to "${currentFile.name}".`);
     },
   );
diff --git a/src/services/sectionUtils.js b/src/services/sectionUtils.js
deleted file mode 100644
index 05202ca0..00000000
--- a/src/services/sectionUtils.js
+++ /dev/null
@@ -1,113 +0,0 @@
-class SectionDimension {
-  constructor(startOffset, endOffset) {
-    this.startOffset = startOffset;
-    this.endOffset = endOffset;
-    this.height = endOffset - startOffset;
-  }
-}
-
-const dimensionNormalizer = dimensionName => (editorSvc) => {
-  const dimensionList = editorSvc.previewCtx.sectionDescList
-    .map(sectionDesc => sectionDesc[dimensionName]);
-  let dimension;
-  let i;
-  let j;
-  for (i = 0; i < dimensionList.length; i += 1) {
-    dimension = dimensionList[i];
-    if (dimension.height) {
-      for (j = i + 1; j < dimensionList.length && dimensionList[j].height === 0; j += 1) {
-        // Loop
-      }
-      const normalizeFactor = j - i;
-      if (normalizeFactor !== 1) {
-        const normalizedHeight = dimension.height / normalizeFactor;
-        dimension.height = normalizedHeight;
-        dimension.endOffset = dimension.startOffset + dimension.height;
-        for (j = i + 1; j < i + normalizeFactor; j += 1) {
-          const startOffset = dimension.endOffset;
-          dimension = dimensionList[j];
-          dimension.startOffset = startOffset;
-          dimension.height = normalizedHeight;
-          dimension.endOffset = dimension.startOffset + dimension.height;
-        }
-        i = j - 1;
-      }
-    }
-  }
-};
-
-const normalizeEditorDimensions = dimensionNormalizer('editorDimension');
-const normalizePreviewDimensions = dimensionNormalizer('previewDimension');
-const normalizeTocDimensions = dimensionNormalizer('tocDimension');
-
-const measureSectionDimensions = (editorSvc) => {
-  let editorSectionOffset = 0;
-  let previewSectionOffset = 0;
-  let tocSectionOffset = 0;
-  let sectionDesc = editorSvc.previewCtx.sectionDescList[0];
-  let nextSectionDesc;
-  let i = 1;
-  for (; i < editorSvc.previewCtx.sectionDescList.length; i += 1) {
-    nextSectionDesc = editorSvc.previewCtx.sectionDescList[i];
-
-    // Measure editor section
-    let newEditorSectionOffset = nextSectionDesc.editorElt
-      ? nextSectionDesc.editorElt.offsetTop
-      : editorSectionOffset;
-    newEditorSectionOffset = newEditorSectionOffset > editorSectionOffset
-      ? newEditorSectionOffset
-      : editorSectionOffset;
-    sectionDesc.editorDimension = new SectionDimension(editorSectionOffset, newEditorSectionOffset);
-    editorSectionOffset = newEditorSectionOffset;
-
-    // Measure preview section
-    let newPreviewSectionOffset = nextSectionDesc.previewElt
-      ? nextSectionDesc.previewElt.offsetTop
-      : previewSectionOffset;
-    newPreviewSectionOffset = newPreviewSectionOffset > previewSectionOffset
-      ? newPreviewSectionOffset
-      : previewSectionOffset;
-    sectionDesc.previewDimension = new SectionDimension(
-      previewSectionOffset,
-      newPreviewSectionOffset,
-    );
-    previewSectionOffset = newPreviewSectionOffset;
-
-    // Measure TOC section
-    let newTocSectionOffset = nextSectionDesc.tocElt
-      ? nextSectionDesc.tocElt.offsetTop + (nextSectionDesc.tocElt.offsetHeight / 2)
-      : tocSectionOffset;
-    newTocSectionOffset = newTocSectionOffset > tocSectionOffset
-      ? newTocSectionOffset
-      : tocSectionOffset;
-    sectionDesc.tocDimension = new SectionDimension(tocSectionOffset, newTocSectionOffset);
-    tocSectionOffset = newTocSectionOffset;
-
-    sectionDesc = nextSectionDesc;
-  }
-
-  // Last section
-  sectionDesc = editorSvc.previewCtx.sectionDescList[i - 1];
-  if (sectionDesc) {
-    sectionDesc.editorDimension = new SectionDimension(
-      editorSectionOffset,
-      editorSvc.editorElt.scrollHeight,
-    );
-    sectionDesc.previewDimension = new SectionDimension(
-      previewSectionOffset,
-      editorSvc.previewElt.scrollHeight,
-    );
-    sectionDesc.tocDimension = new SectionDimension(
-      tocSectionOffset,
-      editorSvc.tocElt.scrollHeight,
-    );
-  }
-
-  normalizeEditorDimensions(editorSvc);
-  normalizePreviewDimensions(editorSvc);
-  normalizeTocDimensions(editorSvc);
-};
-
-export default {
-  measureSectionDimensions,
-};
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 0953a36f..ec2f745c 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -9,12 +9,12 @@ import './providers/couchdbWorkspaceProvider';
 import './providers/githubWorkspaceProvider';
 import './providers/googleDriveWorkspaceProvider';
 import tempFileSvc from './tempFileSvc';
-import fileSvc from './fileSvc';
+import workspaceSvc from './workspaceSvc';
 
 const minAutoSyncEvery = 60 * 1000; // 60 sec
 const inactivityThreshold = 3 * 1000; // 3 sec
 const restartSyncAfter = 30 * 1000; // 30 sec
-const restartContentSyncAfter = 500; // Restart if an authorize window pops up
+const restartContentSyncAfter = 1000; // Enough to detect an authorize pop up
 const maxContentHistory = 20;
 
 const LAST_SEEN = 0;
@@ -112,9 +112,11 @@ const cleanSyncedContent = (syncedContent) => {
       delete syncedContent.syncHistory[syncLocationId];
     }
   });
+
   const allSyncLocationHashSet = new Set([]
     .concat(...Object.keys(syncedContent.syncHistory)
       .map(id => syncedContent.syncHistory[id])));
+
   // Clean historyData from unused contents
   Object.keys(syncedContent.historyData)
     .map(hash => parseInt(hash, 10))
@@ -131,9 +133,11 @@ const cleanSyncedContent = (syncedContent) => {
 const applyChanges = (changes) => {
   const allItemsById = { ...store.getters.allItemsById };
   const syncDataById = { ...store.getters['data/syncDataById'] };
+  const idsToKeep = {};
+  let saveSyncData = false;
   let getExistingItem;
-  if (workspaceProvider.isGit) {
-    const { itemsByGitPath } = store.getters;
+  if (store.getters['workspace/currentWorkspaceIsGit']) {
+    const itemsByGitPath = { ...store.getters.itemsByGitPath };
     getExistingItem = (existingSyncData) => {
       const items = existingSyncData && itemsByGitPath[existingSyncData.id];
       return items ? items[0] : null;
@@ -142,9 +146,6 @@ const applyChanges = (changes) => {
     getExistingItem = existingSyncData => existingSyncData && allItemsById[existingSyncData.itemId];
   }
 
-  const idsToKeep = {};
-  let saveSyncData = false;
-
   // Process each change
   changes.forEach((change) => {
     const existingSyncData = syncDataById[change.syncDataId];
@@ -184,7 +185,10 @@ const applyChanges = (changes) => {
 
   if (saveSyncData) {
     store.dispatch('data/setSyncDataById', syncDataById);
-    fileSvc.ensureUniquePaths(idsToKeep);
+
+    // Sanitize the workspace
+    workspaceSvc.ensureUniquePaths(idsToKeep);
+    workspaceSvc.ensureUniqueLocations(idsToKeep);
   }
 };
 
@@ -192,18 +196,17 @@ const applyChanges = (changes) => {
  * Create a sync location by uploading the current file content.
  */
 const createSyncLocation = (syncLocation) => {
-  syncLocation.id = utils.uid();
   const currentFile = store.getters['file/current'];
   const fileId = currentFile.id;
   syncLocation.fileId = fileId;
-  // Use deepCopy to freeze item
+  // Use deepCopy to freeze the item
   const content = utils.deepCopy(store.getters['content/current']);
   store.dispatch(
     'queue/enqueue',
     async () => {
-      const provider = providerRegistry.providers[syncLocation.providerId];
+      const provider = providerRegistry.providersById[syncLocation.providerId];
       const token = provider.getToken(syncLocation);
-      const syncLocationToStore = await provider.uploadContent(token, {
+      const updatedSyncLocation = await provider.uploadContent(token, {
         ...content,
         history: [content.hash],
       }, syncLocation);
@@ -216,7 +219,7 @@ const createSyncLocation = (syncLocation) => {
       newSyncedContent.historyData[content.hash] = content;
 
       store.commit('syncedContent/patchItem', newSyncedContent);
-      store.commit('syncLocation/setItem', syncLocationToStore);
+      workspaceSvc.addSyncLocation(updatedSyncLocation);
       store.dispatch('notification/info', `A new synchronized location was added to "${currentFile.name}".`);
     },
   );
@@ -241,7 +244,7 @@ const tooLateChecker = (timeout) => {
 const isTempFile = (fileId) => {
   const contentId = `${fileId}/content`;
   if (store.getters['data/syncDataByItemId'][contentId]) {
-    // If file has already been synced, it's not a temp file
+    // If file has already been synced, let's not consider it a temp file
     return false;
   }
   const file = store.state.file.itemsById[fileId];
@@ -271,8 +274,11 @@ const isTempFile = (fileId) => {
  * Patch sync data if some have changed in the result.
  */
 const updateSyncData = (result) => {
-  ['syncData', 'contentSyncData', 'fileSyncData'].forEach((field) => {
-    const syncData = result[field];
+  [
+    result.syncData,
+    result.contentSyncData,
+    result.fileSyncData,
+  ].forEach((syncData) => {
     if (syncData) {
       const oldSyncData = store.getters['data/syncDataById'][syncData.id];
       if (utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)) {
@@ -286,7 +292,7 @@ const updateSyncData = (result) => {
 };
 
 class SyncContext {
-  restart = false;
+  restartSkipContents = false;
   attempted = {};
 }
 
@@ -320,7 +326,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
     }
 
     await utils.awaitSequence(syncLocations, async (syncLocation) => {
-      const provider = providerRegistry.providers[syncLocation.providerId];
+      const provider = providerRegistry.providersById[syncLocation.providerId];
       if (!provider) {
         return;
       }
@@ -491,7 +497,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
         if (provider === workspaceProvider &&
           !store.getters['data/syncDataByItemId'][fileId]
         ) {
-          syncContext.restart = true;
+          syncContext.restartSkipContents = true;
         }
       };
 
@@ -514,15 +520,16 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
     if (err && err.message === 'TOO_LATE') {
       // Restart sync
       await syncFile(fileId, syncContext);
+    } else {
+      throw err;
     }
-    throw err;
   } finally {
     await localDbSvc.unloadContents();
   }
 };
 
 /**
- * Sync a data item, typically settings, workspaces and templates.
+ * Sync a data item, typically settings, templates or workspaces.
  */
 const syncDataItem = async (dataId) => {
   const getItem = () => store.state.data.itemsById[dataId]
@@ -543,8 +550,8 @@ const syncDataItem = async (dataId) => {
 
   const serverItem = item;
   const dataSyncData = store.getters['data/dataSyncDataById'][dataId];
+  const clientItem = utils.deepCopy(getItem());
   let mergedItem = (() => {
-    const clientItem = utils.deepCopy(getItem());
     if (!clientItem) {
       return serverItem;
     }
@@ -572,6 +579,13 @@ const syncDataItem = async (dataId) => {
     return;
   }
 
+  if (clientItem && dataId === 'workspaces') {
+    // Clean deleted workspaces
+    await Promise.all(Object.keys(clientItem.data)
+      .filter(id => !mergedItem.data[id])
+      .map(id => workspaceSvc.removeWorkspace(id)));
+  }
+
   // Update item in store
   store.commit('data/setItem', {
     id: dataId,
@@ -581,19 +595,17 @@ const syncDataItem = async (dataId) => {
   // Retrieve item with new `hash` and freeze it
   mergedItem = utils.deepCopy(getItem());
 
-  if (serverItem && serverItem.hash === mergedItem.hash) {
-    return;
+  // Upload merged data item if out of sync
+  if (!serverItem || serverItem.hash !== mergedItem.hash) {
+    updateSyncData(await workspaceProvider.uploadWorkspaceData({
+      token,
+      item: mergedItem,
+      syncData: store.getters['data/syncDataByItemId'][dataId],
+      ifNotTooLate: tooLateChecker(restartContentSyncAfter),
+    }));
   }
 
-  // Upload merged data item
-  updateSyncData(await workspaceProvider.uploadWorkspaceData({
-    token,
-    item: mergedItem,
-    syncData: store.getters['data/syncDataByItemId'][dataId],
-    ifNotTooLate: tooLateChecker(restartContentSyncAfter),
-  }));
-
-  // Update data sync data
+  // Copy sync data into data sync data
   store.dispatch('data/patchDataSyncDataById', {
     [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
   });
@@ -602,7 +614,7 @@ const syncDataItem = async (dataId) => {
 /**
  * Sync the whole workspace with the main provider and the current file explicit locations.
  */
-const syncWorkspace = async () => {
+const syncWorkspace = async (skipContents = false) => {
   try {
     const workspace = store.getters['workspace/currentWorkspace'];
     const syncContext = new SyncContext();
@@ -627,8 +639,8 @@ const syncWorkspace = async () => {
     // Prevent from sending items too long after changes have been retrieved
     const ifNotTooLate = tooLateChecker(restartSyncAfter);
 
-    // Called until no item to save
-    const saveNextItem = () => ifNotTooLate(async () => {
+    // Find and save one item to save
+    await utils.awaitSome(() => ifNotTooLate(async () => {
       const storeItemMap = {
         ...store.state.file.itemsById,
         ...store.state.folder.itemsById,
@@ -654,27 +666,26 @@ const syncWorkspace = async () => {
         },
       ) || [];
 
-      if (changedItem) {
-        const resultSyncData = await workspaceProvider
-          .saveWorkspaceItem({
-            // Use deepCopy to freeze objects
-            item: utils.deepCopy(changedItem),
-            syncData: utils.deepCopy(syncDataToUpdate),
-            ifNotTooLate,
-          });
-        store.dispatch('data/patchSyncDataById', {
-          [resultSyncData.id]: resultSyncData,
-        });
-        await saveNextItem();
-      }
-    });
-    await saveNextItem();
+      if (!changedItem) return false;
 
-    // Called until no item to remove
-    const removeNextItem = () => ifNotTooLate(async () => {
+      const resultSyncData = await workspaceProvider
+        .saveWorkspaceItem({
+          // Use deepCopy to freeze objects
+          item: utils.deepCopy(changedItem),
+          syncData: utils.deepCopy(syncDataToUpdate),
+          ifNotTooLate,
+        });
+      store.dispatch('data/patchSyncDataById', {
+        [resultSyncData.id]: resultSyncData,
+      });
+      return true;
+    }));
+
+    // Find and remove one item to remove
+    await utils.awaitSome(() => ifNotTooLate(async () => {
       let getItem;
       let getFileItem;
-      if (workspaceProvider.isGit) {
+      if (store.getters['workspace/currentWorkspaceIsGit']) {
         const { itemsByGitPath } = store.getters;
         getItem = syncData => itemsByGitPath[syncData.id];
         getFileItem = syncData => itemsByGitPath[syncData.id.slice(1)]; // Remove leading /
@@ -701,18 +712,17 @@ const syncWorkspace = async () => {
         },
       ));
 
-      if (syncDataToRemove) {
-        await workspaceProvider.removeWorkspaceItem({
-          syncData: syncDataToRemove,
-          ifNotTooLate,
-        });
-        const syncDataCopy = { ...store.getters['data/syncDataById'] };
-        delete syncDataCopy[syncDataToRemove.id];
-        store.dispatch('data/setSyncDataById', syncDataCopy);
-        await removeNextItem();
-      }
-    });
-    await removeNextItem();
+      if (!syncDataToRemove) return false;
+
+      await workspaceProvider.removeWorkspaceItem({
+        syncData: syncDataToRemove,
+        ifNotTooLate,
+      });
+      const syncDataCopy = { ...store.getters['data/syncDataById'] };
+      delete syncDataCopy[syncDataToRemove.id];
+      store.dispatch('data/setSyncDataById', syncDataCopy);
+      return true;
+    }));
 
     // Sync settings and workspaces only in the main workspace
     if (workspace.id === 'main') {
@@ -721,63 +731,61 @@ const syncWorkspace = async () => {
     }
     await syncDataItem('templates');
 
-    const getOneFileIdToSync = () => {
-      let getSyncData;
-      if (workspaceProvider.isGit) {
-        const { gitPathsByItemId } = store.getters;
-        const syncDataById = store.getters['data/syncDataById'];
-        // Use file git path as content may not exist or not be loaded
-        getSyncData = fileId => syncDataById[`/${gitPathsByItemId[fileId]}`];
-      } else {
-        const syncDataByItemId = store.getters['data/syncDataByItemId'];
-        getSyncData = (fileId, contentId) => syncDataByItemId[contentId];
+    if (!skipContents) {
+      const currentFileId = store.getters['file/current'].id;
+      if (currentFileId) {
+        // Sync current file first
+        await syncFile(currentFileId, syncContext);
       }
 
-      // Collect all [fileId, contentId]
-      const ids = [
-        ...Object.keys(localDbSvc.hashMap.content)
-          .map(contentId => [contentId.split('/')[0], contentId]),
-        ...store.getters['file/items']
-          .map(file => [file.id, `${file.id}/content`]),
-      ];
-
-      // Find the first content out of sync
-      const contentMap = store.state.content.itemsById;
-      return utils.someResult(ids, ([fileId, contentId]) => {
-        // Get content hash from itemsById or from localDbSvc if not loaded
-        const loadedContent = contentMap[contentId];
-        const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
-        const syncData = getSyncData(fileId, contentId);
-        if (
-          // Sync if content syncing was not attempted yet
-          !syncContext.attempted[contentId] &&
-          // And if syncData does not exist or if content hash and syncData hash are inconsistent
-          (!syncData || syncData.hash !== hash)
-        ) {
-          return fileId;
+      // Find and sync one file out of sync
+      await utils.awaitSome(async () => {
+        let getSyncData;
+        if (store.getters['workspace/currentWorkspaceIsGit']) {
+          const { gitPathsByItemId } = store.getters;
+          const syncDataById = store.getters['data/syncDataById'];
+          getSyncData = contentId => syncDataById[gitPathsByItemId[contentId]];
+        } else {
+          const syncDataByItemId = store.getters['data/syncDataByItemId'];
+          getSyncData = contentId => syncDataByItemId[contentId];
         }
-        return null;
+
+        // Collect all [fileId, contentId]
+        const ids = [
+          ...Object.keys(localDbSvc.hashMap.content)
+            .map(contentId => [contentId.split('/')[0], contentId]),
+          ...store.getters['file/items']
+            .map(file => [file.id, `${file.id}/content`]),
+        ];
+
+        // Find the first content out of sync
+        const contentMap = store.state.content.itemsById;
+        const fileIdToSync = utils.someResult(ids, ([fileId, contentId]) => {
+          // Get the content hash from itemsById or from localDbSvc if not loaded
+          const loadedContent = contentMap[contentId];
+          const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
+          const syncData = getSyncData(contentId);
+          if (
+            // Sync if content syncing was not attempted yet
+            !syncContext.attempted[contentId] &&
+            // And if syncData does not exist or if content hash and syncData hash are inconsistent
+            (!syncData || syncData.hash !== hash)
+          ) {
+            return fileId;
+          }
+          return null;
+        });
+
+        if (!fileIdToSync) return false;
+
+        await syncFile(fileIdToSync, syncContext);
+        return true;
       });
-    };
-
-    const syncNextFile = async () => {
-      const fileId = getOneFileIdToSync();
-      if (fileId) {
-        await syncFile(fileId, syncContext);
-        await syncNextFile();
-      }
-    };
-
-    const currentFileId = store.getters['file/current'].id;
-    if (currentFileId) {
-      // Sync current file first
-      await syncFile(currentFileId, syncContext);
     }
-    await syncNextFile();
 
-    if (syncContext.restart) {
-      // Restart sync
-      await syncWorkspace();
+    // Restart sync if requested
+    if (syncContext.restartSkipContents) {
+      await syncWorkspace(true);
     }
   } catch (err) {
     if (err && err.message === 'TOO_LATE') {
@@ -786,10 +794,6 @@ const syncWorkspace = async () => {
     } else {
       throw err;
     }
-  } finally {
-    if (workspaceProvider.onSyncEnd) {
-      workspaceProvider.onSyncEnd();
-    }
   }
 };
 
@@ -835,9 +839,9 @@ const requestSync = () => {
           if (isWorkspaceSyncPossible()) {
             await syncWorkspace();
           } else if (hasCurrentFileSyncLocations()) {
-            // Only sync current file if workspace sync is unavailable.
-            // We could sync all files that are out-of-sync but it would
-            // require to load all the syncedContent objects from the DB.
+            // Only sync the current file if workspace sync is unavailable
+            // as we don't want to look for out-of-sync files by loading
+            // all the syncedContent objects.
             await syncFile(store.getters['file/current'].id);
           }
 
@@ -845,7 +849,7 @@ const requestSync = () => {
           Object.entries(fileHashesToClean).forEach(([fileId, fileHash]) => {
             const file = store.state.file.itemsById[fileId];
             if (file && file.hash === fileHash) {
-              fileSvc.deleteFile(fileId);
+              workspaceSvc.deleteFile(fileId);
             }
           });
         } finally {
@@ -865,22 +869,25 @@ export default {
     localDbSvc.syncLocalStorage();
 
     // Try to find a suitable action provider
-    actionProvider = providerRegistry.providers[utils.queryParams.providerId];
+    actionProvider = providerRegistry.providersById[utils.queryParams.providerId];
     if (actionProvider && actionProvider.initAction) {
       await actionProvider.initAction();
     }
 
     // Try to find a suitable workspace sync provider
-    workspaceProvider = providerRegistry.providers[utils.queryParams.providerId];
+    workspaceProvider = providerRegistry.providersById[utils.queryParams.providerId];
     if (!workspaceProvider || !workspaceProvider.initWorkspace) {
       workspaceProvider = googleDriveAppDataProvider;
     }
     const workspace = await workspaceProvider.initWorkspace();
+    // Fix the URL hash
+    utils.setQueryParams(workspaceProvider.getWorkspaceParams(workspace));
+
     store.dispatch('workspace/setCurrentWorkspaceId', workspace.id);
     await localDbSvc.init();
 
     // Try to find a suitable action provider
-    actionProvider = providerRegistry.providers[utils.queryParams.providerId] || actionProvider;
+    actionProvider = providerRegistry.providersById[utils.queryParams.providerId] || actionProvider;
     if (actionProvider && actionProvider.performAction) {
       const newSyncLocation = await actionProvider.performAction();
       if (newSyncLocation) {
diff --git a/src/services/tempFileSvc.js b/src/services/tempFileSvc.js
index fa5df045..29262b97 100644
--- a/src/services/tempFileSvc.js
+++ b/src/services/tempFileSvc.js
@@ -1,8 +1,8 @@
-import cledit from './cledit';
+import cledit from './editor/cledit';
 import store from '../store';
 import utils from './utils';
 import editorSvc from './editorSvc';
-import fileSvc from './fileSvc';
+import workspaceSvc from './workspaceSvc';
 
 const {
   origin,
@@ -31,7 +31,7 @@ export default {
     }
     store.commit('setLight', true);
 
-    const file = await fileSvc.createFile({
+    const file = await workspaceSvc.createFile({
       name: fileName || utils.getHostname(origin),
       text: contentText || '\n',
       properties: contentProperties,
@@ -58,7 +58,7 @@ export default {
       .splice(10)
       .forEach(([id]) => {
         delete lastCreated[id];
-        fileSvc.deleteFile(id);
+        workspaceSvc.deleteFile(id);
       });
 
     // Store file creations and open the file
diff --git a/src/services/utils.js b/src/services/utils.js
index 46c08e99..a9771abd 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -170,6 +170,13 @@ export default {
   makeWorkspaceId(params) {
     return Math.abs(this.hash(this.serializeObject(params))).toString(36);
   },
+  getDbName(workspaceId) {
+    let dbName = 'stackedit-db';
+    if (workspaceId !== 'main') {
+      dbName += `-${workspaceId}`;
+    }
+    return dbName;
+  },
   encodeBase64(str, urlSafe = false) {
     const uriEncodedStr = encodeURIComponent(str);
     const utf8Str = uriEncodedStr.replace(
@@ -227,6 +234,12 @@ export default {
     };
     return runWithNextValue();
   },
+  async awaitSome(asyncFunc) {
+    if (await asyncFunc()) {
+      return this.awaitSome(asyncFunc);
+    }
+    return null;
+  },
   someResult(values, func) {
     let result;
     values.some((value) => {
@@ -279,6 +292,16 @@ export default {
     urlParser.href = url;
     return urlParser.hostname;
   },
+  encodeUrlPath(path) {
+    return path ? path.split('/').map(encodeURIComponent).join('/') : '';
+  },
+  parseGithubRepoUrl(url) {
+    const parsedRepo = url && url.match(/([^/:]+)\/([^/]+?)(?:\.git|\/)?$/);
+    return parsedRepo && {
+      owner: parsedRepo[1],
+      repo: parsedRepo[2],
+    };
+  },
   createHiddenIframe(url) {
     const iframeElt = document.createElement('iframe');
     iframeElt.style.position = 'absolute';
diff --git a/src/services/fileSvc.js b/src/services/workspaceSvc.js
similarity index 74%
rename from src/services/fileSvc.js
rename to src/services/workspaceSvc.js
index 8f6d44b2..f816f39c 100644
--- a/src/services/fileSvc.js
+++ b/src/services/workspaceSvc.js
@@ -4,6 +4,7 @@ import utils from './utils';
 const forbiddenFolderNameMatcher = /^\.stackedit-data$|^\.stackedit-trash$|\.md$|\.sync$|\.publish$/;
 
 export default {
+
   /**
    * Create a file in the store with the specified fields.
    */
@@ -29,7 +30,7 @@ export default {
       discussions: discussions || {},
       comments: comments || {},
     };
-    const workspaceUniquePaths = store.getters['workspace/hasUniquePaths'];
+    const workspaceUniquePaths = store.getters['workspace/currentWorkspaceHasUniquePaths'];
 
     // Show warning dialogs
     if (!background) {
@@ -90,7 +91,7 @@ export default {
     }
 
     // Check if there is a path conflict
-    if (store.getters['workspace/hasUniquePaths']) {
+    if (store.getters['workspace/currentWorkspaceHasUniquePaths']) {
       const parentPath = store.getters.pathsByItemId[item.parentId] || '';
       const path = parentPath + sanitizedName;
       const items = store.getters.itemsByPath[path] || [];
@@ -133,7 +134,7 @@ export default {
     store.commit(`${item.type}/setItem`, item);
 
     // Ensure path uniqueness
-    if (store.getters['workspace/hasUniquePaths']) {
+    if (store.getters['workspace/currentWorkspaceHasUniquePaths']) {
       this.makePathUnique(item.id);
     }
 
@@ -164,7 +165,7 @@ export default {
    * Ensure two files/folders don't have the same path if the workspace doesn't allow it.
    */
   ensureUniquePaths(idsToKeep = {}) {
-    if (store.getters['workspace/hasUniquePaths']) {
+    if (store.getters['workspace/currentWorkspaceHasUniquePaths']) {
       if (Object.keys(store.getters.pathsByItemId)
         .some(id => !idsToKeep[id] && this.makePathUnique(id))
       ) {
@@ -207,4 +208,59 @@ export default {
       }
     }
   },
+
+  addSyncLocation(location) {
+    store.commit('syncLocation/setItem', {
+      ...location,
+      id: utils.uid(),
+    });
+    // Sanitize the workspace
+    this.ensureUniqueLocations();
+  },
+
+  addPublishLocation(location) {
+    store.commit('publishLocation/setItem', {
+      ...location,
+      id: utils.uid(),
+    });
+    // Sanitize the workspace
+    this.ensureUniqueLocations();
+  },
+
+  /**
+   * Ensure two sync/publish locations of the same file don't have the same hash.
+   */
+  ensureUniqueLocations(idsToKeep = {}) {
+    ['syncLocation', 'publishLocation'].forEach((type) => {
+      store.getters[`${type}/items`].forEach((item) => {
+        if (!idsToKeep[item.id]
+          && store.getters[`${type}/groupedByFileIdAndHash`][item.fileId][item.hash].length > 1
+        ) {
+          store.commit(`${item.type}/deleteItem`, item.id);
+        }
+      });
+    });
+  },
+
+  /**
+   * Drop the database and clean the localStorage for the specified workspaceId.
+   */
+  async removeWorkspace(id) {
+    // Remove from the store first as workspace tabs will reload.
+    // Workspace deletion will be persisted as soon as possible
+    // by the store.getters['data/workspaces'] watcher in localDbSvc.
+    store.dispatch('workspace/removeWorkspace', id);
+
+    // Drop the database
+    await new Promise((resolve) => {
+      const dbName = utils.getDbName(id);
+      const request = indexedDB.deleteDatabase(dbName);
+      request.onerror = resolve; // Ignore errors
+      request.onsuccess = resolve;
+    });
+
+    // Clean the local storage
+    localStorage.removeItem(`${id}/lastSyncActivity`);
+    localStorage.removeItem(`${id}/lastWindowFocus`);
+  },
 };
diff --git a/src/store/content.js b/src/store/content.js
index 7f7df571..2ea25961 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -2,7 +2,7 @@ import DiffMatchPatch from 'diff-match-patch';
 import moduleTemplate from './moduleTemplate';
 import empty from '../data/emptyContent';
 import utils from '../services/utils';
-import cledit from '../services/cledit';
+import cledit from '../services/editor/cledit';
 
 const diffMatchPatch = new DiffMatchPatch();
 
diff --git a/src/store/data.js b/src/store/data.js
index 90f19cba..572154d3 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -92,9 +92,6 @@ const tokenAdder = providerId => ({ getters, dispatch }, token) => {
   });
 };
 
-// For workspaces
-const urlParser = window.document.createElement('a');
-
 export default {
   namespaced: true,
   state: {
@@ -126,25 +123,7 @@ export default {
     },
   },
   getters: {
-    workspacesById: getter('workspaces'),
-    sanitizedWorkspacesById: (state, { workspacesById }, rootState, rootGetters) => {
-      const sanitizedWorkspacesById = {};
-      const mainWorkspaceToken = rootGetters['workspace/mainWorkspaceToken'];
-      Object.entries(workspacesById).forEach(([id, workspace]) => {
-        const sanitizedWorkspace = {
-          id,
-          providerId: mainWorkspaceToken && 'googleDriveAppData',
-          sub: mainWorkspaceToken && mainWorkspaceToken.sub,
-          ...workspace,
-        };
-        // Rebuild the url with current hostname
-        urlParser.href = workspace.url || 'app';
-        const params = utils.parseQueryParams(urlParser.hash.slice(1));
-        sanitizedWorkspace.url = utils.addQueryParams('app', params, true);
-        sanitizedWorkspacesById[id] = sanitizedWorkspace;
-      });
-      return sanitizedWorkspacesById;
-    },
+    workspaces: getter('workspaces'), // Not to be used, prefer workspace/workspacesById
     settings: getter('settings'),
     computedSettings: (state, { settings }) => {
       const customSettings = yaml.safeLoad(settings);
@@ -207,18 +186,6 @@ export default {
       }
       return result;
     },
-    syncDataByType: (state, { syncDataById }) => {
-      const result = {};
-      utils.types.forEach((type) => {
-        result[type] = {};
-      });
-      Object.entries(syncDataById).forEach(([, item]) => {
-        if (result[item.type]) {
-          result[item.type][item.itemId] = item;
-        }
-      });
-      return result;
-    },
     dataSyncDataById: getter('dataSyncData'),
     tokensByProviderId: getter('tokens'),
     googleTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.google || {},
@@ -229,8 +196,6 @@ export default {
     zendeskTokensBySub: (state, { tokensByProviderId }) => tokensByProviderId.zendesk || {},
   },
   actions: {
-    setWorkspacesById: setter('workspaces'),
-    patchWorkspacesById: patcher('workspaces'),
     setSettings: setter('settings'),
     patchLocalSettings: patcher('localSettings'),
     patchLayoutSettings: patcher('layoutSettings'),
diff --git a/src/store/locationTemplate.js b/src/store/locationTemplate.js
index 7aadbd7f..0561eea9 100644
--- a/src/store/locationTemplate.js
+++ b/src/store/locationTemplate.js
@@ -2,9 +2,12 @@ import moduleTemplate from './moduleTemplate';
 import providerRegistry from '../services/providers/common/providerRegistry';
 
 const addToGroup = (groups, item) => {
-  const list = groups[item.fileId] || [];
-  list.push(item);
-  groups[item.fileId] = list;
+  const list = groups[item.fileId];
+  if (!list) {
+    groups[item.fileId] = [item];
+  } else {
+    list.push(item);
+  }
 };
 
 export default (empty) => {
@@ -17,26 +20,64 @@ export default (empty) => {
       items.forEach(item => addToGroup(groups, item));
       return groups;
     },
+    groupedByFileIdAndHash: (state, { items }) => {
+      const fileIdGroups = {};
+      items.forEach((item) => {
+        let hashGroups = fileIdGroups[item.fileId];
+        if (!hashGroups) {
+          hashGroups = {};
+          fileIdGroups[item.fileId] = hashGroups;
+        }
+        const list = hashGroups[item.hash];
+        if (!list) {
+          hashGroups[item.hash] = [item];
+        } else {
+          list.push(item);
+        }
+      });
+      return fileIdGroups;
+    },
     filteredGroupedByFileId: (state, { items }) => {
       const groups = {};
-      items.filter((item) => {
-        // Filter items that we can't use
-        const provider = providerRegistry.providers[item.providerId];
-        return provider && provider.getToken(item);
-      }).forEach(item => addToGroup(groups, item));
+      items
+        .filter((item) => {
+          // Filter items that we can't use
+          const provider = providerRegistry.providersById[item.providerId];
+          return provider && provider.getToken(item);
+        })
+        .forEach(item => addToGroup(groups, item));
       return groups;
     },
     current: (state, { filteredGroupedByFileId }, rootState, rootGetters) => {
       const locations = filteredGroupedByFileId[rootGetters['file/current'].id] || [];
       return locations.map((location) => {
-        const provider = providerRegistry.providers[location.providerId];
+        const provider = providerRegistry.providersById[location.providerId];
         return {
           ...location,
-          description: provider.getDescription(location),
-          url: provider.getUrl(location),
+          description: provider.getLocationDescription(location),
+          url: provider.getLocationUrl(location),
         };
       });
     },
+    currentWithWorkspaceSyncLocation: (state, { current }, rootState, rootGetters) => {
+      const fileId = rootGetters['file/current'].id;
+      const fileSyncData = rootGetters['data/syncDataByItemId'][fileId];
+      const contentSyncData = rootGetters['data/syncDataByItemId'][`${fileId}/content`];
+      if (!fileSyncData || !contentSyncData) {
+        return current;
+      }
+
+      // Add the workspace sync location
+      const workspaceProvider = providerRegistry.providersById[
+        rootGetters['workspace/currentWorkspace'].providerId];
+      return [{
+        id: 'main',
+        providerId: workspaceProvider.id,
+        fileId,
+        description: workspaceProvider.getSyncDataDescription(fileSyncData, contentSyncData),
+        url: workspaceProvider.getSyncDataUrl(fileSyncData, contentSyncData),
+      }, ...current];
+    },
   };
 
   return module;
diff --git a/src/store/workspace.js b/src/store/workspace.js
index 7d80483a..c73f4f26 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -1,4 +1,5 @@
 import utils from '../services/utils';
+import providerRegistry from '../services/providers/common/providerRegistry';
 
 export default {
   namespaced: true,
@@ -15,53 +16,63 @@ export default {
     },
   },
   getters: {
-    mainWorkspace: (state, getters, rootState, rootGetters) => {
-      const sanitizedWorkspacesById = rootGetters['data/sanitizedWorkspacesById'];
-      return sanitizedWorkspacesById.main;
+    workspacesById: (state, getters, rootState, rootGetters) => {
+      const workspacesById = {};
+      const mainWorkspaceToken = rootGetters['workspace/mainWorkspaceToken'];
+      Object.entries(rootGetters['data/workspaces']).forEach(([id, workspace]) => {
+        const sanitizedWorkspace = {
+          id,
+          providerId: mainWorkspaceToken && 'googleDriveAppData',
+          sub: mainWorkspaceToken && mainWorkspaceToken.sub,
+          ...workspace,
+        };
+        // Filter workspaces that don't have a provider
+        const workspaceProvider = providerRegistry.providersById[sanitizedWorkspace.providerId];
+        if (workspaceProvider) {
+          // Rebuild the url with the current hostname
+          const params = workspaceProvider.getWorkspaceParams(sanitizedWorkspace);
+          sanitizedWorkspace.url = utils.addQueryParams('app', params, true);
+          sanitizedWorkspace.locationUrl = workspaceProvider
+            .getWorkspaceLocationUrl(sanitizedWorkspace);
+          workspacesById[id] = sanitizedWorkspace;
+        }
+      });
+      return workspacesById;
     },
-    currentWorkspace: ({ currentWorkspaceId }, { mainWorkspace }, rootState, rootGetters) => {
-      const sanitizedWorkspacesById = rootGetters['data/sanitizedWorkspacesById'];
-      return sanitizedWorkspacesById[currentWorkspaceId] || mainWorkspace;
-    },
-    currentWorkspaceIsGit: (state, { currentWorkspace }) => currentWorkspace.providerId === 'githubWorkspace',
-    hasUniquePaths: (state, { currentWorkspace }) =>
+    mainWorkspace: (state, { workspacesById }) => workspacesById.main,
+    currentWorkspace: ({ currentWorkspaceId }, { workspacesById, mainWorkspace }) =>
+      workspacesById[currentWorkspaceId] || mainWorkspace,
+    currentWorkspaceIsGit: (state, { currentWorkspace }) =>
+      currentWorkspace.providerId === 'githubWorkspace',
+    currentWorkspaceHasUniquePaths: (state, { currentWorkspace }) =>
       currentWorkspace.providerId === 'githubWorkspace',
     lastSyncActivityKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastSyncActivity`,
     lastFocusKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastWindowFocus`,
-    mainWorkspaceToken: (state, getters, rootState, rootGetters) => {
-      const googleTokens = rootGetters['data/googleTokens'];
-      const loginSubs = Object.keys(googleTokens)
-        .filter(sub => googleTokens[sub].isLogin);
-      return googleTokens[loginSubs[0]];
-    },
+    mainWorkspaceToken: (state, getters, rootState, rootGetters) =>
+      utils.someResult(Object.values(rootGetters['data/googleTokensBySub']), (token) => {
+        if (token.isLogin) {
+          return token;
+        }
+        return null;
+      }),
     syncToken: (state, { currentWorkspace, mainWorkspaceToken }, rootState, rootGetters) => {
       switch (currentWorkspace.providerId) {
-        case 'googleDriveWorkspace': {
-          const googleTokens = rootGetters['data/googleTokens'];
-          return googleTokens[currentWorkspace.sub];
-        }
-        case 'githubWorkspace': {
-          const githubTokens = rootGetters['data/githubTokens'];
-          return githubTokens[currentWorkspace.sub];
-        }
-        case 'couchdbWorkspace': {
-          const couchdbTokens = rootGetters['data/couchdbTokens'];
-          return couchdbTokens[currentWorkspace.id];
-        }
+        case 'googleDriveWorkspace':
+          return rootGetters['data/googleTokensBySub'][currentWorkspace.sub];
+        case 'githubWorkspace':
+          return rootGetters['data/githubTokensBySub'][currentWorkspace.sub];
+        case 'couchdbWorkspace':
+          return rootGetters['data/couchdbTokensBySub'][currentWorkspace.id];
         default:
           return mainWorkspaceToken;
       }
     },
     loginToken: (state, { currentWorkspace, mainWorkspaceToken }, rootState, rootGetters) => {
       switch (currentWorkspace.providerId) {
-        case 'googleDriveWorkspace': {
-          const googleTokens = rootGetters['data/googleTokens'];
-          return googleTokens[currentWorkspace.sub];
-        }
-        case 'githubWorkspace': {
-          const githubTokens = rootGetters['data/githubTokens'];
-          return githubTokens[currentWorkspace.sub];
-        }
+        case 'googleDriveWorkspace':
+          return rootGetters['data/googleTokensBySub'][currentWorkspace.sub];
+        case 'githubWorkspace':
+          return rootGetters['data/githubTokensBySub'][currentWorkspace.sub];
         default:
           return mainWorkspaceToken;
       }
@@ -70,18 +81,49 @@ export default {
       if (!loginToken) {
         return null;
       }
-      let prefix;
-      Object.entries(utils.userIdPrefixes).some(([key, value]) => {
-        if (rootGetters[`data/${value}Tokens`][loginToken.sub]) {
-          prefix = key;
+      const prefix = utils.someResult(Object.entries(utils.userIdPrefixes), ([key, value]) => {
+        if (rootGetters[`data/${value}TokensBySub`][loginToken.sub]) {
+          return key;
         }
-        return prefix;
+        return null;
       });
       return prefix ? `${prefix}:${loginToken.sub}` : loginToken.sub;
     },
     sponsorToken: (state, { mainWorkspaceToken }) => mainWorkspaceToken,
   },
   actions: {
+    removeWorkspace: ({ commit, rootGetters }, id) => {
+      const workspaces = {
+        ...rootGetters['data/workspaces'],
+      };
+      delete workspaces[id];
+      commit(
+        'data/setItem',
+        { id: 'workspaces', data: workspaces },
+        { root: true },
+      );
+    },
+    patchWorkspacesById: ({ commit, rootGetters }, workspaces) => {
+      const sanitizedWorkspaces = {};
+      Object
+        .values({
+          ...rootGetters['data/workspaces'],
+          ...workspaces,
+        })
+        .forEach((workspace) => {
+          sanitizedWorkspaces[workspace.id] = {
+            ...workspace,
+            // Do not store urls
+            url: undefined,
+            locationUrl: undefined,
+          };
+        });
+      commit(
+        'data/setItem',
+        { id: 'workspaces', data: sanitizedWorkspaces },
+        { root: true },
+      );
+    },
     setCurrentWorkspaceId: ({ commit, getters }, value) => {
       commit('setCurrentWorkspaceId', value);
       const lastFocus = parseInt(localStorage.getItem(getters.lastFocusKey), 10) || 0;
diff --git a/src/styles/app.scss b/src/styles/app.scss
index d133d972..354eee52 100644
--- a/src/styles/app.scss
+++ b/src/styles/app.scss
@@ -52,6 +52,7 @@ body {
 .icon {
   width: 100%;
   height: 100%;
+  display: block;
 
   * {
     fill: currentColor;
@@ -92,8 +93,8 @@ textarea {
   background-color: transparent;
   display: inline-block;
   height: auto;
-  padding: 6px 12px;
-  margin-bottom: 0;
+  padding: 8px 16px;
+  font-size: 17px;
   font-weight: 400;
   line-height: 1.4;
   text-transform: uppercase;
@@ -147,6 +148,20 @@ textarea {
   }
 }
 
+.button--resolve {
+  background-color: #349be8;
+  color: #fff;
+  margin: -2px 0 -2px 4px;
+  padding: 10px 20px;
+
+  &:active,
+  &:focus,
+  &:hover {
+    color: #fff;
+    background-color: darken(#349be8, 8%);
+  }
+}
+
 .textfield {
   background-color: #fff;
   border: 0;
@@ -158,7 +173,7 @@ textarea {
   width: 100%;
   max-width: 100%;
   color: inherit;
-  height: 2.6rem;
+  height: 2.5rem;
 
   &:focus {
     outline: none;
@@ -199,6 +214,10 @@ textarea {
   align-items: center;
 }
 
+.flex--align-end {
+  align-items: flex-end;
+}
+
 .user-name {
   font-weight: 600;
 }
diff --git a/static/landing/index.html b/static/landing/index.html
index 8eda4c35..a29f9f0d 100644
--- a/static/landing/index.html
+++ b/static/landing/index.html
@@ -74,6 +74,7 @@
         .icon {
             width: 100%;
             height: 100%;
+            display: inline;
         }
 
         .icon * {
@@ -248,7 +249,7 @@
         .image {
             display: block;
             margin: 1em auto;
-            border: 2px solid #f3f3f3;
+            border: 1px solid #eee;
             border-radius: 2px;
             background-color: #fff;
         }
diff --git a/test/unit/specs/components/Explorer.spec.js b/test/unit/specs/components/Explorer.spec.js
index 08c7cafb..94c236c1 100644
--- a/test/unit/specs/components/Explorer.spec.js
+++ b/test/unit/specs/components/Explorer.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import Explorer from '../../../../src/components/Explorer';
 import store from '../../../../src/store';
-import fileSvc from '../../../../src/services/fileSvc';
+import workspaceSvc from '../../../../src/services/workspaceSvc';
 import specUtils from '../specUtils';
 
 const mount = () => shallowMount(Explorer, { store });
@@ -57,7 +57,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should create new folders in a folder', async () => {
-    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const folder = await workspaceSvc.storeItem({ type: 'folder' });
     const wrapper = mount();
     select(folder.id);
     wrapper.find('.side-title__button--new-folder').trigger('click');
@@ -88,7 +88,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should move file to the trash folder on delete', async () => {
-    const file = await fileSvc.createFile({}, true);
+    const file = await workspaceSvc.createFile({}, true);
     expect(file.parentId).toEqual(null);
     const wrapper = mount();
     select(file.id);
@@ -105,7 +105,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should not delete files in the trash folder', async () => {
-    const file = await fileSvc.createFile({ parentId: 'trash' }, true);
+    const file = await workspaceSvc.createFile({ parentId: 'trash' }, true);
     const wrapper = mount();
     select(file.id);
     wrapper.find('.side-title__button--delete').trigger('click');
@@ -114,7 +114,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should delete the temp folder after confirmation', async () => {
-    const file = await fileSvc.createFile({ parentId: 'temp' }, true);
+    const file = await workspaceSvc.createFile({ parentId: 'temp' }, true);
     const wrapper = mount();
     select('temp');
     wrapper.find('.side-title__button--delete').trigger('click');
@@ -123,7 +123,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should delete temp files after confirmation', async () => {
-    const file = await fileSvc.createFile({ parentId: 'temp' }, true);
+    const file = await workspaceSvc.createFile({ parentId: 'temp' }, true);
     const wrapper = mount();
     select(file.id);
     wrapper.find('.side-title__button--delete').trigger('click');
@@ -133,8 +133,8 @@ describe('Explorer.vue', () => {
   });
 
   it('should delete folder after confirmation', async () => {
-    const folder = await fileSvc.storeItem({ type: 'folder' });
-    const file = await fileSvc.createFile({ parentId: folder.id }, true);
+    const folder = await workspaceSvc.storeItem({ type: 'folder' });
+    const file = await workspaceSvc.createFile({ parentId: folder.id }, true);
     const wrapper = mount();
     select(folder.id);
     wrapper.find('.side-title__button--delete').trigger('click');
@@ -146,7 +146,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should rename files', async () => {
-    const file = await fileSvc.createFile({}, true);
+    const file = await workspaceSvc.createFile({}, true);
     const wrapper = mount();
     select(file.id);
     wrapper.find('.side-title__button--rename').trigger('click');
@@ -154,7 +154,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should rename folders', async () => {
-    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const folder = await workspaceSvc.storeItem({ type: 'folder' });
     const wrapper = mount();
     select(folder.id);
     wrapper.find('.side-title__button--rename').trigger('click');
diff --git a/test/unit/specs/components/ExplorerNode.spec.js b/test/unit/specs/components/ExplorerNode.spec.js
index 2acb7c67..f66b1cb3 100644
--- a/test/unit/specs/components/ExplorerNode.spec.js
+++ b/test/unit/specs/components/ExplorerNode.spec.js
@@ -1,19 +1,19 @@
 import { shallowMount } from '@vue/test-utils';
 import ExplorerNode from '../../../../src/components/ExplorerNode';
 import store from '../../../../src/store';
-import fileSvc from '../../../../src/services/fileSvc';
+import workspaceSvc from '../../../../src/services/workspaceSvc';
 import explorerSvc from '../../../../src/services/explorerSvc';
 import specUtils from '../specUtils';
 
 const makeFileNode = async () => {
-  const file = await fileSvc.createFile({}, true);
+  const file = await workspaceSvc.createFile({}, true);
   const node = store.getters['explorer/nodeMap'][file.id];
   expect(node.item.id).toEqual(file.id);
   return node;
 };
 
 const makeFolderNode = async () => {
-  const folder = await fileSvc.storeItem({ type: 'folder' });
+  const folder = await workspaceSvc.storeItem({ type: 'folder' });
   const node = store.getters['explorer/nodeMap'][folder.id];
   expect(node.item.id).toEqual(folder.id);
   return node;
@@ -226,21 +226,21 @@ describe('ExplorerNode.vue', () => {
   });
 
   it('should move a file into a folder', async () => {
-    const sourceItem = await fileSvc.createFile({}, true);
-    const targetItem = await fileSvc.storeItem({ type: 'folder' });
+    const sourceItem = await workspaceSvc.createFile({}, true);
+    const targetItem = await workspaceSvc.storeItem({ type: 'folder' });
     dragAndDrop(sourceItem, targetItem);
   });
 
   it('should move a folder into a folder', async () => {
-    const sourceItem = await fileSvc.storeItem({ type: 'folder' });
-    const targetItem = await fileSvc.storeItem({ type: 'folder' });
+    const sourceItem = await workspaceSvc.storeItem({ type: 'folder' });
+    const targetItem = await workspaceSvc.storeItem({ type: 'folder' });
     dragAndDrop(sourceItem, targetItem);
   });
 
   it('should move a file into a file parent folder', async () => {
-    const targetItem = await fileSvc.storeItem({ type: 'folder' });
-    const file = await fileSvc.createFile({ parentId: targetItem.id }, true);
-    const sourceItem = await fileSvc.createFile({}, true);
+    const targetItem = await workspaceSvc.storeItem({ type: 'folder' });
+    const file = await workspaceSvc.createFile({ parentId: targetItem.id }, true);
+    const sourceItem = await workspaceSvc.createFile({}, true);
     dragAndDrop(sourceItem, file);
   });
 
@@ -264,7 +264,7 @@ describe('ExplorerNode.vue', () => {
   });
 
   it('should not move a file to a file in the temp folder', async () => {
-    const file = await fileSvc.createFile({ parentId: 'temp' }, true);
+    const file = await workspaceSvc.createFile({ parentId: 'temp' }, true);
     const targetNode = store.getters['explorer/nodeMap'][file.id];
     const wrapper = mount(targetNode);
     wrapper.trigger('dragenter');
diff --git a/test/unit/specs/specUtils.js b/test/unit/specs/specUtils.js
index d4e315b9..f47ff7c1 100644
--- a/test/unit/specs/specUtils.js
+++ b/test/unit/specs/specUtils.js
@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import store from '../../../src/store';
 import utils from '../../../src/services/utils';
 import '../../../src/icons';
-import '../../../src/components/common/globals';
+import '../../../src/components/common/vueGlobals';
 
 const clone = object => JSON.parse(JSON.stringify(object));
 

From 987d66ef26692dbdf6969881917864153fd088e8 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Tue, 17 Jul 2018 20:58:40 +0100
Subject: [PATCH 09/19] Sync refactoring

---
 src/components/FindReplace.vue                |   2 +-
 src/components/SideBar.vue                    |   5 +
 src/components/Tour.vue                       |  23 +-
 src/components/UserImage.vue                  |   4 +-
 src/components/UserName.vue                   |   4 +-
 src/components/menus/HistoryMenu.vue          | 316 +++++++++++-------
 src/components/menus/MainMenu.vue             |   9 +-
 src/components/menus/MoreMenu.vue             |   7 +-
 src/components/modals/AboutModal.vue          |   1 +
 src/components/modals/FilePropertiesModal.vue |   4 +-
 .../modals/PublishManagementModal.vue         |   4 -
 src/components/modals/SettingsModal.vue       |   6 +-
 src/components/modals/SponsorModal.vue        |   8 +-
 src/components/modals/SyncManagementModal.vue |   6 +-
 src/components/modals/TemplatesModal.vue      |   8 +-
 .../modals/WorkspaceManagementModal.vue       |   4 -
 src/components/modals/common/ModalInner.vue   |   4 +-
 .../modals/providers/GithubOpenModal.vue      |  12 +-
 .../modals/providers/GithubPublishModal.vue   |  12 +-
 .../modals/providers/ZendeskAccountModal.vue  |   4 +-
 src/data/constants.js                         |  30 ++
 .../{ => defaults}/defaultLayoutSettings.js   |   0
 .../{ => defaults}/defaultLocalSettings.js    |   0
 src/data/{ => defaults}/defaultSettings.yml   |   9 +-
 src/data/{ => defaults}/defaultWorkspaces.js  |   0
 src/data/{ => empties}/emptyContent.js        |   0
 src/data/{ => empties}/emptyContentState.js   |   0
 src/data/{ => empties}/emptyFile.js           |   0
 src/data/{ => empties}/emptyFolder.js         |   0
 .../{ => empties}/emptyPublishLocation.js     |   0
 src/data/{ => empties}/emptySyncLocation.js   |   0
 src/data/{ => empties}/emptySyncedContent.js  |   0
 .../{ => empties}/emptyTemplateHelpers.js     |   0
 .../{ => empties}/emptyTemplateValue.html     |   0
 src/data/faq.md                               |   2 +-
 .../{ => templates}/jekyllSiteTemplate.html   |   0
 .../{ => templates}/plainHtmlTemplate.html    |   0
 .../{ => templates}/styledHtmlTemplate.html   |   0
 .../styledHtmlWithTocTemplate.html            |   0
 src/services/explorerSvc.js                   |   2 +-
 src/services/localDbSvc.js                    |   9 +-
 src/services/networkSvc.js                    | 175 +++++-----
 src/services/providers/bloggerPageProvider.js |   1 +
 src/services/providers/bloggerProvider.js     |   1 +
 src/services/providers/common/Provider.js     |  12 +-
 .../providers/couchdbWorkspaceProvider.js     |  45 +--
 src/services/providers/dropboxProvider.js     |  28 +-
 src/services/providers/gistProvider.js        |  35 ++
 src/services/providers/githubProvider.js      |  79 ++++-
 .../providers/githubWorkspaceProvider.js      | 180 +++++-----
 .../providers/googleDriveAppDataProvider.js   |  32 +-
 src/services/providers/googleDriveProvider.js |  23 ++
 .../providers/googleDriveWorkspaceProvider.js |  43 ++-
 .../providers/helpers/couchdbHelper.js        |   5 +
 .../providers/helpers/dropboxHelper.js        |  42 ++-
 .../providers/helpers/githubHelper.js         |  34 ++
 src/services/providers/wordpressProvider.js   |   1 +
 src/services/providers/zendeskProvider.js     |   1 +
 src/services/publishSvc.js                    |   1 +
 src/services/syncSvc.js                       |  42 ++-
 src/services/userSvc.js                       |  18 +-
 src/services/utils.js                         |  47 +--
 src/services/workspaceSvc.js                  |   5 +-
 src/store/content.js                          |   2 +-
 src/store/contentState.js                     |   2 +-
 src/store/data.js                             |  31 +-
 src/store/explorer.js                         |   4 +-
 src/store/file.js                             |   2 +-
 src/store/folder.js                           |   2 +-
 src/store/index.js                            |  20 +-
 src/store/locationTemplate.js                 |   6 +-
 src/store/notification.js                     |   5 +-
 src/store/syncedContent.js                    |   2 +-
 src/store/workspace.js                        |   7 +-
 src/styles/app.scss                           |   2 +-
 75 files changed, 902 insertions(+), 528 deletions(-)
 create mode 100644 src/data/constants.js
 rename src/data/{ => defaults}/defaultLayoutSettings.js (100%)
 rename src/data/{ => defaults}/defaultLocalSettings.js (100%)
 rename src/data/{ => defaults}/defaultSettings.yml (87%)
 rename src/data/{ => defaults}/defaultWorkspaces.js (100%)
 rename src/data/{ => empties}/emptyContent.js (100%)
 rename src/data/{ => empties}/emptyContentState.js (100%)
 rename src/data/{ => empties}/emptyFile.js (100%)
 rename src/data/{ => empties}/emptyFolder.js (100%)
 rename src/data/{ => empties}/emptyPublishLocation.js (100%)
 rename src/data/{ => empties}/emptySyncLocation.js (100%)
 rename src/data/{ => empties}/emptySyncedContent.js (100%)
 rename src/data/{ => empties}/emptyTemplateHelpers.js (100%)
 rename src/data/{ => empties}/emptyTemplateValue.html (100%)
 rename src/data/{ => templates}/jekyllSiteTemplate.html (100%)
 rename src/data/{ => templates}/plainHtmlTemplate.html (100%)
 rename src/data/{ => templates}/styledHtmlTemplate.html (100%)
 rename src/data/{ => templates}/styledHtmlWithTocTemplate.html (100%)

diff --git a/src/components/FindReplace.vue b/src/components/FindReplace.vue
index 7e2d5672..2a76493d 100644
--- a/src/components/FindReplace.vue
+++ b/src/components/FindReplace.vue
@@ -353,7 +353,7 @@ export default {
 .find-replace__find-stats {
   text-align: right;
   font-size: 0.75em;
-  opacity: 0.5;
+  opacity: 0.6;
 }
 
 .find-replace-highlighting {
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
index 4e52d7fa..d28d020b 100644
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -116,6 +116,11 @@ export default {
   hr + hr {
     display: none;
   }
+
+  .textfield {
+    font-size: 14px;
+    height: 26px;
+  }
 }
 
 .side-bar__inner {
diff --git a/src/components/Tour.vue b/src/components/Tour.vue
index 874528f2..e5ab19c4 100644
--- a/src/components/Tour.vue
+++ b/src/components/Tour.vue
@@ -2,12 +2,12 @@
   <div class="tour" @keydown.esc="skip">
     <div class="tour-step" :class="'tour-step--' + step" :style="stepStyle">
       <div class="tour-step__inner" v-if="step === 'welcome'">
-        <h2>Welcome to StackEdit!</h2>
-        <p>Greater, lighter, faster... <b>StackEdit 5</b> is here!</p>
+        <h2>Welcome back!</h2>
+        <p>The new <b>StackEdit 5</b> is here!</p>
         <p>Please click <b>Next</b> to take a quick tour.</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">Skip</button>
-          <button class="button" @click="next">Next</button>
+          <button class="button button--resolve" @click="next">Next</button>
         </div>
       </div>
       <div class="tour-step__inner" v-else-if="step === 'editor'">
@@ -16,7 +16,7 @@
         <p>Click <icon-side-preview></icon-side-preview> to toggle the side preview.</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">Skip</button>
-          <button class="button" @click="next">Next</button>
+          <button class="button button--resolve" @click="next">Next</button>
         </div>
       </div>
       <div class="tour-step__inner" v-else-if="step === 'explorer'">
@@ -25,7 +25,7 @@
         <p>Click <icon-folder></icon-folder> to open the file explorer.</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">Skip</button>
-          <button class="button" @click="next">Next</button>
+          <button class="button button--resolve" @click="next">Next</button>
         </div>
       </div>
       <div class="tour-step__inner" v-else-if="step === 'menu'">
@@ -34,7 +34,7 @@
         <p>Click <icon-provider provider-id="stackedit"></icon-provider> to explore the menu.</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">Skip</button>
-          <button class="button" @click="next">Next</button>
+          <button class="button button--resolve" @click="next">Next</button>
         </div>
       </div>
       <div class="tour-step__inner" v-else-if="step === 'end'">
@@ -42,7 +42,7 @@
         <p>If you like StackEdit, please rate 5 stars on the <a target="_blank" href="https://chrome.google.com/webstore/detail/iiooodelglhkcpgbajoejffhijaclcdg/reviews">Chrome Web Store</a>.</p>
         <p>You can also star the project on <a target="_blank" href="https://github.com/benweet/stackedit">GitHub</a> and join the <a target="_blank" href="https://community.stackedit.io/">community</a>.</p>
         <div class="tour-step__button-bar">
-          <button class="button" @click="finish">Ok</button>
+          <button class="button button--resolve" @click="finish">Ok</button>
         </div>
       </div>
     </div>
@@ -139,12 +139,12 @@ export default {
 }
 
 $tour-step-background: mix(#f3f3f3, $selection-highlighting-color, 75%);
-$tour-step-width: 220px;
+$tour-step-width: 240px;
 
 .tour-step__inner {
   position: absolute;
   background-color: $tour-step-background;
-  padding: 1.5em 1em 1em;
+  padding: 1em;
   font-size: 0.9em;
   line-height: 1.33;
   width: $tour-step-width;
@@ -213,6 +213,11 @@ $tour-step-width: 220px;
 }
 
 .tour-step__button-bar {
+  margin-top: 1.75em;
   text-align: right;
+
+  .button {
+    font-size: 1.1em;
+  }
 }
 </style>
diff --git a/src/components/UserImage.vue b/src/components/UserImage.vue
index 4a7b1020..c375eea7 100644
--- a/src/components/UserImage.vue
+++ b/src/components/UserImage.vue
@@ -10,13 +10,11 @@ export default {
   props: ['userId'],
   computed: {
     url() {
+      userSvc.getInfo(this.userId);
       const userInfo = this.$store.state.userInfo.itemsById[this.userId];
       return userInfo && userInfo.imageUrl && `url('${userInfo.imageUrl}')`;
     },
   },
-  created() {
-    userSvc.getInfo(this.userId);
-  },
 };
 </script>
 
diff --git a/src/components/UserName.vue b/src/components/UserName.vue
index b191d0a1..895e74be 100644
--- a/src/components/UserName.vue
+++ b/src/components/UserName.vue
@@ -9,12 +9,10 @@ export default {
   props: ['userId'],
   computed: {
     name() {
+      userSvc.getInfo(this.userId);
       const userInfo = this.$store.state.userInfo.itemsById[this.userId];
       return userInfo ? userInfo.name : 'Someone';
     },
   },
-  created() {
-    userSvc.getInfo(this.userId);
-  },
 };
 </script>
diff --git a/src/components/menus/HistoryMenu.vue b/src/components/menus/HistoryMenu.vue
index e0b1e842..d89fb4e0 100644
--- a/src/components/menus/HistoryMenu.vue
+++ b/src/components/menus/HistoryMenu.vue
@@ -1,26 +1,41 @@
 <template>
-  <div class="history side-bar__panel">
-    <div class="side-bar__info" v-if="!syncToken">
-      <p>You have to <a href="javascript:void(0)" @click="signin">sign in with Google</a> to enable revision history.</p>
-      <p><b>Note:</b> This will sync your main workspace.</p>
-    </div>
-    <div class="side-bar__info" v-if="loading">
-      <p>Loading history…</p>
-    </div>
-    <div class="side-bar__info" v-else-if="!revisionsWithSpacer.length">
-      <p><b>{{currentFileName}}</b> has no history.</p>
-    </div>
-    <div class="revision" v-for="revision in revisionsWithSpacer" :key="revision.id">
-      <div class="history__spacer" v-if="revision.spacer"></div>
-      <a class="revision__button button flex flex--row" href="javascript:void(0)" @click="open(revision)">
-        <div class="revision__icon">
-          <user-image :user-id="revision.sub"></user-image>
+  <div class="history side-bar__panel side-bar__panel--menu">
+    <div class="side-bar__info">
+      <p v-if="syncLocations.length > 1">
+        <select slot="field" class="textfield" v-model="syncLocationId" @keydown.enter="resolve()">
+          <option v-for="location in syncLocations" :key="location.id" :value="location.id">
+            {{ location.description }}
+          </option>
+        </select>
+      </p>
+      <p v-if="!historyContext">Synchronize <b>{{currentFileName}}</b> to enable revision history or <a href="javascript:void(0)" @click="signin">sign in with Google</a> to synchronize your main workspace.</p>
+      <p v-else-if="loading">Loading history…</p>
+      <p v-else-if="!revisionsWithSpacer.length"><b>{{currentFileName}}</b> has no history.</p>
+      <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else>
+        <div class="menu-entry__icon menu-entry__icon--image">
+          <icon-provider :provider-id="syncLocation.providerId"></icon-provider>
         </div>
-        <div class="revision__header flex flex--column">
-          <user-name :user-id="revision.sub"></user-name>
-          <div class="revision__created">{{revision.created | formatTime}}</div>
-        </div>
-      </a>
+        <span v-if="syncLocation.url">
+          The following revisions are stored in <a :href="syncLocation.url" target="_blank">{{ syncLocationProviderName }}</a>.
+        </span>
+        <span v-else>
+          The following revisions are stored in {{ syncLocationProviderName }}.
+        </span>
+      </div>
+    </div>
+    <div>
+      <div class="revision" v-for="revision in revisionsWithSpacer" :key="revision.id">
+        <div class="history__spacer" v-if="revision.spacer"></div>
+        <a class="revision__button button flex flex--row" href="javascript:void(0)" @click="open(revision)">
+          <div class="revision__icon">
+            <user-image :user-id="revision.sub"></user-image>
+          </div>
+          <div class="revision__header flex flex--column">
+            <user-name :user-id="revision.sub"></user-name>
+            <div class="revision__created">{{revision.created | formatTime}}</div>
+          </div>
+        </a>
+      </div>
     </div>
     <div class="history__spacer history__spacer--last" v-if="revisions.length"></div>
     <div class="flex flex--row flex--end" v-if="showMoreButton">
@@ -30,7 +45,7 @@
 </template>
 
 <script>
-import { mapMutations, mapGetters } from 'vuex';
+import { mapState, mapMutations, mapGetters } from 'vuex';
 import providerRegistry from '../../services/providers/common/providerRegistry';
 import MenuEntry from './common/MenuEntry';
 import UserImage from '../UserImage';
@@ -44,7 +59,7 @@ import syncSvc from '../../services/syncSvc';
 let editorClassAppliers = [];
 let previewClassAppliers = [];
 
-let cachedFileId;
+let cachedHistoryContextHash;
 let revisionsPromise;
 let revisionContentPromises;
 const pageSize = 30;
@@ -60,16 +75,73 @@ export default {
     allRevisions: [],
     loading: false,
     showCount: pageSize,
+    syncLocationId: null,
   }),
   computed: {
-    ...mapGetters('workspace', [
-      'syncToken',
+    ...mapGetters('data', [
+      'syncDataByItemId',
     ]),
+    ...mapGetters('syncLocation', {
+      syncLocations: 'currentWithWorkspaceSyncLocation',
+    }),
+    ...mapState('content', [
+      'revisionContent',
+    ]),
+    syncLocation() {
+      return utils.someResult(this.syncLocations, (syncLocation) => {
+        if (syncLocation.id === this.syncLocationId) {
+          return syncLocation;
+        }
+        return null;
+      });
+    },
+    syncLocationProviderName() {
+      if (!this.syncLocation) {
+        return null;
+      }
+      return providerRegistry.providersById[this.syncLocation.providerId].name;
+    },
     currentFileName() {
       return this.$store.getters['file/current'].name;
     },
+    historyContext() {
+      const { syncLocation } = this;
+      if (syncLocation) {
+        const provider = providerRegistry.providersById[syncLocation.providerId];
+        const token = provider.getToken(syncLocation);
+        const fileId = this.$store.getters['file/current'].id;
+        const contentId = `${fileId}/content`;
+        const historyContext = {
+          token,
+          fileId,
+          contentId,
+          syncLocation: this.syncLocation,
+        };
+        if (syncLocation.id !== 'main') {
+          return historyContext;
+        }
+
+        // Add syncData for workspace sync location
+        const { syncDataByItemId } = this;
+        const fileSyncData = syncDataByItemId[fileId];
+        const contentSyncData = syncDataByItemId[contentId];
+        if (fileSyncData && contentSyncData) {
+          return {
+            ...historyContext,
+            fileSyncData,
+            contentSyncData,
+          };
+        }
+      }
+      return null;
+    },
+    historyContextHash() {
+      return utils.serializeObject(this.historyContext);
+    },
     revisions() {
-      return this.allRevisions.slice(0, this.showCount);
+      return this.allRevisions.slice()
+        .sort((revision1, revision2) => revision2.created - revision1.created)
+        .slice(0, this.showCount);
     },
     revisionsWithSpacer() {
       let previousCreated = 0;
@@ -85,12 +157,6 @@ export default {
     showMoreButton() {
       return this.showCount < this.allRevisions.length;
     },
-    refreshTrigger() {
-      return utils.serializeObject([
-        this.$store.getters['file/current'].id,
-        this.syncToken,
-      ]);
-    },
   },
   methods: {
     ...mapMutations('content', [
@@ -113,32 +179,31 @@ export default {
     open(revision) {
       let revisionContentPromise = revisionContentPromises[revision.id];
       if (!revisionContentPromise) {
-        revisionContentPromise = new Promise((resolve, reject) => {
-          const { syncToken } = this;
-          const currentFile = this.$store.getters['file/current'];
-          this.$store.dispatch(
+        const historyContext = utils.deepCopy(this.historyContext);
+        if (historyContext) {
+          const provider = providerRegistry.providersById[this.syncLocation.providerId];
+          revisionContentPromise = new Promise((resolve, reject) => this.$store.dispatch(
             'queue/enqueue',
-            async () => {
-              try {
-                const content = await this.workspaceProvider
-                  .getRevisionContent(syncToken, currentFile.id, revision.id);
-                resolve(content);
-              } catch (e) {
-                reject(e);
-              }
-            },
-          );
-        });
-        revisionContentPromises[revision.id] = revisionContentPromise;
-        revisionContentPromise.catch(() => {
-          revisionContentPromises[revision.id] = null;
-        });
+            () => provider.getFileRevisionContent({
+              ...historyContext,
+              revisionId: revision.id,
+            })
+              .then(resolve, reject),
+          ));
+          revisionContentPromises[revision.id] = revisionContentPromise;
+          revisionContentPromise.catch((err) => {
+            this.$store.dispatch('notification/error', err);
+            revisionContentPromises[revision.id] = null;
+          });
+        }
+      }
+      if (revisionContentPromise) {
+        revisionContentPromise.then(revisionContent =>
+          this.$store.dispatch('content/setRevisionContent', revisionContent));
       }
-      revisionContentPromise.then(revisionContent =>
-        this.$store.dispatch('content/setRevisionContent', revisionContent));
     },
     refreshHighlighters() {
-      const { revisionContent } = this.$store.state.content;
+      const { revisionContent } = this;
       editorClassAppliers.forEach(editorClassApplier => editorClassApplier.stop());
       editorClassAppliers = [];
       previewClassAppliers.forEach(previewClassApplier => previewClassApplier.stop());
@@ -166,40 +231,40 @@ export default {
       }
     },
   },
-  created() {
-    // Find the workspace provider
-    const workspace = this.$store.getters['workspace/currentWorkspace'];
-    this.workspaceProvider = providerRegistry.providersById[workspace.providerId];
-
-    // Watch file changes
-    this.$watch(
-      () => this.refreshTrigger,
-      () => {
+  watch: {
+    // Fix syncLocationId
+    syncLocation: {
+      immediate: true,
+      handler(value) {
+        if (!value) {
+          const firstSyncLocation = this.syncLocations[0];
+          if (firstSyncLocation) {
+            this.syncLocationId = firstSyncLocation.id;
+          }
+        }
+      },
+    },
+    // Load revision list on context changes
+    historyContextHash: {
+      immediate: true,
+      handler() {
         this.allRevisions = [];
-        const { id } = this.$store.getters['file/current'];
-        const { syncToken } = this;
-        if (id && syncToken) {
-          if (id !== cachedFileId) {
+        const historyContext = utils.deepCopy(this.historyContext);
+        if (historyContext) {
+          if (this.historyContextHash !== cachedHistoryContextHash) {
             this.setRevisionContent();
-            cachedFileId = id;
+            cachedHistoryContextHash = this.historyContextHash;
             revisionContentPromises = {};
-            const currentFile = this.$store.getters['file/current'];
-            revisionsPromise = new Promise((resolve, reject) => {
-              this.$store.dispatch(
-                'queue/enqueue',
-                async () => {
-                  try {
-                    const revisions = await this.workspaceProvider
-                      .listRevisions(syncToken, currentFile.id);
-                    resolve(revisions);
-                  } catch (e) {
-                    reject(e);
-                  }
-                },
-              );
-            })
-              .catch(() => {
-                cachedFileId = null;
+            const provider = providerRegistry.providersById[this.syncLocation.providerId];
+            revisionsPromise = new Promise((resolve, reject) => this.$store.dispatch(
+              'queue/enqueue',
+              () => provider
+                .listFileRevisions(historyContext)
+                .then(resolve, reject),
+            ))
+              .catch((err) => {
+                this.$store.dispatch('notification/error', err);
+                cachedHistoryContextHash = null;
                 return [];
               });
           }
@@ -211,44 +276,40 @@ export default {
             });
           }
         }
-      }, { immediate: true },
-    );
-
-    const loadOne = () => {
-      if (!this.destroyed) {
+      },
+    },
+    // Load each revision on revision list changes
+    revisions(revisions) {
+      const { historyContext } = this;
+      if (historyContext) {
         this.$store.dispatch(
           'queue/enqueue',
-          () => {
-            let loadPromise;
-            this.revisions.some((revision) => {
-              if (!revision.created) {
-                const { syncToken } = this;
-                const currentFile = this.$store.getters['file/current'];
-                loadPromise = this.workspaceProvider
-                  .loadRevision(syncToken, currentFile.id, revision)
-                  .then(() => loadOne());
-              }
-              return loadPromise;
-            });
-            return loadPromise;
-          },
+          () => utils.awaitSequence(revisions, async (revision) => {
+            // Make sure revisions and historyContext haven't changed
+            if (!this.destroyed
+              && this.revisions === revisions
+              && this.historyContext === historyContext
+            ) {
+              const provider = providerRegistry.providersById[this.syncLocation.providerId];
+              await provider.loadFileRevision({
+                ...historyContext,
+                revision,
+              });
+            }
+          }),
         );
       }
-    };
-
-    this.$watch(
-      () => this.revisions,
-      () => loadOne(),
-      { immediate: true },
-    );
-
-    // Watch diffs changes
-    this.$watch(
-      () => this.$store.state.content.revisionContent,
-      () => this.refreshHighlighters(),
-    );
-
-    // Close revision
+    },
+    // Refresh highlighters on open/close revision
+    revisionContent: {
+      immediate: true,
+      handler() {
+        this.refreshHighlighters();
+      },
+    },
+  },
+  created() {
+    // Close revision on escape
     this.onKeyup = (evt) => {
       if (evt.which === 27) {
         // Esc key
@@ -273,10 +334,6 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.history {
-  padding: 5px 5px 50px;
-}
-
 .history__button {
   font-size: 14px;
   margin-top: 0.5em;
@@ -291,7 +348,7 @@ export default {
     position: absolute;
     height: 100%;
     top: 0;
-    left: 24px;
+    left: 19px;
     border-left: 2px dotted $hr-color;
   }
 }
@@ -302,7 +359,7 @@ export default {
 
 .revision__button {
   text-align: left;
-  padding: 15px;
+  padding: 10px;
   height: auto;
   text-transform: none;
   position: relative;
@@ -312,7 +369,7 @@ export default {
     position: absolute;
     height: 100%;
     top: 0;
-    left: 24px;
+    left: 19px;
     border-left: 2px solid $hr-color;
   }
 
@@ -343,20 +400,21 @@ export default {
 .revision__header {
   font-size: 15px;
   width: 100%;
+  line-height: 1.33;
 }
 
 .revision__created {
   font-size: 0.75em;
-  opacity: 0.5;
+  opacity: 0.6;
 }
 
 .layout--revision {
   .cledit-section *,
   .cl-preview-section * {
-    color: transparentize($editor-color-light, 0.67) !important;
+    color: transparentize($editor-color-light, 0.5) !important;
 
     .app--dark & {
-      color: transparentize($editor-color-dark, 0.67) !important;
+      color: transparentize($editor-color-dark, 0.5) !important;
     }
   }
 
diff --git a/src/components/menus/MainMenu.vue b/src/components/menus/MainMenu.vue
index 560b02e2..eefa0a1d 100644
--- a/src/components/menus/MainMenu.vue
+++ b/src/components/menus/MainMenu.vue
@@ -15,10 +15,13 @@
           <b>{{currentWorkspace.name}}</b> synced with your Google Drive app data folder.
         </span>
         <span v-else-if="currentWorkspace.providerId === 'googleDriveWorkspace'">
-          <b>{{currentWorkspace.name}}</b> synced with a <a :href="currentWorkspaceUrl" target="_blank">Google Drive folder</a>.
+          <b>{{currentWorkspace.name}}</b> synced with a <a :href="workspaceLocationUrl" target="_blank">Google Drive folder</a>.
         </span>
         <span v-else-if="currentWorkspace.providerId === 'couchdbWorkspace'">
-          <b>{{currentWorkspace.name}}</b> synced with a <a :href="currentWorkspaceUrl" target="_blank">CouchDB database</a>.
+          <b>{{currentWorkspace.name}}</b> synced with a <a :href="workspaceLocationUrl" target="_blank">CouchDB database</a>.
+        </span>
+        <span v-else-if="currentWorkspace.providerId === 'githubWorkspace'">
+          <b>{{currentWorkspace.name}}</b> synced with a <a :href="workspaceLocationUrl" target="_blank">GitHub repo</a>.
         </span>
       </div>
       <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else>
@@ -108,7 +111,7 @@ export default {
       'loginToken',
       'userId',
     ]),
-    currentWorkspaceUrl() {
+    workspaceLocationUrl() {
       const provider = providerRegistry.providersById[this.currentWorkspace.providerId];
       return provider.getWorkspaceLocationUrl(this.currentWorkspace);
     },
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 9e5444ff..19fb3d52 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -7,7 +7,7 @@
     </menu-entry>
     <menu-entry @click.native="templates">
       <icon-code-braces slot="icon"></icon-code-braces>
-      <div>Templates</div>
+      <div><div class="menu-entry__label menu-entry__label--count">{{templateCount}}</div> Templates</div>
       <span>Configure Handlebars templates for your exports.</span>
     </menu-entry>
     <menu-entry @click.native="reset">
@@ -50,6 +50,11 @@ export default {
   components: {
     MenuEntry,
   },
+  computed: {
+    templateCount() {
+      return Object.keys(this.$store.getters['data/allTemplatesById']).length;
+    },
+  },
   methods: {
     onImportBackup(evt) {
       const file = evt.target.files[0];
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index 5ffdc89b..fc56ceae 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -65,6 +65,7 @@ export default {
   small {
     display: block;
     font-size: 0.75em;
+    opacity: 0.75;
   }
 
   hr {
diff --git a/src/components/modals/FilePropertiesModal.vue b/src/components/modals/FilePropertiesModal.vue
index efc4bcd6..941a1f44 100644
--- a/src/components/modals/FilePropertiesModal.vue
+++ b/src/components/modals/FilePropertiesModal.vue
@@ -228,8 +228,8 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.modal__inner-1--file-properties {
-  max-width: 540px;
+.modal__inner-1.modal__inner-1--file-properties {
+  max-width: 520px;
 }
 
 .modal__error--file-properties {
diff --git a/src/components/modals/PublishManagementModal.vue b/src/components/modals/PublishManagementModal.vue
index 1bcec7b5..ccdbb71c 100644
--- a/src/components/modals/PublishManagementModal.vue
+++ b/src/components/modals/PublishManagementModal.vue
@@ -64,10 +64,6 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.modal__inner-1--publish-management {
-  max-width: 560px;
-}
-
 .publish-entry {
   padding: 0.5rem 0.25rem;
   border-bottom: 1px solid $hr-color;
diff --git a/src/components/modals/SettingsModal.vue b/src/components/modals/SettingsModal.vue
index 2723d76d..98659f7b 100644
--- a/src/components/modals/SettingsModal.vue
+++ b/src/components/modals/SettingsModal.vue
@@ -36,7 +36,7 @@ import { mapGetters } from 'vuex';
 import ModalInner from './common/ModalInner';
 import Tab from './common/Tab';
 import CodeEditor from '../CodeEditor';
-import defaultSettings from '../../data/defaultSettings.yml';
+import defaultSettings from '../../data/defaults/defaultSettings.yml';
 
 const emptySettings = `# Add your custom settings here to override the
 # default settings.
@@ -83,8 +83,8 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.modal__inner-1--settings {
-  max-width: 600px;
+.modal__inner-1.modal__inner-1--settings {
+  max-width: 560px;
 }
 
 .modal__error--settings {
diff --git a/src/components/modals/SponsorModal.vue b/src/components/modals/SponsorModal.vue
index 0075d5b7..0c5ed22a 100644
--- a/src/components/modals/SponsorModal.vue
+++ b/src/components/modals/SponsorModal.vue
@@ -1,7 +1,7 @@
 <template>
   <modal-inner class="modal__inner-1--sponsor" aria-label="Sponsor">
     <div class="modal__content">
-      <p>Please choose a <b>PayPal</b> option.</p>
+      <p>Please choose a <b>PayPal</b> option:</p>
       <a class="paypal-option button flex flex--row flex--center" v-for="button in buttons" :key="button.id" :href="button.link">
         <div class="flex flex--column">
           <div>{{button.price}}<div class="paypal-option__offer" v-if="button.offer">{{button.offer}}</div></div>
@@ -65,8 +65,8 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.modal__inner-1--sponsor {
-  max-width: 380px;
+.modal__inner-1.modal__inner-1--sponsor {
+  max-width: 400px;
 }
 
 .paypal-option {
@@ -81,7 +81,7 @@ export default {
   span {
     display: inline-block;
     font-size: 0.75rem;
-    opacity: 0.5;
+    opacity: 0.6;
     white-space: normal;
     line-height: 1.5;
   }
diff --git a/src/components/modals/SyncManagementModal.vue b/src/components/modals/SyncManagementModal.vue
index 19060d42..6e5c1aa1 100644
--- a/src/components/modals/SyncManagementModal.vue
+++ b/src/components/modals/SyncManagementModal.vue
@@ -23,7 +23,7 @@
           </div>
           <div class="sync-entry__row flex flex--row flex--align-center">
             <div class="sync-entry__url">
-              {{location.url || 'Workspace location'}}
+              {{location.url || 'Google Drive app data'}}
             </div>
             <div class="sync-entry__buttons flex flex--row flex--center" v-if="location.url">
               <button class="sync-entry__button button" v-clipboard="location.url" @click="info('Location URL copied to clipboard!')" v-title="'Copy URL'">
@@ -83,10 +83,6 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.modal__inner-1--sync-management {
-  max-width: 560px;
-}
-
 .sync-entry {
   margin: 1.5em 0;
   height: auto;
diff --git a/src/components/modals/TemplatesModal.vue b/src/components/modals/TemplatesModal.vue
index 01215ca5..0b717522 100644
--- a/src/components/modals/TemplatesModal.vue
+++ b/src/components/modals/TemplatesModal.vue
@@ -55,8 +55,8 @@ import { mapGetters } from 'vuex';
 import utils from '../../services/utils';
 import ModalInner from './common/ModalInner';
 import CodeEditor from '../CodeEditor';
-import emptyTemplateValue from '../../data/emptyTemplateValue.html';
-import emptyTemplateHelpers from '!raw-loader!../../data/emptyTemplateHelpers.js'; // eslint-disable-line
+import emptyTemplateValue from '../../data/empties/emptyTemplateValue.html';
+import emptyTemplateHelpers from '!raw-loader!../../data/empties/emptyTemplateHelpers.js'; // eslint-disable-line
 
 const collator = new Intl.Collator(undefined, { sensitivity: 'base' });
 
@@ -163,7 +163,7 @@ export default {
 </script>
 
 <style lang="scss">
-.modal__inner-1--templates {
-  max-width: 680px;
+.modal__inner-1.modal__inner-1--templates {
+  max-width: 600px;
 }
 </style>
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 4192c7a0..43356c35 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -126,10 +126,6 @@ export default {
 <style lang="scss">
 @import '../../styles/variables.scss';
 
-.modal__inner-1--workspace-management {
-  max-width: 560px;
-}
-
 .workspace-entry {
   margin: 1.75em 0;
   height: auto;
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index 81f14d84..89bd9533 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -54,8 +54,8 @@ export default {
   top: 7px;
   right: 7px;
   color: rgba(0, 0, 0, 0.5);
-  width: 28px;
-  height: 28px;
+  width: 30px;
+  height: 30px;
   padding: 2px;
 
   &:active,
diff --git a/src/components/modals/providers/GithubOpenModal.vue b/src/components/modals/providers/GithubOpenModal.vue
index 1ffbf4f9..3717fc50 100644
--- a/src/components/modals/providers/GithubOpenModal.vue
+++ b/src/components/modals/providers/GithubOpenModal.vue
@@ -11,18 +11,18 @@
           <b>Example:</b> https://github.com/benweet/stackedit
         </div>
       </form-entry>
-      <form-entry label="Branch" info="optional">
-        <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
-        <div class="form-entry__info">
-          If not supplied, the <code>master</code> branch will be used.
-        </div>
-      </form-entry>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
           <b>Example:</b> path/to/README.md
         </div>
       </form-entry>
+      <form-entry label="Branch" info="optional">
+        <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          If not supplied, the <code>master</code> branch will be used.
+        </div>
+      </form-entry>
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">Cancel</button>
diff --git a/src/components/modals/providers/GithubPublishModal.vue b/src/components/modals/providers/GithubPublishModal.vue
index 35338647..56052540 100644
--- a/src/components/modals/providers/GithubPublishModal.vue
+++ b/src/components/modals/providers/GithubPublishModal.vue
@@ -11,12 +11,6 @@
           <b>Example:</b> https://github.com/benweet/stackedit
         </div>
       </form-entry>
-      <form-entry label="Branch" info="optional">
-        <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
-        <div class="form-entry__info">
-          If not supplied, the <code>master</code> branch will be used.
-        </div>
-      </form-entry>
       <form-entry label="File path" error="path">
         <input slot="field" class="textfield" type="text" v-model.trim="path" @keydown.enter="resolve()">
         <div class="form-entry__info">
@@ -24,6 +18,12 @@
           If the file exists, it will be overwritten.
         </div>
       </form-entry>
+      <form-entry label="Branch" info="optional">
+        <input slot="field" class="textfield" type="text" v-model.trim="branch" @keydown.enter="resolve()">
+        <div class="form-entry__info">
+          If not supplied, the <code>master</code> branch will be used.
+        </div>
+      </form-entry>
       <form-entry label="Template">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
           <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
diff --git a/src/components/modals/providers/ZendeskAccountModal.vue b/src/components/modals/providers/ZendeskAccountModal.vue
index 7edccbd7..a85e8919 100644
--- a/src/components/modals/providers/ZendeskAccountModal.vue
+++ b/src/components/modals/providers/ZendeskAccountModal.vue
@@ -27,12 +27,12 @@
 </template>
 
 <script>
-import utils from '../../../services/utils';
 import modalTemplate from '../common/modalTemplate';
+import constants from '../../../data/constants';
 
 export default modalTemplate({
   data: () => ({
-    redirectUrl: utils.oauth2RedirectUri,
+    redirectUrl: constants.oauth2RedirectUri,
   }),
   computedLocalSettings: {
     siteUrl: 'zendeskSiteUrl',
diff --git a/src/data/constants.js b/src/data/constants.js
new file mode 100644
index 00000000..6982a991
--- /dev/null
+++ b/src/data/constants.js
@@ -0,0 +1,30 @@
+const origin = `${window.location.protocol}//${window.location.host}`;
+
+export default {
+  cleanTrashAfter: 0 * 24 * 60 * 60 * 1000, // 7 days
+  origin,
+  oauth2RedirectUri: `${origin}/oauth2/callback`,
+  types: [
+    'contentState',
+    'syncedContent',
+    'content',
+    'file',
+    'folder',
+    'syncLocation',
+    'publishLocation',
+    'data',
+  ],
+  localStorageDataIds: [
+    'workspaces',
+    'settings',
+    'layoutSettings',
+    'tokens',
+  ],
+  userIdPrefixes: {
+    db: 'dropbox',
+    gh: 'github',
+    go: 'google',
+  },
+  textMaxLength: 250000,
+  defaultName: 'Untitled',
+};
diff --git a/src/data/defaultLayoutSettings.js b/src/data/defaults/defaultLayoutSettings.js
similarity index 100%
rename from src/data/defaultLayoutSettings.js
rename to src/data/defaults/defaultLayoutSettings.js
diff --git a/src/data/defaultLocalSettings.js b/src/data/defaults/defaultLocalSettings.js
similarity index 100%
rename from src/data/defaultLocalSettings.js
rename to src/data/defaults/defaultLocalSettings.js
diff --git a/src/data/defaultSettings.yml b/src/data/defaults/defaultSettings.yml
similarity index 87%
rename from src/data/defaultSettings.yml
rename to src/data/defaults/defaultSettings.yml
index 64797b17..ccd0d1b0 100644
--- a/src/data/defaultSettings.yml
+++ b/src/data/defaults/defaultSettings.yml
@@ -5,7 +5,7 @@ fontSizeFactor: 1
 # Adjust maximum text width in editor and preview
 maxWidthFactor: 1
 # Auto-sync frequency (in ms). Minimum is 60000.
-autoSyncEvery: 60000
+autoSyncEvery: 90000
 
 # Editor settings
 editor:
@@ -77,10 +77,11 @@ turndown:
   linkStyle: inlined
   linkReferenceStyle: full
 
+# GitHub commit messages
 github:
-  createFileMessage: Create {{path}} from https://stackedit.io/
-  updateFileMessage: Update {{path}} from https://stackedit.io/
-  deleteFileMessage: Delete {{path}} from https://stackedit.io/
+  createFileMessage: '{{path}} created from https://stackedit.io/'
+  updateFileMessage: '{{path}} updated from https://stackedit.io/'
+  deleteFileMessage: '{{path}} deleted from https://stackedit.io/'
 
 # Default content for new files
 newFileContent: |
diff --git a/src/data/defaultWorkspaces.js b/src/data/defaults/defaultWorkspaces.js
similarity index 100%
rename from src/data/defaultWorkspaces.js
rename to src/data/defaults/defaultWorkspaces.js
diff --git a/src/data/emptyContent.js b/src/data/empties/emptyContent.js
similarity index 100%
rename from src/data/emptyContent.js
rename to src/data/empties/emptyContent.js
diff --git a/src/data/emptyContentState.js b/src/data/empties/emptyContentState.js
similarity index 100%
rename from src/data/emptyContentState.js
rename to src/data/empties/emptyContentState.js
diff --git a/src/data/emptyFile.js b/src/data/empties/emptyFile.js
similarity index 100%
rename from src/data/emptyFile.js
rename to src/data/empties/emptyFile.js
diff --git a/src/data/emptyFolder.js b/src/data/empties/emptyFolder.js
similarity index 100%
rename from src/data/emptyFolder.js
rename to src/data/empties/emptyFolder.js
diff --git a/src/data/emptyPublishLocation.js b/src/data/empties/emptyPublishLocation.js
similarity index 100%
rename from src/data/emptyPublishLocation.js
rename to src/data/empties/emptyPublishLocation.js
diff --git a/src/data/emptySyncLocation.js b/src/data/empties/emptySyncLocation.js
similarity index 100%
rename from src/data/emptySyncLocation.js
rename to src/data/empties/emptySyncLocation.js
diff --git a/src/data/emptySyncedContent.js b/src/data/empties/emptySyncedContent.js
similarity index 100%
rename from src/data/emptySyncedContent.js
rename to src/data/empties/emptySyncedContent.js
diff --git a/src/data/emptyTemplateHelpers.js b/src/data/empties/emptyTemplateHelpers.js
similarity index 100%
rename from src/data/emptyTemplateHelpers.js
rename to src/data/empties/emptyTemplateHelpers.js
diff --git a/src/data/emptyTemplateValue.html b/src/data/empties/emptyTemplateValue.html
similarity index 100%
rename from src/data/emptyTemplateValue.html
rename to src/data/empties/emptyTemplateValue.html
diff --git a/src/data/faq.md b/src/data/faq.md
index 634255c8..b92ba9ad 100644
--- a/src/data/faq.md
+++ b/src/data/faq.md
@@ -2,7 +2,7 @@
 
 If your workspace is not synced, your files are only stored inside your browser using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) and are not stored anywhere else.
 
-We recommend syncing your workspace to make sure files won't be lost in case your browser data is cleared.
+We recommend syncing your workspace to make sure files won't be lost in case your browser data is cleared. Self-hosted CouchDB backend is best suited for privacy.
 
 **Can StackEdit access my data without telling me?**
 
diff --git a/src/data/jekyllSiteTemplate.html b/src/data/templates/jekyllSiteTemplate.html
similarity index 100%
rename from src/data/jekyllSiteTemplate.html
rename to src/data/templates/jekyllSiteTemplate.html
diff --git a/src/data/plainHtmlTemplate.html b/src/data/templates/plainHtmlTemplate.html
similarity index 100%
rename from src/data/plainHtmlTemplate.html
rename to src/data/templates/plainHtmlTemplate.html
diff --git a/src/data/styledHtmlTemplate.html b/src/data/templates/styledHtmlTemplate.html
similarity index 100%
rename from src/data/styledHtmlTemplate.html
rename to src/data/templates/styledHtmlTemplate.html
diff --git a/src/data/styledHtmlWithTocTemplate.html b/src/data/templates/styledHtmlWithTocTemplate.html
similarity index 100%
rename from src/data/styledHtmlWithTocTemplate.html
rename to src/data/templates/styledHtmlWithTocTemplate.html
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
index 747dd6bf..7ce2ed92 100644
--- a/src/services/explorerSvc.js
+++ b/src/services/explorerSvc.js
@@ -54,7 +54,7 @@ export default {
 
     const deleteFile = (id) => {
       if (moveToTrash) {
-        store.commit('file/patchItem', {
+        workspaceSvc.setOrPatchItem({
           id,
           parentId: 'trash',
         });
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index 55d7e217..4fb291b8 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -3,6 +3,7 @@ import utils from './utils';
 import store from '../store';
 import welcomeFile from '../data/welcomeFile.md';
 import workspaceSvc from './workspaceSvc';
+import constants from '../data/constants';
 
 const dbVersion = 1;
 const dbStoreName = 'objects';
@@ -82,7 +83,7 @@ const contentTypes = {
 };
 
 const hashMap = {};
-utils.types.forEach((type) => {
+constants.types.forEach((type) => {
   hashMap[type] = Object.create(null);
 });
 const lsHashMap = Object.create(null);
@@ -96,7 +97,7 @@ const localDbSvc = {
    * Sync data items stored in the localStorage.
    */
   syncLocalStorage() {
-    utils.localStorageDataIds.forEach((id) => {
+    constants.localStorageDataIds.forEach((id) => {
       const key = `data/${id}`;
 
       // Skip reloading the layoutSettings
@@ -327,7 +328,7 @@ const localDbSvc = {
     if (resetApp) {
       await Promise.all(Object.keys(store.getters['workspace/workspacesById'])
         .map(workspaceId => workspaceSvc.removeWorkspace(workspaceId)));
-      utils.localStorageDataIds.forEach((id) => {
+      constants.localStorageDataIds.forEach((id) => {
         // Clean data stored in localStorage
         localStorage.removeItem(`data/${id}`);
       });
@@ -372,7 +373,7 @@ const localDbSvc = {
 
     // If app was last opened 7 days ago and synchronization is off
     if (!store.getters['workspace/syncToken'] &&
-      (store.state.workspace.lastFocus + utils.cleanTrashAfter < Date.now())
+      (store.state.workspace.lastFocus + constants.cleanTrashAfter < Date.now())
     ) {
       // Clean files
       store.getters['file/items']
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index 8bbb2358..377a4d66 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -1,11 +1,13 @@
 import utils from './utils';
 import store from '../store';
+import constants from '../data/constants';
 
 const scriptLoadingPromises = Object.create(null);
-const oauth2AuthorizationTimeout = 120 * 1000; // 2 minutes
+const authorizeTimeout = 6 * 60 * 1000; // 2 minutes
+const silentAuthorizeTimeout = 15 * 1000; // 15 secondes (which will be reattempted)
 const networkTimeout = 30 * 1000; // 30 sec
 let isConnectionDown = false;
-const userInactiveAfter = 2 * 60 * 1000; // 2 minutes
+const userInactiveAfter = 3 * 60 * 1000; // 3 minutes (twice the default sync period)
 
 
 function parseHeaders(xhr) {
@@ -54,9 +56,9 @@ export default {
     // Check browser is online periodically
     const checkOffline = async () => {
       const isBrowserOffline = window.navigator.onLine === false;
-      if (!isBrowserOffline &&
-        store.state.lastOfflineCheck + networkTimeout + 5000 < Date.now() &&
-        this.isUserActive()
+      if (!isBrowserOffline
+        && store.state.lastOfflineCheck + networkTimeout + 5000 < Date.now()
+        && this.isUserActive()
       ) {
         store.commit('updateLastOfflineCheck');
         const script = document.createElement('script');
@@ -121,85 +123,98 @@ export default {
     }
     return scriptLoadingPromises[url];
   },
-  async startOauth2(url, params = {}, silent = false) {
-    // Build the authorize URL
-    const state = utils.uid();
-    params.state = state;
-    params.redirect_uri = utils.oauth2RedirectUri;
-    const authorizeUrl = utils.addQueryParams(url, params);
-
-    let iframeElt;
-    let wnd;
-    if (silent) {
-      // Use an iframe as wnd for silent mode
-      iframeElt = utils.createHiddenIframe(authorizeUrl);
-      document.body.appendChild(iframeElt);
-      wnd = iframeElt.contentWindow;
-    } else {
-      // Open a tab otherwise
-      wnd = window.open(authorizeUrl);
-      if (!wnd) {
-        return Promise.reject(new Error('The authorize window was blocked.'));
-      }
-    }
-
-    let checkClosedInterval;
-    let closeTimeout;
-    let msgHandler;
+  async startOauth2(url, params = {}, silent = false, reattempt = false) {
     try {
-      return await new Promise((resolve, reject) => {
-        if (silent) {
-          iframeElt.onerror = () => {
-            reject(new Error('Unknown error.'));
-          };
-          closeTimeout = setTimeout(() => {
-            isConnectionDown = true;
-            store.commit('setOffline', true);
-            store.commit('updateLastOfflineCheck');
-            reject(new Error('You are offline.'));
-          }, networkTimeout);
-        } else {
-          closeTimeout = setTimeout(() => {
-            reject(new Error('Timeout.'));
-          }, oauth2AuthorizationTimeout);
-        }
-
-        msgHandler = (event) => {
-          if (event.source === wnd && event.origin === utils.origin) {
-            const data = utils.parseQueryParams(`${event.data}`.slice(1));
-            if (data.error || data.state !== state) {
-              console.error(data); // eslint-disable-line no-console
-              reject(new Error('Could not get required authorization.'));
-            } else {
-              resolve({
-                accessToken: data.access_token,
-                code: data.code,
-                idToken: data.id_token,
-                expiresIn: data.expires_in,
-              });
-            }
-          }
-        };
-
-        window.addEventListener('message', msgHandler);
-        if (!silent) {
-          checkClosedInterval = setInterval(() => {
-            if (wnd.closed) {
-              reject(new Error('Authorize window was closed.'));
-            }
-          }, 250);
-        }
+      // Build the authorize URL
+      const state = utils.uid();
+      const authorizeUrl = utils.addQueryParams(url, {
+        ...params,
+        state,
+        redirect_uri: constants.oauth2RedirectUri,
       });
-    } finally {
-      clearInterval(checkClosedInterval);
-      if (!silent && !wnd.closed) {
-        wnd.close();
+
+      let iframeElt;
+      let wnd;
+      if (silent) {
+        // Use an iframe as wnd for silent mode
+        iframeElt = utils.createHiddenIframe(authorizeUrl);
+        document.body.appendChild(iframeElt);
+        wnd = iframeElt.contentWindow;
+      } else {
+        // Open a tab otherwise
+        wnd = window.open(authorizeUrl);
+        if (!wnd) {
+          throw new Error('The authorize window was blocked.');
+        }
       }
-      if (iframeElt) {
-        document.body.removeChild(iframeElt);
+
+      let checkClosedInterval;
+      let closeTimeout;
+      let msgHandler;
+      try {
+        return await new Promise((resolve, reject) => {
+          if (silent) {
+            iframeElt.onerror = () => {
+              reject(new Error('Unknown error.'));
+            };
+            closeTimeout = setTimeout(() => {
+              if (!reattempt) {
+                reject(new Error('REATTEMPT'));
+              } else {
+                isConnectionDown = true;
+                store.commit('setOffline', true);
+                store.commit('updateLastOfflineCheck');
+                reject(new Error('You are offline.'));
+              }
+            }, silentAuthorizeTimeout);
+          } else {
+            closeTimeout = setTimeout(() => {
+              reject(new Error('Timeout.'));
+            }, authorizeTimeout);
+          }
+
+          msgHandler = (event) => {
+            if (event.source === wnd && event.origin === constants.origin) {
+              const data = utils.parseQueryParams(`${event.data}`.slice(1));
+              if (data.error || data.state !== state) {
+                console.error(data); // eslint-disable-line no-console
+                reject(new Error('Could not get required authorization.'));
+              } else {
+                resolve({
+                  accessToken: data.access_token,
+                  code: data.code,
+                  idToken: data.id_token,
+                  expiresIn: data.expires_in,
+                });
+              }
+            }
+          };
+
+          window.addEventListener('message', msgHandler);
+          if (!silent) {
+            checkClosedInterval = setInterval(() => {
+              if (wnd.closed) {
+                reject(new Error('Authorize window was closed.'));
+              }
+            }, 250);
+          }
+        });
+      } finally {
+        clearInterval(checkClosedInterval);
+        if (!silent && !wnd.closed) {
+          wnd.close();
+        }
+        if (iframeElt) {
+          document.body.removeChild(iframeElt);
+        }
+        clearTimeout(closeTimeout);
+        window.removeEventListener('message', msgHandler);
       }
-      clearTimeout(closeTimeout);
-      window.removeEventListener('message', msgHandler);
+    } catch (e) {
+      if (e.message === 'REATTEMPT') {
+        return this.startOauth2(url, params, silent, true);
+      }
+      throw e;
     }
   },
   async request(configParam, offlineCheck = false) {
diff --git a/src/services/providers/bloggerPageProvider.js b/src/services/providers/bloggerPageProvider.js
index 69b956e2..8a655bec 100644
--- a/src/services/providers/bloggerPageProvider.js
+++ b/src/services/providers/bloggerPageProvider.js
@@ -4,6 +4,7 @@ import Provider from './common/Provider';
 
 export default new Provider({
   id: 'bloggerPage',
+  name: 'Blogger Page',
   getToken({ sub }) {
     const token = store.getters['data/googleTokensBySub'][sub];
     return token && token.isBlogger ? token : null;
diff --git a/src/services/providers/bloggerProvider.js b/src/services/providers/bloggerProvider.js
index 0b6413c4..f84d6042 100644
--- a/src/services/providers/bloggerProvider.js
+++ b/src/services/providers/bloggerProvider.js
@@ -4,6 +4,7 @@ import Provider from './common/Provider';
 
 export default new Provider({
   id: 'blogger',
+  name: 'Blogger',
   getToken({ sub }) {
     const token = store.getters['data/googleTokensBySub'][sub];
     return token && token.isBlogger ? token : null;
diff --git a/src/services/providers/common/Provider.js b/src/services/providers/common/Provider.js
index 42a58ce2..0e13dc4b 100644
--- a/src/services/providers/common/Provider.js
+++ b/src/services/providers/common/Provider.js
@@ -1,10 +1,10 @@
 import providerRegistry from './providerRegistry';
-import emptyContent from '../../../data/emptyContent';
+import emptyContent from '../../../data/empties/emptyContent';
 import utils from '../../utils';
 import store from '../../../store';
 import workspaceSvc from '../../workspaceSvc';
 
-const dataExtractor = /<!--stackedit_data:([A-Za-z0-9+/=\s]+)-->$/;
+const dataExtractor = /<!--stackedit_data:([A-Za-z0-9+/=\s]+)-->\s*$/;
 
 export default class Provider {
   prepareChanges = changes => changes
@@ -70,14 +70,6 @@ export default class Provider {
     return utils.addItemHash(result);
   }
 
-  static getContentSyncData(fileId) {
-    const syncData = store.getters['data/syncDataByItemId'][`${fileId}/content`];
-    if (!syncData) {
-      throw new Error(); // No need for a proper error message.
-    }
-    return syncData;
-  }
-
   /**
    * Find and open a file with location that meets the criteria
    */
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index 7db9903d..a4c58882 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -7,6 +7,7 @@ let syncLastSeq;
 
 export default new Provider({
   id: 'couchdbWorkspace',
+  name: 'CouchDB',
   getToken() {
     return store.getters['workspace/syncToken'];
   },
@@ -91,19 +92,22 @@ export default new Provider({
   },
   async saveWorkspaceItem({ item, syncData }) {
     const syncToken = store.getters['workspace/syncToken'];
-    const { id, rev } = couchdbHelper.uploadDocument({
+    const { id, rev } = await couchdbHelper.uploadDocument({
       token: syncToken,
       item,
       documentId: syncData && syncData.id,
       rev: syncData && syncData.rev,
     });
+
+    // Build sync data to save
     return {
-      // Build sync data
-      id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
-      rev,
+      syncData: {
+        id,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+        rev,
+      },
     };
   },
   removeWorkspaceItem({ syncData }) {
@@ -190,31 +194,34 @@ export default new Provider({
       },
     };
   },
-  async listRevisions(token, fileId) {
-    const syncData = Provider.getContentSyncData(fileId);
-    const body = await couchdbHelper.retrieveDocumentWithRevisions(token, syncData.id);
+  async listFileRevisions({ token, contentSyncData }) {
+    const body = await couchdbHelper.retrieveDocumentWithRevisions(token, contentSyncData.id);
     const revisions = [];
-    body._revs_info.forEach((revInfo) => { // eslint-disable-line no-underscore-dangle
+    body._revs_info.forEach((revInfo, idx) => { // eslint-disable-line no-underscore-dangle
       if (revInfo.status === 'available') {
         revisions.push({
           id: revInfo.rev,
           sub: null,
-          created: null,
+          created: idx,
+          loaded: false,
         });
       }
     });
     return revisions;
   },
-  async loadRevision(token, fileId, revision) {
-    const syncData = Provider.getContentSyncData(fileId);
-    const body = await couchdbHelper.retrieveDocument(token, syncData.id, revision.id);
+  async loadFileRevision({ token, contentSyncData, revision }) {
+    if (revision.loaded) {
+      return false;
+    }
+    const body = await couchdbHelper.retrieveDocument(token, contentSyncData.id, revision.id);
     revision.sub = body.sub;
-    revision.created = body.time || 1; // Has to be truthy to prevent from loading several times
+    revision.created = body.time;
+    revision.loaded = true;
+    return true;
   },
-  async getRevisionContent(token, fileId, revisionId) {
-    const syncData = Provider.getContentSyncData(fileId);
+  async getFileRevisionContent({ token, contentSyncData, revisionId }) {
     const body = await couchdbHelper
-      .retrieveDocumentWithAttachments(token, syncData.id, revisionId);
+      .retrieveDocumentWithAttachments(token, contentSyncData.id, revisionId);
     return Provider.parseContent(body.attachments.data, body.item.id);
   },
 });
diff --git a/src/services/providers/dropboxProvider.js b/src/services/providers/dropboxProvider.js
index e082b751..3748cb37 100644
--- a/src/services/providers/dropboxProvider.js
+++ b/src/services/providers/dropboxProvider.js
@@ -19,6 +19,7 @@ const makePathRelative = (token, path) => {
 
 export default new Provider({
   id: 'dropbox',
+  name: 'Dropbox',
   getToken({ sub }) {
     return store.getters['data/dropboxTokensBySub'][sub];
   },
@@ -27,8 +28,8 @@ export default new Provider({
     const filename = pathComponents.pop();
     return `https://www.dropbox.com/home${pathComponents.join('/')}?preview=${filename}`;
   },
-  getLocationDescription({ path }) {
-    return path;
+  getLocationDescription({ path, dropboxFileId }) {
+    return dropboxFileId || path;
   },
   checkPath(path) {
     return path && path.match(/^\/[^\\<>:"|?*]+$/);
@@ -122,4 +123,27 @@ export default new Provider({
       path,
     };
   },
+  async listFileRevisions({ token, syncLocation }) {
+    const entries = await dropboxHelper.listRevisions(token, syncLocation.dropboxFileId);
+    return entries.map(entry => ({
+      id: entry.rev,
+      sub: `db:${(entry.sharing_info || {}).modified_by || token.sub}`,
+      created: new Date(entry.server_modified).getTime(),
+    }));
+  },
+  async loadFileRevision() {
+    // Revision are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    revisionId,
+  }) {
+    const { content } = await dropboxHelper.downloadFile({
+      token,
+      path: `rev:${revisionId}`,
+    });
+    return Provider.parseContent(content, contentId);
+  },
 });
diff --git a/src/services/providers/gistProvider.js b/src/services/providers/gistProvider.js
index 60968deb..90b9f364 100644
--- a/src/services/providers/gistProvider.js
+++ b/src/services/providers/gistProvider.js
@@ -2,9 +2,11 @@ import store from '../../store';
 import githubHelper from './helpers/githubHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
+import userSvc from '../userSvc';
 
 export default new Provider({
   id: 'gist',
+  name: 'Gist',
   getToken({ sub }) {
     return store.getters['data/githubTokensBySub'][sub];
   },
@@ -56,4 +58,37 @@ export default new Provider({
       gistId,
     };
   },
+  async listFileRevisions({ token, syncLocation }) {
+    const entries = await githubHelper.getGistCommits({
+      ...syncLocation,
+      token,
+    });
+
+    return entries.map((entry) => {
+      const sub = `gh:${entry.user.id}`;
+      userSvc.addInfo({ id: sub, name: entry.user.login, imageUrl: entry.user.avatar_url });
+      return {
+        sub,
+        id: entry.version,
+        created: new Date(entry.committed_at).getTime(),
+      };
+    });
+  },
+  async loadFileRevision() {
+    // Revision are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    syncLocation,
+    revisionId,
+  }) {
+    const data = await githubHelper.downloadGistRevision({
+      ...syncLocation,
+      token,
+      sha: revisionId,
+    });
+    return Provider.parseContent(data, contentId);
+  },
 });
diff --git a/src/services/providers/githubProvider.js b/src/services/providers/githubProvider.js
index 88f7a339..1e59ca46 100644
--- a/src/services/providers/githubProvider.js
+++ b/src/services/providers/githubProvider.js
@@ -3,11 +3,13 @@ import githubHelper from './helpers/githubHelper';
 import Provider from './common/Provider';
 import utils from '../utils';
 import workspaceSvc from '../workspaceSvc';
+import userSvc from '../userSvc';
 
 const savedSha = {};
 
 export default new Provider({
   id: 'github',
+  name: 'GitHub',
   getToken({ sub }) {
     return store.getters['data/githubTokensBySub'][sub];
   },
@@ -23,21 +25,21 @@ export default new Provider({
     return path;
   },
   async downloadContent(token, syncLocation) {
-    try {
-      const { sha, data } = await githubHelper.downloadFile({
-        ...syncLocation,
-        token,
-      });
-      savedSha[syncLocation.id] = sha;
-      return Provider.parseContent(data, `${syncLocation.fileId}/content`);
-    } catch (e) {
-      // Ignore error, upload is going to fail anyway
-      return null;
-    }
+    const { sha, data } = await githubHelper.downloadFile({
+      ...syncLocation,
+      token,
+    });
+    savedSha[syncLocation.id] = sha;
+    return Provider.parseContent(data, `${syncLocation.fileId}/content`);
   },
   async uploadContent(token, content, syncLocation) {
     if (!savedSha[syncLocation.id]) {
-      await this.downloadContent(token, syncLocation); // Get the last sha
+      try {
+        // Get the last sha
+        await this.downloadContent(token, syncLocation);
+      } catch (e) {
+        // Ignore error
+      }
     }
     const sha = savedSha[syncLocation.id];
     delete savedSha[syncLocation.id];
@@ -50,7 +52,12 @@ export default new Provider({
     return syncLocation;
   },
   async publish(token, html, metadata, publishLocation) {
-    await this.downloadContent(token, publishLocation); // Get the last sha
+    try {
+      // Get the last sha
+      await this.downloadContent(token, publishLocation);
+    } catch (e) {
+      // Ignore error
+    }
     const sha = savedSha[publishLocation.id];
     delete savedSha[publishLocation.id];
     await githubHelper.uploadFile({
@@ -109,4 +116,50 @@ export default new Provider({
       path,
     };
   },
+  async listFileRevisions({ token, syncLocation }) {
+    const entries = await githubHelper.getCommits({
+      ...syncLocation,
+      token,
+    });
+
+    return entries.map(({
+      author,
+      committer,
+      commit,
+      sha,
+    }) => {
+      let user;
+      if (author && author.login) {
+        user = author;
+      } else if (committer && committer.login) {
+        user = committer;
+      }
+      const sub = `gh:${user.id}`;
+      userSvc.addInfo({ id: sub, name: user.login, imageUrl: user.avatar_url });
+      const date = (commit.author && commit.author.date)
+        || (commit.committer && commit.committer.date);
+      return {
+        id: sha,
+        sub,
+        created: date ? new Date(date).getTime() : 1,
+      };
+    });
+  },
+  async loadFileRevision() {
+    // Revision are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    syncLocation,
+    revisionId,
+  }) {
+    const { data } = await githubHelper.downloadFile({
+      ...syncLocation,
+      token,
+      branch: revisionId,
+    });
+    return Provider.parseContent(data, contentId);
+  },
 });
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 4105e28b..5d73c524 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -18,6 +18,7 @@ const endsWith = (str, suffix) => str.slice(-suffix.length) === suffix;
 
 export default new Provider({
   id: 'githubWorkspace',
+  name: 'GitHub',
   getToken() {
     return store.getters['workspace/syncToken'];
   },
@@ -136,76 +137,90 @@ export default new Provider({
 
     // Collect changes
     const changes = [];
-    const pathIds = {};
-    const syncDataToKeep = Object.create(null);
+    const idsByPath = {};
     const syncDataByPath = store.getters['data/syncDataById'];
-    const { itemsByGitPath } = store.getters;
-    const getId = (path) => {
-      const existingItem = itemsByGitPath[path];
-      // Use the item ID only if the item was already synced
-      if (existingItem && syncDataByPath[path]) {
-        pathIds[path] = existingItem.id;
-        return existingItem.id;
+    const { itemIdsByGitPath } = store.getters;
+    const getIdFromPath = (path, isFile) => {
+      let itemId = idsByPath[path];
+      if (!itemId) {
+        const existingItemId = itemIdsByGitPath[path];
+        // We can replace the item only if it was already synced
+        if (existingItemId
+          && (syncDataByPath[path]
+          // Content may have already be synced
+          || (isFile && syncDataByPath[`/${path}`]))
+        ) {
+          itemId = existingItemId;
+        } else {
+          // Otherwise, make a new ID for a new item
+          itemId = utils.uid();
+        }
+        // If it's a file path, add the content path as well
+        if (isFile) {
+          idsByPath[`/${path}`] = `${itemId}/content`;
+        }
+        idsByPath[path] = itemId;
       }
-      // Generate a new ID
-      let id = utils.uid();
-      if (path[0] === '/') {
-        id += '/content';
-      }
-      pathIds[path] = id;
-      return id;
+      return itemId;
     };
 
     // Folder creations/updates
     // Assume map entries are sorted from top to bottom
     Object.entries(treeFolderMap).forEach(([path, parentPath]) => {
-      const item = utils.addItemHash({
-        id: getId(path),
-        type: 'folder',
-        name: path.slice(parentPath.length, -1),
-        parentId: pathIds[parentPath] || null,
-      });
-      changes.push({
-        syncDataId: path,
-        item,
-        syncData: {
-          id: path,
-          type: item.type,
-          hash: item.hash,
-        },
-      });
+      if (path === '.stackedit-trash/') {
+        idsByPath[path] = 'trash';
+      } else {
+        const item = utils.addItemHash({
+          id: getIdFromPath(path),
+          type: 'folder',
+          name: path.slice(parentPath.length, -1),
+          parentId: idsByPath[parentPath] || null,
+        });
+
+        const folderSyncData = syncDataByPath[path];
+        if (!folderSyncData || folderSyncData.hash !== item.hash) {
+          changes.push({
+            syncDataId: path,
+            item,
+            syncData: {
+              id: path,
+              type: item.type,
+              hash: item.hash,
+            },
+          });
+        }
+      }
     });
 
     // File/content creations/updates
     Object.entries(treeFileMap).forEach(([path, parentPath]) => {
-      // Look for content sync data as it's created before file sync data
+      const fileId = getIdFromPath(path, true);
       const contentPath = `/${path}`;
-      const contentId = getId(contentPath);
+      const contentId = idsByPath[contentPath];
 
       // File creations/updates
-      const [fileId] = contentId.split('/');
       const item = utils.addItemHash({
         id: fileId,
         type: 'file',
         name: path.slice(parentPath.length, -'.md'.length),
-        parentId: pathIds[parentPath] || null,
-      });
-      changes.push({
-        syncDataId: path,
-        item,
-        syncData: {
-          id: path,
-          type: item.type,
-          hash: item.hash,
-        },
+        parentId: idsByPath[parentPath] || null,
       });
 
+      const fileSyncData = syncDataByPath[path];
+      if (!fileSyncData || fileSyncData.hash !== item.hash) {
+        changes.push({
+          syncDataId: path,
+          item,
+          syncData: {
+            id: path,
+            type: item.type,
+            hash: item.hash,
+          },
+        });
+      }
+
       // Content creations/updates
       const contentSyncData = syncDataByPath[contentPath];
-      if (contentSyncData) {
-        syncDataToKeep[path] = true;
-        syncDataToKeep[contentPath] = true;
-      }
       if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
         const type = 'content';
         // Use `/` as a prefix to get a unique syncData id
@@ -233,11 +248,8 @@ export default new Provider({
       // Only template data are stored
       const [, id] = path.match(/^\.stackedit-data\/(templates)\.json$/) || [];
       if (id) {
-        pathIds[path] = id;
+        idsByPath[path] = id;
         const syncData = syncDataByItemId[id];
-        if (syncData) {
-          syncDataToKeep[syncData.id] = true;
-        }
         if (!syncData || syncData.sha !== treeShaMap[path]) {
           const type = 'data';
           changes.push({
@@ -273,14 +285,11 @@ export default new Provider({
         const [, filePath, data] = path.match(pathMatcher) || [];
         if (filePath) {
           // If there is a corresponding md file in the tree
-          const fileId = pathIds[`${filePath}.md`];
+          const fileId = idsByPath[`${filePath}.md`];
           if (fileId) {
             // Reuse existing ID or create a new one
-            const existingItem = itemsByGitPath[path];
-            const id = existingItem
-              ? existingItem.id
-              : utils.uid();
-            pathIds[path] = id;
+            const id = itemIdsByGitPath[path] || utils.uid();
+            idsByPath[path] = id;
 
             const item = utils.addItemHash({
               ...JSON.parse(utils.decodeBase64(data)),
@@ -288,22 +297,26 @@ export default new Provider({
               type,
               fileId,
             });
-            changes.push({
-              syncDataId: path,
-              item,
-              syncData: {
-                id: path,
-                type: item.type,
-                hash: item.hash,
-              },
-            });
+
+            const locationSyncData = syncDataByPath[path];
+            if (!locationSyncData || locationSyncData.hash !== item.hash) {
+              changes.push({
+                syncDataId: path,
+                item,
+                syncData: {
+                  id: path,
+                  type: item.type,
+                  hash: item.hash,
+                },
+              });
+            }
           }
         }
       }));
 
     // Deletions
     Object.keys(syncDataByPath).forEach((path) => {
-      if (!pathIds[path] && !syncDataToKeep[path]) {
+      if (!idsByPath[path]) {
         changes.push({ syncDataId: path });
       }
     });
@@ -331,7 +344,11 @@ export default new Provider({
       content: '',
       sha: treeShaMap[syncData.id],
     });
-    return syncData;
+
+    // Return sync data to save
+    return {
+      syncData,
+    };
   },
   async removeWorkspaceItem({ syncData }) {
     if (treeShaMap[syncData.id]) {
@@ -435,16 +452,16 @@ export default new Provider({
       },
     };
   },
-  async listRevisions(token, fileId) {
+  async listFileRevisions({ token, fileSyncData }) {
     const { owner, repo, branch } = store.getters['workspace/currentWorkspace'];
-    const syncData = Provider.getContentSyncData(fileId);
     const entries = await githubHelper.getCommits({
       token,
       owner,
       repo,
       sha: branch,
-      path: syncData.id,
+      path: getAbsolutePath(fileSyncData),
     });
+
     return entries.map(({
       author,
       committer,
@@ -466,17 +483,24 @@ export default new Provider({
         sub,
         created: date ? new Date(date).getTime() : 1,
       };
-    })
-      .sort((revision1, revision2) => revision2.created - revision1.created);
+    });
   },
-  async getRevisionContent(token, fileId, revisionId) {
-    const syncData = Provider.getContentSyncData(fileId);
+  async loadFileRevision() {
+    // Revisions are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    fileSyncData,
+    revisionId,
+  }) {
     const { data } = await githubHelper.downloadFile({
       ...store.getters['workspace/currentWorkspace'],
       token,
       branch: revisionId,
-      path: getAbsolutePath(syncData),
+      path: getAbsolutePath(fileSyncData),
     });
-    return Provider.parseContent(data, `${fileId}/content`);
+    return Provider.parseContent(data, contentId);
   },
 });
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index edf2e446..4e0264e8 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -7,6 +7,7 @@ let syncStartPageToken;
 
 export default new Provider({
   id: 'googleDriveAppData',
+  name: 'Google Drive app data',
   getToken() {
     return store.getters['workspace/syncToken'];
   },
@@ -69,12 +70,15 @@ export default new Provider({
       fileId: syncData && syncData.id,
       ifNotTooLate,
     });
-    // Build sync data
+
+    // Build sync data to save
     return {
-      id: file.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
+      syncData: {
+        id: file.id,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+      },
     };
   },
   removeWorkspaceItem({ syncData, ifNotTooLate }) {
@@ -163,19 +167,21 @@ export default new Provider({
       },
     };
   },
-  async listRevisions(token, fileId) {
-    const syncData = Provider.getContentSyncData(fileId);
-    const revisions = await googleHelper.getAppDataFileRevisions(token, syncData.id);
+  async listFileRevisions({ token, contentSyncData }) {
+    const revisions = await googleHelper.getAppDataFileRevisions(token, contentSyncData.id);
     return revisions.map(revision => ({
       id: revision.id,
       sub: `go:${revision.lastModifyingUser.permissionId}`,
       created: new Date(revision.modifiedTime).getTime(),
-    }))
-      .sort((revision1, revision2) => revision2.created - revision1.created);
+    }));
   },
-  async getRevisionContent(token, fileId, revisionId) {
-    const syncData = Provider.getContentSyncData(fileId);
-    const content = await googleHelper.downloadAppDataFileRevision(token, syncData.id, revisionId);
+  async loadFileRevision() {
+    // Revisions are already loaded
+    return false;
+  },
+  async getFileRevisionContent({ token, contentSyncData, revisionId }) {
+    const content = await googleHelper
+      .downloadAppDataFileRevision(token, contentSyncData.id, revisionId);
     return JSON.parse(content);
   },
 });
diff --git a/src/services/providers/googleDriveProvider.js b/src/services/providers/googleDriveProvider.js
index bee6bded..bd033023 100644
--- a/src/services/providers/googleDriveProvider.js
+++ b/src/services/providers/googleDriveProvider.js
@@ -6,6 +6,7 @@ import workspaceSvc from '../workspaceSvc';
 
 export default new Provider({
   id: 'googleDrive',
+  name: 'Google Drive',
   getToken({ sub }) {
     const token = store.getters['data/googleTokensBySub'][sub];
     return token && token.isDrive ? token : null;
@@ -190,4 +191,26 @@ export default new Provider({
     }
     return location;
   },
+  async listFileRevisions({ token, syncLocation }) {
+    const revisions = await googleHelper.getFileRevisions(token, syncLocation.driveFileId);
+    return revisions.map(revision => ({
+      id: revision.id,
+      sub: `go:${revision.lastModifyingUser.permissionId}`,
+      created: new Date(revision.modifiedTime).getTime(),
+    }));
+  },
+  async loadFileRevision() {
+    // Revision are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    syncLocation,
+    revisionId,
+  }) {
+    const content = await googleHelper
+      .downloadFileRevision(token, syncLocation.driveFileId, revisionId);
+    return Provider.parseContent(content, contentId);
+  },
 });
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index 1cd6f363..3363b7c2 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -9,6 +9,7 @@ let syncStartPageToken;
 
 export default new Provider({
   id: 'googleDriveWorkspace',
+  name: 'Google Drive',
   getToken() {
     return store.getters['workspace/syncToken'];
   },
@@ -361,12 +362,16 @@ export default new Provider({
         ifNotTooLate,
       });
     }
-    // Build sync data
+
+    // Build sync data to save
     return {
-      id: file.id,
-      itemId: item.id,
-      type: item.type,
-      hash: item.hash,
+      syncData: {
+        id: file.id,
+        parentIds: file.parents,
+        itemId: item.id,
+        type: item.type,
+        hash: item.hash,
+      },
     };
   },
   async removeWorkspaceItem({ syncData, ifNotTooLate }) {
@@ -449,6 +454,7 @@ export default new Provider({
       // Create file sync data
       newFileSyncData = {
         id: gdriveFile.id,
+        parentIds: gdriveFile.parents,
         itemId: file.id,
         type: file.type,
         hash: file.hash,
@@ -495,25 +501,32 @@ export default new Provider({
     return {
       syncData: {
         id: file.id,
+        parentIds: file.parents,
         itemId: item.id,
         type: item.type,
         hash: item.hash,
       },
     };
   },
-  async listRevisions(token, fileId) {
-    const syncData = Provider.getContentSyncData(fileId);
-    const revisions = await googleHelper.getFileRevisions(token, syncData.id);
+  async listFileRevisions({ token, fileSyncData }) {
+    const revisions = await googleHelper.getFileRevisions(token, fileSyncData.id);
     return revisions.map(revision => ({
       id: revision.id,
-      sub: revision.lastModifyingUser && revision.lastModifyingUser.permissionId,
+      sub: `go:${revision.lastModifyingUser.permissionId}`,
       created: new Date(revision.modifiedTime).getTime(),
-    }))
-      .sort((revision1, revision2) => revision2.created - revision1.created);
+    }));
   },
-  async getRevisionContent(token, fileId, revisionId) {
-    const syncData = Provider.getContentSyncData(fileId);
-    const content = await googleHelper.downloadFileRevision(token, syncData.id, revisionId);
-    return Provider.parseContent(content, `${fileId}/content`);
+  async loadFileRevision() {
+    // Revision are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    fileSyncData,
+    revisionId,
+  }) {
+    const content = await googleHelper.downloadFileRevision(token, fileSyncData.id, revisionId);
+    return Provider.parseContent(content, contentId);
   },
 });
diff --git a/src/services/providers/helpers/couchdbHelper.js b/src/services/providers/helpers/couchdbHelper.js
index bf14f4ca..16b319a5 100644
--- a/src/services/providers/helpers/couchdbHelper.js
+++ b/src/services/providers/helpers/couchdbHelper.js
@@ -141,6 +141,11 @@ export default {
    * http://docs.couchdb.org/en/2.1.1/api/document/common.html#delete--db-docid
    */
   async removeDocument(token, documentId, rev) {
+    if (!documentId) {
+      // Prevent from deleting the whole database
+      throw new Error('Missing document ID');
+    }
+
     return request(token, {
       method: 'DELETE',
       path: documentId,
diff --git a/src/services/providers/helpers/dropboxHelper.js b/src/services/providers/helpers/dropboxHelper.js
index 4e1cf9fd..14e161ab 100644
--- a/src/services/providers/helpers/dropboxHelper.js
+++ b/src/services/providers/helpers/dropboxHelper.js
@@ -11,14 +11,14 @@ const getAppKey = (fullAccess) => {
 const httpHeaderSafeJson = args => args && JSON.stringify(args)
   .replace(/[\u007f-\uffff]/g, c => `\\u${`000${c.charCodeAt(0).toString(16)}`.slice(-4)}`);
 
-const request = (token, options, args) => networkSvc.request({
+const request = ({ accessToken }, options, args) => networkSvc.request({
   ...options,
   headers: {
     ...options.headers || {},
     'Content-Type': options.body && (typeof options.body === 'string'
       ? 'application/octet-stream' : 'application/json; charset=utf-8'),
     'Dropbox-API-Arg': httpHeaderSafeJson(args),
-    Authorization: `Bearer ${token.accessToken}`,
+    Authorization: `Bearer ${accessToken}`,
   },
 });
 
@@ -64,6 +64,28 @@ export default {
     return this.startOauth2(fullAccess);
   },
 
+  /**
+   * https://www.dropbox.com/developers/documentation/http/documentation#users-get_account
+   */
+  async getAccount(token, userId) {
+    const { body } = await request(token, {
+      method: 'POST',
+      url: 'https://api.dropboxapi.com/2/users/get_account',
+      body: {
+        account_id: userId,
+      },
+    });
+
+    // Add user info to the store
+    store.commit('userInfo/addItem', {
+      id: `db:${body.account_id}`,
+      name: body.name.display_name,
+      imageUrl: body.profile_photo_url || '',
+    });
+
+    return body;
+  },
+
   /**
    * https://www.dropbox.com/developers/documentation/http/documentation#files-upload
    */
@@ -104,6 +126,22 @@ export default {
     };
   },
 
+  /**
+   * https://www.dropbox.com/developers/documentation/http/documentation#list-revisions
+   */
+  async listRevisions(token, fileId) {
+    const res = await request(token, {
+      method: 'POST',
+      url: 'https://api.dropboxapi.com/2/files/list_revisions',
+      body: {
+        path: fileId,
+        mode: 'id',
+        limit: 100,
+      },
+    });
+    return res.body.entries;
+  },
+
   /**
    * https://www.dropbox.com/developers/chooser
    */
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index 0b53877a..1cb0a8d8 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -95,11 +95,14 @@ export default {
         t: Date.now(), // Prevent from caching
       },
     })).body;
+
+    // Add user info to the store
     store.commit('userInfo/addItem', {
       id: `gh:${user.id}`,
       name: user.login,
       imageUrl: user.avatar_url || '',
     });
+
     return user;
   },
 
@@ -263,4 +266,35 @@ export default {
     }
     return result.content;
   },
+
+  /**
+   * https://developer.github.com/v3/gists/#list-gist-commits
+   */
+  async getGistCommits({
+    token,
+    gistId,
+  }) {
+    const { body } = await request(token, {
+      url: `https://api.github.com/gists/${gistId}/commits`,
+    });
+    return body;
+  },
+
+  /**
+   * https://developer.github.com/v3/gists/#get-a-specific-revision-of-a-gist
+   */
+  async downloadGistRevision({
+    token,
+    gistId,
+    filename,
+    sha,
+  }) {
+    const result = (await request(token, {
+      url: `https://api.github.com/gists/${gistId}/${sha}`,
+    })).body.files[filename];
+    if (!result) {
+      throw new Error('Gist file not found.');
+    }
+    return result.content;
+  },
 };
diff --git a/src/services/providers/wordpressProvider.js b/src/services/providers/wordpressProvider.js
index 19e117fc..c469d7f3 100644
--- a/src/services/providers/wordpressProvider.js
+++ b/src/services/providers/wordpressProvider.js
@@ -4,6 +4,7 @@ import Provider from './common/Provider';
 
 export default new Provider({
   id: 'wordpress',
+  name: 'WordPress',
   getToken(location) {
     return store.getters['data/wordpressTokensBySub'][location.sub];
   },
diff --git a/src/services/providers/zendeskProvider.js b/src/services/providers/zendeskProvider.js
index b5ce5d61..690d88fe 100644
--- a/src/services/providers/zendeskProvider.js
+++ b/src/services/providers/zendeskProvider.js
@@ -4,6 +4,7 @@ import Provider from './common/Provider';
 
 export default new Provider({
   id: 'zendesk',
+  name: 'Zendesk',
   getToken(location) {
     return store.getters['data/zendeskTokensBySub'][location.sub];
   },
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index d4f8042f..04c7d198 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -79,6 +79,7 @@ const publishFile = async (fileId) => {
               utils.serializeObject(publishLocationToStore)
             ) {
               store.commit('publishLocation/patchItem', publishLocationToStore);
+              workspaceSvc.ensureUniqueLocations();
             }
             counter += 1;
           } catch (err) {
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index ec2f745c..b3f4bd07 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -10,6 +10,7 @@ import './providers/githubWorkspaceProvider';
 import './providers/googleDriveWorkspaceProvider';
 import tempFileSvc from './tempFileSvc';
 import workspaceSvc from './workspaceSvc';
+import constants from '../data/constants';
 
 const minAutoSyncEvery = 60 * 1000; // 60 sec
 const inactivityThreshold = 3 * 1000; // 3 sec
@@ -128,7 +129,7 @@ const cleanSyncedContent = (syncedContent) => {
 };
 
 /**
- * Apply changes retrieved from the main provider. Update sync data accordingly.
+ * Apply changes retrieved from the workspace provider. Update sync data accordingly.
  */
 const applyChanges = (changes) => {
   const allItemsById = { ...store.getters.allItemsById };
@@ -138,10 +139,7 @@ const applyChanges = (changes) => {
   let getExistingItem;
   if (store.getters['workspace/currentWorkspaceIsGit']) {
     const itemsByGitPath = { ...store.getters.itemsByGitPath };
-    getExistingItem = (existingSyncData) => {
-      const items = existingSyncData && itemsByGitPath[existingSyncData.id];
-      return items ? items[0] : null;
-    };
+    getExistingItem = existingSyncData => existingSyncData && itemsByGitPath[existingSyncData.id];
   } else {
     getExistingItem = existingSyncData => existingSyncData && allItemsById[existingSyncData.itemId];
   }
@@ -476,6 +474,13 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
           return;
         }
 
+        // If content is to be created, schedule a restart to create the file as well
+        if (provider === workspaceProvider &&
+          !store.getters['data/syncDataByItemId'][fileId]
+        ) {
+          syncContext.restartSkipContents = true;
+        }
+
         // Upload merged content
         const item = {
           ...mergedContent,
@@ -491,13 +496,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
           utils.serializeObject(syncLocationToStore)
         ) {
           store.commit('syncLocation/patchItem', syncLocationToStore);
-        }
-
-        // If content was just created, restart sync to create the file as well
-        if (provider === workspaceProvider &&
-          !store.getters['data/syncDataByItemId'][fileId]
-        ) {
-          syncContext.restartSkipContents = true;
+          workspaceSvc.ensureUniqueLocations();
         }
       };
 
@@ -668,16 +667,13 @@ const syncWorkspace = async (skipContents = false) => {
 
       if (!changedItem) return false;
 
-      const resultSyncData = await workspaceProvider
-        .saveWorkspaceItem({
-          // Use deepCopy to freeze objects
-          item: utils.deepCopy(changedItem),
-          syncData: utils.deepCopy(syncDataToUpdate),
-          ifNotTooLate,
-        });
-      store.dispatch('data/patchSyncDataById', {
-        [resultSyncData.id]: resultSyncData,
-      });
+      updateSyncData(await workspaceProvider.saveWorkspaceItem({
+        // Use deepCopy to freeze objects
+        item: utils.deepCopy(changedItem),
+        syncData: utils.deepCopy(syncDataToUpdate),
+        ifNotTooLate,
+      }));
+
       return true;
     }));
 
@@ -819,7 +815,7 @@ const requestSync = () => {
 
         // Determine if we have to clean files
         const fileHashesToClean = {};
-        if (getLastStoredSyncActivity() + utils.cleanTrashAfter < Date.now()) {
+        if (getLastStoredSyncActivity() + constants.cleanTrashAfter < Date.now()) {
           // Last synchronization happened 7 days ago
           const syncDataByItemId = store.getters['data/syncDataByItemId'];
           store.getters['file/items'].forEach((file) => {
diff --git a/src/services/userSvc.js b/src/services/userSvc.js
index 65f6fb78..61406b04 100644
--- a/src/services/userSvc.js
+++ b/src/services/userSvc.js
@@ -1,13 +1,14 @@
 import googleHelper from './providers/helpers/googleHelper';
 import githubHelper from './providers/helpers/githubHelper';
-import utils from './utils';
 import store from '../store';
+import dropboxHelper from './providers/helpers/dropboxHelper';
+import constants from '../data/constants';
 
 const promised = {};
 
 const parseUserId = (userId) => {
   const prefix = userId[2] === ':' && userId.slice(0, 2);
-  const type = prefix && utils.userIdPrefixes[prefix];
+  const type = prefix && constants.userIdPrefixes[prefix];
   return type ? [type, userId.slice(3)] : ['google', userId];
 };
 
@@ -17,7 +18,7 @@ export default {
     store.commit('userInfo/addItem', { id, name, imageUrl });
   },
   async getInfo(userId) {
-    if (!promised[userId]) {
+    if (userId && !promised[userId]) {
       const [type, sub] = parseUserId(userId);
 
       // Try to find a token with this sub
@@ -33,6 +34,17 @@ export default {
       if (!store.state.offline) {
         promised[userId] = true;
         switch (type) {
+          case 'dropbox': {
+            const dropboxToken = Object.values(store.getters['data/dropboxTokensBySub'])[0];
+            try {
+              await dropboxHelper.getAccount(dropboxToken, sub);
+            } catch (err) {
+              if (!token || err.status !== 404) {
+                promised[userId] = false;
+              }
+            }
+            break;
+          }
           case 'github':
             try {
               await githubHelper.getUser(sub);
diff --git a/src/services/utils.js b/src/services/utils.js
index a9771abd..1c18220d 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -1,8 +1,7 @@
 import yaml from 'js-yaml';
 import '../libs/clunderscore';
 import presets from '../data/presets';
-
-const origin = `${window.location.protocol}//${window.location.host}`;
+import constants from '../data/constants';
 
 // For utils.uid()
 const uidLength = 16;
@@ -16,7 +15,18 @@ const parseQueryParams = (params) => {
   const result = {};
   params.split('&').forEach((param) => {
     const [key, value] = param.split('=').map(decodeURIComponent);
-    if (key) {
+    if (key && value != null) {
+      result[key] = value;
+    }
+  });
+  return result;
+};
+
+// For utils.setQueryParams()
+const filterParams = (params = {}) => {
+  const result = {};
+  Object.entries(params).forEach(([key, value]) => {
+    if (key && value != null) {
       result[key] = value;
     }
   });
@@ -67,12 +77,9 @@ Object.keys(presets).forEach((key) => {
 
 export default {
   computedPresets,
-  cleanTrashAfter: 7 * 24 * 60 * 60 * 1000, // 7 days
-  origin,
-  oauth2RedirectUri: `${origin}/oauth2/callback`,
   queryParams: parseQueryParams(window.location.hash.slice(1)),
   setQueryParams(params = {}) {
-    this.queryParams = params;
+    this.queryParams = filterParams(params);
     const serializedParams = Object.entries(this.queryParams).map(([key, value]) =>
       `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join('&');
     const hash = `#${serializedParams}`;
@@ -80,39 +87,17 @@ export default {
       window.location.replace(hash);
     }
   },
-  types: [
-    'contentState',
-    'syncedContent',
-    'content',
-    'file',
-    'folder',
-    'syncLocation',
-    'publishLocation',
-    'data',
-  ],
-  localStorageDataIds: [
-    'workspaces',
-    'settings',
-    'layoutSettings',
-    'tokens',
-  ],
-  userIdPrefixes: {
-    go: 'google',
-    gh: 'github',
-  },
-  textMaxLength: 250000,
   sanitizeText(text) {
-    const result = `${text || ''}`.slice(0, this.textMaxLength);
+    const result = `${text || ''}`.slice(0, constants.textMaxLength);
     // last char must be a `\n`.
     return `${result}\n`.replace(/\n\n$/, '\n');
   },
-  defaultName: 'Untitled',
   sanitizeName(name) {
     return `${name || ''}`
       // Replace `/`, control characters and other kind of spaces with a space
       .replace(/[/\x00-\x1F\x7f-\xa0\s]+/g, ' ').trim() // eslint-disable-line no-control-regex
       // Keep only 250 characters
-      .slice(0, 250) || this.defaultName;
+      .slice(0, 250) || constants.defaultName;
   },
   deepCopy,
   serializeObject(obj) {
diff --git a/src/services/workspaceSvc.js b/src/services/workspaceSvc.js
index f816f39c..b46134e7 100644
--- a/src/services/workspaceSvc.js
+++ b/src/services/workspaceSvc.js
@@ -1,5 +1,6 @@
 import store from '../store';
 import utils from './utils';
+import constants from '../data/constants';
 
 const forbiddenFolderNameMatcher = /^\.stackedit-data$|^\.stackedit-trash$|\.md$|\.sync$|\.publish$/;
 
@@ -35,7 +36,7 @@ export default {
     // Show warning dialogs
     if (!background) {
       // If name is being stripped
-      if (item.name !== utils.defaultName && item.name !== name) {
+      if (item.name !== constants.defaultName && item.name !== name) {
         await store.dispatch('modal/open', {
           type: 'stripName',
           item,
@@ -83,7 +84,7 @@ export default {
 
     // Show warning dialogs
     // If name has been stripped
-    if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) {
+    if (sanitizedName !== constants.defaultName && sanitizedName !== item.name) {
       await store.dispatch('modal/open', {
         type: 'stripName',
         item,
diff --git a/src/store/content.js b/src/store/content.js
index 2ea25961..d761e884 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -1,6 +1,6 @@
 import DiffMatchPatch from 'diff-match-patch';
 import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptyContent';
+import empty from '../data/empties/emptyContent';
 import utils from '../services/utils';
 import cledit from '../services/editor/cledit';
 
diff --git a/src/store/contentState.js b/src/store/contentState.js
index 7e3d485b..3cbcb1bf 100644
--- a/src/store/contentState.js
+++ b/src/store/contentState.js
@@ -1,5 +1,5 @@
 import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptyContentState';
+import empty from '../data/empties/emptyContentState';
 
 const module = moduleTemplate(empty, true);
 
diff --git a/src/store/data.js b/src/store/data.js
index 572154d3..bdc6814e 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -1,14 +1,15 @@
 import Vue from 'vue';
 import yaml from 'js-yaml';
 import utils from '../services/utils';
-import defaultWorkspaces from '../data/defaultWorkspaces';
-import defaultSettings from '../data/defaultSettings.yml';
-import defaultLocalSettings from '../data/defaultLocalSettings';
-import defaultLayoutSettings from '../data/defaultLayoutSettings';
-import plainHtmlTemplate from '../data/plainHtmlTemplate.html';
-import styledHtmlTemplate from '../data/styledHtmlTemplate.html';
-import styledHtmlWithTocTemplate from '../data/styledHtmlWithTocTemplate.html';
-import jekyllSiteTemplate from '../data/jekyllSiteTemplate.html';
+import defaultWorkspaces from '../data/defaults/defaultWorkspaces';
+import defaultSettings from '../data/defaults/defaultSettings.yml';
+import defaultLocalSettings from '../data/defaults/defaultLocalSettings';
+import defaultLayoutSettings from '../data/defaults/defaultLayoutSettings';
+import plainHtmlTemplate from '../data/templates/plainHtmlTemplate.html';
+import styledHtmlTemplate from '../data/templates/styledHtmlTemplate.html';
+import styledHtmlWithTocTemplate from '../data/templates/styledHtmlWithTocTemplate.html';
+import jekyllSiteTemplate from '../data/templates/jekyllSiteTemplate.html';
+import constants from '../data/constants';
 
 const itemTemplate = (id, data = {}) => ({
   id,
@@ -33,7 +34,7 @@ const empty = (id) => {
 };
 
 // Item IDs that will be stored in the localStorage
-const lsItemIdSet = new Set(utils.localStorageDataIds);
+const lsItemIdSet = new Set(constants.localStorageDataIds);
 
 // Getter/setter/patcher factories
 const getter = id => state => ((lsItemIdSet.has(id)
@@ -58,13 +59,13 @@ const layoutSettingsToggler = propertyName => ({ getters, dispatch }, value) =>
   [propertyName]: value === undefined ? !getters.layoutSettings[propertyName] : value,
 });
 const notEnoughSpace = (getters) => {
-  const constants = getters['layout/constants'];
+  const layoutConstants = getters['layout/constants'];
   const showGutter = getters['discussion/currentDiscussion'];
-  return document.body.clientWidth < constants.editorMinWidth +
-    constants.explorerWidth +
-    constants.sideBarWidth +
-    constants.buttonBarWidth +
-    (showGutter ? constants.gutterWidth : 0);
+  return document.body.clientWidth < layoutConstants.editorMinWidth +
+    layoutConstants.explorerWidth +
+    layoutConstants.sideBarWidth +
+    layoutConstants.buttonBarWidth +
+    (showGutter ? layoutConstants.gutterWidth : 0);
 };
 
 // For templates
diff --git a/src/store/explorer.js b/src/store/explorer.js
index f9fdfc29..a340ef08 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import emptyFile from '../data/emptyFile';
-import emptyFolder from '../data/emptyFolder';
+import emptyFile from '../data/empties/emptyFile';
+import emptyFolder from '../data/empties/emptyFolder';
 
 const setter = propertyName => (state, value) => {
   state[propertyName] = value;
diff --git a/src/store/file.js b/src/store/file.js
index 896da0e0..3c06a205 100644
--- a/src/store/file.js
+++ b/src/store/file.js
@@ -1,5 +1,5 @@
 import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptyFile';
+import empty from '../data/empties/emptyFile';
 
 const module = moduleTemplate(empty);
 
diff --git a/src/store/folder.js b/src/store/folder.js
index 410bac26..715dc469 100644
--- a/src/store/folder.js
+++ b/src/store/folder.js
@@ -1,5 +1,5 @@
 import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptyFolder';
+import empty from '../data/empties/emptyFolder';
 
 const module = moduleTemplate(empty);
 
diff --git a/src/store/index.js b/src/store/index.js
index 3f6d9f82..455bdc8b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -19,8 +19,9 @@ import syncedContent from './syncedContent';
 import userInfo from './userInfo';
 import workspace from './workspace';
 import locationTemplate from './locationTemplate';
-import emptyPublishLocation from '../data/emptyPublishLocation';
-import emptySyncLocation from '../data/emptySyncLocation';
+import emptyPublishLocation from '../data/empties/emptyPublishLocation';
+import emptySyncLocation from '../data/empties/emptySyncLocation';
+import constants from '../data/constants';
 
 Vue.use(Vuex);
 
@@ -77,7 +78,7 @@ const store = new Vuex.Store({
   getters: {
     allItemsById: (state) => {
       const result = {};
-      utils.types.forEach(type => Object.assign(result, state[type].itemsById));
+      constants.types.forEach(type => Object.assign(result, state[type].itemsById));
       return result;
     },
     pathsByItemId: (state, getters) => {
@@ -86,7 +87,7 @@ const store = new Vuex.Store({
       const getPath = (item) => {
         let itemPath = result[item.id];
         if (!itemPath) {
-          if (item.parendId === 'trash') {
+          if (item.parentId === 'trash') {
             itemPath = `.stackedit-trash/${item.name}`;
           } else {
             let { name } = item;
@@ -150,14 +151,19 @@ const store = new Vuex.Store({
       });
       return result;
     },
+    itemIdsByGitPath: (state, { gitPathsByItemId }) => {
+      const result = {};
+      Object.entries(gitPathsByItemId).forEach(([id, path]) => {
+        result[path] = id;
+      });
+      return result;
+    },
     itemsByGitPath: (state, { allItemsById, gitPathsByItemId }) => {
       const result = {};
       Object.entries(gitPathsByItemId).forEach(([id, path]) => {
         const item = allItemsById[id];
         if (item) {
-          const items = result[path] || [];
-          items.push(item);
-          result[path] = items;
+          result[path] = item;
         }
       });
       return result;
diff --git a/src/store/locationTemplate.js b/src/store/locationTemplate.js
index 0561eea9..9911383e 100644
--- a/src/store/locationTemplate.js
+++ b/src/store/locationTemplate.js
@@ -1,5 +1,6 @@
 import moduleTemplate from './moduleTemplate';
 import providerRegistry from '../services/providers/common/providerRegistry';
+import utils from '../services/utils';
 
 const addToGroup = (groups, item) => {
   const list = groups[item.fileId];
@@ -54,7 +55,7 @@ export default (empty) => {
         const provider = providerRegistry.providersById[location.providerId];
         return {
           ...location,
-          description: provider.getLocationDescription(location),
+          description: utils.sanitizeName(provider.getLocationDescription(location)),
           url: provider.getLocationUrl(location),
         };
       });
@@ -74,7 +75,8 @@ export default (empty) => {
         id: 'main',
         providerId: workspaceProvider.id,
         fileId,
-        description: workspaceProvider.getSyncDataDescription(fileSyncData, contentSyncData),
+        description: utils.sanitizeName(workspaceProvider
+          .getSyncDataDescription(fileSyncData, contentSyncData)),
         url: workspaceProvider.getSyncDataUrl(fileSyncData, contentSyncData),
       }, ...current];
     },
diff --git a/src/store/notification.js b/src/store/notification.js
index b69e3999..5787c47e 100644
--- a/src/store/notification.js
+++ b/src/store/notification.js
@@ -1,3 +1,5 @@
+import providerRegistry from '../services/providers/common/providerRegistry';
+
 const defaultTimeout = 5000;
 
 export default {
@@ -34,7 +36,8 @@ export default {
         } else if (error.status) {
           const location = rootState.queue.currentLocation;
           if (location.providerId) {
-            item.content = `HTTP error ${error.status} on ${location.providerId} location.`;
+            const provider = providerRegistry.providersById[location.providerId];
+            item.content = `HTTP error ${error.status} on ${provider.name} location.`;
           } else {
             item.content = `HTTP error ${error.status}.`;
           }
diff --git a/src/store/syncedContent.js b/src/store/syncedContent.js
index 6f3efc79..471c89fa 100644
--- a/src/store/syncedContent.js
+++ b/src/store/syncedContent.js
@@ -1,5 +1,5 @@
 import moduleTemplate from './moduleTemplate';
-import empty from '../data/emptySyncedContent';
+import empty from '../data/empties/emptySyncedContent';
 
 const module = moduleTemplate(empty, true);
 
diff --git a/src/store/workspace.js b/src/store/workspace.js
index c73f4f26..ea436a09 100644
--- a/src/store/workspace.js
+++ b/src/store/workspace.js
@@ -1,5 +1,6 @@
 import utils from '../services/utils';
 import providerRegistry from '../services/providers/common/providerRegistry';
+import constants from '../data/constants';
 
 export default {
   namespaced: true,
@@ -22,14 +23,14 @@ export default {
       Object.entries(rootGetters['data/workspaces']).forEach(([id, workspace]) => {
         const sanitizedWorkspace = {
           id,
-          providerId: mainWorkspaceToken && 'googleDriveAppData',
+          providerId: 'googleDriveAppData',
           sub: mainWorkspaceToken && mainWorkspaceToken.sub,
           ...workspace,
         };
         // Filter workspaces that don't have a provider
         const workspaceProvider = providerRegistry.providersById[sanitizedWorkspace.providerId];
         if (workspaceProvider) {
-          // Rebuild the url with the current hostname
+          // Build the url with the current hostname
           const params = workspaceProvider.getWorkspaceParams(sanitizedWorkspace);
           sanitizedWorkspace.url = utils.addQueryParams('app', params, true);
           sanitizedWorkspace.locationUrl = workspaceProvider
@@ -81,7 +82,7 @@ export default {
       if (!loginToken) {
         return null;
       }
-      const prefix = utils.someResult(Object.entries(utils.userIdPrefixes), ([key, value]) => {
+      const prefix = utils.someResult(Object.entries(constants.userIdPrefixes), ([key, value]) => {
         if (rootGetters[`data/${value}TokensBySub`][loginToken.sub]) {
           return key;
         }
diff --git a/src/styles/app.scss b/src/styles/app.scss
index 354eee52..a6c8f349 100644
--- a/src/styles/app.scss
+++ b/src/styles/app.scss
@@ -173,7 +173,7 @@ textarea {
   width: 100%;
   max-width: 100%;
   color: inherit;
-  height: 2.5rem;
+  height: 2.4rem;
 
   &:focus {
     outline: none;

From 6989d421ed9d4f6fe425ba8e27953963a17102ca Mon Sep 17 00:00:00 2001
From: Felix Wu <mail@flxwu.com>
Date: Wed, 1 Aug 2018 11:16:35 +0200
Subject: [PATCH 10/19] feat$(docs): add twemoji screenshot

---
 static/landing/twemoji.png | Bin 0 -> 12872 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 static/landing/twemoji.png

diff --git a/static/landing/twemoji.png b/static/landing/twemoji.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3919a83f80b7fed84df60b751a39498e79e877a
GIT binary patch
literal 12872
zcmeI3<x?C%yY`pG7Pnx*77y+o*o6=@xVt1sNO0F(AV3l{5G=R_2oAv=5-hj}U7X;q
z%kJTM|Ae>Bhf}A{mzle2uIjtHYo>axU*G*nTT__`|0zBI03cFTQPc$hFbp2!SrG8?
zdL$d!`gp_iR8Z9ifk2CES_l9D3{X{+*Y~qLw7?6}pPA{bs~UWD6`K%2>I1?eC1pq8
zhZ+7b&>^eOcdoBkG-_;cTrSI>nGK_K$7tj(Y0|NyzzT)-Pyv|<{$9TlzE8Xz&7kH;
zN|$im9%&OKmKwW_bsd$x&b&vZqAkXP$w(D4H93PeB0yl^3nC1RL|BP|l$-zyLJ9iO
z7!3T_mGBa93wcw<$V5*D9)Ka0;UGc_toa)OQcxtn;LYa8E>b994jl<)-(Y0{hLBqC
zqaWVL3$egKnXDi%dhE;RU;R)l1t{Q_3Fw%HO(v;K3Pt6xQhtgL1$}@6&LCLhf&?sX
zabP$SqRdUsgh>X%z}SR=a&4#-5%ltaTUeYvn;Z@cDG)e-CWZF$e(aJ8gZm|9_qvGE
zn_Qaj#Wa_S><}jsh^n({FE9BY?+K`J)0LS?`}ecSNL7L*oVU(i{^fFSqf-tiQ?{;N
zhh0O0J3A^(%eC#T+?T8U30P5?J5CsIWYV#J(I0EZY24`_o48gFnBo}W_#TQeBttiy
z0aH=X5I@G&LF3ca#$3LV#oEE874k2f&l|H)?w8ci5X8=q3{^_oT~t0^bM~0o!)%U1
z2-10sfAwzILt3T@pv;`n69X~B!m&fH{&XnY!F*u`r~m|Qo~k}}-p=Z@EQgO?$Ef-+
ziYITF$E9tP#3&1Loj0>+4p}z3su+tnSIpjlsPoYE3Pt$CvO$FS=n;mB7%hUcJpss1
zx=a7LmA(?VLM3RN6>UdNt)L`uhWi>{+TZVXV=2n$o|{@$6e>v*P0*pK<B>v!@JFtC
zpFJbI{F~GL&a103rnH+CA$CI|T;RaTG#bRL;#+c6rvT5n?5w0v-fIZ?YuF-@=0Gu+
zOx<?jBKWO@f)t~hk|cEWGo1ixKQX%X;=3IW1oeJQXv~~fHVC?5i9afkv-J)861ELG
z5k$H2Jp3E@u@er{+;xlVJU88oVR1&?AUyLp2!K4Z!Nmq#Awr%9i`NfMhrYip-+5=t
zB86>ktrUM-@8K!0Ev)G9iZkOyV%k)Ks~4F*m(CK~R<iO1s%|jaPLNqpVk@k(<qxr$
z5PafDRdeQHzg(o%P5OQoM?>;}&h9@tlUQ>Q;8(<ru?&!CCH`K^3cW@jNN1NOCtm&q
z%BuXx+B08FM2LiOT%j`&XNEZ2*YvCwTbr9WwvPFF`-Z<kTca0d7m8V$XH*pHV1v~Q
zG5nQVJXLNsieuIVKt+SA9F=O*Ic$E0AQq|3VGMd^a!Z}kV?*8vLMj+*Bry&55Ft0`
z<V??_;iYk2D8;7@Nr`j!137_mgHlWv-t9F}b=zOUR!LvWCacAR%p+e_6pvIC-#a%@
zB{BFWK9!TO?PWkmQ*w8X(JKPWse3M%-6#F!ck|VZL5`oiWBs~1c#%u??KROVy|vNl
zm@I(JW4TwR#0eC1OD#lW`g9-G9|SD2Ums?F5nAM#sn~u<ZGIn6i+1N0d#3|!?0)uP
z5gnb(Ju*=9v-sCr&pyb>!9_Atm&8(F^L6UN&%iFokTrg+^Z`hae*<%|{?~RoSxDuR
z!?Uk~_HV8uN-;>QMfEma1qudNPa2-eVM)Uj2sL$THMG8<U;QX;#+P#m|6I6sVpC0`
z0qqsXk@D4PLPo7DPHG-r^=qW1v~Efa#k_Bda&3xdn3&_QE^c60=x?7-3n#)@eJNvn
zbstgPCo#sCpOmnfa&Lbz5=Kr8k~~!O1@%}D4r=`~&r&q!(iSBsoK;pj?vUB)DOAla
zMezn|VL@Hd__q6}#Y}C_y->Y)Olj@CLl9ZCR;CZL!H@NIb_sz9lBL4o^kaV9!T^rY
zB@wZk^?Z8}=m}`SiX081UG<5%7}i98VABS5^V;LZK(B>>8qk@!UoMvHs%FfCy3d8Y
ze~E|~&CViQ8=P8<xxbX`>Mwj{VaJt=v8Uw#76}MDd5}krq7zfmz&hW?y0kWTx6V6=
zYqq32xtv?U@W9!t%U8f=8Ol+Ryk1Y~cnSS;px_}|AIV2}sh)LuEnQ+$d>@tr{=k+R
zCgzt>Li+?rOd&K!q0aeM4s>S#e5rIt6QPem$Hh8%R{u*UEwDx=c^Q1Jm}^fVBwp=6
znD&$fZ8NEvbK))oc-s3AiaA{{DN%d#W=wyKEumF!EoM9$vRYKNpL5mZxu%f@0+cnX
z$VC-}Wa$OeKL}S9$=%>7r~t9GdpW?bezw=`Yw0FVO`py3Boaz{Cr#imHFdHHWh74P
zZ3wSM+jJe5VI?N*)Bf%zc(DoF$mX+@gZF{ch3$m-qUfUgxd1AUV`Zq)Pg6r+bR)_}
zjHb?;7_-!pI-%njggNi5^bccBN3j22zH?__kn^1>^ph2q^%hBGgYb>hlK~}%ILM42
zQ0|1HqyM{Bfo_I6((an^L}ag<6x_z6h}zdA1_?(9U+8OlhHiCs1aA&Jzv+st=~%E3
z|4-&-2X5pC9AFr*H!vkHdr@R`Od|w<O=G$K>LiMoEfiQNERJ!*34U0kf)Y>2O|M(A
zyK7h354eAen`2Z>(#hC@qUiJVnCF`G<acM*L`ZIeEqZ*c_d~4QPZHg((aYHjSBG#u
zcxgn$apxTMA`Ds2`CPAf#ivsSZ*yd^^NO3joa1qk%pQll1EGYp9|xb!d5b|ybvD)1
zOu5Tpoqebl@EzfeMJm4yhtJeMzL04<nr5u&ZglKA9LTDFB?`w+pYHyUCA!-`$$Ja$
z?B#*fk?me4d1ZlZeql$=qd7IbVlAInj`rSj&vm+#7mKGO=#E;oF5}7O^_K0!p384;
zJ%t6Z0HSY`C%wBipK|Vu^9}%ME&jSIgWF(+S1#P08Ebke6wP0awa7vdiPP?NN#~{d
z!Dt@Jd6}T9?>1dpAbi3N{2FvrflSB!mGgZ=Z@-nzyxu=^w>VNOs%?@k>rEIbgC*Aj
z(YNYq$efQ|l$Wz$^OAIu^PEd^keuqcJM?U@JubaUlEZB%Zs-9tU;2Wo`ViNuMKgVp
zJF%;$Q+s~Ve|p+RyQqgFCn@_W7S;$4)_@Glv$kh&?K_y{8cEeD$oPo#$$O3^5Fv&*
zH$nTDauS-d|7Nh^odW0}f;WMzHe6mX;y#So5a*4j_MbJc5?H&x;jP5hjLc9ONkaHO
zF%zoxlk^U5YPK}?X6y7ZPhNC4uSDdfCCBIkq<oTSh2S~cS{4VWy&?bk4qrY6>7aVl
zHGhLuOO1p~CT`1|(7RTV2fb5!5G`+FWw>ByBSYmWx8)L9iCFgP{uA<0y;Y2KY@yp=
zx;JjeN9bS&)X!gmKeS?LgDUF=(Vyez2pMnJ2EkuRZ9@^SLdW#-;k2PFHkg?^0^}FI
zK%2xIpAB)K^N?A-b0g@_S}?{iJCut6$RfpNy0~{y5sYc(9q>(>by+0p+Ao__>l5c%
zyJ)Z(Zc5mV`uaG!cl~+WX4J%ZfAXPOhB*ae+}x7>WqtF5nI5U07jk*7Z<Y4W?48tI
ze8452trPA%<)TD%$IkVa?Z4EOPaZ&r>R<klS$4C4<Cw1)^9M)04t_W>Y>yVXI({Yd
zBfHYKr4e*-V5@VTLTqI@F^FQ?wuJMo(8>~@!&0d4M^p?wy<hF$+kfB#7-JKTERYUk
z^ISFl-RUX}Hamt}MhHCX;-$f*W<KCJF^DYrS>Wa#@(ak4=&-fB6b~l9jB82x+;9?$
zd`+_`BHJ8Dnd|z;nyoRl$uE6#9DRL5GBKk6$A$6B$x&&CMgdK8Q1=Hey;_fRy{XCi
zQ$+3JdueS8|J?6qWxcoo!@;m}U@cT>)!_pdPRG+>YAPkwxI-l+sZIqyJ({2}B<@hv
zzGMCOVGg$grb@2Pk;$N!zYe{V6Mwz>_pyxXb3K>-&Z;o@EZ*+@v5e?$6=)aP8%PF-
zx`rLLq3xvy=B$zrTxMbB%l;EhVGzp}K||t221064ECJV*i-(ECcXb=~-v#5JBF3<W
z{mxbi({(n(;pa|2{AFcQtugCAL>N_rph&BJMkgwSH^wbVRcM90m2E4#8)o{hQg`ri
z1<7Vk-8U7Qo|bmmJM>5%+JO_&1dxkY|EMvXvm1}h#Z)zl$#Dy96ER%cuhM7k)E>@}
z|H=v^gF?X^cy*;Z@S2t?O2Bq+C{uj)s;|mR_2*HTgnvT2f@rRy=FX?!Zir59);|dR
z<JZmbnc1NVi2flJM@&ro7)^HCk3>E7+<>~~hKkbW3e9PgJg;xBO_qBIdQ8l%$yrD>
zKwS!eb}A^f^c*GjK}(SGKnHoFa6yNIljC){BE6$9KP(7}nv#OA6&_aC9G<xERqLTC
zH&xjAa{`h9mLCBug7Y9Z1VnNBZV|oF`1MA59C7-@^d6<?kYEx}RJQ!h{QQpCFx>02
z)8mh_<N>;Su+7G^ispdxiw=y{>&QA#%HiPM*XfHrUUQSdg*pVbMW!8=<O!1+4y=&^
z<uZn#B(q0R9Q7cWhym0ZUM~|#PzDJy&rY$!t=ulUA^{Sp@S+LzV?2*10EZ9fmCck3
z(croB+?|}DRf;{E;bX{~z>mzCS7&E09c(}V{;mnq$lJ_dFXDT2HjQ>omzlV{V#57P
zDAdE-zJZ0A7F5oda!A>Q$sA0&NFZ=4Qvc$Fbz;s?X1Eelx01jVKka;@dX)%NoUym9
zc@qv}PbL!Mv%nDX$U^s4GX;czVLoc+(2WvOZ_tMUbV;Blui&F+x?$<^M;^ZevOi82
zY0;y9D)_lxJ^v9v@)-I9$TYw}ozIV+NsWg%Iu>;DXrFR$Nhh%WPx{|61Msv|4;dnk
zDU$o)dlHJ`7lk!EeLm_@W}lX!uMC2(UiX=4sT19^X=WsXiq1+Yo>0G{D0$N6r_Abt
z6(hbADZFvO>z|_Zp&AUtAS0E`8ilJJ;K$9zjV8Z45WCEF`u4}{$?L!+@~Ik{Wr@LT
z{Ppsfra)H;_TP1M{rZ}qHY2C`prOo?Cmmk?^u;kH&qc{Vc1V);_WFY-K?oe}sfT@t
z<!14RRW`GC_bt9nr!0_XP^tltgyn3cz1Yd+^zT?h!5RC5iV3Nk+D|?#VercvuHF=j
z@WXHCH&*C>jgeK2GO<t2*AioOOtole)!$0yezDhea_cRzmYtZt-7H9{?Kl7yDTu-1
z0#5B>hMp0A>}sUk_IWK((Xf{0eyd-v%W{(XuD`)KN?qN%g<pHz@hA0gx=2lKSB~(|
z?aSOo<<;|B`>Bq}6~^%Twy=vU@=uDHY2fL;9xc+zqxGW}6S3o<5Q{*Q4RO?Qh(q}4
zB7;1Y3V2`RmO%{digJjXB0qq>@c$c8qh3WkiTwiuc#+xJ)Q!K~K@FyUGsr)p=U0h6
zt#1T*__eXWV!2PSd{Tapk-~R>c#O`SaSGPc=^+4iAxGy{XDaT!;9^e1{BZPhfwv(p
zci*TZgq$pqcOvAxe9VyH^KeecZmSg2^IK->M{kb$9PMF+B`0hDA$v6ynS1*pb}OAh
z+BfBTwvs`DCF%<@*R$pO-M@aL;cvpX+Nz(bsK0)Qhqrf>u3h1_4U+g^LxVX(4FL-n
zbIQ`vT5@mcpG6&iT?XQ!GJFo~8h;z@nRxy(3T1t_6ZYOeEU}r9(zd(E-=oD3ifVP~
z6tmXJqfCRi@{40&gs%Sp$ijN7n5t89Y)4hZFs8w9lySU~7YrF8$roXA8#DcC1blHI
zeNZ}#c9}oNO6S)6IsWY^11ysNloQL^uk-AzDN5jDRw9SD!|?RSqi6b6nM{p-G2|Zv
z4@e@BUOvW8;2gPS(WXzkq6M%PvhP#d^JvT46$$6?q;uHr?1kN8Q(S<fH{qwSvm}yQ
zzq$5nF41QvBl#49pD@uj!Th;WTG;=pJH!-Jh3lU&Ab-#3oTQA|j0mZc8=rVW5L^EE
zX~@<&bap@xcCkYg2O_7cZJ3LIyABLsg*{NCF(dRe@2Ns5XRoh7?{mn`yLc<P0Opm)
zX=VJc(~+2mi)fT|bU!#r^2Ex2%_}tDRggBu`|n9df6~rng#%6!fjPXuT2!Z>0K@wJ
zU`?2`r@B+H9mWet)S#1?9Kvrl=O*SBbzEL_W$i(Nt@nlA-zA6_UF~k_Wm-~VsKYOK
z;dhZlK&4|rgzMdg)$(R)+|%w7s=@?JG_$!@yY;ICpO-b_e`yzbiI9ZCtW8}_UErEC
zgVy(jz=2M`@=4Df5*+mMa&Q?u+99s}t>s!ZmXor$kRkS}a7|jxOLznz6L`Zitf703
z{nwrIHmK5WhtsR?2}{c)mw`04NM<4}5HDKHnCs-*qFx{_I^_BSnGs_K^K$rFSX@hk
zm-fpUZ6$Wp)LxDob_-m%Bt&7_-IT6UNKTVX>u<#4ipJqvf{bJ0>f`A<*2Z4fkr$R#
zUi8u4Xzh>DWF?muZG+}4CI2~k>m?d4JBz~1%!&CF$~0Ghh)mb(dWK|8EWOU3b+M*A
z>B(nNlzD>nUiQs>mZERi=)1W~-=BXzIr+O$F=MI7Ig<xvd{$>R?n=6H!JM41xkQ`a
z91D^@kd169g1u?f=NmreH5zIBTlER6?a}JRsF)fOU(%-X`aSxNQ<m@7!mC0IL%DEF
zw-QH#6fYAE;v4=ZM`(iB15z}KV*RH`|C?qq+Ek58x^a58x6{I(Bn4#2<bD-tFD_iJ
zW<?=zSi=<1xcUzf8AxWjyel*g4mP~>?5;27Mza1L2fsijO|82$D;;yYhVNk>d)H(W
zPlj>iMa|1Y;4R$v$xUf{+wVn0`l>ZPq3&jJRW>V1ROcuf;Dt&q((kmmdQG=<&z(jT
z07jqqIsH5ie5*g52rqsvqN=V%x=GHz9A5P=kC(Rj!>b1#vg?Y0Azj)%cERVsIgi|a
zy9QG;FIj1$C0TPJBMWK4taE{h&y+l2Bhxo>Le~suWc_-w&lPW^q}eq8!0iZ~2q9TE
z`=DA$FY-X1dgxXM{B|!rYk|iUJoDlQ%K~k8ij(7ha?tA8)_(EAUI~n}&n57*QNvB-
z{WKhJVcWY*lb)MVjMs#{m<oIKrt$`A_u9s#h1w(g%($p+(K<UVHC-g+Y#c{2rg$!n
zg*8O=4PIgK(8OE86cXbvMDMA6FmR4Q3MnsU>cyj88{4*-t5q<tp%3LlV+#I;#x;wc
zxMlkyur&Zdyp-I3-Zs~3+PEfR+^%irbUG9yS>FO!fY!dG;-IB>A24f;k)|gO{sTiv
zkzBSEg`#MT55H_a7rt`pT|IXym&Ox;b*IB#jYuB{6ei1VO_PFk^t>;?%%LwLBYAH^
znas&wSc3&UJ~{PtUmY_Zis7{46Q>0KBVmPw|K=tK)pP&&JQK}t^A}8LE}n`*jp{|_
z`~wn;Or@#PegmZ7<O@Vm-j01>NaB61Psn?JcvIcrrLI28cG$BjT!rJ0lUnSU#tF3a
zIQH}6IDSSzj<Hrf_^oKJcTcuej_`PEvIDhLc8q)0JHS+1{7WZXCeM@-ol$f!8>YI|
z1H1n7JWPl_j`%ExH9!!7iwY#VUl#Z1)2Ng)-9!2J|Bi^+4&F-mqC*kE49;zSE0noY
zpI!21&}?dfct3d1G?vOT_JssMb8>b{Z*d{7QCmisJKal>yIz#>I-_VkrrHO!YwNZK
zQSTPw$_KsK>{p@8UjlAxr2Ee;FBn_62d!#W316jE6fd;MOR@-w_tlFc{58^o$=<~5
zzRuDcwJ9gwxqa%=np1>F^W~dYNlRt(cj9bwzNAktdn!e659RZ9xcltCcgNN`QvKv;
z%k8y$u=+9*{ijQ*P&L$ByB8B9UDs>p4|X*vf+X3$)3h&BkxBBkS}THDLhzFgl{C<c
zqO0~TC)KCoO?x8W_9q0=K@zvjN<0ugJ6j))XIRgvyGn!1?_d)M#+OF|5-upuAHCqO
zQyxk~U%8{*yYPuGZn4up#Wc&))(Udu3DRTja^&tLRhcot1_NDlh*8v_+C*}Z_4<H1
z0|(K!PdsY0Hx~|zuYh@nD#2Usf(lv4DY{KP&d6r0fe5tiwm0ju*@bwLBROpeURiMw
zjieF-LiM?4TProON_7>L@^iCxKb)s$#Jt9Mhs}L7FhsrzM}n#BHNN7+cBTERQ*Q`X
zFUu(R`Q0T8O9;f5mvZba8K4bKvl?}Uy`?0bf9Z7hw0aTuq0JDRX{>^tn|#1Ls3gD#
zz37g>maiu5`rEFI!;g%Ty{*il$-=mmCoYd9DF~}_^L4MVLiN8onNe0v0}bELRJfp0
zXB$JsDioBIZ_=Ev_>H=bV=_C~*|mwM80;OC0URgOK2Vrnj#e&HV2IHVCzmEy+zny$
zHB(YSg8N%#^Ox~+cMuJF5xI{J%9JjkU+l#rRz4D04!TOVPUS=IJ-ujc65oc>Ju*0H
z%4ukNhWGULN5Bcw)rqA2)7<QfUzj#H=x`~1Bz5V>Z|UjS8<MUsV}>-WL;T!A&tdkC
zJ;|e{e$Mh_mjMPeNC(beU7M>9p*a^ZfG1EsbFDN8DNxW=EBN*lYC8OH+zoKMhK(^i
zXkKW3L*k=X`9`#3H(w{lgDP*8H^jU;t)~!7=7>BwM`AiJ@OReiCSc)fFa?tp%Ig#0
zVn{CHif%iF1_<nC2%IT|xQ!e>bn2V@VG7lQcSN8<9JZ9L7%!7W)LfdsTN~PNydZxs
z6!(A|PXBU^ITxZEvO60{A|c_ThrcKmren&Iq=sPi!cM=C&Y~(CajIuJ_TbpfeA%~x
z$Mu$C)wGmxtl5O5D(!`kMEPbT^434FAScbp82r3W7_cli{ItjX<UA}*1|3M8L=i7+
zI31M{_x`WJ@3c)Wb3Ywae)I#fcL??wv2F#$!sL>qZ&!+*A^h4PgJ7Iykd18loFo%R
zzfc$0SefUf8QJ4hXIAc`5~W|G!j|;8i2U>_KriFdWX`+YcFV%-+o@Dr4TP^O7B}&C
zTqwZu0OR<4@9#}=`@dl_W9fd{v)%?K`pfW6Y|?F)99OBPbEfyx9rC7WQ6Jfr=^#s9
zKMTr^gYr`$#^<drYfWM9A+sro)L({Wf}%erBFF#@zO=7!l8W;4*9Fa^)Gn(BH(NL+
z=L%Jeir8f!_X(n3RbM{58#Roo%l~6I`_~tWeFKXP-RwO7=Hrv6CWjcXKZ%gns010$
z@zv>z)0uHxJw5FCAh~rr#rFNsW6)mMM{3Yi<?D*Fc=N*b49O?7b>A2-+~?%AyYt}0
zcZy_Zj%WrpXy8WzxR}DW5F`s%8P$>8s{{ObyepLQmEQb%rKMqty)#WksTgFt6>K)#
zpD}RFIq=qVPeX#QeREP>Zt>*bw$_}wv%dPWlg}=1yZ9U(o$&k7W~H55A01Q6%AgT7
zU?{z<j#?0}tRBLcMStfb)JW=b7VMZZ6%C?i!Wr$w>v`Z&8Tl^v;;rXEIknVNJ3W$Q
zv>R15(#H0OeH}y4(*)SG2-X$#2|i`0Pgb{e1M>b7cDUTI_V4AJfQGS<T2oc}xI3lu
zx(w`@E3z>;w6EujDbDL9S8pQHCz`^;+w|MuQ?+_=J}G|o`s)Rr1JApa9)Je)+kSGW
zACWYWb1vzHz@>k>ACq?wP35r*xFu;?WBrM+gIK&BC>gDd<p|`?wlyc%G?be^`4jkL
zaE$0@=z^@0r$hW{H!c$m^RwVPHKy%w;SXP@`hQ;p=&rWeG~WKJ*xSjz4{Z4B5^&(J
zk~(0g+iXr*%<hr?y2tVULbcsrDqEA>)_@yZ6RW4R2z*8y^bXwY$RLLAIIrZB^Oplo
z);&!rPlIpBPKcV~M^<5D8DM3e<6=`}kn?Vc`TBI8^sLVCWuy<1G>hn}Os2yLjL*wl
z7pjZijnq7+!FK$%@PTqhk@<K;#hv?!CZt%+9n@ur8&u>^e3@MOrsLf_+JvlT9}g)i
z{zb?)p~m-Yi|D{DZt?tzh{uPNdj3RiClnBK%PdfN6^J=>>zld)QV;Ns5{I>9mhKcE
ziq-cZa-4vQEPF{`0=z>j+nQ~cTaTA+GghU~f*c4Qe*0N-IyYPwSb6Z%*&`z1!m;cA
zvn;w-II7<kQY8YJy)hy26)b<Fn`j9O8GO*kJ^)u-XY|S{MkvPb@oZ%=T0ClOZo2Qd
zN?rE8q7C~lCIM6Dsp49%U)TJ3l6gBg$cB#{Dg}F~(fHSYuxxW?=J@;f>IhdL8Zy)o
zF=Tn;j{xT32!KT2v#Lf+udjlwY_8EqXBb6mn9;y-(k@&}s@?Hx0n#2erZ|!?;IFIK
zegd%MAHL3)pLpdHm@-Wdp@B4e6zyaozlX4mw7ia1E;nYPZ~fD;VDVy`eBF0wljfU!
z^q89a1l}XaIr#|azkxBz7H}y7$Ucfb?p>?Q0q&HsSfU>BjmLa}gCcnHk?F8nVD2)J
zeWZVUK424{O%|%c3P;9!5#_=ZYb`(w007y=e`*219{<rs$p$E4vBW+$FewH{k%bO0
zKWgc(c4`0r68!IP^dqYU;36JG_!diAGx@36{>bv-**uorq~J*P7nbz(a^^53<ehc_
ztD-dk7&+VWdF1#}^t`Bc{^mex?pJ)8mrob@Bgm=Sz-xc3gn-jwME%xp+a5dNOH^5p
zvQvAa+iJ2pGwvj22IUOAJ19J@`(2YB9!qnD4v!UFP{wK_b6dFBzI*T}QhZvh_GgSr
z)$ys5o=2ouic#Z?*bL)*#n%iQ7VxLBB#t;LmFX1@zq{B6h!!-TRuL?TRn8YxUeT{o
zHIfrxcdGNkNXs<D(ANHG1*=9nn@0Ao7KC2v3cZ#~z3eZ6st!@Uq}HtnKNWf(pqu7)
zo2c&k`qfLDXCTS)zM+x!ZOyB;n!(d9m}g^mg}pO>{k|qoZL}W~=wuL`GDN{=KsoKZ
zrTQ%3a1HYaS7nrzORwKCaVpVM*<Ld(Gc#k17~?y!I1q}GwV*39?F_LV@E<sfwNJhJ
zd`^9D(DNae46u;#&e#9Ts*|wMfh>LMx3A*d8O!8vL^J0L>D|+{8T%^-xsq{Fm}~Jt
z=$XM~nHICBw88x)^`&PY&d$hxyu8WQ{Zcy3>M%?TI}IDg)1#@&b*m=xyIY$HXqU^S
z4xZrOgh9Uoxw}5B`t6ym3U&4#!Q(CGHs0p77GZ`Ay*5~}4|KLxOzuqR*MS-%apjIp
z(cc{)#}>8<aHNElC({50#bm?55|qc7@Q!sAhR1|J->SRx8+K7Q$|rwi5O{<m+L3&V
z4J1ygkssalF2$|Rdh2*>^;v2LmR>uSma7lE!d6u`U?4=vgTjG0ZUN5LYEmA|FLYJ%
z$8S5gVpF3b_v3#`Jx41>Kc(V{cXB*iRpm6P*#0qP=LXx|by+1>SUm0S#XYk(Z$iY!
zcVl%MVX%jXc6B`bwib6qZaxA!)uPWBJ_UI@Q({#|%XcHzeoRi{Hdmv<J51s}iX(Xx
zBL?0l?yQ(SA{oFH$51Xo5Kq_&9`ge+J8CZf*#ADe2pUo+UDSc-i(3=9w<zBH(j>a$
zt<}s<Rd&12cidZCQTK_;r&#m3)bV4T24$d6c}uX+FsniU*6=Ud&?82tF8`@z5|Kov
zL}<rNL!jj1Z$ddx*8me0GWgd+*nHv564z^6@_YMBw<L*RAjqT^E-&~epEQVk2gNji
z?(Xe;SDJ5lvvAJuk`~0e^sBQT?!$G1q}BD5`nOjg{aR{h2eO|?u&$-Y3QX6}rb%6J
z-UZe*A~zT`)K;@`Ut2!$c$wQ&o;a#2$uXDZdyKM;P-Dn>MI`xPf%=96yL;xK*fs0^
zS?7pL|My!2h4zRZ#_*Xi7GfA}v5$U{#H5zw@t!s4&jsHDyU0E^<RSGz)g#3CZOoXe
zfQj-}@{sG@R=aR|kF8Mq_25vIRmj<$18OjvL9bUix44*-)#1&J&$t2<tK4~dGxeHa
zSP719+3s5(gLpt<=A8!ICeo&ojZYzsa>K;s;sht16$P|MHd2VqqeE7Q(X}_E$tI-6
z53@2}dp~xJnr4QyGBYI~fGOr_zX*U=N2Yyt5XPA6g)YAvjGm=C^!hb=&BSZBJ@ls~
ziHLNCh)lB#>nJ$sB7j58>j$@)?GW8hs(V23G3uJ#R09gid?|S`*qMNSj=Vo{&F{#=
zAQ$mCLzY?NLqL)j?<v*<gW;!jBk0fT?Ou5{My?Bm%>~Muk@dmGiv<y%oTj$0i(gX?
zhsOSM$GLg+$N9EJlwbk48g=YV9ts!LpS$PCV|#;@vf45&;%aw4;d&iJMBc0x+~Pi0
z+Jeq<K~3bG_AG8DT<qT2Y4MrtYvFF8NZ|(3W)6tK&dvjjEo*adN(3$Sa0Oa|u4F~d
z;b!;tJY{^V%=L#4wU@1-Ov0*l^7S)(tZ!?d%T12h)X&|OJyl~$71_nc7-vo<7>@@z
zFOblXreTh4w`sUrE|3+7W2RhITKi|A$ultcwS<95@s)RXqiV4AyHmOt6KxtfU_*oO
ze9`L~J@=;dI<Xuv{h5Bwe!jrn*_b687rT@~44gn`gu*kOPa8_rlD1mweX!D|Ia_ui
zZl|jJj+%hEm8zxI0C1_(CmoJAakrgJNe}nsLDyFW%0A6ghq}oI$@zQbZ2V`v>`COd
z`^@B#8gJ2tLPbm%Nh9O)7MKq~;gv15hb4bqE)@Fhk2ErPoo1*BJ^(e^l=8m*ttc!V
zp0{)s_W3Js!a~jQhG(+xS+YC%&Fyr4{YL>KEFk}V@YQx-q>~fN?8M}4cNx=4=UGT2
zK?>WdExe$vANGmHk_s%T-_VMjmIoc226#dZ%KCCglMeo3oIdZs#>V44K9uFCay}rj
zu1vd5&HjnEA-+=afuqZNuuyZ-Kr`{Xuql+80H~aCb@T)IqxOL&nwZU7{9EK${>Q8Y
zdQQE8c-Ma=OBHn_<*yux<3g6RWkkeb{5ccb2iP*Hx>*gVDVdnDmq|IAVLI?)V)eu-
zu9N{5D?2N^RMhHhfo?*a%aF=yZO*%K;tHtQ3j5HNUYE`M)1{Nm9B8QA$;Q7iiB~iV
za5$1BT7DP9P>rP{{#WBSpbDeO`To%M>%SZK{RzCZ>mDUFDGC*&q=S`WM27||JWWS!
z$*rx6KSt~*{`AK%{<bAe3L=B+NgoWysDIvne<%Y=%g#D_8_ND^;!BmFA71KBXXV-O
zG=}<}pd)VWo-T)>h1>DJ^P`Ikd?F0emGcd=?~y=mA5a)*^UmIPuN;_(zE_}x*6#0a
z_cgQt)Ep9voPLnc)a<qIXUGmh0-A1qn0(F<Fw|tg_N?wGYn=!f3nm#q4U=C`7K1{+
zNk%e6?ZaT08iCgLmz|v}dg<(gbM{c>4wL8Xk9<U-Z$}1pVKO~ltO1A~0<UMbeNOZ{
zYh`@E8Uuy7`?n90-prfEY{0IZ&R@wI%SY&Fsu{{=95r(K?$7NW#{ULI*xGDWX2<Qx
z1zV$D%>CA6(x|waG78Rk_#$R;KU8s2mzQ@s(fJ&;H$?qBYh6|bD9D*=dO6Jv&$$lT
z)EH<*Z{gC!R<jX}Q>(#|Yp+n<Pg7Ajq_GPolC!Na&5|4b2ZXeAcKlNkNmV5$V#UjD
z@oxC~_f07Qb0yKY7jh7`q7-NP<}Ftj1~58|pe<Ge_@O6(?AcM_Grlh>Hltc}7-v<%
zf;I8Td>SCrM`D#Hoe!{2)EY<c$U0VAh~fw%54;@hKioX`-@XmMKCpg{B!%)nbiUIF
zS@CbTFGD!Kg!N(+T%+Wc>SLG+Cj0t+WkH-nX8vs)?G(r1#AP4ywiw(XDS_wkDT3<q
zrcHdAne!<l-8Dp>&yfkg)XPisq1xdKq6dbi&i?mr^JiUORs3p4T%UM<GcHO1*|Dt&
zv;4^wmTpm9l=wA^ns#1jhdCVy>GBBELC`=W3}oJ(mgesr5IZUofbzg*r&jABL18GH
z-&8TY{95{J9;^Lg+MPH$dHwE_lZ|R~ZsYavRaV)7LA@Q-pCCsd!deTBv({Ke7HtXE
zOA6ggRm+s%Jpn^Dah3hBW1*bYQcY!ZYt<&D3>~u+(-P+6w_0?31xMukjS^qYh~<>Z
zaRy7UCsid9zI)fG5j<9}90|(@m`G)h77A@#@y)(j7&~wl+CFe}IevfmRHy?+!gPgZ
zeg>9f57o(`3NuNWMkF<zFqQW-n2&JWbe2_pZ;2Sz@Ba{VhBC4(tLVgoFNX#fnK47h
zZTEA&;Csb}jb)$m{e3B7?iq5OEQu|F4%V^#LSH3?Ra*1Sn2JGq@J-<gAD_`sjKwsO
z`P9E6Ihyl7lYF?0%;Ma}U52P+$-p@66s1=)1tK=Z3F~OoI;ydG!v9o;2I~!1(t&h?
z9zbCEI)9MTaL1qP>lx=9<Z!M-n?);QTOwH<*mw(}ZC#p^tfrQB+wGH0B4${8*uK}g
z-YwM@Ng*(#=-VM$(zEvHw#7&SBREw^hm}4LdK8W2q>{BzAuTqG1vr-oO58ET#JYG0
zu@Dv(2kIBukDsYNPf%9|z0bmf)mM2PG-E96cNZ7^J<Lv;))SZOJdUm?1I`!tt9}HN
z1DMXGImXwULL52@HI*rW>DF-Xw4Kwl*5Mpoz1WHW0ttQR4Db7=#O<ZFAq`z|8`iE@
zE`Im3>q3rMS?-5QMp~KIJG0^G^_*Ay$wT+X7CsANWYzT)fsJgijzcVOQE15sIs5jP
z?Ql0(Tgnh{t|aI<!Pzu!6@%<?S(Gf>5umq5`ftGIFEE`8D-S@ym<lj^=2|e)4$|lz
zhl~n(eO!38v(Tm-K8|JH*+uNiKYgjK0XN6d!-Rc#9zu2d+evu;B`iMH0|sK_Ec^=+
zgJYc?!#W{}z^f}*xzjiAcRyP3v`b4HpuA-AQ{!HldxthrRe2-X+0Qr*S5*j7K6-x6
z-6<Yet&f&0@x==EJsD<PduIOi)Ce<l>txTxFHm4Z0Z}w(<+C@yCB1#@O0W~g_mKd=
zT&I(#m>$UGsjH&<pN$Pkhv8=|8W3`V%M{%zf=E6*)4hVVJ6v^9R@Dh77OjhhkDZvz
zZmMerVkxXwmS+EUoWJwSl+U+Un+Ns-y<fBz{1|lEttH8s^i5N!{Mw7l(zNA7_UmdQ
z@{g0VQBD<GJBO_#2dT*i7Lkbu#d3YeyE-PX!{?K8X!KF#R<qRK(4nw@!yu5NuKWAQ
z-ub<sfm)aBx~km=z}A`BslNr<T;E4Ba84m=M(T&b7`Mvi90?vpDUGyat2W4ooJnex
z-?;A^!nM>hUVN|Uvg<@(oKL>rtwdEK3mlGfEl19lJqO)mqihHbDP@jQwSIou3d4@y
zzA=?MQB}84UFGK$rPW&f9!o1ZgL~F_-q}GJS{k9Z;_q2sMfTP01-Pjb-R(#b`Jg{G
zHuZD$kcAKx9y|N6Iq$UE4A{UFB(QnmK8eZJ{!xmu$efhM49f5=|CU5T?3;TuldE3Y
zOrWpJxfmvMd*f0Ey(N|+=kI6O<M>@p5Z;^aOs2>OBIn@!TI;n#ba~GR%!=?uQdgcu
zN)uEm!)+j^U#hb>`s7B-EX)ufj=kSVb`LLM?Bo1LZO>Qe7(Yw`porQmY7~gFkj_0l
zuGGhj&AH9JzYn)hsiaf5J8Hg0MfPz}F+ovth8=>zPiJZozv+O)WzFtP_Z{FZ^=Dt8
z^zM^1jA%sE9P3FptWj06kw87X4`*`gGv%o{>xX}`A4q;oe&Wb+Ja_++(+E>#jO<vf
zJ-oh_McDZt(xL5b1Y&@Ux99jU*e2#eToh9qQy{9lgm;1CfMC8=OQr&+xL3`U6vW1z
zr%zN6{6*TJTx~75>-dtl?F@F}rtqhm8KBW6vp>ru0KtH*;LZnLTl_H@I2Oml!~h*f
zfFRNXxD9to@lU-cmhz)_D6w~_>hmcd4-EXArB9(F12JL59N{y)_z4Fo@;pKn#|kN4
z2^Lbh$M8f*k>DfrC(9!<nf=!5!3tb^L@gx$6QyX9yi|h~G5rq3$D<(t)t8!zl?v8j
F{{^dA;BNo`

literal 0
HcmV?d00001


From b3f46bec11c02dcd9df13d194c3a09315a058723 Mon Sep 17 00:00:00 2001
From: Felix Wu <mail@flxwu.com>
Date: Wed, 1 Aug 2018 11:17:06 +0200
Subject: [PATCH 11/19] feat$(docs): add twemoji documentation and style fixes

---
 static/landing/index.html | 786 ++++++++++++++++++++------------------
 1 file changed, 414 insertions(+), 372 deletions(-)

diff --git a/static/landing/index.html b/static/landing/index.html
index 6b0fa372..785a4b51 100644
--- a/static/landing/index.html
+++ b/static/landing/index.html
@@ -2,415 +2,457 @@
 <html manifest="cache.manifest">
 
 <head>
-    <title>StackEdit – In-browser Markdown editor</title>
-    <link rel="canonical" href="https://stackedit.io/">
-    <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
-    <meta charset="UTF-8">
-    <meta name="description"
-          content="Full-featured, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.">
-    <meta name="author" content="Benoit Schweblin">
-    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="msvalidate.01" content="5E47EE6F67B069C17E3CDD418351A612">
-    <meta name="google-site-verification" content="iWDn0T2r2_bDQWp_nW23MGePbO9X0M8wQSzbOU70pFQ" />
-    <link rel="stylesheet" href="https://stackedit.io/style.css">
-    <style>
-        * {
-            box-sizing: border-box;
-        }
+  <title>StackEdit – In-browser Markdown editor</title>
+  <link rel="canonical" href="https://stackedit.io/">
+  <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
+  <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
+  <meta charset="UTF-8">
+  <meta name="description" content="Full-featured, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.">
+  <meta name="author" content="Benoit Schweblin">
+  <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
+  <meta name="msvalidate.01" content="5E47EE6F67B069C17E3CDD418351A612">
+  <meta name="google-site-verification" content="iWDn0T2r2_bDQWp_nW23MGePbO9X0M8wQSzbOU70pFQ" />
+  <link rel="stylesheet" href="https://stackedit.io/style.css">
+  <style>
+    * {
+      box-sizing: border-box;
+    }
 
-        h1 {
-            font-weight: 400;
-            text-align: center;
-            font-size: 2.5em;
-            margin: 2.5em 0;
-        }
+    h1 {
+      font-weight: 400;
+      text-align: center;
+      font-size: 2.5em;
+      margin: 2.5em 0;
+    }
 
-        h3 {
-            margin: 1em 0;
-        }
+    h3 {
+      margin: 1em 0;
+    }
 
-        .button {
-            color: #555;
-            font-size: 20px;
-            background-color: transparent;
-            display: inline-block;
-            height: auto;
-            padding: 6px 12px;
-            margin: 0;
-            font-weight: 400;
-            line-height: 1.4;
-            text-transform: uppercase;
-            overflow: hidden;
-            text-align: center;
-            white-space: nowrap;
-            vertical-align: middle;
-            -ms-touch-action: manipulation;
-            touch-action: manipulation;
-            cursor: pointer;
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            user-select: none;
-            background-image: none;
-            border: 0;
-            border-radius: 2px;
-            text-decoration: none;
-        }
+    .button {
+      color: #555;
+      font-size: 20px;
+      background-color: transparent;
+      display: inline-block;
+      height: auto;
+      padding: 6px 12px;
+      margin: 0;
+      font-weight: 400;
+      line-height: 1.4;
+      text-transform: uppercase;
+      overflow: hidden;
+      text-align: center;
+      white-space: nowrap;
+      vertical-align: middle;
+      -ms-touch-action: manipulation;
+      touch-action: manipulation;
+      cursor: pointer;
+      -webkit-user-select: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+      user-select: none;
+      background-image: none;
+      border: 0;
+      border-radius: 2px;
+      text-decoration: none;
+    }
 
-        .button:active,
-        .button:focus,
-        .button:hover {
-            color: #333;
-            background-color: rgba(0, 0, 0, 0.05);
-            outline: 0;
-            text-decoration: none;
-        }
+    .button:active,
+    .button:focus,
+    .button:hover {
+      color: #333;
+      background-color: rgba(0, 0, 0, 0.05);
+      outline: 0;
+      text-decoration: none;
+    }
 
-        .icon {
-            width: 100%;
-            height: 100%;
-        }
+    .icon {
+      width: 100%;
+      height: 100%;
+    }
 
-        .icon * {
-            fill: currentColor;
-        }
+    .icon * {
+      fill: currentColor;
+    }
 
-        .button .icon {
-            height: 30px;
-            width: 30px;
-            margin: -6px 6px -6px 0;
-        }
+    .button .icon {
+      height: 30px;
+      width: 30px;
+      margin: -6px 6px -6px 0;
+    }
 
-        .row {
-            margin: 8em 0;
-        }
+    .row {
+      margin: 8em 0;
+    }
 
-        .row::after {
-            display: block;
-            content: '';
-            clear: both;
-        }
+    .row::after {
+      display: block;
+      content: '';
+      clear: both;
+    }
 
-        @media (min-width: 700px) {
-            .column {
-                width: 50%;
-                float: right;
-            }
-        }
+    @media (min-width: 700px) {
+      .column {
+        width: 50%;
+        float: right;
+      }
+    }
 
-        .landing {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-        }
+    .landing {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+    }
 
-        .landing__content {
-            margin-left: auto;
-            margin-right: auto;
-            padding-left: 30px;
-            padding-right: 30px;
-            max-width: 1000px;
-        }
+    .landing__content {
+      margin-left: auto;
+      margin-right: auto;
+      padding-left: 30px;
+      padding-right: 30px;
+      max-width: 1000px;
+    }
 
-        .landing__footer {
-            padding: 1em 0;
-            text-align: center;
-            background-color: #007acc;
-            color: rgba(255, 255, 255, 0.75);
-            font-size: 0.9em;
-        }
+    .landing__footer {
+      padding: 1em 0;
+      text-align: center;
+      background-color: #007acc;
+      color: rgba(255, 255, 255, 0.75);
+      font-size: 0.9em;
+    }
 
-        .landing__footer a {
-            color: #fff;
-        }
+    .landing__footer a {
+      color: #fff;
+    }
 
-        .navigation-bar {
-            background-color: #2c2c2c;
-            position: fixed;
-            padding: 5px;
-            text-align: center;
-            width: 100%;
-            z-index: 1;
-        }
+    .navigation-bar {
+      background-color: #2c2c2c;
+      position: fixed;
+      padding: 5px;
+      text-align: center;
+      width: 100%;
+      z-index: 1;
+    }
 
-        .navigation-bar__button {
-            color: #b9b9b9;
-        }
+    .navigation-bar__button {
+      color: #b9b9b9;
+    }
 
-        .navigation-bar__button:active,
-        .navigation-bar__button:focus,
-        .navigation-bar__button:hover {
-            color: #fff;
-            background-color: rgba(255, 255, 255, 0.1);
-        }
+    .navigation-bar__button:active,
+    .navigation-bar__button:focus,
+    .navigation-bar__button:hover {
+      color: #fff;
+      background-color: rgba(255, 255, 255, 0.1);
+    }
 
-        .splash-screen {
-            position: relative;
-            width: 100%;
-            height: 100%;
-            padding: 25px;
-        }
+    .splash-screen {
+      position: relative;
+      width: 100%;
+      height: 100%;
+      padding: 25px;
+    }
 
-        .splash-screen__logo {
-            width: 300px;
-            height: 150px;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            margin: auto;
-            background: no-repeat center url('static/landing/logo.svg');
-            background-size: contain;
-        }
+    .splash-screen__logo {
+      width: 300px;
+      height: 150px;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+      background: no-repeat center url('static/landing/logo.svg');
+      background-size: contain;
+    }
 
-        @media (min-width: 700px) {
-            .splash-screen__logo {
-                width: 600px;
-                height: 160px;
-            }
-        }
+    @media (min-width: 700px) {
+      .splash-screen__logo {
+        width: 600px;
+        height: 160px;
+      }
+    }
 
-        .splash-screen__subtitle {
-            position: absolute;
-            text-align: center;
-            color: #777;
-            top: 95px;
-            right: 5px;
-            font-size: 16px;
-        }
+    .splash-screen__subtitle {
+      position: absolute;
+      text-align: center;
+      color: #777;
+      top: 95px;
+      right: 5px;
+      font-size: 16px;
+    }
 
-        @media (min-width: 700px) {
-            .splash-screen__subtitle {
-                text-align: right;
-                top: 125px;
-                font-size: 22px;
-            }
-        }
+    @media (min-width: 700px) {
+      .splash-screen__subtitle {
+        text-align: right;
+        top: 125px;
+        font-size: 22px;
+      }
+    }
 
-        .splash-screen__footer {
-            position: absolute;
-            bottom: 25px;
-            left: 0;
-            width: 100%;
-            text-align: center;
-        }
+    .splash-screen__footer {
+      position: absolute;
+      bottom: 25px;
+      left: 0;
+      width: 100%;
+      text-align: center;
+    }
 
-        .splash-screen__footer .button {
-            padding: 10px 20px;
-        }
+    .splash-screen__footer .button {
+      padding: 10px 20px;
+    }
 
-        .social {
-            margin: 0 5px;
-        }
+    .social {
+      margin: 0 5px;
+    }
 
-        .social a {
-            color: #555;
-            text-decoration: none;
-        }
+    .social a {
+      color: #555;
+      text-decoration: none;
+    }
 
-        .social a:active,
-        .social a:focus,
-        .social a:hover {
-            color: #333;
-            outline: 0;
-        }
+    .social a:active,
+    .social a:focus,
+    .social a:hover {
+      color: #333;
+      outline: 0;
+    }
 
-        .landing__footer .social a {
-            color: rgba(255, 255, 255, 0.85);
-        }
+    .landing__footer .social a {
+      color: rgba(255, 255, 255, 0.85);
+    }
 
-        .landing__footer .social a:active,
-        .landing__footer .social a:focus,
-        .landing__footer .social a:hover {
-            color: #fff;
-        }
+    .landing__footer .social a:active,
+    .landing__footer .social a:focus,
+    .landing__footer .social a:hover {
+      color: #fff;
+    }
 
 
-        .social .icon {
-            height: 30px;
-            width: 30px;
-        }
+    .social .icon {
+      height: 30px;
+      width: 30px;
+    }
 
-        .feature {
-            padding: 5px 5px;
-            border-radius: 2px;
-            max-width: 350px;
-            margin: 1em auto;
-            text-align: center;
-        }
+    .feature {
+      padding: 5px 5px;
+      border-radius: 2px;
+      max-width: 350px;
+      margin: 1em auto;
+      text-align: center;
+    }
 
-        .image {
-            display: block;
-            margin: 1em auto;
-            border-radius: 2px;
-        }
-    </style>
-    <script>
-        function scrollTo(selector) {
-            $('html,body').animate({scrollTop: $(selector).offset().top}, 500);
-        }
-    </script>
+    .image {
+      display: block;
+      margin: 1em auto;
+      border-radius: 2px;
+    }
+  </style>
+  <script>
+    function scrollTo(selector) {
+      $('html,body').animate({ scrollTop: $(selector).offset().top }, 500);
+    }
+  </script>
 </head>
 
 <body>
-    <div class="landing">
-        <div class="navigation-bar">
-            <a class="navigation-bar__button button" href="app" title="The app">
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path></svg>
-                Start writing
-            </a>
-        </div>
-        <div class="splash-screen">
-            <div class="splash-screen__logo">
-                <div class="splash-screen__subtitle">
-                    In-browser Markdown editor
-
-                    <div class="social">
-                        <a href="https://twitter.com/stackedit" target="_blank">
-                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "/></svg>
-                        </a>
-                        <a href="https://github.com/benweet/stackedit" target="_blank">
-                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "/></svg>
-                        </a>
-                    </div>
-                </div>
-            </div>
-            <div class="splash-screen__footer">
-                <a class="button" href="javascript:scrollTo($('.anchor'))">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "/></path></svg>
-                    Read more
-                </a>
-            </div>
-        </div>
-        <div class="anchor"></div>
-        <div class="landing__content">
-            <h1>Unrivalled writing experience</h1>
-            <div class="row">
-                <div class="column">
-                    <div class="feature">
-                        <h3>Rich Markdown editor</h3>
-                        <p>StackEdit’s Markdown syntax highlighting is unique. The refined text formatting of the editor helps you visualize the final rendering of your files.</p>
-                    </div>
-                </div>
-                <div class="column">
-                    <img class="image" width="230" src="static/landing/syntax-highlighting.gif">
-                </div>
-            </div>
-            <div class="row">
-                <img class="image" width="410" src="static/landing/navigation-bar.png">
-                <div class="feature">
-                    <h3>WYSIWYG controls</h3>
-                    <p>StackEdit provides very handy formatting buttons and shortcuts, thanks to PageDown, the WYSIWYG-style Markdown editor used by Stack Overflow.</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="column">
-                    <div class="feature">
-                        <h3>Smart layout</h3>
-                        <p>Whether you write, you review, you comment… StackEdit's layout provides you with the flexibility you need, without sacrifice.</p>
-                    </div>
-                </div>
-                <div class="column">
-                    <img class="image" width="360" src="static/landing/smart-layout.png">
-                </div>
-            </div>
-            <div class="row">
-                <div class="feature">
-                    <h3>Live preview with Scroll Sync</h3>
-                    <p>StackEdit’s Scroll Sync feature accurately binds the scrollbars of the editor panel and the preview panel to ensure that you always keep an eye on the output while writing.</p>
-                </div>
-                <img class="image" width="485" src="static/landing/scroll-sync.gif">
-            </div>
-            <h1>Designed for web writers</h1>
-            <div class="row">
-                <div class="column">
-                    <div class="feature">
-                        <h3>Stay connected</h3>
-                        <p>StackEdit can sync your files with Google Drive, Dropbox and GitHub. It can also publish them as blog posts to Blogger, WordPress and Zendesk. You can choose whether to upload in Markdown format, HTML, or to format the output using the Handlebars template engine.</p>
-                    </div>
-                </div>
-                <div class="column">
-                    <img class="image" width="300" src="static/landing/providers.png">
-                </div>
-            </div>
-            <div class="row">
-                <div class="column">
-                    <div class="feature">
-                        <h3>Collaborate</h3>
-                        <p>With StackEdit, you can share collaborative workspaces, thanks to the Google Drive synchronization mechanism. If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.</p>
-                    </div>
-                    <img class="image" width="300" src="static/landing/workspace.png">
-                </div>
-                <div class="column">
-                    <div class="feature">
-                        <h3>Comment</h3>
-                        <p>StackEdit allows you to insert inline comments and embed collaborator discussions in your files, just as well as Microsoft Word and Google Docs.</p>
-                    </div>
-                    <img class="image" width="395" src="static/landing/discussion.png">
-                </div>
-            </div>
-            <div class="row">
-                <div class="feature">
-                    <h3>Write offline!</h3>
-                    <p>Even when you travel, StackEdit is still accessible and lets you write offline just like any desktop application. You have no excuse!</p>
-                </div>
-            </div>
-            <h1>Extended Markdown support</h1>
-            <div class="row">
-                <div class="column">
-                    <br>
-                    <img class="image" width="230" src="static/landing/gfm.png">
-                </div>
-                <div class="column">
-                    <div class="feature">
-                        <h3>GitHub Flavored Markdown</h3>
-                        <p>StackEdit supports different markdown flavors such as Markdown Extra, GFM and CommonMark. Each markdown feature can be enabled or disabled at your convenience.</p>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="column">
-                    <br>
-                    <img class="image" width="250" src="static/landing/katex.gif">
-                </div>
-                <div class="column">
-                    <div class="feature">
-                        <h3>LaTeX mathematical expressions</h3>
-                        <p>StackEdit renders mathematics from LaTeX expressions inside your markdown file, as you would do on Stack Exchange.</p>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="column">
-                    <img class="image" width="280" src="static/landing/mermaid.gif">
-                </div>
-                <div class="column">
-                    <div class="feature">
-                        <h3>UML diagrams</h3>
-                        <p>StackEdit enables you to write sequence diagrams and flow charts using a simple syntax.</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="landing__footer">
-            <div class="social">
-                <a href="https://twitter.com/stackedit" target="_blank">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "/></svg>
-                </a>
-                <a href="https://github.com/benweet/stackedit" target="_blank">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "/></svg>
-                </a>
-            </div>
-            <a href="app" title="The app">The app</a> – <a href="https://community.stackedit.io" target="_blank" title="The app">Community</a><br>
-            Copyright 2013-2018 <a href="https://twitter.com/benweet" target="_blank">Benoit Schweblin</a><br>
-            Licensed under an
-            <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a> –
-            <a href="privacy_policy.html" target="_blank">Privacy Policy</a>
-        </div>
+  <div class="landing">
+    <div class="navigation-bar">
+      <a class="navigation-bar__button button" href="app" title="The app">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
+          <path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path>
+        </svg>
+        Start writing
+      </a>
     </div>
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+    <div class="splash-screen">
+      <div class="splash-screen__logo">
+        <div class="splash-screen__subtitle">
+          In-browser Markdown editor
+
+          <div class="social">
+            <a href="https://twitter.com/stackedit" target="_blank">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
+                <path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "
+                />
+              </svg>
+            </a>
+            <a href="https://github.com/benweet/stackedit" target="_blank">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
+                <path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "
+                />
+              </svg>
+            </a>
+          </div>
+        </div>
+      </div>
+      <div class="splash-screen__footer">
+        <a class="button" href="javascript:scrollTo($('.anchor'))">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
+            <path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "
+            /></path>
+          </svg>
+          Read more
+        </a>
+      </div>
+    </div>
+    <div class="anchor"></div>
+    <div class="landing__content">
+      <h1>Unrivalled writing experience</h1>
+      <div class="row">
+        <div class="column">
+          <div class="feature">
+            <h3>Rich Markdown editor</h3>
+            <p>StackEdit’s Markdown syntax highlighting is unique. The refined text formatting of the editor helps you visualize
+              the final rendering of your files.</p>
+          </div>
+        </div>
+        <div class="column">
+          <img class="image" width="230" src="static/landing/syntax-highlighting.gif">
+        </div>
+      </div>
+      <div class="row">
+        <img class="image" width="410" src="static/landing/navigation-bar.png">
+        <div class="feature">
+          <h3>WYSIWYG controls</h3>
+          <p>StackEdit provides very handy formatting buttons and shortcuts, thanks to PageDown, the WYSIWYG-style Markdown
+            editor used by Stack Overflow.</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="column">
+          <div class="feature">
+            <h3>Smart layout</h3>
+            <p>Whether you write, you review, you comment… StackEdit's layout provides you with the flexibility you need, without
+              sacrifice.
+            </p>
+          </div>
+        </div>
+        <div class="column">
+          <img class="image" width="360" src="static/landing/smart-layout.png">
+        </div>
+      </div>
+      <div class="row">
+        <div class="feature">
+          <h3>Live preview with Scroll Sync</h3>
+          <p>StackEdit’s Scroll Sync feature accurately binds the scrollbars of the editor panel and the preview panel to ensure
+            that you always keep an eye on the output while writing.</p>
+        </div>
+        <img class="image" width="485" src="static/landing/scroll-sync.gif">
+      </div>
+      <h1>Designed for web writers</h1>
+      <div class="row">
+        <div class="column">
+          <div class="feature">
+            <h3>Stay connected</h3>
+            <p>StackEdit can sync your files with Google Drive, Dropbox and GitHub. It can also publish them as blog posts to
+              Blogger, WordPress and Zendesk. You can choose whether to upload in Markdown format, HTML, or to format the
+              output using the Handlebars template engine.</p>
+          </div>
+        </div>
+        <div class="column">
+          <img class="image" width="300" src="static/landing/providers.png">
+        </div>
+      </div>
+      <div class="row">
+        <div class="column">
+          <div class="feature">
+            <h3>Collaborate</h3>
+            <p>With StackEdit, you can share collaborative workspaces, thanks to the Google Drive synchronization mechanism.
+              If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.</p>
+          </div>
+          <img class="image" width="300" src="static/landing/workspace.png">
+        </div>
+        <div class="column">
+          <div class="feature">
+            <h3>Comment</h3>
+            <p>StackEdit allows you to insert inline comments and embed collaborator discussions in your files, just as well
+              as Microsoft Word and Google Docs.</p>
+          </div>
+          <img class="image" width="395" src="static/landing/discussion.png">
+        </div>
+      </div>
+      <div class="row">
+        <div class="feature">
+          <h3>Write offline!</h3>
+          <p>Even when you travel, StackEdit is still accessible and lets you write offline just like any desktop application.
+            You have no excuse!</p>
+        </div>
+      </div>
+      <h1>Extended Markdown support</h1>
+      <div class="row">
+        <div class="column">
+          <br>
+          <img class="image" width="230" src="static/landing/gfm.png">
+        </div>
+        <div class="column">
+          <div class="feature">
+            <h3>GitHub Flavored Markdown</h3>
+            <p>StackEdit supports different markdown flavors such as Markdown Extra, GFM and CommonMark. Each markdown feature
+              can be enabled or disabled at your convenience.</p>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="column">
+          <br>
+          <img class="image" width="250" src="static/landing/katex.gif">
+        </div>
+        <div class="column">
+          <div class="feature">
+            <h3>LaTeX mathematical expressions</h3>
+            <p>StackEdit renders mathematics from LaTeX expressions inside your markdown file, as you would do on Stack Exchange.</p>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="column">
+          <img class="image" width="280" src="static/landing/mermaid.gif">
+        </div>
+        <div class="column">
+          <div class="feature">
+            <h3>UML diagrams</h3>
+            <p>StackEdit enables you to write sequence diagrams and flow charts using a simple syntax.</p>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="column">
+          <br>
+          <img class="image" width="230" src="static/landing/twemoji.png">
+        </div>
+        <div class="column">
+          <div class="feature">
+            <h3>Emoji Support</h3>
+            <p>StackEdit supports inserting emojis in your markdown document using the Twemoji syntax.</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="landing__footer">
+      <div class="social">
+        <a href="https://twitter.com/stackedit" target="_blank">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
+            <path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "
+            />
+          </svg>
+        </a>
+        <a href="https://github.com/benweet/stackedit" target="_blank">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
+            <path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "
+            />
+          </svg>
+        </a>
+      </div>
+      <a href="app" title="The app">The app</a> –
+      <a href="https://community.stackedit.io" target="_blank" title="The app">Community</a>
+      <br> Copyright 2013-2018
+      <a href="https://twitter.com/benweet" target="_blank">Benoit Schweblin</a>
+      <br> Licensed under an
+      <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a> –
+      <a href="privacy_policy.html" target="_blank">Privacy Policy</a>
+    </div>
+  </div>
+  <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
+    crossorigin="anonymous"></script>
 </body>
 
 </html>

From b3b1010ebdf094f88e9fdc75a1b10fc6461e6d2f Mon Sep 17 00:00:00 2001
From: Felix Wu <mail@flxwu.com>
Date: Wed, 1 Aug 2018 22:52:09 +0200
Subject: [PATCH 12/19] style: undo accidential indentation changes

---
 static/landing/index.html | 794 ++++++++++++++++++--------------------
 1 file changed, 382 insertions(+), 412 deletions(-)

diff --git a/static/landing/index.html b/static/landing/index.html
index 785a4b51..25defd89 100644
--- a/static/landing/index.html
+++ b/static/landing/index.html
@@ -2,457 +2,427 @@
 <html manifest="cache.manifest">
 
 <head>
-  <title>StackEdit – In-browser Markdown editor</title>
-  <link rel="canonical" href="https://stackedit.io/">
-  <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
-  <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
-  <meta charset="UTF-8">
-  <meta name="description" content="Full-featured, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.">
-  <meta name="author" content="Benoit Schweblin">
-  <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
-  <meta name="msvalidate.01" content="5E47EE6F67B069C17E3CDD418351A612">
-  <meta name="google-site-verification" content="iWDn0T2r2_bDQWp_nW23MGePbO9X0M8wQSzbOU70pFQ" />
-  <link rel="stylesheet" href="https://stackedit.io/style.css">
-  <style>
-    * {
-      box-sizing: border-box;
-    }
+    <title>StackEdit – In-browser Markdown editor</title>
+    <link rel="canonical" href="https://stackedit.io/">
+    <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
+    <meta charset="UTF-8">
+    <meta name="description"
+          content="Full-featured, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.">
+    <meta name="author" content="Benoit Schweblin">
+    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="msvalidate.01" content="5E47EE6F67B069C17E3CDD418351A612">
+    <meta name="google-site-verification" content="iWDn0T2r2_bDQWp_nW23MGePbO9X0M8wQSzbOU70pFQ" />
+    <link rel="stylesheet" href="https://stackedit.io/style.css">
+    <style>
+        * {
+            box-sizing: border-box;
+        }
 
-    h1 {
-      font-weight: 400;
-      text-align: center;
-      font-size: 2.5em;
-      margin: 2.5em 0;
-    }
+        h1 {
+            font-weight: 400;
+            text-align: center;
+            font-size: 2.5em;
+            margin: 2.5em 0;
+        }
 
-    h3 {
-      margin: 1em 0;
-    }
+        h3 {
+            margin: 1em 0;
+        }
 
-    .button {
-      color: #555;
-      font-size: 20px;
-      background-color: transparent;
-      display: inline-block;
-      height: auto;
-      padding: 6px 12px;
-      margin: 0;
-      font-weight: 400;
-      line-height: 1.4;
-      text-transform: uppercase;
-      overflow: hidden;
-      text-align: center;
-      white-space: nowrap;
-      vertical-align: middle;
-      -ms-touch-action: manipulation;
-      touch-action: manipulation;
-      cursor: pointer;
-      -webkit-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-      background-image: none;
-      border: 0;
-      border-radius: 2px;
-      text-decoration: none;
-    }
+        .button {
+            color: #555;
+            font-size: 20px;
+            background-color: transparent;
+            display: inline-block;
+            height: auto;
+            padding: 6px 12px;
+            margin: 0;
+            font-weight: 400;
+            line-height: 1.4;
+            text-transform: uppercase;
+            overflow: hidden;
+            text-align: center;
+            white-space: nowrap;
+            vertical-align: middle;
+            -ms-touch-action: manipulation;
+            touch-action: manipulation;
+            cursor: pointer;
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -ms-user-select: none;
+            user-select: none;
+            background-image: none;
+            border: 0;
+            border-radius: 2px;
+            text-decoration: none;
+        }
 
-    .button:active,
-    .button:focus,
-    .button:hover {
-      color: #333;
-      background-color: rgba(0, 0, 0, 0.05);
-      outline: 0;
-      text-decoration: none;
-    }
+        .button:active,
+        .button:focus,
+        .button:hover {
+            color: #333;
+            background-color: rgba(0, 0, 0, 0.05);
+            outline: 0;
+            text-decoration: none;
+        }
 
-    .icon {
-      width: 100%;
-      height: 100%;
-    }
+        .icon {
+            width: 100%;
+            height: 100%;
+        }
 
-    .icon * {
-      fill: currentColor;
-    }
+        .icon * {
+            fill: currentColor;
+        }
 
-    .button .icon {
-      height: 30px;
-      width: 30px;
-      margin: -6px 6px -6px 0;
-    }
+        .button .icon {
+            height: 30px;
+            width: 30px;
+            margin: -6px 6px -6px 0;
+        }
 
-    .row {
-      margin: 8em 0;
-    }
+        .row {
+            margin: 8em 0;
+        }
 
-    .row::after {
-      display: block;
-      content: '';
-      clear: both;
-    }
+        .row::after {
+            display: block;
+            content: '';
+            clear: both;
+        }
 
-    @media (min-width: 700px) {
-      .column {
-        width: 50%;
-        float: right;
-      }
-    }
+        @media (min-width: 700px) {
+            .column {
+                width: 50%;
+                float: right;
+            }
+        }
 
-    .landing {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-    }
+        .landing {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+        }
 
-    .landing__content {
-      margin-left: auto;
-      margin-right: auto;
-      padding-left: 30px;
-      padding-right: 30px;
-      max-width: 1000px;
-    }
+        .landing__content {
+            margin-left: auto;
+            margin-right: auto;
+            padding-left: 30px;
+            padding-right: 30px;
+            max-width: 1000px;
+        }
 
-    .landing__footer {
-      padding: 1em 0;
-      text-align: center;
-      background-color: #007acc;
-      color: rgba(255, 255, 255, 0.75);
-      font-size: 0.9em;
-    }
+        .landing__footer {
+            padding: 1em 0;
+            text-align: center;
+            background-color: #007acc;
+            color: rgba(255, 255, 255, 0.75);
+            font-size: 0.9em;
+        }
 
-    .landing__footer a {
-      color: #fff;
-    }
+        .landing__footer a {
+            color: #fff;
+        }
 
-    .navigation-bar {
-      background-color: #2c2c2c;
-      position: fixed;
-      padding: 5px;
-      text-align: center;
-      width: 100%;
-      z-index: 1;
-    }
+        .navigation-bar {
+            background-color: #2c2c2c;
+            position: fixed;
+            padding: 5px;
+            text-align: center;
+            width: 100%;
+            z-index: 1;
+        }
 
-    .navigation-bar__button {
-      color: #b9b9b9;
-    }
+        .navigation-bar__button {
+            color: #b9b9b9;
+        }
 
-    .navigation-bar__button:active,
-    .navigation-bar__button:focus,
-    .navigation-bar__button:hover {
-      color: #fff;
-      background-color: rgba(255, 255, 255, 0.1);
-    }
+        .navigation-bar__button:active,
+        .navigation-bar__button:focus,
+        .navigation-bar__button:hover {
+            color: #fff;
+            background-color: rgba(255, 255, 255, 0.1);
+        }
 
-    .splash-screen {
-      position: relative;
-      width: 100%;
-      height: 100%;
-      padding: 25px;
-    }
+        .splash-screen {
+            position: relative;
+            width: 100%;
+            height: 100%;
+            padding: 25px;
+        }
 
-    .splash-screen__logo {
-      width: 300px;
-      height: 150px;
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      margin: auto;
-      background: no-repeat center url('static/landing/logo.svg');
-      background-size: contain;
-    }
+        .splash-screen__logo {
+            width: 300px;
+            height: 150px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+            background: no-repeat center url('static/landing/logo.svg');
+            background-size: contain;
+        }
 
-    @media (min-width: 700px) {
-      .splash-screen__logo {
-        width: 600px;
-        height: 160px;
-      }
-    }
+        @media (min-width: 700px) {
+            .splash-screen__logo {
+                width: 600px;
+                height: 160px;
+            }
+        }
 
-    .splash-screen__subtitle {
-      position: absolute;
-      text-align: center;
-      color: #777;
-      top: 95px;
-      right: 5px;
-      font-size: 16px;
-    }
+        .splash-screen__subtitle {
+            position: absolute;
+            text-align: center;
+            color: #777;
+            top: 95px;
+            right: 5px;
+            font-size: 16px;
+        }
 
-    @media (min-width: 700px) {
-      .splash-screen__subtitle {
-        text-align: right;
-        top: 125px;
-        font-size: 22px;
-      }
-    }
+        @media (min-width: 700px) {
+            .splash-screen__subtitle {
+                text-align: right;
+                top: 125px;
+                font-size: 22px;
+            }
+        }
 
-    .splash-screen__footer {
-      position: absolute;
-      bottom: 25px;
-      left: 0;
-      width: 100%;
-      text-align: center;
-    }
+        .splash-screen__footer {
+            position: absolute;
+            bottom: 25px;
+            left: 0;
+            width: 100%;
+            text-align: center;
+        }
 
-    .splash-screen__footer .button {
-      padding: 10px 20px;
-    }
+        .splash-screen__footer .button {
+            padding: 10px 20px;
+        }
 
-    .social {
-      margin: 0 5px;
-    }
+        .social {
+            margin: 0 5px;
+        }
 
-    .social a {
-      color: #555;
-      text-decoration: none;
-    }
+        .social a {
+            color: #555;
+            text-decoration: none;
+        }
 
-    .social a:active,
-    .social a:focus,
-    .social a:hover {
-      color: #333;
-      outline: 0;
-    }
+        .social a:active,
+        .social a:focus,
+        .social a:hover {
+            color: #333;
+            outline: 0;
+        }
 
-    .landing__footer .social a {
-      color: rgba(255, 255, 255, 0.85);
-    }
+        .landing__footer .social a {
+            color: rgba(255, 255, 255, 0.85);
+        }
 
-    .landing__footer .social a:active,
-    .landing__footer .social a:focus,
-    .landing__footer .social a:hover {
-      color: #fff;
-    }
+        .landing__footer .social a:active,
+        .landing__footer .social a:focus,
+        .landing__footer .social a:hover {
+            color: #fff;
+        }
 
 
-    .social .icon {
-      height: 30px;
-      width: 30px;
-    }
+        .social .icon {
+            height: 30px;
+            width: 30px;
+        }
 
-    .feature {
-      padding: 5px 5px;
-      border-radius: 2px;
-      max-width: 350px;
-      margin: 1em auto;
-      text-align: center;
-    }
+        .feature {
+            padding: 5px 5px;
+            border-radius: 2px;
+            max-width: 350px;
+            margin: 1em auto;
+            text-align: center;
+        }
 
-    .image {
-      display: block;
-      margin: 1em auto;
-      border-radius: 2px;
-    }
-  </style>
-  <script>
-    function scrollTo(selector) {
-      $('html,body').animate({ scrollTop: $(selector).offset().top }, 500);
-    }
-  </script>
+        .image {
+            display: block;
+            margin: 1em auto;
+            border-radius: 2px;
+        }
+    </style>
+    <script>
+        function scrollTo(selector) {
+            $('html,body').animate({scrollTop: $(selector).offset().top}, 500);
+        }
+    </script>
 </head>
 
 <body>
-  <div class="landing">
-    <div class="navigation-bar">
-      <a class="navigation-bar__button button" href="app" title="The app">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
-          <path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path>
-        </svg>
-        Start writing
-      </a>
-    </div>
-    <div class="splash-screen">
-      <div class="splash-screen__logo">
-        <div class="splash-screen__subtitle">
-          In-browser Markdown editor
+    <div class="landing">
+        <div class="navigation-bar">
+            <a class="navigation-bar__button button" href="app" title="The app">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path></svg>
+                Start writing
+            </a>
+        </div>
+        <div class="splash-screen">
+            <div class="splash-screen__logo">
+                <div class="splash-screen__subtitle">
+                    In-browser Markdown editor
 
-          <div class="social">
-            <a href="https://twitter.com/stackedit" target="_blank">
-              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
-                <path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "
-                />
-              </svg>
-            </a>
-            <a href="https://github.com/benweet/stackedit" target="_blank">
-              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
-                <path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "
-                />
-              </svg>
-            </a>
-          </div>
+                    <div class="social">
+                        <a href="https://twitter.com/stackedit" target="_blank">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "/></svg>
+                        </a>
+                        <a href="https://github.com/benweet/stackedit" target="_blank">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "/></svg>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="splash-screen__footer">
+                <a class="button" href="javascript:scrollTo($('.anchor'))">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "/></path></svg>
+                    Read more
+                </a>
+            </div>
+        </div>
+        <div class="anchor"></div>
+        <div class="landing__content">
+            <h1>Unrivalled writing experience</h1>
+            <div class="row">
+                <div class="column">
+                    <div class="feature">
+                        <h3>Rich Markdown editor</h3>
+                        <p>StackEdit’s Markdown syntax highlighting is unique. The refined text formatting of the editor helps you visualize the final rendering of your files.</p>
+                    </div>
+                </div>
+                <div class="column">
+                    <img class="image" width="230" src="static/landing/syntax-highlighting.gif">
+                </div>
+            </div>
+            <div class="row">
+                <img class="image" width="410" src="static/landing/navigation-bar.png">
+                <div class="feature">
+                    <h3>WYSIWYG controls</h3>
+                    <p>StackEdit provides very handy formatting buttons and shortcuts, thanks to PageDown, the WYSIWYG-style Markdown editor used by Stack Overflow.</p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="column">
+                    <div class="feature">
+                        <h3>Smart layout</h3>
+                        <p>Whether you write, you review, you comment… StackEdit's layout provides you with the flexibility you need, without sacrifice.</p>
+                    </div>
+                </div>
+                <div class="column">
+                    <img class="image" width="360" src="static/landing/smart-layout.png">
+                </div>
+            </div>
+            <div class="row">
+                <div class="feature">
+                    <h3>Live preview with Scroll Sync</h3>
+                    <p>StackEdit’s Scroll Sync feature accurately binds the scrollbars of the editor panel and the preview panel to ensure that you always keep an eye on the output while writing.</p>
+                </div>
+                <img class="image" width="485" src="static/landing/scroll-sync.gif">
+            </div>
+            <h1>Designed for web writers</h1>
+            <div class="row">
+                <div class="column">
+                    <div class="feature">
+                        <h3>Stay connected</h3>
+                        <p>StackEdit can sync your files with Google Drive, Dropbox and GitHub. It can also publish them as blog posts to Blogger, WordPress and Zendesk. You can choose whether to upload in Markdown format, HTML, or to format the output using the Handlebars template engine.</p>
+                    </div>
+                </div>
+                <div class="column">
+                    <img class="image" width="300" src="static/landing/providers.png">
+                </div>
+            </div>
+            <div class="row">
+                <div class="column">
+                    <div class="feature">
+                        <h3>Collaborate</h3>
+                        <p>With StackEdit, you can share collaborative workspaces, thanks to the Google Drive synchronization mechanism. If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.</p>
+                    </div>
+                    <img class="image" width="300" src="static/landing/workspace.png">
+                </div>
+                <div class="column">
+                    <div class="feature">
+                        <h3>Comment</h3>
+                        <p>StackEdit allows you to insert inline comments and embed collaborator discussions in your files, just as well as Microsoft Word and Google Docs.</p>
+                    </div>
+                    <img class="image" width="395" src="static/landing/discussion.png">
+                </div>
+            </div>
+            <div class="row">
+                <div class="feature">
+                    <h3>Write offline!</h3>
+                    <p>Even when you travel, StackEdit is still accessible and lets you write offline just like any desktop application. You have no excuse!</p>
+                </div>
+            </div>
+            <h1>Extended Markdown support</h1>
+            <div class="row">
+                <div class="column">
+                    <br>
+                    <img class="image" width="230" src="static/landing/gfm.png">
+                </div>
+                <div class="column">
+                    <div class="feature">
+                        <h3>GitHub Flavored Markdown</h3>
+                        <p>StackEdit supports different markdown flavors such as Markdown Extra, GFM and CommonMark. Each markdown feature can be enabled or disabled at your convenience.</p>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="column">
+                    <br>
+                    <img class="image" width="250" src="static/landing/katex.gif">
+                </div>
+                <div class="column">
+                    <div class="feature">
+                        <h3>LaTeX mathematical expressions</h3>
+                        <p>StackEdit renders mathematics from LaTeX expressions inside your markdown file, as you would do on Stack Exchange.</p>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="column">
+                    <img class="image" width="280" src="static/landing/mermaid.gif">
+                </div>
+                <div class="column">
+                    <div class="feature">
+                        <h3>UML diagrams</h3>
+                        <p>StackEdit enables you to write sequence diagrams and flow charts using a simple syntax.</p>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+              <div class="column">
+                <br>
+                <img class="image" width="230" src="static/landing/twemoji.png">
+              </div>
+              <div class="column">
+                <div class="feature">
+                  <h3>Emoji Support</h3>
+                  <p>StackEdit supports inserting emojis in your markdown document using the Twemoji syntax.</p>
+                </div>
+              </div>
+            </div>
+        </div>
+        <div class="landing__footer">
+            <div class="social">
+                <a href="https://twitter.com/stackedit" target="_blank">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "/></svg>
+                </a>
+                <a href="https://github.com/benweet/stackedit" target="_blank">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "/></svg>
+                </a>
+            </div>
+            <a href="app" title="The app">The app</a> – <a href="https://community.stackedit.io" target="_blank" title="The app">Community</a><br>
+            Copyright 2013-2018 <a href="https://twitter.com/benweet" target="_blank">Benoit Schweblin</a><br>
+            Licensed under an
+            <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a> –
+            <a href="privacy_policy.html" target="_blank">Privacy Policy</a>
         </div>
-      </div>
-      <div class="splash-screen__footer">
-        <a class="button" href="javascript:scrollTo($('.anchor'))">
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
-            <path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "
-            /></path>
-          </svg>
-          Read more
-        </a>
-      </div>
     </div>
-    <div class="anchor"></div>
-    <div class="landing__content">
-      <h1>Unrivalled writing experience</h1>
-      <div class="row">
-        <div class="column">
-          <div class="feature">
-            <h3>Rich Markdown editor</h3>
-            <p>StackEdit’s Markdown syntax highlighting is unique. The refined text formatting of the editor helps you visualize
-              the final rendering of your files.</p>
-          </div>
-        </div>
-        <div class="column">
-          <img class="image" width="230" src="static/landing/syntax-highlighting.gif">
-        </div>
-      </div>
-      <div class="row">
-        <img class="image" width="410" src="static/landing/navigation-bar.png">
-        <div class="feature">
-          <h3>WYSIWYG controls</h3>
-          <p>StackEdit provides very handy formatting buttons and shortcuts, thanks to PageDown, the WYSIWYG-style Markdown
-            editor used by Stack Overflow.</p>
-        </div>
-      </div>
-      <div class="row">
-        <div class="column">
-          <div class="feature">
-            <h3>Smart layout</h3>
-            <p>Whether you write, you review, you comment… StackEdit's layout provides you with the flexibility you need, without
-              sacrifice.
-            </p>
-          </div>
-        </div>
-        <div class="column">
-          <img class="image" width="360" src="static/landing/smart-layout.png">
-        </div>
-      </div>
-      <div class="row">
-        <div class="feature">
-          <h3>Live preview with Scroll Sync</h3>
-          <p>StackEdit’s Scroll Sync feature accurately binds the scrollbars of the editor panel and the preview panel to ensure
-            that you always keep an eye on the output while writing.</p>
-        </div>
-        <img class="image" width="485" src="static/landing/scroll-sync.gif">
-      </div>
-      <h1>Designed for web writers</h1>
-      <div class="row">
-        <div class="column">
-          <div class="feature">
-            <h3>Stay connected</h3>
-            <p>StackEdit can sync your files with Google Drive, Dropbox and GitHub. It can also publish them as blog posts to
-              Blogger, WordPress and Zendesk. You can choose whether to upload in Markdown format, HTML, or to format the
-              output using the Handlebars template engine.</p>
-          </div>
-        </div>
-        <div class="column">
-          <img class="image" width="300" src="static/landing/providers.png">
-        </div>
-      </div>
-      <div class="row">
-        <div class="column">
-          <div class="feature">
-            <h3>Collaborate</h3>
-            <p>With StackEdit, you can share collaborative workspaces, thanks to the Google Drive synchronization mechanism.
-              If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.</p>
-          </div>
-          <img class="image" width="300" src="static/landing/workspace.png">
-        </div>
-        <div class="column">
-          <div class="feature">
-            <h3>Comment</h3>
-            <p>StackEdit allows you to insert inline comments and embed collaborator discussions in your files, just as well
-              as Microsoft Word and Google Docs.</p>
-          </div>
-          <img class="image" width="395" src="static/landing/discussion.png">
-        </div>
-      </div>
-      <div class="row">
-        <div class="feature">
-          <h3>Write offline!</h3>
-          <p>Even when you travel, StackEdit is still accessible and lets you write offline just like any desktop application.
-            You have no excuse!</p>
-        </div>
-      </div>
-      <h1>Extended Markdown support</h1>
-      <div class="row">
-        <div class="column">
-          <br>
-          <img class="image" width="230" src="static/landing/gfm.png">
-        </div>
-        <div class="column">
-          <div class="feature">
-            <h3>GitHub Flavored Markdown</h3>
-            <p>StackEdit supports different markdown flavors such as Markdown Extra, GFM and CommonMark. Each markdown feature
-              can be enabled or disabled at your convenience.</p>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="column">
-          <br>
-          <img class="image" width="250" src="static/landing/katex.gif">
-        </div>
-        <div class="column">
-          <div class="feature">
-            <h3>LaTeX mathematical expressions</h3>
-            <p>StackEdit renders mathematics from LaTeX expressions inside your markdown file, as you would do on Stack Exchange.</p>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="column">
-          <img class="image" width="280" src="static/landing/mermaid.gif">
-        </div>
-        <div class="column">
-          <div class="feature">
-            <h3>UML diagrams</h3>
-            <p>StackEdit enables you to write sequence diagrams and flow charts using a simple syntax.</p>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="column">
-          <br>
-          <img class="image" width="230" src="static/landing/twemoji.png">
-        </div>
-        <div class="column">
-          <div class="feature">
-            <h3>Emoji Support</h3>
-            <p>StackEdit supports inserting emojis in your markdown document using the Twemoji syntax.</p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="landing__footer">
-      <div class="social">
-        <a href="https://twitter.com/stackedit" target="_blank">
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
-            <path d="M 22.4592,6.01238C 21.6896,6.35373 20.8624,6.58442 19.9944,6.68815C 20.8803,6.15701 21.5609,5.31598 21.8813,4.31378C 21.052,4.80564 20.1336,5.16278 19.156,5.3552C 18.3732,4.52112 17.2579,4 16.0235,4C 13.6534,4 11.7317,5.92147 11.7317,8.29155C 11.7317,8.6279 11.7697,8.95546 11.8429,9.2696C 8.2761,9.0906 5.11376,7.38203 2.9971,4.78551C 2.62766,5.41935 2.41602,6.15656 2.41602,6.94309C 2.41602,8.43204 3.17365,9.74563 4.32524,10.5153C 3.6218,10.4929 2.95997,10.2999 2.3814,9.97846C 2.38099,9.99639 2.38099,10.0143 2.38099,10.0324C 2.38099,12.1118 3.86034,13.8463 5.8236,14.2406C 5.4635,14.3387 5.08435,14.3912 4.69295,14.3912C 4.41641,14.3912 4.14756,14.3642 3.88547,14.3142C 4.43162,16.0191 6.01654,17.26 7.89455,17.2945C 6.42577,18.4457 4.57528,19.1318 2.56454,19.1318C 2.21813,19.1318 1.87652,19.1114 1.54078,19.0717C 3.44004,20.2894 5.69592,21 8.11951,21C 16.0134,21 20.3302,14.4605 20.3302,8.78918C 20.3302,8.60314 20.326,8.41805 20.3177,8.23395C 21.1563,7.62886 21.8839,6.87302 22.4592,6.01238 Z "
-            />
-          </svg>
-        </a>
-        <a href="https://github.com/benweet/stackedit" target="_blank">
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
-            <path d="M 11.9991,2C 6.47774,2 2.00001,6.47712 2.00001,12.0006C 2.00001,16.4184 4.86504,20.1665 8.83877,21.489C 9.33909,21.5807 9.52142,21.272 9.52142,21.007C 9.52142,20.7696 9.51282,20.1407 9.50791,19.3062C 6.72636,19.9105 6.13948,17.9657 6.13948,17.9657C 5.68459,16.8105 5.02895,16.5029 5.02895,16.5029C 4.121,15.8824 5.09771,15.895 5.09771,15.895C 6.10143,15.9657 6.62936,16.9256 6.62936,16.9256C 7.52135,18.4537 8.97014,18.0125 9.53984,17.7565C 9.63069,17.1102 9.88914,16.6696 10.1746,16.4196C 7.95415,16.1672 5.61952,15.3093 5.61952,11.4773C 5.61952,10.3856 6.00934,9.49292 6.64902,8.79388C 6.54588,8.54089 6.20271,7.52417 6.74723,6.14739C 6.74723,6.14739 7.58643,5.87851 9.49686,7.17252C 10.2943,6.95073 11.1501,6.8398 12.0003,6.83594C 12.8499,6.8398 13.7051,6.95073 14.5038,7.17252C 16.413,5.87851 17.2509,6.14739 17.2509,6.14739C 17.7967,7.52417 17.4535,8.54089 17.351,8.79388C 17.9919,9.49292 18.3787,10.3856 18.3787,11.4773C 18.3787,15.3189 16.0403,16.1642 13.8131,16.4118C 14.1717,16.7205 14.4915,17.3308 14.4915,18.2637C 14.4915,19.6005 14.4792,20.6791 14.4792,21.007C 14.4792,21.2744 14.6597,21.5855 15.1668,21.4878C 19.1374,20.1629 22,16.4172 22,12.0006C 22,6.47712 17.5223,2 11.9991,2 Z "
-            />
-          </svg>
-        </a>
-      </div>
-      <a href="app" title="The app">The app</a> –
-      <a href="https://community.stackedit.io" target="_blank" title="The app">Community</a>
-      <br> Copyright 2013-2018
-      <a href="https://twitter.com/benweet" target="_blank">Benoit Schweblin</a>
-      <br> Licensed under an
-      <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a> –
-      <a href="privacy_policy.html" target="_blank">Privacy Policy</a>
-    </div>
-  </div>
-  <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
-    crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
 </body>
 
 </html>

From bdb01f407b78bcce62c6038a936252b6494992ce Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Thu, 9 Aug 2018 16:42:17 +0100
Subject: [PATCH 13/19] Fixed test

---
 src/components/Modal.vue                      |  2 +-
 src/components/menus/WorkspacesMenu.vue       |  2 +-
 .../modals/WorkspaceManagementModal.vue       |  2 +-
 src/components/modals/common/ModalInner.vue   |  8 ++---
 .../providers/githubWorkspaceProvider.js      | 14 ++++----
 src/services/syncSvc.js                       | 34 ++++++++++---------
 test/unit/specs/components/Explorer.spec.js   |  7 ++--
 .../specs/components/ExplorerNode.spec.js     | 12 +++----
 8 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index ece267f0..ecddac6f 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -198,7 +198,7 @@ export default {
 .modal__inner-2 {
   margin: 40px 10px 100px;
   background-color: #f8f8f8;
-  padding: 40px 50px 30px;
+  padding: 50px 50px 40px;
   border-radius: $border-radius-base;
   position: relative;
   overflow: hidden;
diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue
index 24b230da..ad252cce 100644
--- a/src/components/menus/WorkspacesMenu.vue
+++ b/src/components/menus/WorkspacesMenu.vue
@@ -10,7 +10,7 @@
     <menu-entry @click.native="addCouchdbWorkspace">
       <icon-provider slot="icon" provider-id="couchdbWorkspace"></icon-provider>
       <div>CouchDB workspace</div>
-      <span>Add a workspace synced with your CouchDB database.</span>
+      <span>Add a workspace synced with a CouchDB database.</span>
     </menu-entry>
     <menu-entry @click.native="addGithubWorkspace">
       <icon-provider slot="icon" provider-id="githubWorkspace"></icon-provider>
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 43356c35..2f5a2df7 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -51,7 +51,7 @@
         </div>
       </div>
       <div class="modal__info">
-        <b>ProTip:</b> Workspaces are accessible <b>offline</b> after their first use.
+        <b>ProTip:</b> A workspace is accessible <b>offline</b> once it has been opened for the first time.
       </div>
     </div>
     <div class="modal__button-bar">
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index 89bd9533..e54bfe6e 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -51,11 +51,11 @@ export default {
 
 .modal__close-button {
   position: absolute;
-  top: 7px;
-  right: 7px;
+  top: 8px;
+  right: 8px;
   color: rgba(0, 0, 0, 0.5);
-  width: 30px;
-  height: 30px;
+  width: 32px;
+  height: 32px;
   padding: 2px;
 
   &:active,
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index 5d73c524..0eeef84b 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -144,11 +144,11 @@ export default new Provider({
       let itemId = idsByPath[path];
       if (!itemId) {
         const existingItemId = itemIdsByGitPath[path];
-        // We can replace the item only if it was already synced
         if (existingItemId
-          && (syncDataByPath[path]
-          // Content may have already be synced
-          || (isFile && syncDataByPath[`/${path}`]))
+          // Reuse a file ID only if it has already been synced
+          && (!isFile || syncDataByPath[path]
+          // Content may have already been synced
+          || syncDataByPath[`/${path}`])
         ) {
           itemId = existingItemId;
         } else {
@@ -332,7 +332,7 @@ export default new Provider({
 
     // Files and folders are not in git, only contents
     if (item.type === 'file' || item.type === 'folder') {
-      return syncData;
+      return { syncData };
     }
 
     // locations are stored as paths, so we upload an empty file
@@ -346,9 +346,7 @@ export default new Provider({
     });
 
     // Return sync data to save
-    return {
-      syncData,
-    };
+    return { syncData };
   },
   async removeWorkspaceItem({ syncData }) {
     if (treeShaMap[syncData.id]) {
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index b3f4bd07..88dcab87 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -649,19 +649,22 @@ const syncWorkspace = async (skipContents = false) => {
       };
 
       const syncDataByItemId = store.getters['data/syncDataByItemId'];
+      const isGit = !!store.getters['workspace/currentWorkspaceIsGit'];
       const [changedItem, syncDataToUpdate] = utils.someResult(
         Object.entries(storeItemMap),
         ([id, item]) => {
           const syncData = syncDataByItemId[id];
-          if ((!syncData || syncData.hash !== item.hash)
-            // Add file/folder if parent has been added
-            && (!storeItemMap[item.parentId] || syncDataByItemId[item.parentId])
-            // Add file if content has been added
-            && (item.type !== 'file' || syncDataByItemId[`${id}/content`])
+          if ((syncData && syncData.hash === item.hash)
+            // Add file/folder only if parent folder has been added
+            || (!isGit && storeItemMap[item.parentId] && !syncDataByItemId[item.parentId])
+            // Don't create folder if it's a git workspace
+            || (isGit && item.type === 'folder')
+            // Add file only if content has been added
+            || (item.type === 'file' && !syncDataByItemId[`${id}/content`])
           ) {
-            return [item, syncData];
+            return null;
           }
-          return null;
+          return [item, syncData];
         },
       ) || [];
 
@@ -695,16 +698,15 @@ const syncWorkspace = async (skipContents = false) => {
       const syncDataToRemove = utils.deepCopy(utils.someResult(
         Object.values(syncDataById),
         (syncData) => {
-          if (!getItem(syncData)
+          if (getItem(syncData)
             // We don't want to delete data items, especially on first sync
-            && syncData.type !== 'data'
+            || syncData.type === 'data'
             // Remove content only if file has been removed
-            && (syncData.type !== 'content'
-              || !getFileItem(syncData))
+            || (syncData.type === 'content' && getFileItem(syncData))
           ) {
-            return syncData;
+            return null;
           }
-          return null;
+          return syncData;
         },
       ));
 
@@ -714,9 +716,9 @@ const syncWorkspace = async (skipContents = false) => {
         syncData: syncDataToRemove,
         ifNotTooLate,
       });
-      const syncDataCopy = { ...store.getters['data/syncDataById'] };
-      delete syncDataCopy[syncDataToRemove.id];
-      store.dispatch('data/setSyncDataById', syncDataCopy);
+      const syncDataByIdCopy = { ...store.getters['data/syncDataById'] };
+      delete syncDataByIdCopy[syncDataToRemove.id];
+      store.dispatch('data/setSyncDataById', syncDataByIdCopy);
       return true;
     }));
 
diff --git a/test/unit/specs/components/Explorer.spec.js b/test/unit/specs/components/Explorer.spec.js
index 94c236c1..8bb88a2f 100644
--- a/test/unit/specs/components/Explorer.spec.js
+++ b/test/unit/specs/components/Explorer.spec.js
@@ -11,6 +11,7 @@ const select = (id) => {
 };
 const ensureExists = file => expect(store.getters.allItemsById).toHaveProperty(file.id);
 const ensureNotExists = file => expect(store.getters.allItemsById).not.toHaveProperty(file.id);
+const refreshItem = item => store.getters.allItemsById[item.id];
 
 describe('Explorer.vue', () => {
   it('should create new files in the root folder', () => {
@@ -25,7 +26,7 @@ describe('Explorer.vue', () => {
   });
 
   it('should create new files in a folder', async () => {
-    const folder = await fileSvc.storeItem({ type: 'folder' });
+    const folder = await workspaceSvc.storeItem({ type: 'folder' });
     const wrapper = mount();
     select(folder.id);
     wrapper.find('.side-title__button--new-file').trigger('click');
@@ -94,7 +95,7 @@ describe('Explorer.vue', () => {
     select(file.id);
     wrapper.find('.side-title__button--delete').trigger('click');
     ensureExists(file);
-    expect(file.parentId).toEqual('trash');
+    expect(refreshItem(file).parentId).toEqual('trash');
   });
 
   it('should not delete the trash folder', async () => {
@@ -142,7 +143,7 @@ describe('Explorer.vue', () => {
     ensureNotExists(folder);
     // Make sure file has been moved to Trash
     ensureExists(file);
-    expect(file.parentId).toEqual('trash');
+    expect(refreshItem(file).parentId).toEqual('trash');
   });
 
   it('should rename files', async () => {
diff --git a/test/unit/specs/components/ExplorerNode.spec.js b/test/unit/specs/components/ExplorerNode.spec.js
index f66b1cb3..beb5827b 100644
--- a/test/unit/specs/components/ExplorerNode.spec.js
+++ b/test/unit/specs/components/ExplorerNode.spec.js
@@ -81,16 +81,16 @@ describe('ExplorerNode.vue', () => {
     const wrapper = mount(node);
     wrapper.trigger('contextmenu');
     await specUtils.resolveContextMenu('New file');
-    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(true);
+    expect(wrapper.contains('.explorer-node__new-child')).toBe(true);
     store.commit('explorer/setNewItemName', modifiedName);
-    wrapper.find('.explorer-node__new-child--file .text-input').trigger('blur');
+    wrapper.find('.explorer-node__new-child .text-input').trigger('blur');
     await new Promise(resolve => setTimeout(resolve, 1));
     expect(store.getters['explorer/selectedNode'].item).toMatchObject({
       name: modifiedName,
       type: 'file',
       parentId: node.item.id,
     });
-    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(false);
+    expect(wrapper.contains('.explorer-node__new-child')).toBe(false);
   });
 
   it('should cancel a file creation on escape', async () => {
@@ -98,9 +98,9 @@ describe('ExplorerNode.vue', () => {
     const wrapper = mount(node);
     wrapper.trigger('contextmenu');
     await specUtils.resolveContextMenu('New file');
-    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(true);
+    expect(wrapper.contains('.explorer-node__new-child')).toBe(true);
     store.commit('explorer/setNewItemName', modifiedName);
-    wrapper.find('.explorer-node__new-child--file .text-input').trigger('keydown', {
+    wrapper.find('.explorer-node__new-child .text-input').trigger('keydown', {
       keyCode: 27,
     });
     await new Promise(resolve => setTimeout(resolve, 1));
@@ -109,7 +109,7 @@ describe('ExplorerNode.vue', () => {
       type: 'file',
       parentId: node.item.id,
     });
-    expect(wrapper.contains('.explorer-node__new-child--file')).toBe(false);
+    expect(wrapper.contains('.explorer-node__new-child')).toBe(false);
   });
 
   it('should not create new files in a file', async () => {

From d4624eba9d015d95dcee8eaedfe9e568a17f4d8e Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Fri, 17 Aug 2018 11:13:08 +0100
Subject: [PATCH 14/19] Fixed publishing

---
 Dockerfile                                    |  4 +-
 src/components/App.vue                        |  4 +-
 src/components/Tour.vue                       | 10 +-
 src/components/menus/ImportMenu.vue           |  2 +-
 src/components/menus/MoreMenu.vue             |  7 +-
 src/components/menus/common/MenuEntry.vue     |  2 +-
 .../modals/PublishManagementModal.vue         | 99 ++++++++++++++-----
 .../providers/GoogleDrivePublishModal.vue     |  4 +-
 .../providers/WordpressPublishModal.vue       |  2 +-
 src/services/localDbSvc.js                    |  3 +-
 .../providers/helpers/wordpressHelper.js      |  2 +-
 src/store/explorer.js                         | 13 +++
 src/store/index.js                            | 38 +++----
 13 files changed, 121 insertions(+), 69 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ccd975ca..7f061f40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,9 @@ ENV V4_VERSION 4.3.22
 RUN npm pack stackedit@$V4_VERSION \
   && tar xzf stackedit-*.tgz --strip 1 \
   && yarn \
-  && yarn cache clean
+  && yarn cache clean \
+  && rm -rf ~/.cache/bower \
+  && rm -rf ~/.local/share/bower
 
 WORKDIR /opt/stackedit
 
diff --git a/src/components/App.vue b/src/components/App.vue
index a38bc58b..033eed02 100644
--- a/src/components/App.vue
+++ b/src/components/App.vue
@@ -53,7 +53,9 @@ export default {
       this.ready = true;
       tempFileSvc.setReady();
     } catch (err) {
-      if (err && err.message !== 'RELOAD') {
+      if (err && err.message === 'RELOAD') {
+        window.location.reload();
+      } else if (err && err.message !== 'RELOAD') {
         console.error(err); // eslint-disable-line no-console
         this.$store.dispatch('notification/error', err);
       }
diff --git a/src/components/Tour.vue b/src/components/Tour.vue
index e5ab19c4..d1704c18 100644
--- a/src/components/Tour.vue
+++ b/src/components/Tour.vue
@@ -12,7 +12,7 @@
       </div>
       <div class="tour-step__inner" v-else-if="step === 'editor'">
         <h2>Your Markdown editor</h2>
-        <p>StackEdit renders your Markdown into HTML in real-time.</p>
+        <p>StackEdit converts your Markdown to HTML in real-time.</p>
         <p>Click <icon-side-preview></icon-side-preview> to toggle the side preview.</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">Skip</button>
@@ -144,7 +144,7 @@ $tour-step-width: 240px;
 .tour-step__inner {
   position: absolute;
   background-color: $tour-step-background;
-  padding: 1em;
+  padding: 1.5em;
   font-size: 0.9em;
   line-height: 1.33;
   width: $tour-step-width;
@@ -213,8 +213,10 @@ $tour-step-width: 240px;
 }
 
 .tour-step__button-bar {
-  margin-top: 1.75em;
-  text-align: right;
+  margin-top: 1.5em;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
 
   .button {
     font-size: 1.1em;
diff --git a/src/components/menus/ImportMenu.vue b/src/components/menus/ImportMenu.vue
index 39b80635..3d637ef5 100644
--- a/src/components/menus/ImportMenu.vue
+++ b/src/components/menus/ImportMenu.vue
@@ -7,7 +7,7 @@
       </div>
       <div class="flex flex--column">
         <div>Import Markdown</div>
-        <span>Open a plain text file.</span>
+        <span>Import a plain text file.</span>
       </div>
     </label>
     <input class="hidden-file" id="import-html-file-input" type="file" @change="onImportHtml">
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 19fb3d52..a8d1da87 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -77,11 +77,8 @@ export default {
         ...utils.queryParams,
         exportWorkspace: true,
       }, true);
-      const iframeElt = utils.createHiddenIframe(url);
-      document.body.appendChild(iframeElt);
-      setTimeout(() => {
-        document.body.removeChild(iframeElt);
-      }, 60000);
+      window.location.href = url;
+      window.location.reload(true);
     },
     async settings() {
       try {
diff --git a/src/components/menus/common/MenuEntry.vue b/src/components/menus/common/MenuEntry.vue
index bde5c7d1..00072d09 100644
--- a/src/components/menus/common/MenuEntry.vue
+++ b/src/components/menus/common/MenuEntry.vue
@@ -24,7 +24,7 @@
   span {
     display: inline-block;
     font-size: 0.75rem;
-    opacity: 0.6;
+    opacity: 0.67;
     line-height: 1.3;
 
     .menu-entry__label {
diff --git a/src/components/modals/PublishManagementModal.vue b/src/components/modals/PublishManagementModal.vue
index ccdbb71c..8cd2ff94 100644
--- a/src/components/modals/PublishManagementModal.vue
+++ b/src/components/modals/PublishManagementModal.vue
@@ -7,20 +7,32 @@
       <p v-if="publishLocations.length"><b>{{currentFileName}}</b> is published to the following location(s):</p>
       <p v-else><b>{{currentFileName}}</b> is not published yet.</p>
       <div>
-        <div class="publish-entry flex flex--row flex--align-center" v-for="location in publishLocations" :key="location.id">
-          <div class="publish-entry__icon flex flex--column flex--center">
-            <icon-provider :provider-id="location.providerId"></icon-provider>
+        <div class="publish-entry flex flex--column" v-for="location in publishLocations" :key="location.id">
+          <div class="publish-entry__header flex flex--row flex--align-center">
+            <div class="publish-entry__icon flex flex--column flex--center">
+              <icon-provider :provider-id="location.providerId"></icon-provider>
+            </div>
+            <div class="publish-entry__description">
+              {{location.description}}
+            </div>
+            <div class="publish-entry__buttons flex flex--row flex--center">
+              <button class="publish-entry__button button" @click="remove(location)" v-title="'Remove location'">
+                <icon-delete></icon-delete>
+              </button>
+            </div>
           </div>
-          <div class="publish-entry__description">
-            {{location.description}}
-          </div>
-          <div class="publish-entry__buttons flex flex--row flex--center">
-            <a class="publish-entry__button button" :href="location.url" target="_blank" v-title="'Open location'">
-              <icon-open-in-new></icon-open-in-new>
-            </a>
-            <button class="publish-entry__button button" @click="remove(location)" v-title="'Remove location'">
-              <icon-delete></icon-delete>
-            </button>
+          <div class="publish-entry__row flex flex--row flex--align-center">
+            <div class="publish-entry__url">
+              {{location.url}}
+            </div>
+            <div class="publish-entry__buttons flex flex--row flex--center" v-if="location.url">
+              <button class="publish-entry__button button" v-clipboard="location.url" @click="info('Location URL copied to clipboard!')" v-title="'Copy URL'">
+                <icon-content-copy></icon-content-copy>
+              </button>
+              <a class="publish-entry__button button" v-if="location.url" :href="location.url" target="_blank" v-title="'Open location'">
+                <icon-open-in-new></icon-open-in-new>
+              </a>
+            </div>
           </div>
         </div>
       </div>
@@ -35,7 +47,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import ModalInner from './common/ModalInner';
 
 export default {
@@ -54,6 +66,9 @@ export default {
     },
   },
   methods: {
+    ...mapActions('notification', [
+      'info',
+    ]),
     remove(location) {
       this.$store.commit('publishLocation/deleteItem', location.id);
     },
@@ -65,40 +80,70 @@ export default {
 @import '../../styles/variables.scss';
 
 .publish-entry {
-  padding: 0.5rem 0.25rem;
-  border-bottom: 1px solid $hr-color;
+  margin: 1.5em 0;
+  height: auto;
+  font-size: 17px;
+  line-height: 1.5;
+}
 
-  &:last-child {
-    border-bottom: none;
-  }
+$button-size: 30px;
+$small-button-size: 22px;
+
+.publish-entry__header {
+  line-height: $button-size;
+}
+
+.publish-entry__row {
+  margin-top: 1px;
+  padding-top: 1px;
+  border-top: 1px solid rgba(128, 128, 128, 0.15);
+  line-height: $small-button-size;
 }
 
 .publish-entry__icon {
-  height: 30px;
-  width: 30px;
+  height: 22px;
+  width: 22px;
   margin-right: 0.75rem;
   flex: none;
 }
 
 .publish-entry__description {
-  opacity: 0.5;
-  line-height: 1.4;
-  font-size: 0.9em;
   width: 100%;
   overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.publish-entry__url {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  opacity: 0.5;
+  font-size: 0.67em;
 }
 
 .publish-entry__buttons {
   margin-left: 0.75rem;
+
+  .publish-entry__row & {
+    margin-left: 0.5rem;
+  }
 }
 
 .publish-entry__button {
-  width: 38px;
-  height: 38px;
-  padding: 6px;
+  width: $button-size;
+  height: $button-size;
+  padding: 4px;
   background-color: transparent;
   opacity: 0.75;
 
+  .publish-entry__row & {
+    width: $small-button-size;
+    height: $small-button-size;
+    padding: 4px;
+  }
+
   &:active,
   &:focus,
   &:hover {
diff --git a/src/components/modals/providers/GoogleDrivePublishModal.vue b/src/components/modals/providers/GoogleDrivePublishModal.vue
index a425ece8..47da833d 100644
--- a/src/components/modals/providers/GoogleDrivePublishModal.vue
+++ b/src/components/modals/providers/GoogleDrivePublishModal.vue
@@ -32,7 +32,7 @@
           </label>
         </div>
       </div>
-      <form-entry label="Template">
+      <form-entry label="Template" v-if="format === 'html'">
         <select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
           <option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
             {{ template.name }}
@@ -84,7 +84,7 @@ export default modalTemplate({
     resolve() {
       // Return new location
       const location = googleDriveProvider.makeLocation(this.config.token, this.fileId);
-      if (this.format) {
+      if (this.format === 'html') {
         location.templateId = this.selectedTemplate;
       }
       this.config.resolve(location);
diff --git a/src/components/modals/providers/WordpressPublishModal.vue b/src/components/modals/providers/WordpressPublishModal.vue
index fdc85871..802ff05d 100644
--- a/src/components/modals/providers/WordpressPublishModal.vue
+++ b/src/components/modals/providers/WordpressPublishModal.vue
@@ -9,7 +9,7 @@
         <input slot="field" class="textfield" type="text" v-model.trim="domain" @keydown.enter="resolve()">
         <div class="form-entry__info">
           <b>Example:</b> example.wordpress.com<br>
-          <b>Jetpack plugin</b> is required for self-hosted sites.
+          <b>Note:</b> Jetpack is required for self-hosted sites.
         </div>
       </form-entry>
       <form-entry label="Existing post ID" info="optional">
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index 4fb291b8..cd4b2c15 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -332,7 +332,6 @@ const localDbSvc = {
         // Clean data stored in localStorage
         localStorage.removeItem(`data/${id}`);
       });
-      window.location.reload();
       throw new Error('RELOAD');
     }
 
@@ -349,7 +348,7 @@ const localDbSvc = {
         type: 'text/plain;charset=utf-8',
       });
       FileSaver.saveAs(blob, 'StackEdit workspace.json');
-      return;
+      throw new Error('RELOAD');
     }
 
     // Watch workspace deletions and persist them as soon as possible
diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js
index 3747730b..d705693c 100644
--- a/src/services/providers/helpers/wordpressHelper.js
+++ b/src/services/providers/helpers/wordpressHelper.js
@@ -87,7 +87,7 @@ export default {
     date,
   }) {
     const refreshedToken = await this.refreshToken(token);
-    await request(refreshedToken, {
+    return request(refreshedToken, {
       method: 'POST',
       url: `https://public-api.wordpress.com/rest/v1.2/sites/${siteId || domain}/posts/${postId || 'new'}`,
       body: {
diff --git a/src/store/explorer.js b/src/store/explorer.js
index a340ef08..2f0ff4a4 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -122,6 +122,7 @@ export default {
       });
 
       // Build the tree
+      const parentsMap = {};
       Object.entries(nodeMap).forEach(([, node]) => {
         let parentNode = nodeMap[node.item.parentId];
         if (!parentNode || !parentNode.isFolder) {
@@ -129,6 +130,18 @@ export default {
             return;
           }
           parentNode = rootNode;
+        } else if (node.isFolder) {
+          // Detect circular reference
+          const parentParents = parentsMap[node.item.parentId] || {};
+          if (parentParents[node.item.id]) {
+            // Node is already a parent of its supposed parent
+            parentNode = rootNode;
+          } else {
+            parentsMap[node.item.id] = {
+              ...parentParents,
+              [node.item.parentId]: true,
+            };
+          }
         }
         if (node.isFolder) {
           parentNode.folders.push(node);
diff --git a/src/store/index.js b/src/store/index.js
index 455bdc8b..05b52447 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -83,33 +83,25 @@ const store = new Vuex.Store({
     },
     pathsByItemId: (state, getters) => {
       const result = {};
-      const foldersById = state.folder.itemsById;
-      const getPath = (item) => {
-        let itemPath = result[item.id];
-        if (!itemPath) {
-          if (item.parentId === 'trash') {
-            itemPath = `.stackedit-trash/${item.name}`;
-          } else {
-            let { name } = item;
-            if (foldersById[item.id]) {
-              name += '/';
-            }
-            const parentFolder = foldersById[item.parentId];
-            if (parentFolder) {
-              itemPath = getPath(parentFolder) + name;
-            } else {
-              itemPath = name;
-            }
+      const processNode = (node, parentPath = '') => {
+        let path = parentPath;
+        if (node.item.id) {
+          path += node.item.name;
+          if (node.isTrash) {
+            path = '.stackedit-trash/';
+          } else if (node.isFolder) {
+            path += '/';
           }
+          result[node.item.id] = path;
+        }
+
+        if (node.isFolder) {
+          node.folders.forEach(child => processNode(child, path));
+          node.files.forEach(child => processNode(child, path));
         }
-        result[item.id] = itemPath;
-        return itemPath;
       };
 
-      [
-        ...getters['folder/items'],
-        ...getters['file/items'],
-      ].forEach(item => getPath(item));
+      processNode(getters['explorer/rootNode']);
       return result;
     },
     itemsByPath: (state, { allItemsById, pathsByItemId }) => {

From 3fc974c14c2cbdc1bbee43b629e573f1eec1252a Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Sun, 19 Aug 2018 13:23:33 +0100
Subject: [PATCH 15/19] Fixed circular reference issues

---
 src/services/localDbSvc.js   | 16 ++++++++++------
 src/services/syncSvc.js      |  3 +--
 src/services/workspaceSvc.js | 34 ++++++++++++++++++++++++++++++++++
 src/store/explorer.js        | 13 -------------
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index cd4b2c15..f6be1275 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -133,11 +133,15 @@ const localDbSvc = {
     return new Promise((resolve, reject) => {
       // Create the DB transaction
       this.connection.createTx((tx) => {
+        const { lastTx } = this;
+
         // Look for DB changes and apply them to the store
         this.readAll(tx, (storeItemMap) => {
-          // Sanitize the workspace
-          workspaceSvc.ensureUniquePaths();
-          workspaceSvc.ensureUniqueLocations();
+          // Sanitize the workspace if changes have been applied
+          if (lastTx !== this.lastTx) {
+            workspaceSvc.sanitizeWorkspace();
+          }
+
           // Persist all the store changes into the DB
           this.writeAll(storeItemMap, tx);
           // Sync the localStorage
@@ -156,7 +160,7 @@ const localDbSvc = {
     let { lastTx } = this;
     const dbStore = tx.objectStore(dbStoreName);
     const index = dbStore.index('tx');
-    const range = window.IDBKeyRange.lowerBound(this.lastTx, true);
+    const range = IDBKeyRange.lowerBound(this.lastTx, true);
     const changes = [];
     index.openCursor(range).onsuccess = (event) => {
       const cursor = event.target.result;
@@ -225,7 +229,7 @@ const localDbSvc = {
           tx: incrementedTx,
         });
         delete this.hashMap[type][id];
-        this.lastTx = incrementedTx; // No need to read what we just wrote
+        this.lastTx = incrementedTx;
       }));
     });
 
@@ -239,7 +243,7 @@ const localDbSvc = {
         };
         dbStore.put(item);
         this.hashMap[item.type][item.id] = item.hash;
-        this.lastTx = incrementedTx; // No need to read what we just wrote
+        this.lastTx = incrementedTx;
       }
     });
   },
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 88dcab87..b532d3d7 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -185,8 +185,7 @@ const applyChanges = (changes) => {
     store.dispatch('data/setSyncDataById', syncDataById);
 
     // Sanitize the workspace
-    workspaceSvc.ensureUniquePaths(idsToKeep);
-    workspaceSvc.ensureUniqueLocations(idsToKeep);
+    workspaceSvc.sanitizeWorkspace(idsToKeep);
   }
 };
 
diff --git a/src/services/workspaceSvc.js b/src/services/workspaceSvc.js
index b46134e7..4aeaf138 100644
--- a/src/services/workspaceSvc.js
+++ b/src/services/workspaceSvc.js
@@ -134,6 +134,9 @@ export default {
     // Save item in the store
     store.commit(`${item.type}/setItem`, item);
 
+    // Remove circular reference
+    this.removeCircularReference(item);
+
     // Ensure path uniqueness
     if (store.getters['workspace/currentWorkspaceHasUniquePaths']) {
       this.makePathUnique(item.id);
@@ -162,6 +165,37 @@ export default {
       .forEach(item => store.commit('publishLocation/deleteItem', item.id));
   },
 
+  /**
+   * Sanitize the whole workspace.
+   */
+  sanitizeWorkspace(idsToKeep) {
+    // Detect and remove circular references for all folders.
+    store.getters['folder/items'].forEach(folder => this.removeCircularReference(folder));
+
+    this.ensureUniquePaths(idsToKeep);
+    this.ensureUniqueLocations(idsToKeep);
+  },
+
+  /**
+   * Detect and remove circular reference for an item.
+   */
+  removeCircularReference(item) {
+    const foldersById = store.state.folder.itemsById;
+    for (
+      let parentFolder = foldersById[item.parentId];
+      parentFolder;
+      parentFolder = foldersById[parentFolder.parentId]
+    ) {
+      if (parentFolder.id === item.id) {
+        store.commit('folder/patchItem', {
+          id: item.id,
+          parentId: null,
+        });
+        break;
+      }
+    }
+  },
+
   /**
    * Ensure two files/folders don't have the same path if the workspace doesn't allow it.
    */
diff --git a/src/store/explorer.js b/src/store/explorer.js
index 2f0ff4a4..a340ef08 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -122,7 +122,6 @@ export default {
       });
 
       // Build the tree
-      const parentsMap = {};
       Object.entries(nodeMap).forEach(([, node]) => {
         let parentNode = nodeMap[node.item.parentId];
         if (!parentNode || !parentNode.isFolder) {
@@ -130,18 +129,6 @@ export default {
             return;
           }
           parentNode = rootNode;
-        } else if (node.isFolder) {
-          // Detect circular reference
-          const parentParents = parentsMap[node.item.parentId] || {};
-          if (parentParents[node.item.id]) {
-            // Node is already a parent of its supposed parent
-            parentNode = rootNode;
-          } else {
-            parentsMap[node.item.id] = {
-              ...parentParents,
-              [node.item.parentId]: true,
-            };
-          }
         }
         if (node.isFolder) {
           parentNode.folders.push(node);

From 0d39ca85fc043b171d1f55e15ef62e6c4d0bb538 Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Sun, 19 Aug 2018 14:04:43 +0100
Subject: [PATCH 16/19] Prevent from drag-dropping in a folder child

---
 src/components/ExplorerNode.vue      |  7 +++----
 src/components/modals/AboutModal.vue |  6 ++----
 src/store/explorer.js                | 21 ++++++++++++++++++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/ExplorerNode.vue b/src/components/ExplorerNode.vue
index f69d23e2..f4897ff6 100644
--- a/src/components/ExplorerNode.vue
+++ b/src/components/ExplorerNode.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="explorer-node" :class="{'explorer-node--selected': isSelected, 'explorer-node--folder': node.isFolder, 'explorer-node--open': isOpen, 'explorer-node--trash': node.isTrash, 'explorer-node--temp': node.isTemp, 'explorer-node--drag-target': isDragTargetFolder}" @dragover.prevent @dragenter.stop="node.noDrop || setDragTarget(node.item.id)" @dragleave.stop="isDragTarget && setDragTargetId()" @drop.prevent.stop="onDrop" @contextmenu="onContextMenu">
+  <div class="explorer-node" :class="{'explorer-node--selected': isSelected, 'explorer-node--folder': node.isFolder, 'explorer-node--open': isOpen, 'explorer-node--trash': node.isTrash, 'explorer-node--temp': node.isTemp, 'explorer-node--drag-target': isDragTargetFolder}" @dragover.prevent @dragenter.stop="node.noDrop || setDragTarget(node)" @dragleave.stop="isDragTarget && setDragTarget()" @drop.prevent.stop="onDrop" @contextmenu="onContextMenu">
     <div class="explorer-node__item-editor" v-if="isEditing" :style="{paddingLeft: leftPadding}" draggable="true" @dragstart.stop.prevent>
       <input type="text" class="text-input" v-focus @blur="submitEdit()" @keydown.stop @keydown.enter="submitEdit()" @keydown.esc="submitEdit(true)" v-model="editingNodeName">
     </div>
-    <div class="explorer-node__item" v-else :style="{paddingLeft: leftPadding}" @click="select()" draggable="true" @dragstart.stop="setDragSourceId" @dragend.stop="setDragTargetId()">
+    <div class="explorer-node__item" v-else :style="{paddingLeft: leftPadding}" @click="select()" draggable="true" @dragstart.stop="setDragSourceId" @dragend.stop="setDragTarget()">
       {{node.item.name}}
       <icon-provider class="explorer-node__location" v-for="location in node.locations" :key="location.id" :provider-id="location.providerId"></icon-provider>
     </div>
@@ -73,7 +73,6 @@ export default {
   },
   methods: {
     ...mapMutations('explorer', [
-      'setDragTargetId',
       'setEditingId',
     ]),
     ...mapActions('explorer', [
@@ -142,7 +141,7 @@ export default {
     onDrop() {
       const sourceNode = this.$store.getters['explorer/dragSourceNode'];
       const targetNode = this.$store.getters['explorer/dragTargetNodeFolder'];
-      this.setDragTargetId();
+      this.setDragTarget();
       if (!sourceNode.isNil
         && !targetNode.isNil
         && sourceNode.item.id !== targetNode.item.id
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue
index fc56ceae..5e3a246a 100644
--- a/src/components/modals/AboutModal.vue
+++ b/src/components/modals/AboutModal.vue
@@ -2,7 +2,7 @@
   <modal-inner class="modal__inner-1--about-modal" aria-label="About">
     <div class="modal__content">
       <div class="logo-background"></div>
-      <small>© 2013-2018 Dock5 Software<br>v{{version}}</small>
+      <small>© 2013-2018 Dock5 Software Ltd.<br>v{{version}}</small>
       <hr>
       StackEdit on <a target="_blank" href="https://github.com/benweet/stackedit/">GitHub</a>
       <br>
@@ -59,13 +59,11 @@ export default {
 
   .logo-background {
     height: 75px;
-    margin: 0;
+    margin: 0.5em 0;
   }
 
   small {
     display: block;
-    font-size: 0.75em;
-    opacity: 0.75;
   }
 
   hr {
diff --git a/src/store/explorer.js b/src/store/explorer.js
index a340ef08..809bde20 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -191,9 +191,24 @@ export default {
     openDragTarget: debounceAction(({ state, dispatch }) => {
       dispatch('openNode', state.dragTargetId);
     }, 1000),
-    setDragTarget({ commit, dispatch }, id) {
-      commit('setDragTargetId', id);
-      dispatch('openDragTarget');
+    setDragTarget({ commit, getters, dispatch }, node) {
+      if (!node) {
+        commit('setDragTargetId');
+      } else {
+        // Make sure target node is not a child of source node
+        const folderNode = getFolder(node, getters);
+        const sourceId = getters.dragSourceNode.item.id;
+        const { nodeMap } = getters;
+        for (let parentNode = folderNode; parentNode; parentNode = nodeMap[node.item.parentId]) {
+          if (parentNode.item.id === sourceId) {
+            commit('setDragTargetId');
+            return;
+          }
+        }
+
+        commit('setDragTargetId', node.item.id);
+        dispatch('openDragTarget');
+      }
     },
   },
 };

From 1273ec7cb355cfcd8e54bf3835681a3baf294d84 Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Sun, 19 Aug 2018 17:40:39 +0100
Subject: [PATCH 17/19] Fixed unit tests

---
 src/store/explorer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/store/explorer.js b/src/store/explorer.js
index 809bde20..84a1f0fb 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -199,7 +199,10 @@ export default {
         const folderNode = getFolder(node, getters);
         const sourceId = getters.dragSourceNode.item.id;
         const { nodeMap } = getters;
-        for (let parentNode = folderNode; parentNode; parentNode = nodeMap[node.item.parentId]) {
+        for (let parentNode = folderNode;
+          parentNode;
+          parentNode = nodeMap[parentNode.item.parentId]
+        ) {
           if (parentNode.item.id === sourceId) {
             commit('setDragTargetId');
             return;

From 30b1585231f6df6994cef6ed364fede172d23e9e Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Sun, 19 Aug 2018 17:43:58 +0100
Subject: [PATCH 18/19] Tag v5.12.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5e83e75..95d448b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "5.11.4",
+  "version": "5.12.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7b78eb13..be110011 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "5.11.4",
+  "version": "5.12.0",
   "description": "Free, open-source, full-featured Markdown editor",
   "author": "Benoit Schweblin",
   "license": "Apache-2.0",

From c1b80def91fa0f1772ceee4ba9342fab95849c4e Mon Sep 17 00:00:00 2001
From: Felix Wu <mail@flxwu.com>
Date: Mon, 20 Aug 2018 10:43:15 +0200
Subject: [PATCH 19/19] bump katex dependency, support new katex commands

---
 package-lock.json | 50 +++++++++++++++++++++++++++++++++++++++++++----
 package.json      |  2 +-
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ebdaf199..9d0805cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6326,6 +6326,11 @@
         "ansi-regex": "2.1.1"
       }
     },
+    "has-color": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
+      "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8="
+    },
     "has-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
@@ -7524,11 +7529,12 @@
       }
     },
     "katex": {
-      "version": "0.9.0-alpha2",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.9.0-alpha2.tgz",
-      "integrity": "sha512-Hih2oCEEU3MRy+iHjA/tbvSKA+f93VliWA2jAYpGPR6MoMX1JzIy+Zc8ZnP4n45M8BC1ktDhWDCaQ/0CkJhXLg==",
+      "version": "0.10.0-alpha",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.10.0-alpha.tgz",
+      "integrity": "sha512-zxBALe11/a5T4Va0ybBSavE+dGe7YNR3MWom1avhmRtvoeI5QSHMuHhDbsLOcazdMCjFHIZTJpUpsllnFo9JVA==",
       "requires": {
-        "match-at": "0.1.1"
+        "match-at": "0.1.1",
+        "nomnom": "1.8.1"
       }
     },
     "kew": {
@@ -8876,6 +8882,42 @@
         }
       }
     },
+    "nomnom": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+      "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
+      "requires": {
+        "chalk": "0.4.0",
+        "underscore": "1.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+          "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg="
+        },
+        "chalk": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
+          "requires": {
+            "ansi-styles": "1.0.0",
+            "has-color": "0.1.7",
+            "strip-ansi": "0.1.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+          "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE="
+        },
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+        }
+      }
+    },
     "noop-fn": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/noop-fn/-/noop-fn-1.0.0.tgz",
diff --git a/package.json b/package.json
index 1d1df10b..6228c0b7 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "handlebars": "^4.0.10",
     "indexeddbshim": "^3.0.4",
     "js-yaml": "^3.9.1",
-    "katex": "^0.9.0-alpha1",
+    "katex": "v0.10.0-alpha",
     "markdown-it": "^8.3.1",
     "markdown-it-abbr": "^1.0.4",
     "markdown-it-deflist": "^2.0.2",