3 files changed, 37 insertions, 7 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d7398a126..f3fbb0c73 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -487,7 +487,8 @@ const _templateFactory = intl => [
 
 const _titleBarTemplateFactory = intl => [
   {
-    label: `&${intl.formatMessage(menuItems.edit)}`,
+    label: intl.formatMessage(menuItems.edit),
+    accelerator: 'Alt+E',
     submenu: [
       {
         label: intl.formatMessage(menuItems.undo),
@@ -550,7 +551,8 @@ const _titleBarTemplateFactory = intl => [
     ],
   },
   {
-    label: `&${intl.formatMessage(menuItems.view)}`,
+    label: intl.formatMessage(menuItems.view),
+    accelerator: 'Alt+V',
     submenu: [
       {
         type: 'separator',
@@ -641,11 +643,13 @@ const _titleBarTemplateFactory = intl => [
     ],
   },
   {
-    label: `&${intl.formatMessage(menuItems.services)}`,
+    label: intl.formatMessage(menuItems.services),
+    accelerator: 'Alt+S',
     submenu: [],
   },
   {
-    label: `&${intl.formatMessage(menuItems.workspaces)}`,
+    label: intl.formatMessage(menuItems.workspaces),
+    accelerator: 'Alt+W',
     submenu: [],
     visible: workspaceStore.isFeatureEnabled,
   },
@@ -816,7 +820,8 @@ export default class FranzMenu {
     });
 
     tpl.unshift({
-      label: isMac ? app.getName() : `&${intl.formatMessage(menuItems.file)}`,
+      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      accelerator: 'Alt+F',
       submenu: [
         {
           label: intl.formatMessage(menuItems.about),
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index c6724c20f..59b100b55 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -233,14 +233,25 @@ export default class AppStore extends Store {
         release: os.release(),
         screens: screen.getAllDisplays(),
       },
-      franz: {
+      ferdi: {
         version: app.getVersion(),
         electron: process.versions.electron,
         installedRecipes: this.stores.recipes.all.map(recipe => ({ id: recipe.id, version: recipe.version })),
         devRecipes: this.stores.recipePreviews.dev.map(recipe => ({ id: recipe.id, version: recipe.version })),
-        services: this.stores.services.all.map(service => ({ id: service.id, recipe: service.recipe.id })),
+        services: this.stores.services.all.map(service => ({ 
+          id: service.id, 
+          recipe: service.recipe.id, 
+          isAttached: service.isAttached, 
+          isActive: service.isActive,
+          isEnabled: service.isEnabled,
+          isHibernating: service.isHibernating,
+          hasCrashed: service.hasCrashed,
+          isDarkModeEnabled: service.isDarkModeEnabled,
+        })),
         workspaces: this.stores.workspaces.workspaces.map(workspace => ({ id: workspace.id, services: workspace.services })),
         windowSettings: readJsonSync(path.join(app.getPath('userData'), 'window-state.json')),
+        settings: this.stores.settings.app,
+        features: this.stores.features.features,
         user: this.stores.user.data.id,
       },
     };
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 2bf8f757a..1e290f8be 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -120,6 +120,7 @@ class RecipeController {
       }
     }
 
+    console.log('Set theme to: ', this.settings.service.isDarkModeEnabled ? 'Dark' : 'Light');
     if (this.settings.service.isDarkModeEnabled) {
       debug('Enable dark mode');
 
@@ -127,9 +128,18 @@ class RecipeController {
       const darkModeStyle = path.join(this.settings.service.recipe.path, 'darkmode.css');
       const darkModeExists = fs.pathExistsSync(darkModeStyle);
 
+      console.log('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
+
       if (darkModeExists) {
+        console.log('Injecting darkmode.css');
         injectDarkModeStyle(this.settings.service.recipe.path);
+
+        // Make sure universal dark mode is disabled
+        disableDarkMode();
+        this.universalDarkModeInjected = false;
       } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
+        console.log('Injecting DarkReader');
+
         // Use darkreader instead
         enableDarkMode({}, {
           css: customDarkModeCss[window.location.host] || '',
@@ -138,10 +148,14 @@ class RecipeController {
       }
     } else {
       debug('Remove dark mode');
+      console.log('DarkMode disabled - removing remaining styles');
 
       if (isDarkModeStyleInjected()) {
+        console.log('Removing injected darkmode.css');
         removeDarkModeStyle();
       } else {
+        console.log('Removing DarkReader');
+
         disableDarkMode();
         this.universalDarkModeInjected = false;
       }