3 files changed, 34 insertions, 3 deletions

diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 8b2bde5df..cf5d0a074 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -1,9 +1,13 @@
 import { action, computed, observable } from 'mobx';
+import fs from 'fs-extra';
+import path from 'path';
+import semver from 'semver';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
+import { RECIPES_PATH } from '../config';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
@@ -83,7 +87,30 @@ export default class RecipesStore extends Store {
 
     if (Object.keys(recipes).length === 0) return;
 
-    const updates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+
+    // Check for local updates
+    const allJsonFile = path.join(RECIPES_PATH, 'all.json');
+    const allJson = await fs.readJSON(allJsonFile);
+    const localUpdates = [];
+
+    Object.keys(recipes).forEach((recipe) => {
+      const version = recipes[recipe];
+
+      // Find recipe in local recipe repository
+      const localRecipe = allJson.find(r => r.id === recipe);
+
+      if (localRecipe && semver.lt(version, localRecipe.version)) {
+        localUpdates.push(recipe);
+      }
+    });
+
+    const updates = [
+      ...remoteUpdates,
+      ...localUpdates,
+    ];
+    debug('Got update information (local, remote):', localUpdates, remoteUpdates);
+
     const length = updates.length - 1;
     const syncUpdate = async (i) => {
       const update = updates[i];
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 3dd601bc3..fda18b514 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -83,6 +83,7 @@ export default class ServicesStore extends Store {
     this.actions.service.openDevTools.listen(this._openDevTools.bind(this));
     this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this));
     this.actions.service.setHibernation.listen(this._setHibernation.bind(this));
+    this.actions.service.shareSettingsWithServiceProcess.listen(this._shareSettingsWithServiceProcess.bind(this));
 
     this.registerReactions([
       this._focusServiceReaction.bind(this),
@@ -771,7 +772,10 @@ export default class ServicesStore extends Store {
   }
 
   _shareSettingsWithServiceProcess() {
-    const settings = this.stores.settings.app;
+    const settings = {
+      ...this.stores.settings.app,
+      isDarkThemeActive: this.stores.ui.isDarkThemeActive,
+    };
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
       args: settings,
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 7e6f89fed..6941cf086 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -32,6 +32,7 @@ export default class UIStore extends Store {
         'AppleInterfaceThemeChangedNotification',
         () => {
           this.isOsDarkThemeActive = nativeTheme.shouldUseDarkColors;
+          this.actions.service.shareSettingsWithServiceProcess();
         },
       );
     }
@@ -56,7 +57,6 @@ export default class UIStore extends Store {
 
   @computed get isDarkThemeActive() {
     const isMacWithAdaptableInDarkMode = isMac
-      && this.stores.settings.all.app.darkMode
       && this.stores.settings.all.app.adaptableDarkMode
       && this.isOsDarkThemeActive;
     const isMacWithoutAdaptableInDarkMode = isMac