6 files changed, 13 insertions, 8 deletions

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9bd373a4d..f6c20b520 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "protocol": "inspector",
             "env": {
                 "NODE_ENV": "development",
-                "FRANZ_PLATFORM": "win32"
+                "OS_PLATFORM": "win32"
             }
         },
         {
diff --git a/package.json b/package.json
index 60e45f7f6..7922eff03 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "start": "electron ./build",
     "start:local": "cross-env LOCAL_API=1 yarn start",
     "start:live": "cross-env LIVE_API=1 yarn start",
-    "dev": "cross-env NODE_ENV=development FRANZ_PLATFORM=win32 gulp dev",
+    "dev": "cross-env NODE_ENV=development OS_PLATFORM=win32 gulp dev",
     "lint": "eslint src",
     "sign": "gulp sign",
     "prebuild": "gulp build",
diff --git a/src/environment.js b/src/environment.js
index e185120c0..4dca0807d 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -4,9 +4,14 @@ export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-export const isMac = process.platform === 'darwin';
-export const isWindows = process.platform === 'win32';
-export const isLinux = process.platform === 'linux';
+let platform = process.platform;
+if (process.env.OS_PLATFORM) {
+  platform = process.env.OS_PLATFORM;
+}
+
+export const isMac = platform === 'darwin';
+export const isWindows = platform === 'win32';
+export const isLinux = platform === 'linux';
 
 export const ctrlKey = isMac ? '⌘' : 'Ctrl';
 
diff --git a/src/index.html b/src/index.html
index bb10d2eaf..6c259e5be 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
   <div class="dev-warning">DEV MODE</div>
   <div id="root"></div>
   <script>
-    document.querySelector('body').classList.add(process.env.FRANZ_PLATFORM ? process.env.FRANZ_PLATFORM : process.platform);
+    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
 
     const { isDevMode } = require('./environment');
     if (isDevMode) {
diff --git a/src/index.js b/src/index.js
index 170353fb0..e8818af96 100644
--- a/src/index.js
+++ b/src/index.js
@@ -72,7 +72,7 @@ const createWindow = () => {
     height: mainWindowState.height,
     minWidth: 600,
     minHeight: 500,
-    titleBarStyle: process.env.FRANZ_PLATFORM || process.platform === 'win32' ? '' : 'hidden',
+    titleBarStyle: process.env.OS_PLATFORM || process.platform === 'win32' ? '' : 'hidden',
     frame: false,
     backgroundColor: '#3498db',
     autoHideMenuBar: true,
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index ed21315d8..d043dee87 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -126,7 +126,7 @@ export default class FranzMenu {
   }
 
   get template() {
-    return this.currentTemplate;
+    return this.currentTemplate.toJS();
   }
 
   _build() {