1 files changed, 23 insertions, 12 deletions

diff --git a/src/index.js b/src/index.js
index 3056a8bec..87aa6357b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,9 +9,13 @@ import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
-// Set app directory before loading user modules
+if (process.platform === 'win32') {
+  app.setPath('appData', process.env.LOCALAPPDATA);
+  app.setPath('userData', path.join(process.env.LOCALAPPDATA, app.getName()));
+}
+
 if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`));
 }
 
 /* eslint-disable import/first */
@@ -37,7 +41,7 @@ import { asarPath } from './helpers/asar-helpers';
 import { isValidExternalURL } from './helpers/url-helpers';
 /* eslint-enable import/first */
 
-const debug = require('debug')('Franz:App');
+const debug = require('debug')('Ferdi:App');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -103,7 +107,7 @@ if (!gotTheLock) {
           } else if (argv.includes('--quit')) {
             // Needs to be delayed to not interfere with mainWindow.restore();
             setTimeout(() => {
-              debug('Quitting Franz via Task');
+              debug('Quitting Ferdi via Task');
               app.quit();
             }, 1);
           }
@@ -142,6 +146,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,
@@ -151,7 +162,7 @@ const createWindow = () => {
     minHeight: 500,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
+    backgroundColor,
     webPreferences: {
       nodeIntegration: true,
       webviewTag: true,
@@ -161,7 +172,7 @@ const createWindow = () => {
   mainWindow.webContents.on('did-finish-load', () => {
     const fns = onDidLoadFns;
     onDidLoadFns = null;
-    for (const fn of fns) {
+    for (const fn of fns) { // eslint-disable-line no-unused-vars
       fn(mainWindow);
     }
   });
@@ -284,7 +295,7 @@ const createWindow = () => {
 // https://electronjs.org/docs/api/chrome-command-line-switches
 // used for Kerberos support
 // Usage e.g. MACOS
-// $ Franz.app/Contents/MacOS/Franz --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com
+// $ Franz.app/Contents/MacOS/Ferdi --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com
 const argv = require('minimist')(process.argv.slice(1));
 
 if (argv['auth-server-whitelist']) {
@@ -299,10 +310,10 @@ if (argv['auth-negotiate-delegate-whitelist']) {
 // Some APIs can only be used after this event occurs.
 app.on('ready', () => {
   // Register App URL
-  app.setAsDefaultProtocolClient('franz');
+  app.setAsDefaultProtocolClient('ferdi');
 
   if (isDevMode) {
-    app.setAsDefaultProtocolClient('franz-dev');
+    app.setAsDefaultProtocolClient('ferdi-dev');
   }
 
   if (process.platform === 'win32') {
@@ -311,13 +322,13 @@ app.on('ready', () => {
       arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
       iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')),
       iconIndex: 0,
-      title: 'Move Franz to Current Display',
-      description: 'Restore the position and size of Franz',
+      title: 'Move Ferdi to Current Display',
+      description: 'Restore the position and size of Ferdi',
     }, {
       program: process.execPath,
       arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
       iconIndex: 0,
-      title: 'Quit Franz',
+      title: 'Quit Ferdi',
     }]);
   }