1 files changed, 22 insertions, 1 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index f0ceeb8e6..3898d2b99 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -98,6 +98,14 @@ const messages = defineMessages({
     id: 'settings.app.form.darkMode',
     defaultMessage: '!!!Dark Mode',
   },
+  universalDarkMode: {
+    id: 'settings.app.form.universalDarkMode',
+    defaultMessage: '!!!Enable universal Dark Mode',
+  },
+  accentColor: {
+    id: 'settings.app.form.accentColor',
+    defaultMessage: '!!!Accent color',
+  },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: '!!!Display disabled services tabs',
@@ -172,6 +180,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
         darkMode: settingsData.darkMode,
+        universalDarkMode: settingsData.universalDarkMode,
+        accentColor: settingsData.accentColor,
         showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
@@ -340,6 +350,16 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.darkMode,
           default: DEFAULT_APP_SETTINGS.darkMode,
         },
+        universalDarkMode: {
+          label: intl.formatMessage(messages.universalDarkMode),
+          value: settings.all.app.universalDarkMode,
+          default: DEFAULT_APP_SETTINGS.universalDarkMode,
+        },
+        accentColor: {
+          label: intl.formatMessage(messages.accentColor),
+          value: settings.all.app.accentColor,
+          default: DEFAULT_APP_SETTINGS.accentColor,
+        },
         enableGPUAcceleration: {
           label: intl.formatMessage(messages.enableGPUAcceleration),
           value: settings.all.app.enableGPUAcceleration,
@@ -425,6 +445,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           lockingFeatureEnabled={lockingFeatureEnabled}
           noUpdates={this.props.stores.settings.app.noUpdates}
           hibernationEnabled={this.props.stores.settings.app.hibernate}
+          isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
           openProcessManager={() => this.openProcessManager()}
         />
       </ErrorBoundary>
@@ -457,7 +478,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
       toggleTodosFeatureVisibility: PropTypes.func.isRequired,
     }).isRequired,
     workspaces: PropTypes.shape({
-      toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
+      toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };