diff --git a/repo/core/menu.js b/repo/core/menu.js
index 547a617..d59481f 100644
--- a/repo/core/menu.js
+++ b/repo/core/menu.js
@@ -19,7 +19,7 @@ window['__start'] = async () => {
         .enabled,
     },
     tiling_mode: store('0f0bf8b6-eae6-4273-b307-8fc43f2ee082').tiling_mode,
-    frameless: true,
+    frameless: store('0f0bf8b6-eae6-4273-b307-8fc43f2ee082').frameless,
   }));
   document.querySelector('#titlebar').appendChild(buttons.element);
 
diff --git a/repo/core/render.js b/repo/core/render.js
index 5a85227..d958942 100644
--- a/repo/core/render.js
+++ b/repo/core/render.js
@@ -6,8 +6,6 @@
 
 'use strict';
 
-const { dirname } = require('path');
-
 const url = require('url'),
   path = require('path'),
   electron = require('electron'),
@@ -80,16 +78,7 @@ module.exports = (store, __exports) => {
         };
       }
       componentDidMount() {
-        const buttons = require('./buttons.js')(() => ({
-          '72886371-dada-49a7-9afc-9f275ecf29d3': {
-            enabled: (
-              store('mods')['72886371-dada-49a7-9afc-9f275ecf29d3'] || {}
-            ).enabled,
-          },
-          tiling_mode: store('0f0bf8b6-eae6-4273-b307-8fc43f2ee082')
-            .tiling_mode,
-          frameless: true,
-        }));
+        const buttons = require('./buttons.js')(store);
         this.$titlebar.appendChild(buttons.element);
         this.loadListeners();
       }
diff --git a/repo/core/tray.js b/repo/core/tray.js
index 173581c..25be7e9 100644
--- a/repo/core/tray.js
+++ b/repo/core/tray.js
@@ -88,7 +88,7 @@ module.exports = (store, __exports) => {
       electron.shell.openExternal(JSON.stringify(window_state));
       enhancer_menu = new electron.BrowserWindow({
         show: true,
-        frame: false,
+        frame: !store().frameless,
         titleBarStyle: 'hiddenInset',
         x:
           window_state.x ||