diff --git a/app/application.js b/app/application.js
index d70de482..d9f8ac14 100644
--- a/app/application.js
+++ b/app/application.js
@@ -188,7 +188,7 @@ export class DesktopApplication {
       defaultHeight: WINDOW_DEFAULT_HEIGHT
     });
     const iconLocation = path.join(__dirname, '/icon/Icon-512x512.png');
-    const useSystemMenuBar = Store.get(StoreKeys.useSystemMenuBar);
+    const useSystemMenuBar = Store.get(StoreKeys.UseSystemMenuBar);
     const titleBarStyle = (this.isMac || useSystemMenuBar)
       ? 'hiddenInset'
       : null;
diff --git a/app/javascripts/main/index.js b/app/javascripts/main/index.js
index 40ed750b..45f8f97d 100644
--- a/app/javascripts/main/index.js
+++ b/app/javascripts/main/index.js
@@ -4,6 +4,6 @@ export { FileUtils } from './fileUtils';
 export { MenuManager } from './menuManager';
 export { PackageManager } from './packageManager';
 export { SearchManager } from './searchManager';
-export { TrayManager } from './TrayManager';
+export { TrayManager } from './trayManager';
 export { UpdateManager } from './updateManager';
 export { ZoomManager } from './zoomManager';
diff --git a/app/javascripts/main/store.js b/app/javascripts/main/store.js
index af0567c2..9516cf19 100644
--- a/app/javascripts/main/store.js
+++ b/app/javascripts/main/store.js
@@ -20,8 +20,8 @@ export class Store {
       this.instance = new Store({
         configName: 'user-preferences',
         defaults: {
-          useSystemMenuBar: false,
-          isMenuBarVisible: true
+          [StoreKeys.UseSystemMenuBar]: false,
+          [StoreKeys.MenuBarVisible]: true
         }
       });
     }
diff --git a/app/javascripts/renderer/preload.js b/app/javascripts/renderer/preload.js
index 95140599..61178436 100644
--- a/app/javascripts/renderer/preload.js
+++ b/app/javascripts/renderer/preload.js
@@ -60,7 +60,7 @@ function loadTransmitter() {
 		spellcheck: spellcheck,
     extServerHost: Store.get(StoreKeys.ExtServerHost),
 		rendererPath: rendererPath,
-		isMacOS: process.platform === "darwin",
+		isMacOS: process.platform === 'darwin',
 		appVersion: remote.app.getVersion(),
 		useSystemMenuBar: Store.get(StoreKeys.UseSystemMenuBar),
 
diff --git a/app/javascripts/renderer/renderer.js b/app/javascripts/renderer/renderer.js
index ed23a673..37453d17 100644
--- a/app/javascripts/renderer/renderer.js
+++ b/app/javascripts/renderer/renderer.js
@@ -23,11 +23,11 @@ Promise.all([
   bridge = receiver.items[0];
   desktopManager = angular.element(document).injector().get('desktopManager');
 
-  registerIpcMessageListener();
-  configureDesktopManager();
-  configureWindow();
-  configureSpellcheck();
-  loadZipLibrary();
+  await registerIpcMessageListener();
+  await configureDesktopManager();
+  await configureWindow();
+  await configureSpellcheck();
+  await loadZipLibrary();
 });
 
 async function configureWindow() {
@@ -66,7 +66,6 @@ async function configureWindow() {
     bridge.closeWindow();
   });
 
-
   // For Mac inset window
   const sheet = window.document.styleSheets[0];
   if(isMacOS) {
@@ -162,7 +161,7 @@ async function registerIpcMessageListener() {
   });
 }
 
-function loadZipLibrary() {
+async function loadZipLibrary() {
   // load zip library (for exporting items as zip)
   var scriptTag = document.createElement('script');
   scriptTag.src = "./vendor/zip/zip.js";
diff --git a/app/package-lock.json b/app/package-lock.json
index 43bc8d39..34c57a8c 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes",
-  "version": "3.0.25",
+  "version": "3.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1022,8 +1022,8 @@
       }
     },
     "standard-notes-web": {
-      "version": "github:standardnotes/web#3c8c43ac7e8188a58e7da53311ccf6e023cf6f4a",
-      "from": "github:standardnotes/web#3c8c43ac7e8188a58e7da53311ccf6e023cf6f4a",
+      "version": "github:standardnotes/web#3d15cc1f7086a3d42e2d2de546e2d853e696127e",
+      "from": "github:standardnotes/web#3d15cc1f7086a3d42e2d2de546e2d853e696127e",
       "requires": {
         "lodash": "^4.17.15"
       }
diff --git a/app/package.json b/app/package.json
index 5220d1ff..770e3873 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "Standard Notes",
   "description": "A simple and private place for your notes, thoughts, and life's work.",
   "author": "Standard Notes <help@standardnotes.org>",
-  "version": "3.0.25",
+  "version": "3.3.0",
   "main": "./dist/index.js",
   "dependencies": {
     "adm-zip": "^0.4.13",
@@ -19,6 +19,6 @@
     "semver": "^5.5.0",
     "sn-electron-valence": "0.0.4",
     "spellchecker": "github:mobitar/node-spellchecker",
-    "standard-notes-web": "github:standardnotes/web#3c8c43ac7e8188a58e7da53311ccf6e023cf6f4a"
+    "standard-notes-web": "github:standardnotes/web#3d15cc1f7086a3d42e2d2de546e2d853e696127e"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 30d31e77..25462a80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes",
-  "version": "3.0.25",
+  "version": "3.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index aa122f28..f8aa4ded 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "standard-notes",
   "main": "./app/dist/index.js",
-  "version": "3.0.25",
+  "version": "3.3.0",
   "license": "AGPL-3.0-or-later",
   "devDependencies": {
     "@babel/cli": "^7.7.7",