diff --git a/package.json b/package.json
index ba6be5af..f747426b 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
   "build": {
     "electronVersion": "16.0.6",
     "electronDownload": {
-      "version": "16.0.6+wvcus",
+      "version": "17.0.0-beta.1+wvcus",
       "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",
diff --git a/resources/entitlements.mac.plist b/resources/entitlements.mac.plist
new file mode 100644
index 00000000..8fff4988
--- /dev/null
+++ b/resources/entitlements.mac.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <false/>
+  </dict>
+</plist>
diff --git a/src/renderer/index.js b/src/renderer/index.js
index f9191019..26527908 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -268,6 +268,7 @@ const app = new Vue({
             drawerState: "queue",
             topChromeVisible: true,
             progresshover: false,
+            windowControlPosition: "right"
         },
         collectionList: {
             response: {},
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 1c6f6248..0eccfa28 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -36,7 +36,16 @@
             <div class="mv-chrome" v-if="chrome.topChromeVisible == false"></div>
             <div class="app-chrome" :style="{'display': chrome.topChromeVisible ? '' : 'none'}">
                 <div class="app-chrome--left">
-                    <div class="app-chrome-item full-height">
+                    <div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'left'">
+                        <div class="window-controls">
+                            <div class="close" @click="ipcRenderer.send('close')"></div>
+                            <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
+                            <div class="minmax restore" v-if="chrome.maximized" @click="ipcRenderer.send('maximize')">
+                            </div>
+                            <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
+                        </div>
+                    </div>
+                    <div class="app-chrome-item full-height" v-else>
                         <div class="app-title"></div>
                     </div>
                     <div class="app-chrome-item">
@@ -134,7 +143,7 @@
                         <button class="playback-button--small lyrics" :class="{'active': drawer.panel == 'lyrics'}"
                                 @click="invokeDrawer('lyrics')"></button>
                     </div>
-                    <div class="app-chrome-item full-height">
+                    <div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'right'">
                         <div class="window-controls">
                             <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
                             <div class="minmax restore" v-if="chrome.maximized" @click="ipcRenderer.send('maximize')">