37 files changed, 228 insertions, 195 deletions

diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index fad20ca5e..bc2cb3dd1 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -58,17 +58,21 @@ export function serverBase() {
 
   let terms;
   switch (serverType) {
-    case LIVE_FRANZ_API:
+    case LIVE_FRANZ_API: {
       terms = DEV_API_FRANZ_WEBSITE;
       break;
-    case noServerFerdi:
+    }
+    case noServerFerdi: {
       terms = LIVE_FERDIUM_API;
       break;
-    case noServerFerdium:
+    }
+    case noServerFerdium: {
       terms = LIVE_FERDIUM_API;
       break;
-    default:
+    }
+    default: {
       terms = serverType;
+    }
   }
 
   return fixUrl(terms);
@@ -81,20 +85,25 @@ export function serverName(): string {
 
   let nameServer;
   switch (serverType) {
-    case LIVE_FRANZ_API:
+    case LIVE_FRANZ_API: {
       nameServer = 'Franz';
       break;
-    case LIVE_FERDIUM_API:
+    }
+    case LIVE_FERDIUM_API: {
       nameServer = 'Ferdium';
       break;
-    case noServerFerdi:
+    }
+    case noServerFerdi: {
       nameServer = 'No';
       break;
-    case noServerFerdium:
+    }
+    case noServerFerdium: {
       nameServer = 'No';
       break;
-    default:
+    }
+    default: {
       nameServer = 'Custom';
+    }
   }
 
   return nameServer;
diff --git a/src/components/auth/Invite.tsx b/src/components/auth/Invite.tsx
index 4ab5157a8..cebef9365 100644
--- a/src/components/auth/Invite.tsx
+++ b/src/components/auth/Invite.tsx
@@ -192,7 +192,7 @@ class Invite extends Component<IProps, IState> {
     return (
       <div
         className={
-          !embed ? 'auth__container auth__container--signup' : 'settings__main'
+          embed ? 'settings__main' : 'auth__container auth__container--signup'
         }
       >
         {embed && (
@@ -200,10 +200,10 @@ class Invite extends Component<IProps, IState> {
             <H1>{intl.formatMessage(messages.settingsHeadline)}</H1>
           </div>
         )}
-        {!embed ? (
-          <div>{renderForm}</div>
-        ) : (
+        {embed ? (
           <div className="settings__body invite__form">{renderForm}</div>
+        ) : (
+          <div>{renderForm}</div>
         )}
       </div>
     );
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index e41184431..0754bccc5 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -135,29 +135,9 @@ class ServiceView extends Component<IProps, IState> {
             )}
           </>
         )}
-        {!service.isEnabled ? (
+        {service.isEnabled ? (
           <>
-            {service.isActive && (
-              <ServiceDisabled
-                name={service.name !== '' ? service.name : service.recipe.name}
-                // webview={service.webview} //  TODO - [TECH DEBT][PROPS NOT EXIST IN COMPONENT] check it
-                enable={enable}
-              />
-            )}
-          </>
-        ) : (
-          <>
-            {!service.isHibernating ? (
-              <>
-                {showNavBar && <WebControlsScreen service={service} />}
-                <ServiceWebview
-                  service={service}
-                  setWebviewReference={setWebviewRef}
-                  detachService={detachService}
-                  isSpellcheckerEnabled={isSpellcheckerEnabled}
-                />
-              </>
-            ) : (
+            {service.isHibernating ? (
               <div
                 style={{
                   display: 'flex',
@@ -180,6 +160,26 @@ class ServiceView extends Component<IProps, IState> {
                 <br />
                 Try switching services or reloading Ferdium.
               </div>
+            ) : (
+              <>
+                {showNavBar && <WebControlsScreen service={service} />}
+                <ServiceWebview
+                  service={service}
+                  setWebviewReference={setWebviewRef}
+                  detachService={detachService}
+                  isSpellcheckerEnabled={isSpellcheckerEnabled}
+                />
+              </>
+            )}
+          </>
+        ) : (
+          <>
+            {service.isActive && (
+              <ServiceDisabled
+                name={service.name === '' ? service.recipe.name : service.name}
+                // webview={service.webview} //  TODO - [TECH DEBT][PROPS NOT EXIST IN COMPONENT] check it
+                enable={enable}
+              />
             )}
           </>
         )}
diff --git a/src/components/settings/navigation/SettingsNavigation.tsx b/src/components/settings/navigation/SettingsNavigation.tsx
index 95c69027c..4e2c7f410 100644
--- a/src/components/settings/navigation/SettingsNavigation.tsx
+++ b/src/components/settings/navigation/SettingsNavigation.tsx
@@ -191,9 +191,9 @@ class SettingsNavigation extends Component<IProps> {
           className="settings-navigation__link"
           onClick={this.handleLogout.bind(this)}
         >
-          {!isUsingWithoutAccount
-            ? intl.formatMessage(messages.logout)
-            : 'Exit session'}
+          {isUsingWithoutAccount
+            ? 'Exit session'
+            : intl.formatMessage(messages.logout)}
         </button>
       </div>
     );
diff --git a/src/components/settings/services/ServiceItem.tsx b/src/components/settings/services/ServiceItem.tsx
index fd961a0a8..0737a680c 100644
--- a/src/components/settings/services/ServiceItem.tsx
+++ b/src/components/settings/services/ServiceItem.tsx
@@ -63,7 +63,7 @@ class ServiceItem extends Component<IProps> {
           onClick={goToServiceForm}
           role="gridcell"
         >
-          {service.name !== '' ? service.name : service.recipe.name}
+          {service.name === '' ? service.recipe.name : service.name}
         </td>
         <td
           className="service-table__column-info"
diff --git a/src/components/ui/Loader.tsx b/src/components/ui/Loader.tsx
index ebb437d9d..17cb35f41 100644
--- a/src/components/ui/Loader.tsx
+++ b/src/components/ui/Loader.tsx
@@ -25,7 +25,7 @@ class LoaderComponent extends Component<IProps> {
     } = this.props;
 
     const loaderColor =
-      color !== 'ACCENT' ? color : this.props.stores!.settings.app.accentColor;
+      color === 'ACCENT' ? this.props.stores!.settings.app.accentColor : color;
 
     return (
       <Loader
diff --git a/src/components/ui/Slider.tsx b/src/components/ui/Slider.tsx
index ed9fe9073..be0846513 100644
--- a/src/components/ui/Slider.tsx
+++ b/src/components/ui/Slider.tsx
@@ -51,7 +51,7 @@ class Slider extends Component<IProps> {
             value={field.value}
             min="1"
             max="100"
-            onChange={e => (!disabled ? this.onChange(e) : null)}
+            onChange={e => (disabled ? null : this.onChange(e))}
           />
         </div>
 
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index dc984bf95..9444efde2 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -117,12 +117,12 @@ const styles = (theme: Theme) => ({
     zIndex: 9999,
   },
   loaderContainer: {
-    width: (props: IProps): string => (!props.busy ? '0' : '40px'),
+    width: (props: IProps): string => (props.busy ? '40px' : '0'),
     height: 20,
     overflow: 'hidden',
     transition: loaderContainerTransition,
-    marginLeft: (props: IProps): number => (!props.busy ? 10 : 20),
-    marginRight: (props: IProps): number => (!props.busy ? -10 : -20),
+    marginLeft: (props: IProps): number => (props.busy ? 20 : 10),
+    marginRight: (props: IProps): number => (props.busy ? -20 : -10),
     position: (): Property.Position => 'inherit',
   },
   icon: {
@@ -217,38 +217,38 @@ class ButtonComponent extends Component<IProps, IState> {
       </>
     );
 
-    const wrapperComponent = !href ? (
-      <button
-        id={id}
-        type={type}
+    const wrapperComponent = href ? (
+      <a
+        href={href}
+        target={target}
         onClick={onClick}
         className={classnames({
           [`${classes.button}`]: true,
           [`${classes[buttonType as ButtonType]}`]: true,
-          [`${classes.disabled}`]: disabled,
           [`${className}`]: className,
         })}
-        disabled={disabled}
+        rel={target === '_blank' ? 'noopener' : ''}
         data-type="franz-button"
-        {...(htmlForm && { form: htmlForm })}
       >
         {content}
-      </button>
+      </a>
     ) : (
-      <a
-        href={href}
-        target={target}
+      <button
+        id={id}
+        type={type}
         onClick={onClick}
         className={classnames({
           [`${classes.button}`]: true,
           [`${classes[buttonType as ButtonType]}`]: true,
+          [`${classes.disabled}`]: disabled,
           [`${className}`]: className,
         })}
-        rel={target === '_blank' ? 'noopener' : ''}
+        disabled={disabled}
         data-type="franz-button"
+        {...(htmlForm && { form: htmlForm })}
       >
         {content}
-      </a>
+      </button>
     );
 
     return wrapperComponent;
diff --git a/src/components/ui/imageUpload/index.tsx b/src/components/ui/imageUpload/index.tsx
index 89e2c65a2..3b164ed41 100644
--- a/src/components/ui/imageUpload/index.tsx
+++ b/src/components/ui/imageUpload/index.tsx
@@ -46,7 +46,7 @@ class ImageUpload extends Component<IProps, IState> {
     this.setState({ errorState: false });
 
     for (const file of acceptedFiles) {
-      const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
+      const imgPath = isWindows ? file.path.replaceAll('\\', '/') : file.path;
       this.setState({
         path: imgPath,
       });
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 31aa8a15f..695e70e28 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -321,10 +321,12 @@ class SelectComponent extends Component<IProps, IState> {
       case 39:
       case 38:
       case 40: // Arrow keys
-      case 32:
-        break; // Space
-      default:
-        break; // do not block other keys
+      case 32: {
+        break;
+      } // Space
+      default: {
+        break;
+      } // do not block other keys
     }
   }
 
@@ -381,12 +383,12 @@ class SelectComponent extends Component<IProps, IState> {
                 [`${classes.hasError}`]: error,
               })}
               onClick={
-                !disabled
-                  ? () =>
+                disabled
+                  ? noop
+                  : () =>
                       this.setState((state: IState) => ({
                         open: !state.open,
                       }))
-                  : noop
               }
             >
               {selection}
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index d4186560f..0a079c608 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -175,9 +175,9 @@ class EditServiceScreen extends Component<IProps> {
         { default: defaultSpellcheckerLanguage },
       ),
       automaticDetectionText:
-        stores.settings.app.spellcheckerLanguage !== 'automatic'
-          ? intl.formatMessage(globalMessages.spellcheckerAutomaticDetection)
-          : '',
+        stores.settings.app.spellcheckerLanguage === 'automatic'
+          ? ''
+          : intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
     });
 
     const config: FormFields = {
diff --git a/src/containers/settings/RecipesScreen.tsx b/src/containers/settings/RecipesScreen.tsx
index abbb79b39..1fb2673a8 100644
--- a/src/containers/settings/RecipesScreen.tsx
+++ b/src/containers/settings/RecipesScreen.tsx
@@ -129,8 +129,9 @@ class RecipesScreen extends Component<IProps, IState> {
 
     const { needle } = this.state;
     const allRecipes =
-      needle !== null
-        ? this.prepareRecipes([
+      needle === null
+        ? recipeFilter
+        : this.prepareRecipes([
             // All search recipes from server
             ...recipePreviews.searchResults,
             // All search recipes from local recipes
@@ -143,8 +144,7 @@ class RecipesScreen extends Component<IProps, IState> {
                   ),
               ),
             ),
-          ]).sort(this._sortByName)
-        : recipeFilter;
+          ]).sort(this._sortByName);
 
     const customWebsiteRecipe = recipePreviews.all.find(
       service => service.id === CUSTOM_WEBSITE_RECIPE_ID,
diff --git a/src/containers/settings/ServicesScreen.tsx b/src/containers/settings/ServicesScreen.tsx
index 780b7331e..70eeffed4 100644
--- a/src/containers/settings/ServicesScreen.tsx
+++ b/src/containers/settings/ServicesScreen.tsx
@@ -33,7 +33,7 @@ class ServicesScreen extends Component<IProps> {
     } = this.props.actions.service;
     const isLoading = services.allServicesRequest.isExecuting;
     const allServices =
-      services.filterNeedle !== null ? services.filtered : services.all;
+      services.filterNeedle === null ? services.all : services.filtered;
 
     return (
       <ErrorBoundary>
diff --git a/src/electron/Settings.ts b/src/electron/Settings.ts
index 3e9c6ed99..7bb12338e 100644
--- a/src/electron/Settings.ts
+++ b/src/electron/Settings.ts
@@ -18,10 +18,10 @@ export default class Settings {
     this.store = defaultState;
     this.defaultState = defaultState;
 
-    if (!pathExistsSync(this.settingsFile)) {
-      this._writeFile();
-    } else {
+    if (pathExistsSync(this.settingsFile)) {
       this._hydrate();
+    } else {
+      this._writeFile();
     }
   }
 
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index bf3e79c85..14214aacb 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -7,10 +7,7 @@ const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:autoUpdate');
 export default (params: { mainWindow: BrowserWindow; settings: any }) => {
   const enableUpdate = Boolean(params.settings.app.get('automaticUpdates'));
 
-  if (!enableUpdate) {
-    autoUpdater.autoInstallOnAppQuit = false;
-    autoUpdater.autoDownload = false;
-  } else {
+  if (enableUpdate) {
     ipcMain.on('autoUpdate', (event, args) => {
       if (enableUpdate) {
         try {
@@ -71,5 +68,8 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => {
       debug('update-error');
       params.mainWindow.webContents.send('autoUpdate', { error });
     });
+  } else {
+    autoUpdater.autoInstallOnAppQuit = false;
+    autoUpdater.autoDownload = false;
   }
 };
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index 21af0d045..518a7091c 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -23,12 +23,7 @@ export default (params: { mainWindow: BrowserWindow }) => {
       const win = BrowserWindow.getFocusedWindow();
 
       try {
-        if (!content) {
-          const dl = await download(win!, url, {
-            saveAs: true,
-          });
-          debug('File saved to', dl.savePath);
-        } else {
+        if (content) {
           const extension = mime.extension(fileOptions.mime);
           const filename = `${fileOptions.name}.${extension}`;
 
@@ -50,6 +45,11 @@ export default (params: { mainWindow: BrowserWindow }) => {
           } catch (error) {
             console.error(error);
           }
+        } else {
+          const dl = await download(win!, url, {
+            saveAs: true,
+          });
+          debug('File saved to', dl.savePath);
         }
       } catch (error) {
         console.error(error);
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
index bb14448a3..5f2b68dab 100644
--- a/src/environment-remote.ts
+++ b/src/environment-remote.ts
@@ -35,9 +35,9 @@ if (process.env.FERDIUM_APPDATA_DIR != null) {
 }
 
 export const isDevMode: boolean =
-  process.env.ELECTRON_IS_DEV !== undefined
-    ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1
-    : !app.isPackaged;
+  process.env.ELECTRON_IS_DEV === undefined
+    ? !app.isPackaged
+    : Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
 if (isDevMode) {
   app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
 }
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts
index 9c9f3e175..b6e944724 100644
--- a/src/features/appearance/index.ts
+++ b/src/features/appearance/index.ts
@@ -19,7 +19,7 @@ function createStyleElement() {
   const styles = document.createElement('style');
   styles.id = STYLE_ELEMENT_ID;
 
-  document.querySelector('head')?.appendChild(styles);
+  document.querySelector('head')?.append(styles);
 }
 
 function setAppearance(style) {
@@ -153,40 +153,47 @@ function generateServiceRibbonWidthStyle(
   const verticalStyleOffset = 29;
 
   switch (width) {
-    case 35:
+    case 35: {
       fontSize = 9;
       tabItemHeightBias = 25;
       sidebarSizeBias = 48;
       break;
-    case 45:
+    }
+    case 45: {
       fontSize = 10;
       tabItemHeightBias = 21;
       sidebarSizeBias = 44;
       break;
-    case 55:
+    }
+    case 55: {
       fontSize = 11;
       tabItemHeightBias = 13;
       sidebarSizeBias = 37;
       break;
-    case 80:
+    }
+    case 80: {
       fontSize = 11;
       tabItemHeightBias = 3;
       sidebarSizeBias = 27;
       break;
-    case 90:
+    }
+    case 90: {
       fontSize = 12;
       tabItemHeightBias = 0;
       sidebarSizeBias = 25;
       break;
-    case 100:
+    }
+    case 100: {
       fontSize = 13;
       tabItemHeightBias = 2;
       sidebarSizeBias = 25;
       break;
-    default:
+    }
+    default: {
       fontSize = 11;
       tabItemHeightBias = 13;
       sidebarSizeBias = 37;
+    }
   }
 
   if (!isLabelEnabled) {
@@ -203,18 +210,22 @@ function generateServiceRibbonWidthStyle(
 
   let sidebarServicesAlignment;
   switch (sidebarServicesLocation) {
-    case SIDEBAR_SERVICES_LOCATION_TOPLEFT:
+    case SIDEBAR_SERVICES_LOCATION_TOPLEFT: {
       sidebarServicesAlignment = horizontal ? 'left' : 'start';
       break;
-    case SIDEBAR_SERVICES_LOCATION_CENTER:
+    }
+    case SIDEBAR_SERVICES_LOCATION_CENTER: {
       sidebarServicesAlignment = horizontal ? 'center' : 'center';
       break;
-    case SIDEBAR_SERVICES_LOCATION_BOTTOMRIGHT:
+    }
+    case SIDEBAR_SERVICES_LOCATION_BOTTOMRIGHT: {
       sidebarServicesAlignment = horizontal ? 'right' : 'end';
       break;
-    default:
+    }
+    default: {
       sidebarServicesAlignment = horizontal ? 'left' : 'start';
       break;
+    }
   }
 
   const graysacleServices = `filter: grayscale(1);
@@ -268,7 +279,7 @@ function generateServiceRibbonWidthStyle(
           ? width
           : width +
             sidebarSizeBias +
-            (sizeDragArea !== 0 ? 4 - sizeDragArea : 4)
+            (sizeDragArea === 0 ? 4 : 4 - sizeDragArea)
       }px !important;
     }
     .darwin .workspaces-drawer {
diff --git a/src/features/quickSwitch/Component.tsx b/src/features/quickSwitch/Component.tsx
index fb85d61e1..ab07e5d4d 100644
--- a/src/features/quickSwitch/Component.tsx
+++ b/src/features/quickSwitch/Component.tsx
@@ -215,24 +215,29 @@ class QuickSwitchModal extends Component<IProps, IState> {
   _handleKeyDown(event: KeyboardEvent): void {
     if (ModalState.isModalVisible) {
       switch (event.keyCode) {
-        case this.ARROW_DOWN:
+        case this.ARROW_DOWN: {
           this.changeSelected(1);
           break;
-        case this.TAB:
+        }
+        case this.TAB: {
           if (event.shiftKey) {
             this.changeSelected(-1);
           } else {
             this.changeSelected(1);
           }
           break;
-        case this.ARROW_UP:
+        }
+        case this.ARROW_UP: {
           this.changeSelected(-1);
           break;
-        case this.ENTER:
+        }
+        case this.ENTER: {
           this.openService(this.state.selected);
           break;
-        default:
+        }
+        default: {
           break;
+        }
       }
     }
   }
diff --git a/src/features/todos/preload.ts b/src/features/todos/preload.ts
index 0d76efd7a..de594651b 100644
--- a/src/features/todos/preload.ts
+++ b/src/features/todos/preload.ts
@@ -9,9 +9,10 @@ debug('Preloading Todos Webview');
 
 let hostMessageListener = ({ action }) => {
   switch (action) {
-    case 'todos:initialize-as-service':
+    case 'todos:initialize-as-service': {
       ipcRenderer.sendToHost('hello');
       break;
+    }
     default:
   }
 };
diff --git a/src/features/todos/store.ts b/src/features/todos/store.ts
index bff099eb1..94be4db6a 100644
--- a/src/features/todos/store.ts
+++ b/src/features/todos/store.ts
@@ -197,13 +197,15 @@ export default class TodoStore extends FeatureStore {
   }) => {
     debug('_handleClientMessage', channel, message);
     switch (message.action) {
-      case 'todos:initialized':
+      case 'todos:initialized': {
         this._onTodosClientInitialized();
         break;
-      case 'todos:goToService':
+      }
+      case 'todos:goToService': {
         this._goToService(message.data);
         break;
-      default:
+      }
+      default: {
         debug('Other message received', channel, message);
         if (this.stores.services.isTodosServiceAdded && this.actions) {
           this.actions.service.handleIPCMessage({
@@ -212,6 +214,7 @@ export default class TodoStore extends FeatureStore {
             args: message,
           });
         }
+      }
     }
   };
 
diff --git a/src/features/webControls/components/WebControls.tsx b/src/features/webControls/components/WebControls.tsx
index 51bf7e541..74b343948 100644
--- a/src/features/webControls/components/WebControls.tsx
+++ b/src/features/webControls/components/WebControls.tsx
@@ -115,7 +115,7 @@ class WebControls extends Component<IProps, IState> {
     const { url: inputUrl } = props;
     const { editUrl } = state;
 
-    return !editUrl ? { inputUrl, editUrl } : null;
+    return editUrl ? null : { inputUrl, editUrl };
   }
 
   constructor(props: IProps) {
diff --git a/src/helpers/update-helpers.ts b/src/helpers/update-helpers.ts
index daeef5413..9a36850fc 100644
--- a/src/helpers/update-helpers.ts
+++ b/src/helpers/update-helpers.ts
@@ -13,7 +13,7 @@ export function getFerdiumVersion(
 }
 
 export function updateVersionParse(updateVersion: string): string {
-  return updateVersion !== '' ? `?version=${updateVersion}` : '';
+  return updateVersion === '' ? '' : `?version=${updateVersion}`;
 }
 
 export function onAuthGoToReleaseNotes(
diff --git a/src/helpers/userAgent-helpers.ts b/src/helpers/userAgent-helpers.ts
index 52568555c..c811b34c9 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -16,7 +16,7 @@ function macOS() {
   if (cpuName && /\(/.test(cpuName)) {
     cpuName = cpuName.split('(')[0];
   }
-  return `Macintosh; ${cpuName} Mac OS X ${version.replace(/\./g, '_')}`;
+  return `Macintosh; ${cpuName} Mac OS X ${version.replaceAll('.', '_')}`;
 }
 
 function windows() {
diff --git a/src/index.ts b/src/index.ts
index bb6d64d1e..182a281fa 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -108,9 +108,7 @@ const liftSingleInstanceLock = retrieveSettingValue(
 const gotTheLock = liftSingleInstanceLock
   ? true
   : app.requestSingleInstanceLock();
-if (!gotTheLock) {
-  app.quit();
-} else {
+if (gotTheLock) {
   app.on('second-instance', (_event, argv) => {
     // Someone tried to run a second instance, we should focus our window.
     if (mainWindow) {
@@ -152,6 +150,8 @@ if (!gotTheLock) {
       }
     }
   });
+} else {
+  app.quit();
 }
 
 // Fix Unity indicator issue
diff --git a/src/internal-server/app/ImageHelper.js b/src/internal-server/app/ImageHelper.js
index 905ba81ab..fba610069 100644
--- a/src/internal-server/app/ImageHelper.js
+++ b/src/internal-server/app/ImageHelper.js
@@ -21,7 +21,7 @@ const moveIcon = async icon => {
     name: iconId,
     overwrite: true,
   });
-  return !icon.moved() ? '-1' : iconId;
+  return icon.moved() ? iconId : '-1';
 };
 
 const deduceIconUrl = iconId =>
diff --git a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
index 9591cdc41..91ab22ee5 100644
--- a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
+++ b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
@@ -3,7 +3,7 @@ class ConvertEmptyStringsToNull {
     if (Object.keys(request.body).length > 0) {
       request.body = Object.assign(
         ...Object.keys(request.body).map(key => ({
-          [key]: request.body[key] !== '' ? request.body[key] : null,
+          [key]: request.body[key] === '' ? null : request.body[key],
         })),
       );
     }
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index 0af33a977..4cd502c3f 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -21,13 +21,13 @@ module.exports = async () => {
 
   const user = await User.find(1);
   let settings;
-  if (!user) {
+  if (user) {
+    settings = convertToJSON(user.settings);
+  } else {
     migrateLog("🎩  Migrating from old Ferdium version as user doesn't exist");
 
     // Create new user
     await Database.raw('INSERT INTO  "users" ("id") VALUES (\'1\');');
-  } else {
-    settings = convertToJSON(user.settings);
   }
 
   if (
diff --git a/src/internal-server/test.ts b/src/internal-server/test.ts
index 5bb1f2b36..6949df79e 100644
--- a/src/internal-server/test.ts
+++ b/src/internal-server/test.ts
@@ -6,4 +6,5 @@ const dummyUserFolder = join(__dirname, 'user_data');
 
 ensureDirSync(dummyUserFolder);
 
+// eslint-disable-next-line unicorn/prefer-top-level-await
 server(dummyUserFolder, 46_568, 'test').catch(console.log);
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index b1510cec3..936785b9b 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -453,7 +453,7 @@ function titleBarTemplateFactory(
         },
         {
           label: intl.formatMessage(menuItems.back),
-          accelerator: `${!isMac ? altKey() : cmdOrCtrlShortcutKey()}+Left`,
+          accelerator: `${isMac ? cmdOrCtrlShortcutKey() : altKey()}+Left`,
           click() {
             const activeService = getActiveService();
             if (!activeService) {
@@ -464,7 +464,7 @@ function titleBarTemplateFactory(
         },
         {
           label: intl.formatMessage(menuItems.forward),
-          accelerator: `${!isMac ? altKey() : cmdOrCtrlShortcutKey()}+Right`,
+          accelerator: `${isMac ? cmdOrCtrlShortcutKey() : altKey()}+Right`,
           click() {
             const activeService = getActiveService();
             if (!activeService) {
@@ -728,7 +728,36 @@ class FranzMenu implements StoresProps {
       });
     }
 
-    if (!locked) {
+    if (locked) {
+      const touchIdEnabled = isMac
+        ? this.stores.settings.app.useTouchIdToUnlock &&
+          systemPreferences.canPromptTouchID()
+        : false;
+
+      (tpl[0].submenu as MenuItemConstructorOptions[]).unshift(
+        {
+          label: intl.formatMessage(menuItems.touchId),
+          accelerator: `${lockFerdiumShortcutKey()}`,
+          visible: touchIdEnabled,
+          click() {
+            systemPreferences
+              .promptTouchID(intl.formatMessage(menuItems.touchId))
+              .then(() => {
+                actions.settings.update({
+                  type: 'app',
+                  data: {
+                    locked: false,
+                  },
+                });
+              });
+          },
+        },
+        {
+          type: 'separator',
+          visible: touchIdEnabled,
+        },
+      );
+    } else {
       (tpl[1].submenu as MenuItemConstructorOptions[]).push(
         {
           type: 'separator',
@@ -834,35 +863,6 @@ class FranzMenu implements StoresProps {
       tpl[3].submenu = this.workspacesMenu();
 
       tpl[4].submenu = this.todosMenu();
-    } else {
-      const touchIdEnabled = isMac
-        ? this.stores.settings.app.useTouchIdToUnlock &&
-          systemPreferences.canPromptTouchID()
-        : false;
-
-      (tpl[0].submenu as MenuItemConstructorOptions[]).unshift(
-        {
-          label: intl.formatMessage(menuItems.touchId),
-          accelerator: `${lockFerdiumShortcutKey()}`,
-          visible: touchIdEnabled,
-          click() {
-            systemPreferences
-              .promptTouchID(intl.formatMessage(menuItems.touchId))
-              .then(() => {
-                actions.settings.update({
-                  type: 'app',
-                  data: {
-                    locked: false,
-                  },
-                });
-              });
-          },
-        },
-        {
-          type: 'separator',
-          visible: touchIdEnabled,
-        },
-      );
     }
 
     tpl.unshift({
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index 02d616241..18b38799e 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -529,14 +529,14 @@ export default class AppStore extends TypedStore {
 
   // Reactions
   _offlineCheck() {
-    if (!this.isOnline) {
-      this.timeOfflineStart = moment();
-    } else {
+    if (this.isOnline) {
       const deltaTime = moment().diff(this.timeOfflineStart);
 
       if (deltaTime > ms('30m')) {
         this.actions.service.reloadAll();
       }
+    } else {
+      this.timeOfflineStart = moment();
     }
   }
 
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 829c64d76..9c15d3a07 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -294,19 +294,20 @@ export default class ServicesStore extends TypedStore {
         service.lastPoll - service.lastPollAnswer > ms('1m')
       ) {
         // If service did not reply for more than 1m try to reload.
-        if (!service.isActive) {
-          if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
-            debug(
-              `Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`,
-            );
-            // service.webview.reload();
-            service.lostRecipeReloadAttempt += 1;
-
-            service.lostRecipeConnection = false;
-          }
-        } else {
+        if (service.isActive) {
           debug(`Service lost connection: ${service.name} (${service.id}).`);
           service.lostRecipeConnection = true;
+        } else if (
+          this.stores.app.isOnline &&
+          service.lostRecipeReloadAttempt < 3
+        ) {
+          debug(
+            `Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`,
+          );
+          // service.webview.reload();
+          service.lostRecipeReloadAttempt += 1;
+
+          service.lostRecipeConnection = false;
         }
       } else {
         service.lostRecipeConnection = false;
@@ -512,11 +513,11 @@ export default class ServicesStore extends TypedStore {
     }
 
     if (data.team) {
-      if (!data.customURL) {
-        serviceData.team = data.team;
-      } else {
+      if (data.customURL) {
         // TODO: Is this correct?
         serviceData.customUrl = data.team;
+      } else {
+        serviceData.team = data.team;
       }
     }
 
@@ -893,9 +894,7 @@ export default class ServicesStore extends TypedStore {
         break;
       }
       case 'set-service-spellchecker-language': {
-        if (!args) {
-          console.warn('Did not receive locale');
-        } else {
+        if (args) {
           this.actions.service.updateService({
             serviceId,
             serviceData: {
@@ -903,6 +902,8 @@ export default class ServicesStore extends TypedStore {
             },
             redirect: false,
           });
+        } else {
+          console.warn('Did not receive locale');
         }
 
         break;
@@ -1176,13 +1177,13 @@ export default class ServicesStore extends TypedStore {
       service.lastPoll = Date.now();
     };
 
-    if (!serviceId) {
-      for (const service of this.allDisplayed) resetTimer(service);
-    } else {
+    if (serviceId) {
       const service = this.one(serviceId);
       if (service) {
         resetTimer(service);
       }
+    } else {
+      for (const service of this.allDisplayed) resetTimer(service);
     }
   }
 
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 811bc6f76..5ca499160 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -157,10 +157,7 @@ export default class SettingsStore extends TypedStore {
 
   @action async _update({ type, data }): Promise<void> {
     const appSettings = this.all;
-    if (!this.fileSystemSettingsTypes.includes(type)) {
-      debug('Update settings', type, data, this.all);
-      localStorage.setItem(type, Object.assign(appSettings[type], data));
-    } else {
+    if (this.fileSystemSettingsTypes.includes(type)) {
       debug('Update settings on file system', type, data);
       ipcRenderer.send('updateAppSettings', {
         type,
@@ -168,6 +165,9 @@ export default class SettingsStore extends TypedStore {
       });
 
       Object.assign(this._fileSystemSettingsCache[type], data);
+    } else {
+      debug('Update settings', type, data, this.all);
+      localStorage.setItem(type, Object.assign(appSettings[type], data));
     }
   }
 
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index e0589729f..4ed45fc3b 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -98,7 +98,7 @@ export default class UIStore extends TypedStore {
 
   // Actions
   @action _openSettings({ path = '/settings' }): void {
-    const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
+    const settingsPath = path === '/settings' ? path : `/settings/${path}`;
     this.stores.router.push(settingsPath);
   }
 
@@ -116,19 +116,19 @@ export default class UIStore extends TypedStore {
 
   // Reactions
   _setupThemeInDOM(): void {
-    if (!this.isDarkThemeActive) {
-      document.body.classList.remove('theme__dark');
-    } else {
+    if (this.isDarkThemeActive) {
       document.body.classList.add('theme__dark');
+    } else {
+      document.body.classList.remove('theme__dark');
     }
   }
 
   _setupModeInDOM(): void {
-    if (!this.isSplitModeActive) {
-      document.body.classList.remove('mode__split');
-    } else {
+    if (this.isSplitModeActive) {
       document.body.classList.add('mode__split');
       document.body.dataset.columns = this.splitColumnsNo.toString();
+    } else {
+      document.body.classList.remove('mode__split');
     }
   }
 
diff --git a/src/webview/darkmode.ts b/src/webview/darkmode.ts
index 9944a7afa..f5e8700e0 100644
--- a/src/webview/darkmode.ts
+++ b/src/webview/darkmode.ts
@@ -5,7 +5,7 @@ const debug = require('../preload-safe-debug')('Ferdium:DarkMode');
 
 const chars = [...'abcdefghijklmnopqrstuvwxyz'];
 
-const ID = [...Array.from({ length: 20 })]
+const ID = Array.from({ length: 20 })
   .map(() => chars[Math.trunc(Math.random() * chars.length)])
   .join('');
 
@@ -26,7 +26,7 @@ export function injectDarkModeStyle(recipePath: string) {
     styles.innerHTML = data.toString();
     debug('Loaded darkmode.css from: ', darkmodeCss);
 
-    document.querySelector('head')?.appendChild(styles);
+    document.querySelector('head')?.append(styles);
 
     debug('Injected Dark Mode style with ID', ID);
   }
diff --git a/src/webview/lib/RecipeWebview.ts b/src/webview/lib/RecipeWebview.ts
index 436525b9e..44b3c5ab4 100644
--- a/src/webview/lib/RecipeWebview.ts
+++ b/src/webview/lib/RecipeWebview.ts
@@ -101,13 +101,13 @@ class RecipeWebview {
    * @param  {string | number | undefined | null} text to be parsed
    */
   isImage(link): boolean {
-    if (typeof link === 'undefined') {
+    if (link === undefined) {
       return false;
     }
 
     const { role } = link.dataset;
 
-    if (typeof role !== 'undefined') {
+    if (role !== undefined) {
       const roles = ['img'];
       return roles.includes(role);
     }
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts
index 36b8b7c98..0d18e4347 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -280,12 +280,12 @@ class RecipeController {
         }
       };
 
-      if (document.readyState !== 'loading') {
-        loadUserJs();
-      } else {
+      if (document.readyState === 'loading') {
         document.addEventListener('DOMContentLoaded', () => {
           loadUserJs();
         });
+      } else {
+        loadUserJs();
       }
     }
   }