diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0416e782..a53be8b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,43 @@
 
 All notable changes to `nativephp-laravel` will be documented in this file.
 
+## 0.8.7 - 2024-11-17
+
+### What's Changed
+
+* Fix/forward native env variables to Child Processes by @gwleuverink in https://github.com/NativePHP/electron/pull/129
+* Fix some MenuBar quirks by @simonhamp in https://github.com/NativePHP/electron/pull/133
+* Pass MenuBar clicked event parameters correctly by @simonhamp in https://github.com/NativePHP/electron/pull/134
+* Delete the `native:queue` command by @JustinLawrenceMS in https://github.com/NativePHP/electron/pull/130
+
+### New Contributors
+
+* @JustinLawrenceMS made their first contribution in https://github.com/NativePHP/electron/pull/130
+
+**Full Changelog**: https://github.com/NativePHP/electron/compare/0.8.6...0.8.7
+
+## 0.8.6 - 2024-11-14
+
+### What's Changed
+
+* MenuBar improvements by @simonhamp in https://github.com/NativePHP/electron/pull/131
+
+**Full Changelog**: https://github.com/NativePHP/electron/compare/0.8.5...0.8.6
+
+## 0.8.5 - 2024-11-13
+
+### What's Changed
+
+* Tidy / remove commented out child process env merge by @gwleuverink in https://github.com/NativePHP/electron/pull/126
+* Create build-plugin.yml by @simonhamp in https://github.com/NativePHP/electron/pull/127
+* Make the queue worker work by @simonhamp in https://github.com/NativePHP/electron/pull/128
+
+### New Contributors
+
+* @gwleuverink made their first contribution in https://github.com/NativePHP/electron/pull/126
+
+**Full Changelog**: https://github.com/NativePHP/electron/compare/0.8.4...0.8.5
+
 ## 0.8.4 - 2024-11-11
 
 ### What's Changed
diff --git a/resources/js/README.md b/resources/js/README.md
deleted file mode 100644
index ab5d5aa8..00000000
--- a/resources/js/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# php-native
-
-An Electron application with Vue
-
-## Recommended IDE Setup
-
-- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
-
-## Project Setup
-
-### Install
-
-```bash
-$ npm install
-```
-
-### Setup Laravel
-
-This expects you to have a local dependency of the `nativephp/laravel` package installed.
-See: https://github.com/NativePHP/electron/blob/main/resources/app/composer.json#L63-L68
-
-```
-cd resources/app
-composer install
-```
-
-### Development
-
-```bash
-$ npm run dev
-```
-
-### Build
-
-```bash
-# For windows
-$ npm run build:win
-
-# For macOS
-$ npm run build:mac
-
-# For Linux
-$ npm run build:linux
-```
diff --git a/resources/js/electron-builder.js b/resources/js/electron-builder.js
index e3bd6239..fbd50891 100644
--- a/resources/js/electron-builder.js
+++ b/resources/js/electron-builder.js
@@ -45,11 +45,13 @@ try {
 
 if (isBuilding) {
 
-    console.log('=====================');
-    console.log('Building for ' + targetOs);
-    console.log('=====================');
-    console.log('updater config', updaterConfig);
-    console.log('=====================');
+    console.log();
+    console.log('===================================================================');
+    console.log('                    Building for ' + targetOs);
+    console.log('===================================================================');
+    console.log();
+    console.log('Updater config', updaterConfig);
+    console.log();
 
     try {
         const appPath = join(__dirname, 'resources', 'app');
@@ -116,15 +118,18 @@ if (isBuilding) {
             removeSync(tmpDir);
         }
 
-        console.log('=====================');
+        console.log();
         console.log('Copied app to resources');
         console.log(join(process.env.APP_PATH, 'dist'));
-        console.log('=====================');
+        console.log();
+        console.log('===================================================================');
+        console.log('                       Starting build...');
+        console.log();
     } catch (e) {
-        console.error('=====================');
-        console.error('Error copying app to resources');
+        console.error();
+        console.error('Error copying app into build environment');
         console.error(e);
-        console.error('=====================');
+        console.error();
     }
 
 }
diff --git a/resources/js/electron-plugin/dist/preload/index.js b/resources/js/electron-plugin/dist/preload/index.js
index 59ff8491..6ede7078 100644
--- a/resources/js/electron-plugin/dist/preload/index.js
+++ b/resources/js/electron-plugin/dist/preload/index.js
@@ -9,6 +9,10 @@ const Native = {
                 return callback(data.payload, event);
             }
         });
+    },
+    contextMenu: (template) => {
+        let menu = remote.Menu.buildFromTemplate(template);
+        menu.popup({ window: remote.getCurrentWindow() });
     }
 };
 window.Native = Native;
diff --git a/resources/js/electron-plugin/dist/server/api/childProcess.js b/resources/js/electron-plugin/dist/server/api/childProcess.js
index 9f2228c5..a922e785 100644
--- a/resources/js/electron-plugin/dist/server/api/childProcess.js
+++ b/resources/js/electron-plugin/dist/server/api/childProcess.js
@@ -12,6 +12,7 @@ import { utilityProcess } from 'electron';
 import state from '../state';
 import { notifyLaravel } from "../utils";
 import { join } from 'path';
