Merge branch 'develop' of https://github.com/getferdi/ferdi into develop

52 files changed, 97 insertions, 24 deletions

diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index a77ad7742..aadb18d91 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -95,7 +95,7 @@ const styles = theme => ({
   },
 });
 
-export default @observer @injectSheet(styles) class Signup extends Component {
+export default @injectSheet(styles) @observer class Signup extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     isLoadingRequiredData: PropTypes.bool.isRequired,
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index a7f8696c3..e2f056f5c 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -116,7 +116,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
             { stores.settings.all.app.lockingFeatureEnabled ? (
               <button
                 type="button"
-                className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
+                className={`sidebar__button`}
                 onClick={() => {
                   // Disable lock first - otherwise the application might not update correctly
                   actions.settings.update({
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 664a494c1..49ee24361 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -15,7 +15,7 @@ import SettingsStore from '../../../stores/SettingsStore';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants';
 
-export default @observer @inject('stores', 'actions') class ServiceView extends Component {
+export default @inject('stores', 'actions') @observer class ServiceView extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index edff29ae8..caa3f3b23 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -39,7 +39,7 @@ const styles = {
   },
 };
 
-export default @observer @injectSheet(styles) class Services extends Component {
+export default @injectSheet(styles) @observer class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
diff --git a/src/components/subscription/TrialForm.js b/src/components/subscription/TrialForm.js
index 9ed548f16..6ccdf20ae 100644
--- a/src/components/subscription/TrialForm.js
+++ b/src/components/subscription/TrialForm.js
@@ -56,7 +56,7 @@ const styles = theme => ({
   },
 });
 
-export default @observer @injectSheet(styles) class TrialForm extends Component {
+export default @injectSheet(styles) @observer class TrialForm extends Component {
   static propTypes = {
     activateTrial: PropTypes.func.isRequired,
     isActivatingTrial: PropTypes.bool.isRequired,
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index f46fd34ea..5066b9c06 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -4,7 +4,7 @@ import { observer, inject } from 'mobx-react';
 import Loader from 'react-loader';
 import classnames from 'classnames';
 
-export default @observer @inject('stores') class Button extends Component {
+export default @inject('stores') @observer class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     label: PropTypes.string.isRequired,
@@ -26,7 +26,7 @@ export default @observer @inject('stores') class Button extends Component {
   static defaultProps = {
     className: null,
     disabled: false,
-    onClick: () => {},
+    onClick: () => { },
     type: 'button',
     buttonType: '',
     loaded: true,
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 334bb6c4a..d8cdc2e8a 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -8,7 +8,7 @@ import Loader from '../Loader';
 
 import styles from './styles';
 
-export default @observer @inject('stores') @withTheme @injectSheet(styles) class FullscreenLoader extends Component {
+export default @inject('stores') @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component {
   static propTypes = {
     className: PropTypes.string,
     title: PropTypes.string.isRequired,
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js
index 627749273..4d7113aa1 100644
--- a/src/components/ui/Loader.js
+++ b/src/components/ui/Loader.js
@@ -5,7 +5,7 @@ import Loader from 'react-loader';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-export default @observer @inject('stores') class LoaderComponent extends Component {
+export default @inject('stores') @observer class LoaderComponent extends Component {
   static propTypes = {
     children: oneOrManyChildElements,
     loaded: PropTypes.bool,
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 58b6b6f1b..923f10327 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -14,7 +14,7 @@ const messages = defineMessages({
   },
 });
 
-export default @observer @injectSheet(styles) class WebviewLoader extends Component {
+export default @injectSheet(styles) @observer class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     classes: PropTypes.object.isRequired,
diff --git a/src/config.js b/src/config.js
index ae07ab0de..0673e994a 100644
--- a/src/config.js
+++ b/src/config.js
@@ -89,7 +89,7 @@ export const DEFAULT_FEATURES_CONFIG = {
   },
   isServiceProxyEnabled: false,
   isServiceProxyIncludedInCurrentPlan: true,
-  isAnnouncementsEnabled: true,
+  isAnnouncementsEnabled: false,
   isWorkspaceIncludedInCurrentPlan: true,
   isWorkspaceEnabled: false,
   isCommunityRecipesIncludedInCurrentPlan: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index e5dd2d4fc..3898d2b99 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -478,7 +478,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
       toggleTodosFeatureVisibility: PropTypes.func.isRequired,
     }).isRequired,
     workspaces: PropTypes.shape({
-      toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
+      toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index 42823e74c..10f081bb1 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -12,13 +12,12 @@ export const ANNOUNCEMENTS_ROUTES = {
 };
 
 export default function initAnnouncements(stores, actions) {
-  // const { features } = stores;
+  const { features } = stores;
 
-  // Toggle workspace feature
+  // Toggle announcement feature
   reaction(
     () => (
-      true
-      // features.features.isAnnouncementsEnabled
+      features.features.isAnnouncementsEnabled
     ),
     (isEnabled) => {
       if (isEnabled) {
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index 35c102220..e9b1963f7 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -79,7 +79,7 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer @inject('stores')
+@injectSheet(styles) @inject('stores') @observer
 class TodosWebview extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 124c34518..2cb685f26 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Configuració",
   "settings.app.headlineAdvanced": "Avançat",
   "settings.app.headlineAppearance": "Aparença",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Memòria cau",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Ajuda'ns a traduir Ferdi en la teva llengua.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Actualització disponible, descarregant ...",
   "settings.app.updateStatusSearching": "Està buscant actualitzacions",
   "settings.app.updateStatusUpToDate": "Esteu utilitzant la versió més recent de Ferdi",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 6b90ad898..2bd2cb513 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Nastavení",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhled",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Mezipaměť",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Pomozte nám přeložit Ferdi do svého jazyka.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Aktualizace k dispozici, stahování...",
   "settings.app.updateStatusSearching": "Hledá aktualizace",
   "settings.app.updateStatusUpToDate": "Používáte nejnovější verzi programu Ferdi",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index bd634594b..45c033e56 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
   "settings.app.form.showServiceNavigationBar": "Navigationsleiste immer anzeigen",
   "settings.app.form.todoServer": "Todo-Server",
+  "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
   "settings.app.headline": "Einstellungen",
   "settings.app.headlineAdvanced": "Erweitert",
   "settings.app.headlineAppearance": "Darstellung",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Dieser Server wird für die Funktion \"Ferdi Todo\" verwendet. (Standard: https://app.franztodos.com)",
   "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.",
+  "settings.app.universalDarkModeInfo": "Universeller Dark Mode versucht dynamisch Dienste abzudunkeln, die vom normalen Dark Mode noch nicht unterstützt werden.",
   "settings.app.updateStatusAvailable": "Update verfügbar, lädt herunter ...",
   "settings.app.updateStatusSearching": "Suche nach Updates",
   "settings.app.updateStatusUpToDate": "Du nutzt die aktuellste Version von Ferdi",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 82f6be754..a61346770 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Ρυθμίσεις",
   "settings.app.headlineAdvanced": "Για προχωρημένους",
   "settings.app.headlineAppearance": "Εμφάνιση",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Λανθάνουσα μνήμη",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Βοηθήστε μας να μεταφράσουμε το Ferdi στη δική σας γλώσσα.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Υπάρχει διαθέσιμη ενημέρωση, γίνεται λήψη...",
   "settings.app.updateStatusSearching": " Γίνεται αναζήτηση για ενημέρωση",
   "settings.app.updateStatusUpToDate": "Χρησιμοποιείτε την τελευταία έκδοση του Ferdi",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 7310ea945..950e24814 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Configuración",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Caché",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Actualización disponible, descargando...",
   "settings.app.updateStatusSearching": "Buscando actualizaciones",
   "settings.app.updateStatusUpToDate": "Estás utilizando la última versión de Ferdi",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 77e58362f..e82ba3f36 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -214,13 +214,13 @@
   "settings.account.upgradeToPro.label": "Améliorez à Ferdi Professionnel",
   "settings.account.userInfoRequestFailed": "Impossible de charger les informations de l'utilisateur",
   "settings.account.yourLicense": "Votre licence Ferdi",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)",
+  "settings.app.accentColorInfo": "Écrivez votre accent de couleur dans un format compatible avec CSS. (Par défaut : #7367f0)",
   "settings.app.buttonClearAllCache": "Vider le cache",
   "settings.app.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
   "settings.app.buttonSearchForUpdate": "Vérifier les mises à jour",
   "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
   "settings.app.currentVersion": "Version actuelle :",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Accent de couleur",
   "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan",
   "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage",
   "settings.app.form.beta": "Accepter les versions bêta",
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
   "settings.app.form.showServiceNavigationBar": "Toujours afficher la barre de navigation du service",
   "settings.app.form.todoServer": "Serveur Todo",
+  "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
   "settings.app.headline": "Paramètres",
   "settings.app.headlineAdvanced": "Paramètres avancés",
   "settings.app.headlineAppearance": "Apparence",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Ce serveur va être utilisé pour la fonction \"Ferdi Todo\". (défaut: https://app.franztodos.com)",
   "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.",
+  "settings.app.universalDarkModeInfo": "Le mode sombre universel tente de générer dynamiquement des styles de mode sombre pour les services qui ne sont pas encore supportés.",
   "settings.app.updateStatusAvailable": "Mise à jour disponible, téléchargement en cours...",
   "settings.app.updateStatusSearching": "Recherche d'une mise à jour",
   "settings.app.updateStatusUpToDate": "Vous utilisez la dernière version de Ferdi",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index bd4c702a0..5a57b98ab 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Socruithe",
   "settings.app.headlineAdvanced": "Casta",
   "settings.app.headlineAppearance": "Dealramh",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Taisce",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Cabhraigh linn Ferdi a aistriú i do theanga.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Nuashonrú le fáil, ag íoslódáil...",
   "settings.app.updateStatusSearching": "Ag cuardach le nuashonruithe",
   "settings.app.updateStatusUpToDate": "Tá tú ag baint úsáid as an leagan is deireanaí de Ferdi",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index b3e073c67..10d6a1a17 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Predmemorija",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Nadogradnja dostupna, preuzimanje...",
   "settings.app.updateStatusSearching": "Traže se ažuriranja",
   "settings.app.updateStatusUpToDate": "Koristite najnoviju verziju Franca.",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index c083c9473..8699e1230 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Beállítások",
   "settings.app.headlineAdvanced": "Haladó",
   "settings.app.headlineAppearance": "Megjelenés",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Gyorsítótár",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Segíts nekünk a Ferdi-ot lefordítani a nyelvedre.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Frissítés elérhető, letöltés folyamatban...",
   "settings.app.updateStatusSearching": "Frissítéseket keres",
   "settings.app.updateStatusUpToDate": "A Ferdi legfrissebb verzióját használod",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 271de3b74..7be6c28a2 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Pengaturan",
   "settings.app.headlineAdvanced": "Tingkat Lanjut",
   "settings.app.headlineAppearance": "Tampilan",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Singgahan",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Bantu kami menerjemahkan Ferdi ke bahasa Anda.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Versi baru tersedia, mengunduh...",
   "settings.app.updateStatusSearching": "Sedang mencari versi baru",
   "settings.app.updateStatusUpToDate": "Anda sedang menggunakan versi terbaru Ferdi",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index d629bcf79..9548ce135 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Impostazioni",
   "settings.app.headlineAdvanced": "Avanzate",
   "settings.app.headlineAppearance": "Aspetto",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Aiutaci a tradurre Ferdi nella tua lingua.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Aggiornamento disponibile, download in corso...",
   "settings.app.updateStatusSearching": "Ricerca aggiornamenti",
   "settings.app.updateStatusUpToDate": "Stai utilizzando l'ultima versione di Ferdi",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index bb15e80d9..22a763ffd 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "設定",
   "settings.app.headlineAdvanced": "詳細",
   "settings.app.headlineAppearance": "表示スタイル",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "キャッシュ",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Ferdiの翻訳作業にご協力をお願いします。",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "更新が見つかりました。ダウンロードしています...",
   "settings.app.updateStatusSearching": "更新を確認中",
   "settings.app.updateStatusUpToDate": "お使いのFerdiは最新です",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 3a8c98296..e0eb6657f 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "პარამეტრები",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "განახლება ხელმისაწვდომია, იწყება გადმოწერა...",
   "settings.app.updateStatusSearching": "მიმდინარეობს განახლების ძიება",
   "settings.app.updateStatusUpToDate": "თქვენ იყენებთ Ferdi-ის უახლეს ვერსიას",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 862f57739..d76febdeb 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help ons om Ferdi te vertalen naar uw taal.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update beschikbaar, downloaden...",
   "settings.app.updateStatusSearching": "Zoekt naar updates",
   "settings.app.updateStatusUpToDate": "Je gebruikt de laatste versie van Ferdi",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 52a68c4cf..c55804152 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help ons om Ferdi uw taal te laten spreken.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update beschikbaar, downloaden...",
   "settings.app.updateStatusSearching": "Zoekt naar updates",
   "settings.app.updateStatusUpToDate": "Je gebruikt de laatste versie van Ferdi",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 0aad17679..f7ad5425c 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Ustawienia",
   "settings.app.headlineAdvanced": "Zaawansowane",
   "settings.app.headlineAppearance": "Wygląd",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Pamięć podręczna",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Pomóż nam tłumaczyć Ferdi na Twój język.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Dostępna aktualizacja, pobieram...",
   "settings.app.updateStatusSearching": "Szukam aktualizacji",
   "settings.app.updateStatusUpToDate": "Używasz najnowszej wersji aplikacji Ferdi",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index eb42e9b76..2e3b5b189 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "memória cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Ajude-nos a traduzir o Ferdi para seu idioma.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Atualização disponível, baixando...",
   "settings.app.updateStatusSearching": "Buscando atualizações",
   "settings.app.updateStatusUpToDate": "Você está usando a última versão do Ferdi",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 215d616bb..e9a0138ad 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Definições",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Ajude-nos a traduzir a Ferdi para a sua língua.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Atualização disponivel, a transferir...",
   "settings.app.updateStatusSearching": "A procurar atualizações",
   "settings.app.updateStatusUpToDate": "Está a usar a versão mais recente do Ferdi",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index a2f5951e9..5f5ccc109 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Настройки",
   "settings.app.headlineAdvanced": "Дополнительно",
   "settings.app.headlineAppearance": "Внешний вид",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Кэш",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Помогите нам перевести Ferdi на ваш язык.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Доступно обновление, идёт загрузка...",
   "settings.app.updateStatusSearching": "Поиск обновлений",
   "settings.app.updateStatusUpToDate": "Вы используете актуальную версию Ferdi",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 8332d1369..93a823cae 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Nastavenia",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhľad",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Vyrovnávacia pamäť",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Pomôžte nám preložiť Ferdi do svojho jazyka.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Je dostupná aktualizácia, sťahuje sa...",
   "settings.app.updateStatusSearching": "Vyhľadáva aktualizácie",
   "settings.app.updateStatusUpToDate": "Používate najnovšiu verziu Ferdi",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 7cf2816b9..d2fee5361 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Кеш",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Nadogradnja dostupna, preuzimanje...",
   "settings.app.updateStatusSearching": "Traže se ažuriranja",
   "settings.app.updateStatusUpToDate": "Koristite najnoviju verziju Franca.",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 700f22847..97a9d5636 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Ayarlar",
   "settings.app.headlineAdvanced": "Gelişmiş",
   "settings.app.headlineAppearance": "Görünüm",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Önbellek",
   "settings.app.todoServerInfo": "Bu sunucu \"Ferdi Yapılacaklar Listesi\" özelliği için kullanılacakdır. (varsayılan: https://app.franztodos.com)",
   "settings.app.translationHelp": "Ferdi'ı senin diline tercüme etmemiz için yardım et.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Güncelleme mevcut, indiriliyor...",
   "settings.app.updateStatusSearching": "Güncellemeleri denetliyor",
   "settings.app.updateStatusUpToDate": "Ferdi'ın son versiyonunu kullanıyorsun",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index d61d25402..27c858e30 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Налаштування",
   "settings.app.headlineAdvanced": "Додаткові налаштування",
   "settings.app.headlineAppearance": "Вигляд",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Кеш",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Допоможіть перекласти Ferdi на Вашу мову.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Оновлення доступне, завантаження...",
   "settings.app.updateStatusSearching": "Шукає оновлення",
   "settings.app.updateStatusUpToDate": "Ви використовуєте останню версію Ferdi",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
index 851a3c901..678554c05 100644
--- a/src/i18n/locales/zh-Hant.json
+++ b/src/i18n/locales/zh-Hant.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "有可用更新，下載中...",
   "settings.app.updateStatusSearching": "檢查更新中...",
   "settings.app.updateStatusUpToDate": "已經是最新版本了",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index b29123f83..8b88fcdeb 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -247,6 +247,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.todoServer": "Todo Server",
+  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
@@ -266,6 +267,7 @@
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
   "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
+  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
diff --git a/src/index.js b/src/index.js
index 4dcabb599..799e762f5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,10 +10,10 @@ import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
 // Set app directory before loading user modules
-if (process.env.FERDI_APPDATA_DIR != null) {
-  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR);
+if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) {
+  const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR
+  app.setPath('appData', appDataPath);
+  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
 }
 if (isDevMode) {
   app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`));
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 7f91049df..8b2bde5df 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -108,7 +108,7 @@ export default class RecipesStore extends Store {
   async _checkIfRecipeIsInstalled() {
     const { router } = this.stores;
 
-    const match = matchRoute('/settings/services/add/:id', router.location.pathname);
+    const match = router.location && matchRoute('/settings/services/add/:id', router.location.pathname);
     if (match) {
       const recipeId = match.id;