1 files changed, 12 insertions, 5 deletions

diff --git a/src/index.js b/src/index.js
index 338a8e795..7a0e89285 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`));
@@ -147,6 +147,13 @@ const createWindow = () => {
   }
 
   // Create the browser window.
+  let backgroundColor = '#7367F0';
+  if (settings.get('accentColor') !== '#7367f0') {
+    backgroundColor = settings.get('accentColor');
+  } else if (settings.get('darkMode')) {
+    backgroundColor = '#1E1E1E';
+  }
+
   mainWindow = new BrowserWindow({
     x: posX,
     y: posY,
@@ -156,7 +163,7 @@ const createWindow = () => {
     minHeight: 500,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    backgroundColor: !settings.get('darkMode') ? '#7367F0' : '#1E1E1E',
+    backgroundColor,
     webPreferences: {
       nodeIntegration: true,
       webviewTag: true,