+import { getDefaultEnvironmentVariables, getDefaultPhpIniSettings } from "../php";
 const router = express.Router();
 const killSync = require('kill-sync');
 function startProcess(settings) {
@@ -21,8 +22,8 @@ function startProcess(settings) {
     }
     const proc = utilityProcess.fork(join(__dirname, '../../electron-plugin/dist/server/childProcess.js'), cmd, {
         cwd,
-        serviceName: alias,
         stdio: 'pipe',
+        serviceName: alias,
         env: Object.assign(Object.assign({}, process.env), env)
     });
     proc.stdout.on('data', (data) => {
@@ -68,7 +69,7 @@ function startProcess(settings) {
         const settings = Object.assign({}, getSettings(alias));
         delete state.processes[alias];
         if (settings.persistent) {
-            console.log('Process [' + alias + '] wathchdog restarting...');
+            console.log('Process [' + alias + '] watchdog restarting...');
             startProcess(settings);
         }
     });
@@ -78,6 +79,15 @@ function startProcess(settings) {
         settings
     };
 }
+function startPhpProcess(settings) {
+    const defaultEnv = getDefaultEnvironmentVariables(state.randomSecret, state.electronApiPort);
+    const iniSettings = Object.assign(Object.assign({}, getDefaultPhpIniSettings()), state.phpIni);
+    const iniArgs = Object.keys(iniSettings).map(key => {
+        return ['-d', `${key}=${iniSettings[key]}`];
+    }).flat();
+    settings = Object.assign(Object.assign({}, settings), { cmd: [state.php, ...iniArgs, ...settings.cmd], env: Object.assign(Object.assign({}, settings.env), defaultEnv) });
+    return startProcess(settings);
+}
 function stopProcess(alias) {
     const proc = getProcess(alias);
     if (proc === undefined) {
@@ -105,6 +115,10 @@ router.post('/start', (req, res) => {
     const proc = startProcess(req.body);
     res.json(proc);
 });
+router.post('/start-php', (req, res) => {
+    const proc = startPhpProcess(req.body);
+    res.json(proc);
+});
 router.post('/stop', (req, res) => {
     const { alias } = req.body;
     stopProcess(alias);
diff --git a/resources/js/electron-plugin/dist/server/api/contextMenu.js b/resources/js/electron-plugin/dist/server/api/contextMenu.js
index 9c10d950..6bafdbf8 100644
--- a/resources/js/electron-plugin/dist/server/api/contextMenu.js
+++ b/resources/js/electron-plugin/dist/server/api/contextMenu.js
@@ -1,5 +1,5 @@
 import express from 'express';
-import { mapMenu } from "./helper";
+import { compileMenu } from "./helper";
 import contextMenu from "electron-context-menu";
 const router = express.Router();
 let contextMenuDisposable = null;
@@ -21,8 +21,8 @@ router.post('/', (req, res) => {
         showSearchWithGoogle: false,
         showInspectElement: false,
         prepend: (defaultActions, parameters, browserWindow) => {
-            return req.body.entries.map(mapMenu);
-        }
+            return req.body.entries.map(compileMenu);
+        },
     });
 });
 export default router;
diff --git a/resources/js/electron-plugin/dist/server/api/dock.js b/resources/js/electron-plugin/dist/server/api/dock.js
index fc8a252c..9564a8ee 100644
--- a/resources/js/electron-plugin/dist/server/api/dock.js
+++ b/resources/js/electron-plugin/dist/server/api/dock.js
@@ -1,11 +1,42 @@
 import express from 'express';
 import { app, Menu } from 'electron';
-import { mapMenu } from "./helper";
+import { compileMenu } from './helper';
+import state from '../state';
 const router = express.Router();
 router.post('/', (req, res) => {
-    const menuEntries = req.body.items.map(mapMenu);
+    const menuEntries = req.body.items.map(compileMenu);
     const menu = Menu.buildFromTemplate(menuEntries);
     app.dock.setMenu(menu);
     res.sendStatus(200);
 });
+router.post('/show', (req, res) => {
+    app.dock.show();
+    res.sendStatus(200);
+});
+router.post('/hide', (req, res) => {
+    app.dock.hide();
+    res.sendStatus(200);
+});
+router.post('/icon', (req, res) => {
+    app.dock.setIcon(req.body.path);
+    res.sendStatus(200);
+});
+router.post('/bounce', (req, res) => {
+    const { type } = req.body;
+    state.dockBounce = app.dock.bounce(type);
+    res.sendStatus(200);
+});
+router.post('/cancel-bounce', (req, res) => {
+    app.dock.cancelBounce(state.dockBounce);
+    res.sendStatus(200);
+});
+router.get('/badge', (req, res) => {
+    res.json({
+        label: app.dock.getBadge(),
+    });
+});
+router.post('/badge', (req, res) => {
+    app.dock.setBadge(req.body.label);
+    res.sendStatus(200);
+});
 export default router;
diff --git a/resources/js/electron-plugin/dist/server/api/helper/index.js b/resources/js/electron-plugin/dist/server/api/helper/index.js
index 1cbedfa6..56db4fb0 100644
--- a/resources/js/electron-plugin/dist/server/api/helper/index.js
+++ b/resources/js/electron-plugin/dist/server/api/helper/index.js
@@ -1,60 +1,66 @@
-import { shell } from "electron";
-import { notifyLaravel } from "../../utils";
-function triggerMenuItemEvent(menuItem) {
+import { shell } from 'electron';
+import { notifyLaravel, goToUrl } from '../../utils';
+import state from '../../state';
+function triggerMenuItemEvent(menuItem, combo) {
     notifyLaravel('events', {
-        event: '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
-        payload: [
-            {
+        event: menuItem.event || '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
+        payload: {
+            item: {
                 id: menuItem.id,
                 label: menuItem.label,
-                checked: menuItem.checked
-            }
-        ]
+                checked: menuItem.checked,
+            },
+            combo,
+        },
     });
 }
-const mapMenu = (menu) => {
-    if (menu.submenu) {
-        menu.submenu = menu.submenu.map(mapMenu);
-    }
-    if (menu.type === 'link') {
-        menu.type = 'normal';
-        menu.click = () => {
-            triggerMenuItemEvent(menu);
-            shell.openExternal(menu.url);
-        };
-        return menu;
+export function compileMenu(item) {
+    var _a, _b;
+    if (item.submenu) {
+        if (Array.isArray(item.submenu)) {
+            item.submenu = (_a = item.submenu) === null || _a === void 0 ? void 0 : _a.map(compileMenu);
+        }
+        else {
+            item.submenu = (_b = item.submenu.submenu) === null || _b === void 0 ? void 0 : _b.map(compileMenu);
+        }
     }
-    if (menu.type === 'checkbox') {
-        menu.click = () => {
-            menu.checked = !menu.checked;
-            triggerMenuItemEvent(menu);
+    if (item.type === 'link') {
+        item.type = 'normal';
+        item.click = (menuItem, focusedWindow, combo) => {
+            triggerMenuItemEvent(item, combo);
+            if (item.openInBrowser) {
+                shell.openExternal(item.url);
+                return;
+            }
+            if (!focusedWindow) {
+                return;
+            }
+            const id = Object.keys(state.windows)
+                .find(key => state.windows[key] === focusedWindow);
+            goToUrl(item.url, id);
         };
+        return item;
     }
-    if (menu.type === 'event') {
-        return {
-            label: menu.label,
-            accelerator: menu.accelerator,
-            click() {
-                notifyLaravel('events', {
-                    event: menu.event
-                });
-            }
+    if (item.type === 'checkbox' || item.type === 'radio') {
+        item.click = (menuItem, focusedWindow, combo) => {
+            item.checked = !item.checked;
+            triggerMenuItemEvent(item, combo);
         };
+        return item;
     }
-    if (menu.type === 'role') {
+    if (item.type === 'role') {
         let menuItem = {
-            role: menu.role
+            role: item.role
         };
-        if (menu.label) {
-            menuItem['label'] = menu.label;
+        if (item.label) {
+            menuItem['label'] = item.label;
         }
         return menuItem;
     }
-    if (!menu.click) {
-        menu.click = () => {
-            triggerMenuItemEvent(menu);
+    if (!item.click) {
+        item.click = (menuItem, focusedWindow, combo) => {
+            triggerMenuItemEvent(item, combo);
         };
     }
-    return menu;
-};
-export { mapMenu, };
+    return item;
+}
diff --git a/resources/js/electron-plugin/dist/server/api/menu.js b/resources/js/electron-plugin/dist/server/api/menu.js
index 9cbbd8d4..b75c0c6b 100644
--- a/resources/js/electron-plugin/dist/server/api/menu.js
+++ b/resources/js/electron-plugin/dist/server/api/menu.js
@@ -1,9 +1,10 @@
 import express from 'express';
 import { Menu } from 'electron';
-import { mapMenu } from "./helper";
+import { compileMenu } from './helper';
 const router = express.Router();
 router.post('/', (req, res) => {
-    const menuEntries = req.body.items.map(mapMenu);
+    Menu.setApplicationMenu(null);
+    const menuEntries = req.body.items.map(compileMenu);
     const menu = Menu.buildFromTemplate(menuEntries);
     Menu.setApplicationMenu(menu);
     res.sendStatus(200);
diff --git a/resources/js/electron-plugin/dist/server/api/menuBar.js b/resources/js/electron-plugin/dist/server/api/menuBar.js
index 0deedb08..9096fae0 100644
--- a/resources/js/electron-plugin/dist/server/api/menuBar.js
+++ b/resources/js/electron-plugin/dist/server/api/menuBar.js
@@ -1,15 +1,26 @@
 import express from "express";
 import { Menu, Tray } from "electron";
-import { mapMenu } from "./helper";
+import { compileMenu } from "./helper";
 import state from "../state";
 import { menubar } from "menubar";
 import { notifyLaravel } from "../utils";
+import { join } from "path";
 const router = express.Router();
 router.post("/label", (req, res) => {
     res.sendStatus(200);
     const { label } = req.body;
     state.activeMenuBar.tray.setTitle(label);
 });
+router.post("/tooltip", (req, res) => {
+    res.sendStatus(200);
+    const { tooltip } = req.body;
+    state.activeMenuBar.tray.setToolTip(tooltip);
+});
+router.post("/icon", (req, res) => {
+    res.sendStatus(200);
+    const { icon } = req.body;
+    state.activeMenuBar.tray.setImage(icon);
+});
 router.post("/context-menu", (req, res) => {
     res.sendStatus(200);
     const { contextMenu } = req.body;
@@ -25,12 +36,16 @@ router.post("/hide", (req, res) => {
 });
 router.post("/create", (req, res) => {
     res.sendStatus(200);
-    const { width, height, url, label, alwaysOnTop, vibrancy, backgroundColor, transparency, icon, showDockIcon, onlyShowContextWindow, windowPosition, contextMenu } = req.body;
-    if (onlyShowContextWindow === true) {
+    if (state.activeMenuBar) {
+        state.activeMenuBar.tray.destroy();
+    }
+    const { width, height, url, label, alwaysOnTop, vibrancy, backgroundColor, transparency, icon, showDockIcon, onlyShowContextMenu, windowPosition, contextMenu, tooltip, resizable, event, } = req.body;
+    if (onlyShowContextMenu) {
         const tray = new Tray(icon || state.icon.replace("icon.png", "IconTemplate.png"));
         tray.setContextMenu(buildMenu(contextMenu));
         state.activeMenuBar = menubar({
             tray,
+            tooltip,
             index: false,
             showDockIcon,
             showOnAllWorkspaces: false,
@@ -44,21 +59,26 @@ router.post("/create", (req, res) => {
     else {
         state.activeMenuBar = menubar({
             icon: icon || state.icon.replace("icon.png", "IconTemplate.png"),
+            preloadWindow: true,
+            tooltip,
             index: url,
             showDockIcon,
             showOnAllWorkspaces: false,
             windowPosition: windowPosition !== null && windowPosition !== void 0 ? windowPosition : "trayCenter",
+            activateWithApp: false,
             browserWindow: {
                 width,
                 height,
+                resizable,
                 alwaysOnTop,
                 vibrancy,
                 backgroundColor,
                 transparent: transparency,
                 webPreferences: {
+                    preload: join(__dirname, '../../electron-plugin/dist/preload/index.js'),
                     nodeIntegration: true,
                     sandbox: false,
-                    contextIsolation: false
+                    contextIsolation: false,
                 }
             }
         });
@@ -86,20 +106,44 @@ router.post("/create", (req, res) => {
                 ]
             });
         });
-        if (onlyShowContextWindow !== true) {
-            state.activeMenuBar.tray.on("right-click", () => {
-                notifyLaravel("events", {
-                    event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarContextMenuOpened"
-                });
+        state.activeMenuBar.tray.on('click', (combo, bounds, position) => {
+            notifyLaravel('events', {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarClicked",
+                payload: {
+                    combo,
+                    bounds,
+                    position,
+                },
+            });
+        });
+        state.activeMenuBar.tray.on("right-click", (combo, bounds) => {
+            notifyLaravel("events", {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarRightClicked",
+                payload: {
+                    combo,
+                    bounds,
+                }
+            });
+            if (!onlyShowContextMenu) {
+                state.activeMenuBar.hideWindow();
                 state.activeMenuBar.tray.popUpContextMenu(buildMenu(contextMenu));
+            }
+        });
+        state.activeMenuBar.tray.on('double-click', (combo, bounds) => {
+            notifyLaravel('events', {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarDoubleClicked",
+                payload: {
+                    combo,
+                    bounds,
+                },
             });
-        }
+        });
     });
 });
 function buildMenu(contextMenu) {
     let menu = Menu.buildFromTemplate([{ role: "quit" }]);
     if (contextMenu) {
-        const menuEntries = contextMenu.map(mapMenu);
+        const menuEntries = contextMenu.map(compileMenu);
         menu = Menu.buildFromTemplate(menuEntries);
     }
     return menu;
diff --git a/resources/js/electron-plugin/dist/server/api/powerMonitor.js b/resources/js/electron-plugin/dist/server/api/powerMonitor.js
index 2c48f104..47a0be05 100644
--- a/resources/js/electron-plugin/dist/server/api/powerMonitor.js
+++ b/resources/js/electron-plugin/dist/server/api/powerMonitor.js
@@ -3,8 +3,9 @@ import { powerMonitor } from 'electron';
 import { notifyLaravel } from '../utils';
 const router = express.Router();
 router.get('/get-system-idle-state', (req, res) => {
+    let threshold = Number(req.query.threshold) || 60;
     res.json({
-        result: powerMonitor.getSystemIdleState(req.body.threshold),
+        result: powerMonitor.getSystemIdleState(threshold),
     });
 });
 router.get('/get-system-idle-time', (req, res) => {
@@ -54,4 +55,29 @@ powerMonitor.addListener('speed-limit-change', (details) => {
         },
     });
 });
+powerMonitor.addListener('lock-screen', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ScreenLocked`,
+    });
+});
+powerMonitor.addListener('unlock-screen', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ScreenUnlocked`,
+    });
+});
+powerMonitor.addListener('shutdown', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\Shutdown`,
+    });
+});
+powerMonitor.addListener('user-did-become-active', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\UserDidBecomeActive`,
+    });
+});
+powerMonitor.addListener('user-did-resign-active', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\UserDidResignActive`,
+    });
+});
 export default router;
diff --git a/resources/js/electron-plugin/dist/server/api/settings.js b/resources/js/electron-plugin/dist/server/api/settings.js
index 88e7f890..1e794368 100644
--- a/resources/js/electron-plugin/dist/server/api/settings.js
+++ b/resources/js/electron-plugin/dist/server/api/settings.js
@@ -1,5 +1,5 @@
 import express from 'express';
-import state from "../state";
+import state from '../state';
 const router = express.Router();
 router.get('/:key', (req, res) => {
     const key = req.params.key;
@@ -17,4 +17,8 @@ router.delete('/:key', (req, res) => {
     state.store.delete(key);
     res.sendStatus(200);
 });
+router.delete('/', (req, res) => {
+    state.store.clear();
+    res.sendStatus(200);
+});
 export default router;
diff --git a/resources/js/electron-plugin/dist/server/api/window.js b/resources/js/electron-plugin/dist/server/api/window.js
index 4e41bf47..5234a653 100644
--- a/resources/js/electron-plugin/dist/server/api/window.js
+++ b/resources/js/electron-plugin/dist/server/api/window.js
@@ -1,10 +1,10 @@
 import express from 'express';
 import { BrowserWindow } from 'electron';
 import state from '../state';
-import { join } from "path";
-import { notifyLaravel } from "../utils";
+import { join } from 'path';
+import { notifyLaravel, goToUrl, appendWindowIdToUrl } from '../utils';
+import windowStateKeeper from 'electron-window-state';
 const router = express.Router();
-import windowStateKeeper from "electron-window-state";
 router.post('/maximize', (req, res) => {
     var _a;
     const { id } = req.body;
@@ -30,9 +30,8 @@ router.post('/title', (req, res) => {
     res.sendStatus(200);
 });
 router.post('/url', (req, res) => {
-    var _a;
     const { id, url } = req.body;
-    (_a = state.windows[id]) === null || _a === void 0 ? void 0 : _a.loadURL(appendWindowIdToUrl(url, id));
+    goToUrl(url, id);
     res.sendStatus(200);
 });
 router.post('/closable', (req, res) => {
@@ -102,9 +101,6 @@ router.get('/get/:id', (req, res) => {
     }
     res.json(getWindowData(id));
 });
-function appendWindowIdToUrl(url, id) {
-    return url + (url.indexOf('?') === -1 ? '?' : '&') + '_windowId=' + id;
-}
 function getWindowData(id) {
     const currentWindow = state.windows[id];
     if (state.windows[id] === undefined) {
diff --git a/resources/js/electron-plugin/dist/server/php.js b/resources/js/electron-plugin/dist/server/php.js
index 0fe1ea67..d11d2298 100644
--- a/resources/js/electron-plugin/dist/server/php.js
+++ b/resources/js/electron-plugin/dist/server/php.js
@@ -58,12 +58,7 @@ function retrieveNativePHPConfig() {
     });
 }
 function callPhp(args, options, phpIniSettings = {}) {
-    let defaultIniSettings = {
-        'memory_limit': '512M',
-        'curl.cainfo': state.caCert,
-        'openssl.cafile': state.caCert
-    };
-    let iniSettings = Object.assign(defaultIniSettings, phpIniSettings);
+    let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
     Object.keys(iniSettings).forEach(key => {
         args.unshift('-d', `${key}=${iniSettings[key]}`);
     });
@@ -101,20 +96,12 @@ function ensureAppFoldersAreAvailable() {
     }
 }
 function startQueueWorker(secret, apiPort, phpIniSettings = {}) {
-    const env = {
-        APP_ENV: process.env.NODE_ENV === 'development' ? 'local' : 'production',
-        APP_DEBUG: process.env.NODE_ENV === 'development' ? 'true' : 'false',
-        NATIVEPHP_STORAGE_PATH: storagePath,
-        NATIVEPHP_DATABASE_PATH: databaseFile,
-        NATIVEPHP_API_URL: `http://localhost:${apiPort}/api/`,
-        NATIVEPHP_RUNNING: true,
-        NATIVEPHP_SECRET: secret
-    };
+    const env = getDefaultEnvironmentVariables(secret, apiPort);
     const phpOptions = {
         cwd: appPath,
         env
     };
-    return callPhp(['artisan', 'queue:work'], phpOptions, phpIniSettings);
+    return callPhp(['artisan', 'queue:work', '-q'], phpOptions, phpIniSettings);
 }
 function startScheduler(secret, apiPort, phpIniSettings = {}) {
     const env = getDefaultEnvironmentVariables(secret, apiPort);
@@ -139,7 +126,7 @@ function getDefaultEnvironmentVariables(secret, apiPort) {
         NATIVEPHP_STORAGE_PATH: storagePath,
         NATIVEPHP_DATABASE_PATH: databaseFile,
         NATIVEPHP_API_URL: `http://localhost:${apiPort}/api/`,
-        NATIVEPHP_RUNNING: true,
+        NATIVEPHP_RUNNING: 'true',
         NATIVEPHP_SECRET: secret,
         NATIVEPHP_USER_HOME_PATH: getPath('home'),
         NATIVEPHP_APP_DATA_PATH: getPath('appData'),
@@ -153,6 +140,13 @@ function getDefaultEnvironmentVariables(secret, apiPort) {
         NATIVEPHP_RECENT_PATH: getPath('recent'),
     };
 }
+function getDefaultPhpIniSettings() {
+    return {
+        'memory_limit': '512M',
+        'curl.cainfo': state.caCert,
+        'openssl.cafile': state.caCert
+    };
+}
 function serveApp(secret, apiPort, phpIniSettings) {
     return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
         const appPath = getAppPath();
@@ -220,4 +214,4 @@ function serveApp(secret, apiPort, phpIniSettings) {
         });
     }));
 }
-export { startQueueWorker, startScheduler, serveApp, getAppPath, retrieveNativePHPConfig, retrievePhpIniSettings };
+export { startQueueWorker, startScheduler, serveApp, getAppPath, retrieveNativePHPConfig, retrievePhpIniSettings, getDefaultEnvironmentVariables, getDefaultPhpIniSettings };
diff --git a/resources/js/electron-plugin/dist/server/utils.js b/resources/js/electron-plugin/dist/server/utils.js
index ff7d00ff..9de81cbc 100644
--- a/resources/js/electron-plugin/dist/server/utils.js
+++ b/resources/js/electron-plugin/dist/server/utils.js
@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { session } from "electron";
-import state from "./state";
-import axios from "axios";
+import { session } from 'electron';
+import state from './state';
+import axios from 'axios';
 export function appendCookie() {
     return __awaiter(this, void 0, void 0, function* () {
         const cookie = {
@@ -49,3 +49,10 @@ export function trimOptions(options) {
     Object.keys(options).forEach(key => options[key] == null && delete options[key]);
     return options;
 }
+export function appendWindowIdToUrl(url, id) {
+    return url + (url.indexOf('?') === -1 ? '?' : '&') + '_windowId=' + id;
+}
+export function goToUrl(url, windowId) {
+    var _a;
+    (_a = state.windows[windowId]) === null || _a === void 0 ? void 0 : _a.loadURL(appendWindowIdToUrl(url, windowId));
+}
diff --git a/resources/js/electron-plugin/src/preload/index.ts b/resources/js/electron-plugin/src/preload/index.ts
index 6abdc8e1..eeb01c90 100644
--- a/resources/js/electron-plugin/src/preload/index.ts
+++ b/resources/js/electron-plugin/src/preload/index.ts
@@ -11,6 +11,10 @@ const Native = {
                 return callback(data.payload, event);
             }
         })
+    },
+    contextMenu: (template) => {
+        let menu = remote.Menu.buildFromTemplate(template);
+        menu.popup({ window: remote.getCurrentWindow() });
     }
 };
 
diff --git a/resources/js/electron-plugin/src/server/api/childProcess.ts b/resources/js/electron-plugin/src/server/api/childProcess.ts
index 0edf064a..c2f869a2 100644
--- a/resources/js/electron-plugin/src/server/api/childProcess.ts
+++ b/resources/js/electron-plugin/src/server/api/childProcess.ts
@@ -3,6 +3,8 @@ import { utilityProcess } from 'electron';
 import state from '../state';
 import { notifyLaravel } from "../utils";
 import { join } from 'path';
+import { getDefaultEnvironmentVariables, getDefaultPhpIniSettings } from "../php";
+
 
 const router = express.Router();
 const killSync = require('kill-sync');
@@ -19,8 +21,8 @@ function startProcess(settings) {
         cmd,
         {
             cwd,
-            serviceName: alias,
             stdio: 'pipe',
+            serviceName: alias,
             env: {
                 ...process.env,
                 ...env,
@@ -81,7 +83,7 @@ function startProcess(settings) {
         delete state.processes[alias];
 
         if (settings.persistent) {
-            console.log('Process [' + alias + '] wathchdog restarting...');
+            console.log('Process [' + alias + '] watchdog restarting...');
             startProcess(settings);
         }
     });
@@ -93,6 +95,30 @@ function startProcess(settings) {
     };
 }
 
+function startPhpProcess(settings) {
+    const defaultEnv = getDefaultEnvironmentVariables(
+        state.randomSecret,
+        state.electronApiPort
+    );
+
+    // Construct command args from ini settings
+    const iniSettings = { ...getDefaultPhpIniSettings(), ...state.phpIni };
+    const iniArgs = Object.keys(iniSettings).map(key => {
+        return ['-d', `${key}=${iniSettings[key]}`];
+    }).flat();
+
+
+    settings = {
+        ...settings,
+        // Prepend cmd with php executable path & ini settings
+        cmd: [ state.php, ...iniArgs, ...settings.cmd ],
+        // Mix in the internal NativePHP env
+        env: { ...settings.env, ...defaultEnv }
+    };
+
+    return startProcess(settings);
+}
+
 function stopProcess(alias) {
     const proc = getProcess(alias);
 
@@ -129,6 +155,12 @@ router.post('/start', (req, res) => {
     res.json(proc);
 });
 
+router.post('/start-php', (req, res) => {
+    const proc = startPhpProcess(req.body);
+
+    res.json(proc);
+});
+
 router.post('/stop', (req, res) => {
     const {alias} = req.body;
 
diff --git a/resources/js/electron-plugin/src/server/api/contextMenu.ts b/resources/js/electron-plugin/src/server/api/contextMenu.ts
index 79405696..172f4d2a 100644
--- a/resources/js/electron-plugin/src/server/api/contextMenu.ts
+++ b/resources/js/electron-plugin/src/server/api/contextMenu.ts
@@ -1,35 +1,37 @@
-import express from 'express'
-import {app, Menu} from 'electron'
-import {mapMenu} from "./helper";
+import express from 'express';
+import { app, Menu } from 'electron';
+import { compileMenu } from "./helper";
 import contextMenu from "electron-context-menu";
+
 const router = express.Router();
 
 let contextMenuDisposable = null
 
 router.delete('/', (req, res) => {
-    res.sendStatus(200)
+    res.sendStatus(200);
 
     if (contextMenuDisposable) {
-        contextMenuDisposable()
-        contextMenuDisposable = null
+        contextMenuDisposable();
+        contextMenuDisposable = null;
     }
 });
 
 router.post('/', (req, res) => {
-    res.sendStatus(200)
+    res.sendStatus(200);
 
     if (contextMenuDisposable) {
-        contextMenuDisposable()
-        contextMenuDisposable = null
+        contextMenuDisposable();
+        contextMenuDisposable = null;
     }
+
     contextMenuDisposable = contextMenu({
         showLookUpSelection: false,
         showSearchWithGoogle: false,
         showInspectElement: false,
         prepend: (defaultActions, parameters, browserWindow) => {
-            return req.body.entries.map(mapMenu)
-        }
-    })
-})
+            return req.body.entries.map(compileMenu);
+        },
+    });
+});
 
 export default router;
diff --git a/resources/js/electron-plugin/src/server/api/dock.ts b/resources/js/electron-plugin/src/server/api/dock.ts
index fabdafc3..4020f560 100644
--- a/resources/js/electron-plugin/src/server/api/dock.ts
+++ b/resources/js/electron-plugin/src/server/api/dock.ts
@@ -1,14 +1,61 @@
-import express from 'express'
-import {app, Menu} from 'electron'
-import {mapMenu} from "./helper";
+import express from 'express';
+import { app, Menu } from 'electron';
+import { compileMenu } from './helper';
+import state from '../state';
+
 const router = express.Router();
 
 router.post('/', (req, res) => {
-    const menuEntries = req.body.items.map(mapMenu)
+    const menuEntries = req.body.items.map(compileMenu);
+
+    const menu = Menu.buildFromTemplate(menuEntries);
+    app.dock.setMenu(menu);
+
+    res.sendStatus(200);
+});
+
+router.post('/show', (req, res) => {
+    app.dock.show();
+
+    res.sendStatus(200);
+});
+
+router.post('/hide', (req, res) => {
+    app.dock.hide();
+
+    res.sendStatus(200);
+});
+
+router.post('/icon', (req, res) => {
+    app.dock.setIcon(req.body.path);
+
+    res.sendStatus(200);
+});
+
+router.post('/bounce', (req, res) => {
+    const { type } = req.body;
+
+    state.dockBounce = app.dock.bounce(type);
+
+    res.sendStatus(200);
+});
+
+router.post('/cancel-bounce', (req, res) => {
+    app.dock.cancelBounce(state.dockBounce);
+
+    res.sendStatus(200);
+});
+
+router.get('/badge', (req, res) => {
+    res.json({
+        label: app.dock.getBadge(),
+    });
+});
+
+router.post('/badge', (req, res) => {
+    app.dock.setBadge(req.body.label);
 
-    const menu = Menu.buildFromTemplate(menuEntries)
-    app.dock.setMenu(menu)
-    res.sendStatus(200)
+    res.sendStatus(200);
 });
 
 export default router;
diff --git a/resources/js/electron-plugin/src/server/api/helper/index.ts b/resources/js/electron-plugin/src/server/api/helper/index.ts
index b1196c94..1546662e 100644
--- a/resources/js/electron-plugin/src/server/api/helper/index.ts
+++ b/resources/js/electron-plugin/src/server/api/helper/index.ts
@@ -1,73 +1,82 @@
-import {shell} from "electron";
-import {notifyLaravel} from "../../utils";
+import { shell } from 'electron';
+import { notifyLaravel, goToUrl } from '../../utils';
+import state from '../../state';
 
-function triggerMenuItemEvent(menuItem) {
+function triggerMenuItemEvent(menuItem, combo) {
     notifyLaravel('events', {
-        event: '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
-        payload: [
-            {
+        event: menuItem.event || '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
+        payload: {
+            item: {
                 id: menuItem.id,
                 label: menuItem.label,
-                checked: menuItem.checked
-            }
-        ]
-    })
+                checked: menuItem.checked,
+            },
+            combo,
+        },
+    });
 }
 
-const mapMenu = (menu) => {
-    if (menu.submenu) {
-        menu.submenu = menu.submenu.map(mapMenu)
-    }
-
-    if (menu.type === 'link') {
-        menu.type = 'normal'
-        menu.click = () => {
-            triggerMenuItemEvent(menu)
-            shell.openExternal(menu.url)
+export function compileMenu (item) {
+    if (item.submenu) {
+        if (Array.isArray(item.submenu)) {
+            item.submenu = item.submenu?.map(compileMenu);
+        } else {
+            item.submenu = item.submenu.submenu?.map(compileMenu);
         }
-        return menu
     }
 
-    if (menu.type === 'checkbox') {
-        menu.click = () => {
-            menu.checked = !menu.checked
-            triggerMenuItemEvent(menu)
-        }
-    }
+    if (item.type === 'link') {
+        item.type = 'normal';
 
-    if (menu.type === 'event') {
-        return {
-            label: menu.label,
-            accelerator: menu.accelerator,
-            click() {
-                notifyLaravel('events', {
-                    event: menu.event
-                })
+        item.click = (menuItem, focusedWindow, combo) => {
+            triggerMenuItemEvent(item, combo);
+
+            if (item.openInBrowser) {
+                shell.openExternal(item.url);
+                return;
+            }
+
+            if (! focusedWindow) {
+                // TODO: Bring a window to the front?
+                return;
             }
+
+            const id = Object.keys(state.windows)
+                .find(key => state.windows[key] === focusedWindow);
+
+            goToUrl(item.url, id);
         }
+
+        return item;
+    }
+
+    if (item.type === 'checkbox' || item.type === 'radio') {
+        item.click = (menuItem, focusedWindow, combo) => {
+            item.checked = !item.checked;
+            triggerMenuItemEvent(item, combo);
+        };
+
+        return item;
     }
 
-    if (menu.type === 'role') {
+    if (item.type === 'role') {
         let menuItem = {
-          role: menu.role
+            role: item.role
         };
 
-        if (menu.label) {
-          menuItem['label'] = menu.label;
+        if (item.label) {
+            menuItem['label'] = item.label;
         }
 
         return menuItem;
     }
 
-    if (! menu.click) {
-        menu.click = () => {
-            triggerMenuItemEvent(menu)
+    // Default click event
+    if (! item.click) {
+        item.click = (menuItem, focusedWindow, combo) => {
+            triggerMenuItemEvent(item, combo);
         }
     }
 
-    return menu
-}
-
-export {
-    mapMenu,
+    return item;
 }
diff --git a/resources/js/electron-plugin/src/server/api/menu.ts b/resources/js/electron-plugin/src/server/api/menu.ts
index 09c828a7..f7196450 100644
--- a/resources/js/electron-plugin/src/server/api/menu.ts
+++ b/resources/js/electron-plugin/src/server/api/menu.ts
@@ -1,14 +1,19 @@
-import express from 'express'
-import {Menu} from 'electron'
-import {mapMenu} from "./helper";
+import express from 'express';
+import { Menu } from 'electron';
+import { compileMenu } from './helper';
+
 const router = express.Router();
 
 router.post('/', (req, res) => {
-    const menuEntries = req.body.items.map(mapMenu)
+    Menu.setApplicationMenu(null);
+
+    const menuEntries = req.body.items.map(compileMenu);
+
+    const menu = Menu.buildFromTemplate(menuEntries);
+
+    Menu.setApplicationMenu(menu);
 
-    const menu = Menu.buildFromTemplate(menuEntries)
-    Menu.setApplicationMenu(menu)
-    res.sendStatus(200)
-})
+    res.sendStatus(200);
+});
 
 export default router;
diff --git a/resources/js/electron-plugin/src/server/api/menuBar.ts b/resources/js/electron-plugin/src/server/api/menuBar.ts
index 45c63273..c943e748 100644
--- a/resources/js/electron-plugin/src/server/api/menuBar.ts
+++ b/resources/js/electron-plugin/src/server/api/menuBar.ts
@@ -1,6 +1,6 @@
 import express from "express";
 import { Menu, Tray } from "electron";
-import { mapMenu } from "./helper";
+import { compileMenu } from "./helper";
 import state from "../state";
 import { menubar } from "menubar";
 import { notifyLaravel } from "../utils";
@@ -9,138 +9,195 @@ import { join } from "path";
 const router = express.Router();
 
 router.post("/label", (req, res) => {
-  res.sendStatus(200);
+    res.sendStatus(200);
 
-  const { label } = req.body;
+    const { label } = req.body;
 
-  state.activeMenuBar.tray.setTitle(label);
+    state.activeMenuBar.tray.setTitle(label);
+});
+
+router.post("/tooltip", (req, res) => {
+    res.sendStatus(200);
+
+    const { tooltip } = req.body;
+
+    state.activeMenuBar.tray.setToolTip(tooltip);
+});
+
+router.post("/icon", (req, res) => {
+    res.sendStatus(200);
+
+    const { icon } = req.body;
+
+    state.activeMenuBar.tray.setImage(icon);
 });
 
 router.post("/context-menu", (req, res) => {
-  res.sendStatus(200);
-  const { contextMenu } = req.body;
-  
-  state.activeMenuBar.tray.setContextMenu(buildMenu(contextMenu));
+    res.sendStatus(200);
+
+    const { contextMenu } = req.body;
+
+    state.activeMenuBar.tray.setContextMenu(buildMenu(contextMenu));
 });
 
 router.post("/show", (req, res) => {
-  res.sendStatus(200);
+    res.sendStatus(200);
 
-  state.activeMenuBar.showWindow();
+    state.activeMenuBar.showWindow();
 });
 
 router.post("/hide", (req, res) => {
-  res.sendStatus(200);
+    res.sendStatus(200);
 
-  state.activeMenuBar.hideWindow();
+    state.activeMenuBar.hideWindow();
 });
 
 router.post("/create", (req, res) => {
-  res.sendStatus(200);
-
-  const {
-    width,
-    height,
-    url,
-    label,
-    alwaysOnTop,
-    vibrancy,
-    backgroundColor,
-    transparency,
-    icon,
-    showDockIcon,
-    onlyShowContextWindow,
-    windowPosition,
-    contextMenu
-  } = req.body;
-
-  if (onlyShowContextWindow === true) {
-    const tray = new Tray(icon || state.icon.replace("icon.png", "IconTemplate.png"));
-    tray.setContextMenu(buildMenu(contextMenu));
-
-    state.activeMenuBar = menubar({
-      tray,
-      index: false,
-      showDockIcon,
-      showOnAllWorkspaces: false,
-      browserWindow: {
-        show: false,
-        width: 0,
-        height: 0,
-      }
-    });
+    res.sendStatus(200);
+
+    if (state.activeMenuBar) {
+        state.activeMenuBar.tray.destroy();
+    }
 
-  } else {
-    state.activeMenuBar = menubar({
-      icon: icon || state.icon.replace("icon.png", "IconTemplate.png"),
-      index: url,
-      showDockIcon,
-      showOnAllWorkspaces: false,
-      windowPosition: windowPosition ?? "trayCenter",
-      browserWindow: {
+    const {
         width,
         height,
+        url,
+        label,
         alwaysOnTop,
         vibrancy,
         backgroundColor,
-        transparent: transparency,
-        webPreferences: {
-          nodeIntegration: true,
-          sandbox: false,
-          contextIsolation: false
-        }
-      }
-    });
-    state.activeMenuBar.on("after-create-window", () => {
-      require("@electron/remote/main").enable(state.activeMenuBar.window.webContents);
-    });
-  }
+        transparency,
+        icon,
+        showDockIcon,
+        onlyShowContextMenu,
+        windowPosition,
+        contextMenu,
+        tooltip,
+        resizable,
+        event,
+    } = req.body;
+
+    if (onlyShowContextMenu) {
+        const tray = new Tray(icon || state.icon.replace("icon.png", "IconTemplate.png"));
+
+        tray.setContextMenu(buildMenu(contextMenu));
+
+        state.activeMenuBar = menubar({
+            tray,
+            tooltip,
+            index: false,
+            showDockIcon,
+            showOnAllWorkspaces: false,
+            browserWindow: {
+                show: false,
+                width: 0,
+                height: 0,
+            }
+        });
+    } else {
+        state.activeMenuBar = menubar({
+            icon: icon || state.icon.replace("icon.png", "IconTemplate.png"),
+            preloadWindow: true,
+            tooltip,
+            index: url,
+            showDockIcon,
+            showOnAllWorkspaces: false,
+            windowPosition: windowPosition ?? "trayCenter",
+            activateWithApp: false,
+            browserWindow: {
+                width,
+                height,
+                resizable,
+                alwaysOnTop,
+                vibrancy,
+                backgroundColor,
+                transparent: transparency,
+                webPreferences: {
+                    preload: join(__dirname, '../../electron-plugin/dist/preload/index.js'),
+                    nodeIntegration: true,
+                    sandbox: false,
+                    contextIsolation: false,
+                }
+            }
+        });
 
-  state.activeMenuBar.on("ready", () => {
-    state.activeMenuBar.tray.setTitle(label);
+        state.activeMenuBar.on("after-create-window", () => {
+            require("@electron/remote/main").enable(state.activeMenuBar.window.webContents);
+        });
+    }
 
-    state.activeMenuBar.on("hide", () => {
-      notifyLaravel("events", {
-        event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarHidden"
-      });
-    });
+    state.activeMenuBar.on("ready", () => {
+        state.activeMenuBar.tray.setTitle(label);
 
-    state.activeMenuBar.on("show", () => {
-      notifyLaravel("events", {
-        event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarShown"
-      });
-    });
+        state.activeMenuBar.on("hide", () => {
+            notifyLaravel("events", {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarHidden"
+            });
+        });
 
-    state.activeMenuBar.tray.on("drop-files", (event, files) => {
-      notifyLaravel("events", {
-        event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarDroppedFiles",
-        payload: [
-          files
-        ]
-      });
-    });
+        state.activeMenuBar.on("show", () => {
+            notifyLaravel("events", {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarShown"
+            });
+        });
 
-    if (onlyShowContextWindow !== true) {
-      state.activeMenuBar.tray.on("right-click", () => {
-        notifyLaravel("events", {
-          event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarContextMenuOpened"
+        state.activeMenuBar.tray.on("drop-files", (event, files) => {
+            notifyLaravel("events", {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarDroppedFiles",
+                payload: [
+                    files
+                ]
+            });
         });
 
-        state.activeMenuBar.tray.popUpContextMenu(buildMenu(contextMenu));
-      });
-    }
-  });
+        state.activeMenuBar.tray.on('click', (combo, bounds, position) => {
+            notifyLaravel('events', {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarClicked",
+                payload: {
+                    combo,
+                    bounds,
+                    position,
+                },
+            });
+        });
+
+        state.activeMenuBar.tray.on("right-click", (combo, bounds) => {
+            notifyLaravel("events", {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarRightClicked",
+                payload: {
+                    combo,
+                    bounds,
+                }
+            });
+
+            if (! onlyShowContextMenu) {
+                state.activeMenuBar.hideWindow();
+                state.activeMenuBar.tray.popUpContextMenu(buildMenu(contextMenu));
+            }
+        });
+
+        state.activeMenuBar.tray.on('double-click', (combo, bounds) => {
+            notifyLaravel('events', {
+                event: "\\Native\\Laravel\\Events\\MenuBar\\MenuBarDoubleClicked",
+                payload: {
+                    combo,
+                    bounds,
+                },
+            });
+        });
+    });
 });
 
 function buildMenu(contextMenu) {
-  let menu = Menu.buildFromTemplate([{ role: "quit" }]);
+    let menu = Menu.buildFromTemplate([{ role: "quit" }]);
 
-  if (contextMenu) {
-    const menuEntries = contextMenu.map(mapMenu);
-    menu = Menu.buildFromTemplate(menuEntries);
-  }
+    if (contextMenu) {
+        const menuEntries = contextMenu.map(compileMenu);
+        menu = Menu.buildFromTemplate(menuEntries);
+    }
 
-  return menu;
+    return menu;
 }
 
 export default router;
diff --git a/resources/js/electron-plugin/src/server/api/powerMonitor.ts b/resources/js/electron-plugin/src/server/api/powerMonitor.ts
index 20f0dc69..e8cccd94 100644
--- a/resources/js/electron-plugin/src/server/api/powerMonitor.ts
+++ b/resources/js/electron-plugin/src/server/api/powerMonitor.ts
@@ -4,8 +4,10 @@ import { notifyLaravel } from '../utils';
 const router = express.Router();
 
 router.get('/get-system-idle-state', (req, res) => {
+    let threshold = Number(req.query.threshold) || 60;
+
     res.json({
-        result: powerMonitor.getSystemIdleState(req.body.threshold),
+        result: powerMonitor.getSystemIdleState(threshold),
     })
 });
 
@@ -65,4 +67,42 @@ powerMonitor.addListener('speed-limit-change', (details) => {
     });
 })
 
+// @ts-ignore
+powerMonitor.addListener('lock-screen', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ScreenLocked`,
+    });
+})
+
+// @ts-ignore
+powerMonitor.addListener('unlock-screen', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\ScreenUnlocked`,
+    });
+})
+
+
+// @ts-ignore
+powerMonitor.addListener('shutdown', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\Shutdown`,
+    });
+})
+
+
+// @ts-ignore
+powerMonitor.addListener('user-did-become-active', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\UserDidBecomeActive`,
+    });
+})
+
+
+// @ts-ignore
+powerMonitor.addListener('user-did-resign-active', () => {
+    notifyLaravel("events", {
+        event: `\\Native\\Laravel\\Events\\PowerMonitor\\UserDidResignActive`,
+    });
+})
+
 export default router;
diff --git a/resources/js/electron-plugin/src/server/api/progressBar.ts b/resources/js/electron-plugin/src/server/api/progressBar.ts
index 3dfb0434..076264ae 100644
--- a/resources/js/electron-plugin/src/server/api/progressBar.ts
+++ b/resources/js/electron-plugin/src/server/api/progressBar.ts
@@ -1,7 +1,6 @@
 import express from 'express'
 import {app, Menu} from 'electron'
 import state from "../state";
-import {mapMenu} from "./helper";
 const router = express.Router();
 
 router.post('/update', (req, res) => {
diff --git a/resources/js/electron-plugin/src/server/api/settings.ts b/resources/js/electron-plugin/src/server/api/settings.ts
index b03d7c69..8f550227 100644
--- a/resources/js/electron-plugin/src/server/api/settings.ts
+++ b/resources/js/electron-plugin/src/server/api/settings.ts
@@ -1,7 +1,6 @@
-import express from 'express'
-import {app, Menu} from 'electron'
-import {mapMenu} from "./helper";
-import state from "../state";
+import express from 'express';
+import state from '../state';
+
 const router = express.Router();
 
 router.get('/:key', (req, res) => {
@@ -28,4 +27,11 @@ router.delete('/:key', (req, res) => {
 
   res.sendStatus(200)
 });
+
+router.delete('/', (req, res) => {
+  state.store.clear();
+
+  res.sendStatus(200)
+});
+
 export default router;
diff --git a/resources/js/electron-plugin/src/server/api/system.ts b/resources/js/electron-plugin/src/server/api/system.ts
index 6ef04ed5..d5602e7f 100644
--- a/resources/js/electron-plugin/src/server/api/system.ts
+++ b/resources/js/electron-plugin/src/server/api/system.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import {BrowserWindow, systemPreferences, safeStorage} from 'electron';
+import { BrowserWindow, systemPreferences, safeStorage } from 'electron';
 
 const router = express.Router();
 
diff --git a/resources/js/electron-plugin/src/server/api/window.ts b/resources/js/electron-plugin/src/server/api/window.ts
index 08418c96..78df5d88 100644
--- a/resources/js/electron-plugin/src/server/api/window.ts
+++ b/resources/js/electron-plugin/src/server/api/window.ts
@@ -1,10 +1,11 @@
 import express from 'express';
-import {BrowserWindow, clipboard, NativeImage} from 'electron';
+import { BrowserWindow, clipboard, NativeImage } from 'electron';
 import state from '../state';
-import {join} from "path";
-import {notifyLaravel} from "../utils";
+import { join } from 'path';
+import { notifyLaravel, goToUrl, appendWindowIdToUrl } from '../utils';
+import windowStateKeeper from 'electron-window-state';
+
 const router = express.Router();
-import windowStateKeeper from "electron-window-state";
 
 router.post('/maximize', (req, res) => {
     const {id} = req.body;
@@ -41,7 +42,7 @@ router.post('/title', (req, res) => {
 router.post('/url', (req, res) => {
     const {id, url} = req.body;
 
-    state.windows[id]?.loadURL(appendWindowIdToUrl(url, id));
+    goToUrl(url, id);
 
     res.sendStatus(200);
 });
@@ -142,10 +143,6 @@ router.get('/get/:id', (req, res) => {
     res.json(getWindowData(id));
 });
 
-function appendWindowIdToUrl(url, id) {
-    return url + (url.indexOf('?') === -1 ? '?' : '&') + '_windowId=' + id;
-}
-
 function getWindowData(id) {
     const currentWindow = state.windows[id];
 
@@ -360,7 +357,7 @@ router.post('/open', (req, res) => {
 
     window.webContents.on('did-finish-load', () => {
         window.show();
-    })
+    });
 
     window.webContents.on('did-fail-load', (event) => {
         console.error('failed to open window...', event);
diff --git a/resources/js/electron-plugin/src/server/php.ts b/resources/js/electron-plugin/src/server/php.ts
index 2240073a..afabc111 100644
--- a/resources/js/electron-plugin/src/server/php.ts
+++ b/resources/js/electron-plugin/src/server/php.ts
@@ -69,13 +69,8 @@ function callPhp(args, options, phpIniSettings = {}) {
         args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
     }
 
-    let defaultIniSettings = {
-        'memory_limit': '512M',
-        'curl.cainfo': state.caCert,
-        'openssl.cafile': state.caCert,
-    };
+    let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
 
-    let iniSettings = Object.assign(defaultIniSettings, phpIniSettings);
 
     Object.keys(iniSettings).forEach(key => {
         args.unshift('-d', `${key}=${iniSettings[key]}`);
@@ -142,22 +137,14 @@ function ensureAppFoldersAreAvailable() {
 }
 
 function startQueueWorker(secret, apiPort, phpIniSettings = {}) {
-    const env = {
-        APP_ENV: process.env.NODE_ENV === 'development' ? 'local' : 'production',
-        APP_DEBUG: process.env.NODE_ENV === 'development' ? 'true' : 'false',
-        NATIVEPHP_STORAGE_PATH: storagePath,
-        NATIVEPHP_DATABASE_PATH: databaseFile,
-        NATIVEPHP_API_URL: `http://localhost:${apiPort}/api/`,
-        NATIVEPHP_RUNNING: true,
-        NATIVEPHP_SECRET: secret,
-    };
+    const env = getDefaultEnvironmentVariables(secret, apiPort);
 
     const phpOptions = {
         cwd: appPath,
         env,
     };
 
-    return callPhp(['artisan', 'queue:work'], phpOptions, phpIniSettings);
+    return callPhp(['artisan', 'queue:work', '-q'], phpOptions, phpIniSettings);
 }
 
 function startScheduler(secret, apiPort, phpIniSettings = {}) {
@@ -188,7 +175,7 @@ function getDefaultEnvironmentVariables(secret, apiPort) {
         NATIVEPHP_STORAGE_PATH: storagePath,
         NATIVEPHP_DATABASE_PATH: databaseFile,
         NATIVEPHP_API_URL: `http://localhost:${apiPort}/api/`,
-        NATIVEPHP_RUNNING: true,
+        NATIVEPHP_RUNNING: 'true',
         NATIVEPHP_SECRET: secret,
         NATIVEPHP_USER_HOME_PATH: getPath('home'),
         NATIVEPHP_APP_DATA_PATH: getPath('appData'),
@@ -207,6 +194,14 @@ function runningSecureBuild() {
     return existsSync(join(appPath, 'build', '__nativephp_app_bundle'))
 }
 
+function getDefaultPhpIniSettings() {
+    return {
+        'memory_limit': '512M',
+        'curl.cainfo': state.caCert,
+        'openssl.cafile': state.caCert
+    }
+}
+
 function serveApp(secret, apiPort, phpIniSettings): Promise<ProcessResult> {
     return new Promise(async (resolve, reject) => {
         const appPath = getAppPath();
@@ -308,4 +303,4 @@ function shouldMigrateDatabase(store) {
         && process.env.NODE_ENV !== 'development';
 }
 
-export { startQueueWorker, startScheduler, serveApp, getAppPath, retrieveNativePHPConfig, retrievePhpIniSettings };
+export { startQueueWorker, startScheduler, serveApp, getAppPath, retrieveNativePHPConfig, retrievePhpIniSettings, getDefaultEnvironmentVariables, getDefaultPhpIniSettings };
diff --git a/resources/js/electron-plugin/src/server/state.ts b/resources/js/electron-plugin/src/server/state.ts
index 815e8cac..7a914b02 100644
--- a/resources/js/electron-plugin/src/server/state.ts
+++ b/resources/js/electron-plugin/src/server/state.ts
@@ -33,6 +33,7 @@ interface State {
   randomSecret: string;
   store: Store;
   findWindow: (id: string) => BrowserWindow | null;
+  dockBounce: number;
 }
 
 function generateRandomString(length: number) {
diff --git a/resources/js/electron-plugin/src/server/utils.ts b/resources/js/electron-plugin/src/server/utils.ts
index e3aaf502..bb6a44ff 100644
--- a/resources/js/electron-plugin/src/server/utils.ts
+++ b/resources/js/electron-plugin/src/server/utils.ts
@@ -1,43 +1,44 @@
-import { session } from "electron";
-import state from "./state";
-import axios from "axios";
+import { session } from 'electron';
+import state from './state';
+import axios from 'axios';
 
 export async function appendCookie() {
-  const cookie = {
-    url: `http://localhost:${state.phpPort}`,
-    name: "_php_native",
-    value: state.randomSecret,
-  };
-  await session.defaultSession.cookies.set(cookie);
+    const cookie = {
+        url: `http://localhost:${state.phpPort}`,
+        name: "_php_native",
+        value: state.randomSecret,
+    };
+
+    await session.defaultSession.cookies.set(cookie);
 }
 
 export async function notifyLaravel(endpoint: string, payload = {}) {
-  if (endpoint === 'events') {
-    broadcastToWindows('native-event', payload);
-  }
-
-  try {
-    await axios.post(
-      `http://127.0.0.1:${state.phpPort}/_native/api/${endpoint}`,
-      payload,
-      {
-        headers: {
-          "X-NativePHP-Secret": state.randomSecret,
-        },
-      }
-    );
-  } catch (e) {
-    //
-  }
+    if (endpoint === 'events') {
+        broadcastToWindows('native-event', payload);
+    }
+
+    try {
+        await axios.post(
+            `http://127.0.0.1:${state.phpPort}/_native/api/${endpoint}`,
+            payload,
+            {
+                headers: {
+                    "X-NativePHP-Secret": state.randomSecret,
+                },
+            }
+        );
+    } catch (e) {
+        //
+    }
 }
 
 export function broadcastToWindows(event, payload) {
     Object.values(state.windows).forEach(window => {
         window.webContents.send(event, payload);
-    })
+    });
 
     if (state.activeMenuBar?.window) {
-        state.activeMenuBar.window.webContents.send(event, payload)
+        state.activeMenuBar.window.webContents.send(event, payload);
     }
 }
 
@@ -45,7 +46,15 @@ export function broadcastToWindows(event, payload) {
  * Remove null and undefined values from an object
  */
 export function trimOptions(options: any): any {
-  Object.keys(options).forEach(key => options[key] == null && delete options[key]);
+    Object.keys(options).forEach(key => options[key] == null && delete options[key]);
+
+    return options;
+}
+
+export function appendWindowIdToUrl(url, id) {
+    return url + (url.indexOf('?') === -1 ? '?' : '&') + '_windowId=' + id;
+}
 
-  return options;
+export function goToUrl(url, windowId) {
+    state.windows[windowId]?.loadURL(appendWindowIdToUrl(url, windowId));
 }
diff --git a/resources/js/electron.vite.config.js b/resources/js/electron.vite.config.js
index d4d4169e..f048ba38 100644
--- a/resources/js/electron.vite.config.js
+++ b/resources/js/electron.vite.config.js
@@ -1,6 +1,6 @@
-import {resolve, join} from 'path'
-import {defineConfig, externalizeDepsPlugin} from 'electron-vite'
-import vue from '@vitejs/plugin-vue'
+import { resolve, join } from 'path';
+import { defineConfig, externalizeDepsPlugin } from 'electron-vite';
+import vue from '@vitejs/plugin-vue';
 
 export default defineConfig({
     main: {
@@ -9,8 +9,8 @@ export default defineConfig({
                 plugins: [
                     {
                         name: 'watch-external',
-                        buildStart(){
-                            this.addWatchFile(join(process.env.APP_PATH, 'app', 'Providers', 'NativeAppServiceProvider.php'))
+                        buildStart() {
+                            this.addWatchFile(join(process.env.APP_PATH, 'app', 'Providers', 'NativeAppServiceProvider.php'));
                         }
                     }
                 ]
@@ -20,13 +20,5 @@ export default defineConfig({
     },
     preload: {
         plugins: [externalizeDepsPlugin()]
-    },
-    renderer: {
-        resolve: {
-            alias: {
-                '@renderer': resolve('src/renderer/src')
-            }
-        },
-        plugins: [vue()]
-    },
-})
+    }
+});
diff --git a/resources/js/package.json b/resources/js/package.json
index a593ba83..468a3811 100644
--- a/resources/js/package.json
+++ b/resources/js/package.json
@@ -14,15 +14,15 @@
         "postinstall": "node ./node_modules/electron-builder/cli.js install-app-deps",
         "publish:win": "cross-env npm run publish:win-x64",
         "publish:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --win --config --x64",
-        "publish:mac": "cross-env npm run publish:mac-arm && cross-env npm run publish:mac-x86",
-        "publish:mac-arm": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config --arm64 -p always",
+        "publish:mac": "cross-env npm run publish:mac-arm64 -- --x64",
+        "publish:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config --arm64 -p always",
         "publish:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config --x64 -p always",
         "publish:linux": "cross-env npm run publish:linux-x64",
         "publish:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js --linux --config --x64 -p always",
         "build:all": "cross-env npm run build:mac && cross-env npm run build:win && cross-env npm run build:linux",
         "build:win": "cross-env npm run build:win-x64",
         "build:win-x64": "cross-env node php.js --win --x64 && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --win --config --x64",
-        "build:mac": "cross-env npm run build:mac-arm64 && cross-env npm run build:mac-x86",
+        "build:mac": "cross-env npm run build:mac-arm64 -- --x64",
         "build:mac-arm64": "cross-env node php.js --mac --arm64 && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config --arm64",
         "build:mac-x86": "cross-env node php.js --mac --x86 && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config --x64",
         "build:linux": "cross-env npm run build:linux-x64",
diff --git a/resources/js/src/renderer/index.html b/resources/js/src/renderer/index.html
deleted file mode 100644
index 86a61eb6..00000000
--- a/resources/js/src/renderer/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>Electron</title>
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'"
-    />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
-  </body>
-</html>
diff --git a/resources/js/src/renderer/src/App.vue b/resources/js/src/renderer/src/App.vue
deleted file mode 100644
index 05176623..00000000
--- a/resources/js/src/renderer/src/App.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<script setup>
-import Versions from './components/Versions.vue'
-</script>
-
-<template>
-  <Versions></Versions>
-
-  <svg class="hero-logo" viewBox="0 0 900 300">
-    <use xlink:href="./assets/icons.svg#electron" />
-  </svg>
-  <h2 class="hero-text">You've successfully created an Electron project with Vue</h2>
-  <p class="hero-tagline">Please try pressing <code>F12</code> to open the devTool</p>
-
-  <div class="links">
-    <div class="link-item">
-      <a target="_blank" href="https://evite.netlify.app">Documentation</a>
-    </div>
-    <div class="link-item link-dot">•</div>
-    <div class="link-item">
-      <a target="_blank" href="https://github.com/alex8088/electron-vite">Getting Help</a>
-    </div>
-    <div class="link-item link-dot">•</div>
-    <div class="link-item">
-      <a
-        target="_blank"
-        href="https://github.com/alex8088/quick-start/tree/master/packages/create-electron"
-      >
-        create-electron
-      </a>
-    </div>
-  </div>
-
-  <div class="features">
-    <div class="feature-item">
-      <article>
-        <h2 class="title">Configuring</h2>
-        <p class="detail">
-          Config with <span>electron.vite.config.js</span> and refer to the
-          <a target="_blank" href="https://evite.netlify.app/config/">config guide</a>.
-        </p>
-      </article>
-    </div>
-    <div class="feature-item">
-      <article>
-        <h2 class="title">HMR</h2>
-        <p class="detail">
-          Edit <span>src/renderer</span> files to test HMR. See
-          <a target="_blank" href="https://evite.netlify.app/guide/hmr-in-renderer.html">docs</a>.
-        </p>
-      </article>
-    </div>
-    <div class="feature-item">
-      <article>
-        <h2 class="title">Hot Reloading</h2>
-        <p class="detail">
-          Run <span>'electron-vite dev --watch'</span> to enable. See
-          <a target="_blank" href="https://evite.netlify.app/guide/hot-reloading.html">docs</a>.
-        </p>
-      </article>
-    </div>
-    <div class="feature-item">
-      <article>
-        <h2 class="title">Debugging</h2>
-        <p class="detail">
-          Check out <span>.vscode/launch.json</span>. See
-          <a target="_blank" href="https://evite.netlify.app/guide/debugging.html">docs</a>.
-        </p>
-      </article>
-    </div>
-    <div class="feature-item">
-      <article>
-        <h2 class="title">Source Code Protection</h2>
-        <p class="detail">
-          Supported via built-in plugin <span>bytecodePlugin</span>. See
-          <a target="_blank" href="https://evite.netlify.app/guide/source-code-protection.html">
-            docs
-          </a>
-          .
-        </p>
-      </article>
-    </div>
-    <div class="feature-item">
-      <article>
-        <h2 class="title">Packaging</h2>
-        <p class="detail">
-          Use
-          <a target="_blank" href="https://www.electron.build">electron-builder</a>
-          and pre-configured to pack your app.
-        </p>
-      </article>
-    </div>
-  </div>
-</template>
-
-<style lang="less">
-@import './assets/css/styles.less';
-</style>
diff --git a/resources/js/src/renderer/src/assets/css/styles.less b/resources/js/src/renderer/src/assets/css/styles.less
deleted file mode 100644
index b6e53c94..00000000
--- a/resources/js/src/renderer/src/assets/css/styles.less
+++ /dev/null
@@ -1,189 +0,0 @@
-body {
-  display: flex;
-  flex-direction: column;
-  font-family: Roboto, -apple-system, BlinkMacSystemFont, 'Helvetica Neue', 'Segoe UI', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Open Sans', sans-serif;
-  color: #86a5b1;
-  background-color: #2f3241;
-}
-
-* {
-  padding: 0;
-  margin: 0;
-}
-
-ul {
-  list-style: none;
-}
-
-code {
-  font-weight: 600;
-  padding: 3px 5px;
-  border-radius: 2px;
-  background-color: #26282e;
-  font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
-  font-size: 85%;
-}
-
-a {
-  color: #9feaf9;
-  font-weight: 600;
-  cursor: pointer;
-  text-decoration: none;
-  outline: none;
-}
-
-a:hover {
-  border-bottom: 1px solid;
-}
-
-#app {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  max-width: 840px;
-  margin: 0 auto;
-  padding: 15px 30px 0 30px;
-}
-
-.versions {
-  margin: 0 auto;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  font-family: 'Menlo', 'Lucida Console', monospace;
-  color: #c2f5ff;
-  line-height: 1;
-  transition: all 0.3s;
-
-  li {
-    display: block;
-    float: left;
-    border-right: 1px solid rgba(194, 245, 255, 0.4);
-    padding: 0 20px;
-    font-size: 13px;
-    opacity: 0.8;
-
-    &:last-child {
-      border: none;
-    }
-  }
-}
-
-.hero-logo {
-  margin-top: -0.4rem;
-  transition: all 0.3s;
-}
-
-@media (max-width: 840px) {
-  .versions {
-    display: none;
-  }
-
-  .hero-logo {
-    margin-top: -1.5rem;
-  }
-}
-
-.hero-text {
-  font-weight: 400;
-  color: #c2f5ff;
-  text-align: center;
-  margin-top: -0.5rem;
-  margin-bottom: 10px;
-}
-
-@media (max-width: 660px) {
-  .hero-logo {
-    display: none;
-  }
-
-  .hero-text {
-    margin-top: 20px;
-  }
-}
-
-.hero-tagline {
-  text-align: center;
-  margin-bottom: 14px;
-}
-
-.links {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 24px;
-  font-size: 18px;
-  font-weight: 500;
-
-  a {
-    font-weight: 500;
-  }
-
-  .link-item {
-    padding: 0 4px;
-  }
-}
-
-.features {
-  display: flex;
-  flex-wrap: wrap;
-  margin: -6px;
-
-  .feature-item {
-    width: 33.33%;
-    box-sizing: border-box;
-    padding: 6px;
-  }
-
-  article {
-    background-color: rgba(194, 245, 255, 0.1);
-    border-radius: 8px;
-    box-sizing: border-box;
-    padding: 12px;
-    height: 100%;
-  }
-
-  span {
-    color: #d4e8ef;
-    word-break: break-all;
-  }
-
-  .title {
-    font-size: 17px;
-    font-weight: 500;
-    color: #c2f5ff;
-    line-height: 22px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .detail {
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 22px;
-    margin-top: 6px;
-  }
-}
-
-@media (max-width: 660px) {
-  .features .feature-item {
-    width: 50%;
-  }
-}
-
-@media (max-width: 480px) {
-  .links {
-    flex-direction: column;
-    line-height: 32px;
-
-    .link-dot {
-      display: none;
-    }
-  }
-
-  .features .feature-item {
-    width: 100%;
-  }
-}
diff --git a/resources/js/src/renderer/src/assets/icons.svg b/resources/js/src/renderer/src/assets/icons.svg
deleted file mode 100644
index 8ef80447..00000000
--- a/resources/js/src/renderer/src/assets/icons.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <symbol id="electron" viewBox="0 0 900 300">
-    <g fill="none" fill-rule="evenodd">
-      <g class="hero-apps" style="fill: #71abb7;">
-        <path d="M15 138l-4.9-.64L8 133l-2.1 4.36L1 138l3.6 3.26-.93 4.74L8 143.67l4.33 2.33-.93-4.74z"></path>
-        <path d="M897.2 114.0912l-5.2 3.63v-2.72c0-.55-.45-1-1-1h-8c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h8c.55 0 1-.45 1-1v-2.72l5.2 3.63c.33.23.8 0 .8-.41v-10c0-.41-.47-.64-.8-.41z"></path>
-        <path d="M65.4 188.625h-1.6c.88 0 1.6-.7313 1.6-1.625v-1.625c0-.8937-.72-1.625-1.6-1.625h-1.6c-.88 0-1.6.7313-1.6 1.625V187c0 .8937.72 1.625 1.6 1.625h-1.6c-.88 0-1.6.7313-1.6 1.625v3.25h1.6v4.875c0 .8937.72 1.625 1.6 1.625h1.6c.88 0 1.6-.7313 1.6-1.625V193.5H67v-3.25c0-.8937-.72-1.625-1.6-1.625zm-3.2-3.25h1.6V187h-1.6v-1.625zm3.2 6.5h-1.6v6.5h-1.6v-6.5h-1.6v-1.625h4.8v1.625zm3.344-5.6875c0-3.2175-2.576-5.8337-5.744-5.8337-3.168 0-5.744 2.6162-5.744 5.8337 0 .455.048.8937.144 1.3162v3.2175c-.976-1.2512-1.6-2.8112-1.6-4.55 0-4.03 3.232-7.3125 7.2-7.3125s7.2 3.2825 7.2 7.3125c0 1.7225-.624 3.2988-1.6 4.55v-3.2175c.096-.4387.144-.8612.144-1.3162zm6.256 0c0 4.68-2.608 8.7425-6.4 10.7738v-1.7063c2.976-1.885 4.944-5.2325 4.944-9.0675 0-5.915-4.72-10.7087-10.544-10.7087-5.824 0-10.544 4.7937-10.544 10.7087 0 3.835 1.968 7.1825 4.944 9.0675v1.7063c-3.792-2.0313-6.4-6.0938-6.4-10.7738C51 179.46 56.376 174 63 174s12 5.46 12 12.1875z"></path>
-        <path d="M830.7143 142.3333c-.8643 0-1.5714.7125-1.5714 1.5834v3.1666c0 .871.707 1.5834 1.5713 1.5834h12.5714c.8643 0 1.5714-.7125 1.5714-1.5834v-3.1666c0-.871-.707-1.5834-1.5713-1.5834h-12.5714zm12.5714 2.771l-1.9643 1.979h-2.357L837 145.1043l-1.9643 1.979h-2.357l-1.9644-1.979v-1.1876h1.1786l1.964 1.979 1.9644-1.979h2.3572l1.9643 1.979 1.964-1.979h1.1787v1.1875zm-9.4286 5.1457h6.286v1.5833h-6.286V150.25zM837 136c-6.0657 0-11 4.6075-11 10.2917v7.125c0 .8708.707 1.5833 1.5714 1.5833h18.8572c.8643 0 1.5714-.7125 1.5714-1.5833v-7.125C848 140.6075 843.0657 136 837 136zm9.4286 17.4167h-18.8572v-7.125c0-4.8925 4.1486-8.851 9.4286-8.851 5.28 0 9.4286 3.9585 9.4286 8.851v7.125z"></path>
-        <path d="M75 91.8065V96h4.1935L90.376 84.8174l-4.1934-4.1935L75 91.8064zm4.1935 2.7957h-2.7957v-2.7957h1.398v1.3978h1.3977v1.398zM93.591 81.6024l-1.817 1.817-4.1935-4.1934 1.817-1.817c.5453-.5453 1.426-.5453 1.971 0l2.2226 2.2224c.5453.5452.5453 1.4258 0 1.971z"></path>
-        <path d="M797 187h4v4h-4v-4zm12-1v19c0 1.1-.9 2-2 2h-20c-1.1 0-2-.9-2-2v-24c0-1.1.9-2 2-2h15l7 7zm-2 1l-6-6h-14v22l6-10 4 8 4-4 6 6v-16z"></path>
-        <path d="M138 125c-6.62 0-12 5-12 11 0 9.04 12 21 12 21s12-11.96 12-21c0-6-5.38-11-12-11zm0 29.1c-3.72-4.06-10-12.22-10-18.1 0-4.96 4.5-9 10-9 2.68 0 5.22.96 7.12 2.72 1.84 1.72 2.88 3.94 2.88 6.28 0 5.88-6.28 14.04-10 18.1zm4-18.1c0 2.22-1.78 4-4 4-2.22 0-4-1.78-4-4 0-2.22 1.78-4 4-4 2.22 0 4 1.78 4 4z"></path>
-        <path d="M771 82h8v2h-8v-2zm0 6h8v-2h-8v2zm0 4h8v-2h-8v2zm22-10h-8v2h8v-2zm0 4h-8v2h8v-2zm0 4h-8v2h8v-2zm4-12v18c0 1.1-.9 2-2 2h-11l-2 2-2-2h-11c-1.1 0-2-.9-2-2V78c0-1.1.9-2 2-2h11l2 2 2-2h11c1.1 0 2 .9 2 2zm-16 1l-1-1h-11v18h12V79zm14-1h-11l-1 1v17h12V78z"></path>
-        <path d="M176 203h-24c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h4v7l7-7h13c1.1 0 2-.9 2-2v-16c0-1.1-.9-2-2-2zm0 18h-14l-4 4v-4h-6v-16h24v16z"></path>
-        <path d="M673 88.921c0 2.18-.9 4.18-2.34 5.66l-1.34-1.34c1.1-1.12 1.78-2.62 1.78-4.32 0-1.7-.68-3.22-1.78-4.32l1.34-1.34c1.44 1.44 2.34 3.44 2.34 5.66zm-8.56-11.48l-7.44 7.44h-4c-1.1 0-2 .9-2 2v4c0 1.1.9 2 2 2h4l7.44 7.44c.94.94 2.56.28 2.56-1.06v-20.76c0-1.34-1.62-2-2.56-1.06zm11.88.16l-1.34 1.34c2.56 2.56 4.12 6.06 4.12 9.96 0 3.88-1.56 7.4-4.12 9.96l1.34 1.34c2.9-2.9 4.68-6.9 4.68-11.32 0-4.44-1.78-8.44-4.68-11.32v.04zm-2.82 2.82l-1.38 1.34c1.84 1.84 2.96 4.38 2.96 7.16 0 2.78-1.12 5.32-2.96 7.12l1.38 1.34c2.16-2.16 3.5-5.16 3.5-8.46 0-3.3-1.34-6.32-3.5-8.5z"></path>
-        <path d="M226 79h-16c0-1.1-.9-2-2-2h-8c-1.1 0-2 .9-2 2-1.1 0-2 .9-2 2v18c0 1.1.9 2 2 2h28c1.1 0 2-.9 2-2V81c0-1.1-.9-2-2-2zm-18 4h-8v-2h8v2zm9 14c-3.88 0-7-3.12-7-7s3.12-7 7-7 7 3.12 7 7-3.12 7-7 7zm5-7c0 2.76-2.26 5-5 5s-5-2.26-5-5 2.26-5 5-5 5 2.26 5 5z"></path>
-        <path d="M725.8393 157h-15.6498c-1.1807 0-1.1807-.82-1.1807-2 0-1.18 0-2 1.1807-2h15.6298C727 153 727 153.82 727 155c0 1.18 0 2-1.1807 2h.02zm-11.6473-10c-1.1807 0-1.1807-.82-1.1807-2 0-1.18 0-2 1.1807-2h11.6273C727 143 727 143.82 727 145c0 1.18 0 2-1.1807 2H714.192zM695 146.82l2.8218-2.6 3.182 3.18 8.185-8.4 2.8218 2.82-11.0068 11-6.0038-6zM710.1895 163h15.6298C727 163 727 163.82 727 165c0 1.18 0 2-1.1807 2h-15.6298c-1.1807 0-1.1807-.82-1.1807-2 0-1.18 0-2 1.1807-2z"></path>
-        <path d="M223 152v24c0 1.65 1.35 3 3 3h36c1.65 0 3-1.35 3-3v-24c0-1.65-1.35-3-3-3h-36c-1.65 0-3 1.35-3 3zm39 0l-18 15-18-15h36zm-36 4.5l12 9-12 9v-18zm3 19.5l10.5-9 4.5 4.5 4.5-4.5 10.5 9h-30zm33-1.5l-12-9 12-9v18z"></path>
-        <path d="M648 182h-3v4.5c0 .84-.66 1.5-1.5 1.5h-6c-.84 0-1.5-.66-1.5-1.5V182h-9v4.5c0 .84-.66 1.5-1.5 1.5h-6c-.84 0-1.5-.66-1.5-1.5V182h-3c-1.65 0-3 1.35-3 3v33c0 1.65 1.35 3 3 3h33c1.65 0 3-1.35 3-3v-33c0-1.65-1.35-3-3-3zm0 36h-33v-27h33v27zm-24-33h-3v-6h3v6zm18 0h-3v-6h3v6zm-15 12h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm-24 6h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm-24 6h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm-24 6h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3zm6 0h-3v-3h3v3z"></path>
-      </g>
-      <g class="hero-icons" style="fill: #c2f5ff;">
-        <path d="M441.1132 69.724c7.681 0 13.9075-6.207 13.9075-13.8636 0-7.6565-6.2266-13.8634-13.9075-13.8634-7.681 0-13.9076 6.207-13.9076 13.8634 0 7.6566 6.2266 13.8635 13.9076 13.8635zm0-5.7932c-4.4713 0-8.096-3.6132-8.096-8.0704 0-4.457 3.6247-8.0703 8.096-8.0703 4.4712 0 8.096 3.6133 8.096 8.0704 0 4.4572-3.6248 8.0704-8.096 8.0704z"></path>
-        <path d="M354.8995 220.2693c7.681 0 13.9075-6.207 13.9075-13.8635s-6.2266-13.8634-13.9075-13.8634c-7.681 0-13.9075 6.207-13.9075 13.8634 0 7.6566 6.2266 13.8635 13.9075 13.8635zm0-5.793c-4.4713 0-8.096-3.6133-8.096-8.0705 0-4.457 3.6247-8.0703 8.096-8.0703s8.096 3.6132 8.096 8.0703c0 4.4572-3.6247 8.0704-8.096 8.0704z"></path>
-        <path d="M541.0343 206.4058c0-7.6565-6.2266-13.8634-13.9075-13.8634-7.681 0-13.9075 6.207-13.9075 13.8634 0 7.6566 6.2266 13.8635 13.9075 13.8635 7.681 0 13.9075-6.207 13.9075-13.8635zm-5.8115 0c0 4.4572-3.6247 8.0704-8.096 8.0704s-8.096-3.6132-8.096-8.0704c0-4.457 3.6247-8.0703 8.096-8.0703s8.096 3.6132 8.096 8.0703z"></path>
-        <path d="M397.6943 214.5258c9.7012 27.0033 25.5723 43.629 43.419 43.629 13.0157 0 25.0578-8.8443 34.4482-24.4154.827-1.371.3822-3.1507-.9932-3.975-1.3755-.824-3.1607-.3808-3.9876.9902-8.439 13.9938-18.8052 21.6072-29.4675 21.6072-14.8247 0-28.9803-14.8288-37.9476-39.7892-.541-1.506-2.2044-2.2897-3.7153-1.7504-1.511.5394-2.297 2.1975-1.756 3.7036z"></path>
-        <path d="M514.124 163.4733c18.5545-21.85 25.033-43.826 16.122-59.2117-6.557-11.321-20.419-17.2982-38.841-17.537-1.6047-.021-2.9225 1.259-2.9434 2.8586-.0208 1.5996 1.263 2.9132 2.8678 2.934 16.5683.2148 28.5106 5.3642 33.8836 14.641 7.4018 12.7797 1.6243 32.3774-15.5247 52.5722-1.037 1.221-.8844 3.0487.3405 4.0822 1.2248 1.0336 3.0584.8817 4.0952-.3393z"></path>
-        <path d="M411.5672 88.457c-28.3373-5.1448-50.7424.24-59.672 15.6575-6.6635 11.505-4.7588 26.7585 4.6193 43.0637.7982 1.3878 2.574 1.8678 3.966 1.072 1.3923-.7956 1.874-2.5656 1.0756-3.9534-8.4477-14.688-10.0915-27.8524-4.628-37.2857 7.418-12.8074 27.403-17.6105 53.5978-12.8546 1.579.2866 3.092-.7568 3.3794-2.3307.2876-1.5738-.7592-3.082-2.338-3.3687z"></path>
-        <path d="M486.3075 209.2436c5.022-15.998 7.7194-34.453 7.7194-53.6842 0-47.9875-16.849-89.3545-40.8478-99.977-1.4667-.649-3.1837.0098-3.835 1.472-.6512 1.462.01 3.1735 1.4766 3.8227 21.404 9.474 37.3945 48.7337 37.3945 94.6824 0 18.6574-2.612 36.5297-7.454 51.954-.4794 1.5268.3736 3.1518 1.9052 3.6295s3.1617-.3727 3.641-1.8994z"></path>
-        <path d="M466.439 89.4215c-16.7763 3.583-34.6332 10.5886-51.7827 20.4585-42.434 24.4216-70.1147 60.4323-66.2703 86.5432.233 1.5828 1.709 2.6776 3.297 2.4453 1.5877-.2323 2.686-1.7037 2.453-3.2865-3.4135-23.1838 22.825-57.3183 63.426-80.685 16.6365-9.5746 33.9267-16.3578 50.0946-19.811 1.5692-.335 2.5687-1.8748 2.2325-3.439-.336-1.5642-1.8807-2.5606-3.45-2.2255z"></path>
-        <path d="M371.2508 166.997c11.458 12.5516 26.3438 24.3243 43.3203 34.0947 41.106 23.6572 84.866 29.9805 106.4328 15.3217 1.326-.9013 1.668-2.7033.7638-4.025-.904-1.3217-2.712-1.6626-4.0378-.7614-19.302 13.1195-60.871 7.1128-100.253-15.5523-16.469-9.4783-30.8834-20.8782-41.9277-32.9767-1.08-1.1832-2.9178-1.2695-4.1048-.1928-1.187 1.0766-1.2735 2.9086-.1934 4.0918z"></path>
-        <path d="M443.2374 165.3634c-5.432 1.17-10.7838-2.2712-11.9598-7.686-1.1714-5.415 2.2785-10.7498 7.7106-11.922 5.432-1.17 10.7838 2.2712 11.9598 7.686 1.1737 5.415-2.2785 10.7498-7.7106 11.922z"></path>
-      </g>
-    </g>
-  </symbol>
-</svg>
diff --git a/resources/js/src/renderer/src/components/Versions.vue b/resources/js/src/renderer/src/components/Versions.vue
deleted file mode 100644
index 33ce4efc..00000000
--- a/resources/js/src/renderer/src/components/Versions.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<script setup>
-import { reactive } from 'vue'
-
-const versions = reactive({ ...window.electron.process.versions })
-</script>
-
-<template>
-  <ul class="versions">
-    <li class="electron-version">Electron v{{ versions.electron }}</li>
-    <li class="chrome-version">Chromium v{{ versions.chrome }}</li>
-    <li class="node-version">Node v{{ versions.node }}</li>
-    <li class="v8-version">V8 v{{ versions.v8 }}</li>
-  </ul>
-</template>
diff --git a/resources/js/src/renderer/src/main.js b/resources/js/src/renderer/src/main.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/Commands/BuildCommand.php b/src/Commands/BuildCommand.php
index 0cec14fd..7fcf837e 100644
--- a/src/Commands/BuildCommand.php
+++ b/src/Commands/BuildCommand.php
@@ -43,7 +43,6 @@ public function handle(): void
                 echo $output;
             });
 
-        // Added checks for correct input for os and arch
         $os = $this->selectOs($this->argument('os'));
 
         $this->installIcon();
@@ -55,10 +54,11 @@ public function handle(): void
             $os .= $arch != 'all' ? "-{$arch}" : '';
 
             // Should we publish?
-            if ($publish = ($this->option('publish'))) {
+            if ($publish = $this->option('publish')) {
                 $buildCommand = 'publish';
             }
         }
+
         $this->info((($publish ?? false) ? 'Publishing' : 'Building')." for {$os}");
 
         Process::path(__DIR__.'/../../resources/js/')
diff --git a/src/Commands/QueueWorkerCommand.php b/src/Commands/QueueWorkerCommand.php
deleted file mode 100644
index df753ecd..00000000
--- a/src/Commands/QueueWorkerCommand.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Native\Electron\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Process;
-use Illuminate\Support\Str;
-
-use function Laravel\Prompts\intro;
-
-class QueueWorkerCommand extends Command
-{
-    protected $signature = 'native:queue {--port=4000}';
-
-    protected function getAppDirectory(): string|false
-    {
-        $appName = Str::slug(config('app.name'));
-
-        if (PHP_OS_FAMILY === 'Windows') {
-            $basePath = getenv('APPDATA');
-        } elseif (PHP_OS_FAMILY === 'Linux') {
-            $basePath = getenv('XDG_CONFIG_HOME') ?: getenv('HOME').'/.config';
-        } elseif (PHP_OS_FAMILY === 'Darwin') {
-            $basePath = getenv('HOME').'/Library/Application Support';
-        }
-
-        return realpath($basePath.'/'.$appName);
-    }
-
-    public function handle(): void
-    {
-        intro('Starting NativePHP queue worker…');
-
-        $phpBinary = __DIR__.'/../../resources/js/resources/php/php';
-
-        Process::path(base_path())
-            ->env([
-                'APP_PATH' => base_path(),
-                'NATIVEPHP_RUNNING' => true,
-                'NATIVEPHP_STORAGE_PATH' => $this->getAppDirectory().'/storage',
-                'NATIVEPHP_API_URL' => 'http://localhost:'.$this->option('port').'/api/',
-                'NATIVEPHP_DATABASE_PATH' => $this->getAppDirectory().'/database/database.sqlite',
-            ])
-            ->forever()
-            ->tty()
-            ->run($phpBinary.' artisan queue:work', function (string $type, string $output) {
-                echo $output;
-            });
-    }
-}
diff --git a/src/ElectronServiceProvider.php b/src/ElectronServiceProvider.php
index 6e4d193c..65a9540c 100644
--- a/src/ElectronServiceProvider.php
+++ b/src/ElectronServiceProvider.php
@@ -6,7 +6,6 @@
 use Native\Electron\Commands\DevelopCommand;
 use Native\Electron\Commands\InstallCommand;
 use Native\Electron\Commands\PublishCommand;
-use Native\Electron\Commands\QueueWorkerCommand;
 use Native\Electron\Updater\UpdaterManager;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -23,7 +22,6 @@ public function configurePackage(Package $package): void
                 DevelopCommand::class,
                 BuildCommand::class,
                 PublishCommand::class,
-                QueueWorkerCommand::class,
             ]);
     }
 
diff --git a/src/Facades/Updater.php b/src/Facades/Updater.php
index 9ab655dd..ce1ee0cb 100644
--- a/src/Facades/Updater.php
+++ b/src/Facades/Updater.php
@@ -4,6 +4,10 @@
 
 use Illuminate\Support\Facades\Facade;
 
+/**
+ * @method static array builderOptions()
+ * @method static array environmentVariables()
+ */
 class Updater extends Facade
 {
     protected static function getFacadeAccessor(): string