199 files changed, 1150 insertions, 933 deletions

diff --git a/src/@types/ferdium-components.types.ts b/src/@types/ferdium-components.types.ts
index 516ef9dd7..35c0da85f 100644
--- a/src/@types/ferdium-components.types.ts
+++ b/src/@types/ferdium-components.types.ts
@@ -1,5 +1,5 @@
-import { Actions } from '../actions/lib/actions';
-import { RealStores } from '../stores';
+import type { Actions } from '../actions/lib/actions';
+import type { RealStores } from '../stores';
 
 export interface StoresProps {
   actions: Actions;
diff --git a/src/@types/ferdium.types.ts b/src/@types/ferdium.types.ts
index f54fb64ae..1120b73c8 100644
--- a/src/@types/ferdium.types.ts
+++ b/src/@types/ferdium.types.ts
@@ -21,4 +21,4 @@ declare global {
  * Workaround to make TS recognize this file as a module.
  * https://fettblog.eu/typescript-augmenting-global-lib-dom/
  */
-export {};
+export type {};
diff --git a/src/@types/mobx-form.types.ts b/src/@types/mobx-form.types.ts
index aa274b9db..67b0aa3ec 100644
--- a/src/@types/mobx-form.types.ts
+++ b/src/@types/mobx-form.types.ts
@@ -1,5 +1,5 @@
-import { ChangeEventHandler, FocusEventHandler } from 'react';
-import { GlobalError } from './ferdium-components.types';
+import type { ChangeEventHandler, FocusEventHandler } from 'react';
+import type { GlobalError } from './ferdium-components.types';
 
 interface SelectOptions {
   disabled?: boolean;
diff --git a/src/@types/stores.types.ts b/src/@types/stores.types.ts
index c2d7bd78a..a2e935bf1 100644
--- a/src/@types/stores.types.ts
+++ b/src/@types/stores.types.ts
@@ -1,11 +1,11 @@
 /* eslint-disable no-use-before-define */
-import Workspace from '../features/workspaces/models/Workspace';
-import Recipe from '../models/Recipe';
-import Service from '../models/Service';
-import User from '../models/User';
-import Request from '../stores/lib/Request';
-import CachedRequest from '../stores/lib/CachedRequest';
-import Reaction from '../stores/lib/Reaction';
+import type Workspace from '../features/workspaces/models/Workspace';
+import type Recipe from '../models/Recipe';
+import type Service from '../models/Service';
+import type User from '../models/User';
+import type CachedRequest from '../stores/lib/CachedRequest';
+import type Reaction from '../stores/lib/Reaction';
+import type Request from '../stores/lib/Request';
 
 // TODO: This file will be removed in the future when all stores are
 // correctly typed and the use of these interfaces are obsolete.
diff --git a/src/I18n.tsx b/src/I18n.tsx
index 1a69ed1a2..2085f3e98 100644
--- a/src/I18n.tsx
+++ b/src/I18n.tsx
@@ -1,10 +1,10 @@
-import { Component, ReactNode } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactNode } from 'react';
 import { IntlProvider } from 'react-intl';
 
 import generatedTranslations from './i18n/translations';
-import UserStore from './stores/UserStore';
-import AppStore from './stores/AppStore';
+import type AppStore from './stores/AppStore';
+import type UserStore from './stores/UserStore';
 
 const translations = generatedTranslations();
 
diff --git a/src/actions/app.ts b/src/actions/app.ts
index 07cc47078..22324c055 100644
--- a/src/actions/app.ts
+++ b/src/actions/app.ts
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   setBadge: {
diff --git a/src/actions/index.ts b/src/actions/index.ts
index 5297a7a7b..2368e98a5 100644
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -1,16 +1,16 @@
 import PropTypes from 'prop-types';
 
+import { todoActions } from '../features/todos/actions';
+import workspaces from '../features/workspaces/actions';
+import app from './app';
 import defineActions from './lib/actions';
-import service from './service';
 import recipe from './recipe';
 import recipePreview from './recipePreview';
+import requests from './requests';
+import service from './service';
+import settings from './settings';
 import ui from './ui';
-import app from './app';
 import user from './user';
-import settings from './settings';
-import requests from './requests';
-import workspaces from '../features/workspaces/actions';
-import { todoActions } from '../features/todos/actions';
 
 const actions = {
   service,
diff --git a/src/actions/recipe.ts b/src/actions/recipe.ts
index 0dd92737f..9a1210793 100644
--- a/src/actions/recipe.ts
+++ b/src/actions/recipe.ts
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   install: {
diff --git a/src/actions/recipePreview.ts b/src/actions/recipePreview.ts
index 053b363e9..6e4421d9e 100644
--- a/src/actions/recipePreview.ts
+++ b/src/actions/recipePreview.ts
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   search: {
diff --git a/src/actions/requests.ts b/src/actions/requests.ts
index 0b4c905ee..b487a3fa4 100644
--- a/src/actions/requests.ts
+++ b/src/actions/requests.ts
@@ -1,4 +1,4 @@
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   retryRequiredRequests: {},
diff --git a/src/actions/service.ts b/src/actions/service.ts
index 4b43fc2ca..c141f03ec 100644
--- a/src/actions/service.ts
+++ b/src/actions/service.ts
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import ServiceModel from '../models/Service';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   setActive: {
diff --git a/src/actions/settings.ts b/src/actions/settings.ts
index 4796f6a02..b99344a03 100644
--- a/src/actions/settings.ts
+++ b/src/actions/settings.ts
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   update: {
diff --git a/src/actions/ui.ts b/src/actions/ui.ts
index f496c5c07..b76a7e5bf 100644
--- a/src/actions/ui.ts
+++ b/src/actions/ui.ts
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   openSettings: {
diff --git a/src/actions/user.ts b/src/actions/user.ts
index c0ede619e..90fefdbce 100644
--- a/src/actions/user.ts
+++ b/src/actions/user.ts
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { ActionDefinitions } from './lib/actions';
+import type { ActionDefinitions } from './lib/actions';
 
 export default <ActionDefinitions>{
   login: {
diff --git a/src/api/UserApi.ts b/src/api/UserApi.ts
index 38f489131..b70d3b345 100644
--- a/src/api/UserApi.ts
+++ b/src/api/UserApi.ts
@@ -1,4 +1,4 @@
-import { BinaryLike } from 'node:crypto';
+import type { BinaryLike } from 'node:crypto';
 import { hash } from '../helpers/password-helpers';
 
 export default class UserApi {
diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index 649895fbc..522891fa0 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -1,15 +1,15 @@
-/**
- * Get API base URL from store
- */
-import { API_VERSION } from '../environment-remote';
 import {
   DEV_API_FRANZ_WEBSITE,
-  LIVE_FRANZ_API,
   LIVE_FERDIUM_API,
+  LIVE_FRANZ_API,
   LOCAL_HOSTNAME,
   LOCAL_SERVER,
   SERVER_NOT_LOADED,
 } from '../config';
+/**
+ * Get API base URL from store
+ */
+import { API_VERSION } from '../environment-remote';
 import { fixUrl } from '../helpers/url-helpers';
 
 // Note: This cannot be used from the internal-server since we are not running within the context of a browser window
diff --git a/src/api/index.ts b/src/api/index.ts
index 5ca6ba132..f0f396edc 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,10 +1,10 @@
 import AppApi from './AppApi';
-import ServicesApi from './ServicesApi';
+import FeaturesApi from './FeaturesApi';
+import LocalApi from './LocalApi';
 import RecipePreviewsApi from './RecipePreviewsApi';
 import RecipesApi from './RecipesApi';
+import ServicesApi from './ServicesApi';
 import UserApi from './UserApi';
-import LocalApi from './LocalApi';
-import FeaturesApi from './FeaturesApi';
 
 export interface ApiInterface {
   app: AppApi;
diff --git a/src/api/server/LocalApi.ts b/src/api/server/LocalApi.ts
index 6764816f9..56fa5cc8f 100644
--- a/src/api/server/LocalApi.ts
+++ b/src/api/server/LocalApi.ts
@@ -1,4 +1,4 @@
-import { ExecException } from 'node:child_process';
+import type { ExecException } from 'node:child_process';
 import { ipcRenderer } from 'electron';
 import fastFolderSize from 'fast-folder-size';
 
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index 9e7582e1e..58c6845ac 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -1,22 +1,24 @@
 /* eslint-disable import/no-import-module-exports */
 /* eslint-disable global-require */
 import { join } from 'node:path';
-import tar from 'tar';
 import {
-  readdirSync,
-  statSync,
-  writeFileSync,
+  type PathOrFileDescriptor,
   copySync,
   ensureDirSync,
   pathExistsSync,
   readJsonSync,
+  readdirSync,
   removeSync,
-  PathOrFileDescriptor,
+  statSync,
+  writeFileSync,
 } from 'fs-extra';
+import tar from 'tar';
 
+import RecipeModel, { type IRecipe } from '../../models/Recipe';
+import RecipePreviewModel, {
+  type IRecipePreview,
+} from '../../models/RecipePreview';
 import ServiceModel from '../../models/Service';
-import RecipePreviewModel, { IRecipePreview } from '../../models/RecipePreview';
-import RecipeModel, { IRecipe } from '../../models/Recipe';
 import UserModel from '../../models/User';
 
 import sleep from '../../helpers/async-helpers';
@@ -32,8 +34,8 @@ import {
 } from '../utils/auth';
 
 import {
-  getRecipeDirectory,
   getDevRecipeDirectory,
+  getRecipeDirectory,
   loadRecipeConfig,
 } from '../../helpers/recipe-helpers';
 
diff --git a/src/api/utils/auth.ts b/src/api/utils/auth.ts
index 1f694a781..ce30e0132 100644
--- a/src/api/utils/auth.ts
+++ b/src/api/utils/auth.ts
@@ -1,7 +1,7 @@
-import localStorage from 'mobx-localstorage';
 import { when } from 'mobx';
-import { localServerToken, needsToken } from '../apiBase';
+import localStorage from 'mobx-localstorage';
 import { ferdiumLocale, ferdiumVersion } from '../../environment-remote';
+import { localServerToken, needsToken } from '../apiBase';
 
 export const prepareAuthRequest = (
   // eslint-disable-next-line unicorn/no-object-as-default-parameter
diff --git a/src/app.tsx b/src/app.tsx
index 77ec27021..a894e6737 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,17 +1,17 @@
 import { webFrame } from 'electron';
 
-import { createRoot } from 'react-dom/client';
-import { Provider } from 'mobx-react';
 import { RouterStore } from '@superwf/mobx-react-router';
 import { createHashHistory } from 'history';
+import { Provider } from 'mobx-react';
+import { createRoot } from 'react-dom/client';
 
-import ServerApi from './api/server/ServerApi';
-import LocalApi from './api/server/LocalApi';
-import storeFactory from './stores';
-import apiFactory from './api';
 import actions from './actions';
+import apiFactory from './api';
+import LocalApi from './api/server/LocalApi';
+import ServerApi from './api/server/ServerApi';
 import MenuFactory from './lib/Menu';
 import TouchBarFactory from './lib/TouchBar';
+import storeFactory from './stores';
 
 import I18N from './I18n';
 import FerdiumRoutes from './routes';
diff --git a/src/components/AppUpdateInfoBar.tsx b/src/components/AppUpdateInfoBar.tsx
index 103bd2900..7bba8053a 100644
--- a/src/components/AppUpdateInfoBar.tsx
+++ b/src/components/AppUpdateInfoBar.tsx
@@ -1,12 +1,12 @@
 import { defineMessages, useIntl } from 'react-intl';
 
 import { mdiInformation } from '@mdi/js';
-import { MouseEventHandler } from 'react';
+import type { MouseEventHandler } from 'react';
 import InfoBar from './ui/InfoBar';
 import Icon from './ui/icon';
 
-import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
 import { isWinPortable } from '../environment';
+import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
 
 const messages = defineMessages({
   updateAvailable: {
diff --git a/src/components/auth/AuthLayout.tsx b/src/components/auth/AuthLayout.tsx
index eeb93b83b..67e898318 100644
--- a/src/components/auth/AuthLayout.tsx
+++ b/src/components/auth/AuthLayout.tsx
@@ -1,24 +1,24 @@
+import { mdiFlash } from '@mdi/js';
+import type { Response } from 'electron';
+import { TitleBar } from 'electron-react-titlebar/renderer';
+import { observer } from 'mobx-react';
 import {
-  cloneElement,
   Component,
-  MouseEventHandler,
-  ReactElement,
+  type MouseEventHandler,
+  type ReactElement,
+  cloneElement,
 } from 'react';
-import { observer } from 'mobx-react';
-import { TitleBar } from 'electron-react-titlebar/renderer';
-import { injectIntl, WrappedComponentProps } from 'react-intl';
-import { mdiFlash } from '@mdi/js';
-import { Response } from 'electron';
-import Link from '../ui/Link';
-import InfoBar from '../ui/InfoBar';
+import { type WrappedComponentProps, injectIntl } from 'react-intl';
+import { serverName } from '../../api/apiBase';
+import { GITHUB_FERDIUM_URL } from '../../config';
+import { isWindows } from '../../environment';
 import { Component as PublishDebugInfo } from '../../features/publishDebugInfo';
 import { updateVersionParse } from '../../helpers/update-helpers';
 import globalMessages from '../../i18n/globalMessages';
-import { isWindows } from '../../environment';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
-import { GITHUB_FERDIUM_URL } from '../../config';
+import InfoBar from '../ui/InfoBar';
+import Link from '../ui/Link';
 import Icon from '../ui/icon';
-import { serverName } from '../../api/apiBase';
 
 export interface IProps extends WrappedComponentProps {
   children: ReactElement;
diff --git a/src/components/auth/ChangeServer.tsx b/src/components/auth/ChangeServer.tsx
index c49e52673..665e8f6f9 100644
--- a/src/components/auth/ChangeServer.tsx
+++ b/src/components/auth/ChangeServer.tsx
@@ -1,19 +1,23 @@
-import { Component, FormEvent, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiArrowLeftCircle } from '@mdi/js';
 import { noop } from 'lodash';
+import { observer } from 'mobx-react';
+import { Component, type FormEvent, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config';
+import { url, required } from '../../helpers/validation-helpers';
+import globalMessages from '../../i18n/globalMessages';
 import Form from '../../lib/Form';
-import Input from '../ui/input/index';
+import Infobox from '../ui/Infobox';
+import Link from '../ui/Link';
 import Select from '../ui/Select';
 import Button from '../ui/button';
-import Link from '../ui/Link';
-import Infobox from '../ui/Infobox';
-import { url, required } from '../../helpers/validation-helpers';
-import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config';
-import globalMessages from '../../i18n/globalMessages';
 import { H1 } from '../ui/headline';
 import Icon from '../ui/icon';
+import Input from '../ui/input/index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/auth/Invite.tsx b/src/components/auth/Invite.tsx
index 0d39d861a..93441abe3 100644
--- a/src/components/auth/Invite.tsx
+++ b/src/components/auth/Invite.tsx
@@ -1,16 +1,20 @@
-import { Component } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import { Link } from 'react-router-dom';
 import classnames from 'classnames';
 import { noop } from 'lodash';
-import Infobox from '../ui/Infobox';
-import Appear from '../ui/effects/Appear';
-import Form from '../../lib/Form';
+import { observer } from 'mobx-react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { Link } from 'react-router-dom';
 import { email, required } from '../../helpers/validation-helpers';
-import Input from '../ui/input/index';
+import Form from '../../lib/Form';
+import Infobox from '../ui/Infobox';
 import Button from '../ui/button';
+import Appear from '../ui/effects/Appear';
 import { H1 } from '../ui/headline';
+import Input from '../ui/input/index';
 
 const messages = defineMessages({
   settingsHeadline: {
diff --git a/src/components/auth/Locked.tsx b/src/components/auth/Locked.tsx
index 34d010782..46ce24a2e 100644
--- a/src/components/auth/Locked.tsx
+++ b/src/components/auth/Locked.tsx
@@ -1,13 +1,17 @@
 import { systemPreferences } from '@electron/remote';
-import { Component } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { noop } from 'lodash';
+import { observer } from 'mobx-react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { isMac } from '../../environment';
 import Form from '../../lib/Form';
-import Input from '../ui/input/index';
 import Button from '../ui/button';
 import { H1 } from '../ui/headline';
-import { isMac } from '../../environment';
+import Input from '../ui/input/index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/auth/Login.tsx b/src/components/auth/Login.tsx
index 9bad731c8..37ce595eb 100644
--- a/src/components/auth/Login.tsx
+++ b/src/components/auth/Login.tsx
@@ -1,19 +1,23 @@
-import { Component, FormEvent, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiArrowLeftCircle } from '@mdi/js';
 import { noop } from 'lodash';
-import Icon from '../ui/icon';
+import { observer } from 'mobx-react';
+import { Component, type FormEvent, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import type { GlobalError } from '../../@types/ferdium-components.types';
+import { serverBase } from '../../api/apiBase'; // TODO: Remove this line after fixing password recovery in-app
 import { LIVE_FRANZ_API } from '../../config';
 import { API_VERSION } from '../../environment-remote';
-import { serverBase } from '../../api/apiBase'; // TODO: Remove this line after fixing password recovery in-app
+import { email, required } from '../../helpers/validation-helpers';
 import Form from '../../lib/Form';
-import { required, email } from '../../helpers/validation-helpers';
-import Input from '../ui/input/index';
-import Button from '../ui/button';
 import Link from '../ui/Link';
+import Button from '../ui/button';
 import { H1 } from '../ui/headline';
-import { GlobalError } from '../../@types/ferdium-components.types';
+import Icon from '../ui/icon';
+import Input from '../ui/input/index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/auth/Password.tsx b/src/components/auth/Password.tsx
index 03adc3859..6f398c3fb 100644
--- a/src/components/auth/Password.tsx
+++ b/src/components/auth/Password.tsx
@@ -1,16 +1,20 @@
-import { Component, FormEvent } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type FormEvent } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 
 import { noop } from 'lodash';
+import { email, required } from '../../helpers/validation-helpers';
+import globalMessages from '../../i18n/globalMessages';
 import Form from '../../lib/Form';
-import { required, email } from '../../helpers/validation-helpers';
-import Input from '../ui/input/index';
-import Button from '../ui/button';
-import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
-import globalMessages from '../../i18n/globalMessages';
+import Link from '../ui/Link';
+import Button from '../ui/button';
 import { H1 } from '../ui/headline';
+import Input from '../ui/input/index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/auth/SetupAssistant.tsx b/src/components/auth/SetupAssistant.tsx
index c25495471..c1965dbb4 100644
--- a/src/components/auth/SetupAssistant.tsx
+++ b/src/components/auth/SetupAssistant.tsx
@@ -1,17 +1,21 @@
-import { Component } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import withStyles, { WithStylesProps } from 'react-jss';
 import classnames from 'classnames';
-import Input from '../ui/input/index';
-import Button from '../ui/button';
-import Badge from '../ui/badge';
-import Modal from '../ui/Modal';
+import { observer } from 'mobx-react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import { CDN_URL } from '../../config';
+import globalMessages from '../../i18n/globalMessages';
 import Infobox from '../ui/Infobox';
+import Modal from '../ui/Modal';
+import Badge from '../ui/badge';
+import Button from '../ui/button';
 import Appear from '../ui/effects/Appear';
-import globalMessages from '../../i18n/globalMessages';
-import { CDN_URL } from '../../config';
 import { H1, H2 } from '../ui/headline';
+import Input from '../ui/input/index';
 
 const SLACK_ID = 'slack';
 
diff --git a/src/components/auth/Signup.tsx b/src/components/auth/Signup.tsx
index 06a9774aa..84974fd07 100644
--- a/src/components/auth/Signup.tsx
+++ b/src/components/auth/Signup.tsx
@@ -1,18 +1,22 @@
-import { Component } from 'react';
-import { observer, inject } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiArrowLeftCircle } from '@mdi/js';
 import { noop } from 'lodash';
+import { inject, observer } from 'mobx-react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import type { GlobalError } from '../../@types/ferdium-components.types';
+import type { Actions } from '../../actions/lib/actions';
+import { serverBase } from '../../api/apiBase';
+import { email, minLength, required } from '../../helpers/validation-helpers';
 import Form from '../../lib/Form';
-import { required, email, minLength } from '../../helpers/validation-helpers';
-import Input from '../ui/input/index';
-import Button from '../ui/button';
 import Link from '../ui/Link';
-import Icon from '../ui/icon';
-import { serverBase } from '../../api/apiBase';
+import Button from '../ui/button';
 import { H1 } from '../ui/headline';
-import { GlobalError } from '../../@types/ferdium-components.types';
-import { Actions } from '../../actions/lib/actions';
+import Icon from '../ui/icon';
+import Input from '../ui/input/index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/auth/Welcome.tsx b/src/components/auth/Welcome.tsx
index c1a2db386..ec1c167c0 100644
--- a/src/components/auth/Welcome.tsx
+++ b/src/components/auth/Welcome.tsx
@@ -1,14 +1,18 @@
-import { Component, ReactElement } from 'react';
-import { observer, inject } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { noop } from 'lodash';
-import serverlessLogin from '../../helpers/serverless-helpers';
-import shuffleArray from '../../helpers/array-helpers';
+import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import { serverName } from '../../api/apiBase';
+import shuffleArray from '../../helpers/array-helpers';
+import serverlessLogin from '../../helpers/serverless-helpers';
+import type RecipePreview from '../../models/RecipePreview';
 import Link from '../ui/Link';
 import { H1 } from '../ui/headline';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import RecipePreview from '../../models/RecipePreview';
 
 const messages = defineMessages({
   signupButton: {
diff --git a/src/components/downloadManager/DownloadManagerDashboard.tsx b/src/components/downloadManager/DownloadManagerDashboard.tsx
index 25e73d48f..490be269d 100644
--- a/src/components/downloadManager/DownloadManagerDashboard.tsx
+++ b/src/components/downloadManager/DownloadManagerDashboard.tsx
@@ -1,29 +1,29 @@
-import { Component } from 'react';
-import { observer } from 'mobx-react';
-import { IntlShape, defineMessages, injectIntl } from 'react-intl';
-import { shell } from 'electron';
-import prettyBytes from 'pretty-bytes';
+import { mdiDownload } from '@mdi/js';
+import CancelIcon from '@mui/icons-material/Cancel';
+import ClearAllIcon from '@mui/icons-material/ClearAll';
+import DeleteIcon from '@mui/icons-material/Delete';
+import FolderIcon from '@mui/icons-material/Folder';
+import PauseIcon from '@mui/icons-material/Pause';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import {
-  Typography,
+  Box,
   Card,
   CardContent,
-  LinearProgress,
-  Box,
   IconButton,
+  LinearProgress,
   ListItemButton,
   ListItemIcon,
   ListItemText,
+  Typography,
 } from '@mui/material';
-import { mdiDownload } from '@mdi/js';
-import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import PauseIcon from '@mui/icons-material/Pause';
-import CancelIcon from '@mui/icons-material/Cancel';
-import FolderIcon from '@mui/icons-material/Folder';
-import DeleteIcon from '@mui/icons-material/Delete';
-import ClearAllIcon from '@mui/icons-material/ClearAll';
+import { shell } from 'electron';
 import { round } from 'lodash';
-import { RealStores } from '../../stores';
-import { Actions } from '../../actions/lib/actions';
+import { observer } from 'mobx-react';
+import prettyBytes from 'pretty-bytes';
+import { Component } from 'react';
+import { type IntlShape, defineMessages, injectIntl } from 'react-intl';
+import type { Actions } from '../../actions/lib/actions';
+import type { RealStores } from '../../stores';
 import Icon from '../ui/icon';
 
 const messages = defineMessages({
diff --git a/src/components/downloadManager/DownloadManagerLayout.tsx b/src/components/downloadManager/DownloadManagerLayout.tsx
index 1e018cfb8..08c0ace1e 100644
--- a/src/components/downloadManager/DownloadManagerLayout.tsx
+++ b/src/components/downloadManager/DownloadManagerLayout.tsx
@@ -1,14 +1,19 @@
-import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import type React from 'react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 
 import { mdiClose } from '@mdi/js';
 import { Outlet } from 'react-router-dom';
-import { Actions } from '../../actions/lib/actions';
+import type { Actions } from '../../actions/lib/actions';
 import { isEscKeyPress } from '../../jsUtils';
 import Appear from '../ui/effects/Appear';
-import ErrorBoundary from '../util/ErrorBoundary';
 import Icon from '../ui/icon';
+import ErrorBoundary from '../util/ErrorBoundary';
 
 const messages = defineMessages({
   closeSettings: {
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx
index 97795212a..160664c20 100644
--- a/src/components/layout/AppLayout.tsx
+++ b/src/components/layout/AppLayout.tsx
@@ -1,28 +1,33 @@
-import React, { Component, PropsWithChildren } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import { TitleBar } from 'electron-react-titlebar/renderer';
-import injectSheet, { WithStylesProps } from 'react-jss';
 import { ipcRenderer } from 'electron';
+import { TitleBar } from 'electron-react-titlebar/renderer';
+import { observer } from 'mobx-react';
+import type React from 'react';
+import { Component, type PropsWithChildren } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import injectSheet, { type WithStylesProps } from 'react-jss';
 
 import { mdiFlash, mdiPowerPlug } from '@mdi/js';
 import { Outlet } from 'react-router-dom';
-import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
-import { Component as QuickSwitch } from '../../features/quickSwitch';
 import { Component as PublishDebugInfo } from '../../features/publishDebugInfo';
-import ErrorBoundary from '../util/ErrorBoundary';
+import { Component as QuickSwitch } from '../../features/quickSwitch';
 import { updateVersionParse } from '../../helpers/update-helpers';
+import InfoBar from '../ui/InfoBar';
+import ErrorBoundary from '../util/ErrorBoundary';
 
 import { isMac, isWindows } from '../../environment';
-import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
+import Todos from '../../features/todos/containers/TodosScreen';
 import { workspaceStore } from '../../features/workspaces';
+import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
-import Todos from '../../features/todos/containers/TodosScreen';
 import Icon from '../ui/icon';
 
 import LockedScreen from '../../containers/auth/LockedScreen';
-import SettingsStore from '../../stores/SettingsStore';
+import type SettingsStore from '../../stores/SettingsStore';
 
 const messages = defineMessages({
   servicesUpdated: {
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index 1106113f0..a927d5745 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -1,7 +1,3 @@
-import { Component } from 'react';
-import { Tooltip as ReactTooltip } from 'react-tooltip';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import { inject, observer } from 'mobx-react';
 import {
   mdiBell,
   mdiBellOff,
@@ -9,14 +5,22 @@ import {
   mdiChevronDown,
   mdiChevronRight,
   mdiCog,
+  mdiDownload,
   mdiLock,
   mdiMenu,
   mdiPlusBox,
   mdiViewGrid,
   mdiViewSplitVertical,
-  mdiDownload,
 } from '@mdi/js';
-import Tabbar from '../services/tabs/Tabbar';
+import { inject, observer } from 'mobx-react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { Tooltip as ReactTooltip } from 'react-tooltip';
+import type { Actions } from '../../actions/lib/actions';
 import {
   addNewServiceShortcutKey,
   downloadsShortcutKey,
@@ -30,10 +34,10 @@ import {
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import globalMessages from '../../i18n/globalMessages';
+import type Service from '../../models/Service';
+import type { RealStores } from '../../stores';
+import Tabbar from '../services/tabs/Tabbar';
 import Icon from '../ui/icon';
-import { Actions } from '../../actions/lib/actions';
-import { RealStores } from '../../stores';
-import Service from '../../models/Service';
 
 const messages = defineMessages({
   addNewService: {
diff --git a/src/components/services/content/ConnectionLostBanner.tsx b/src/components/services/content/ConnectionLostBanner.tsx
index 7040337f0..04e62ff6b 100644
--- a/src/components/services/content/ConnectionLostBanner.tsx
+++ b/src/components/services/content/ConnectionLostBanner.tsx
@@ -1,8 +1,12 @@
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiAlert } from '@mdi/js';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { LIVE_API_FERDIUM_WEBSITE } from '../../../config';
 import Icon from '../../ui/icon';
 
diff --git a/src/components/services/content/ServiceDisabled.tsx b/src/components/services/content/ServiceDisabled.tsx
index 2f0d439ec..9b9f377b1 100644
--- a/src/components/services/content/ServiceDisabled.tsx
+++ b/src/components/services/content/ServiceDisabled.tsx
@@ -1,6 +1,10 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import Button from '../../ui/button';
 import { H1 } from '../../ui/headline';
 
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index d89cd0610..577473b5d 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -1,18 +1,18 @@
-import { Component } from 'react';
-import { autorun, IReactionDisposer } from 'mobx';
-import { observer, inject } from 'mobx-react';
 import classnames from 'classnames';
+import { type IReactionDisposer, autorun } from 'mobx';
+import { inject, observer } from 'mobx-react';
+import { Component } from 'react';
 import TopBarProgress from 'react-topbar-progress-indicator';
-import ServiceModel from '../../../models/Service';
+import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config';
+import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
+import type ServiceModel from '../../../models/Service';
+import type { RealStores } from '../../../stores';
 import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
 import WebviewLoader from '../../ui/WebviewLoader';
-import WebviewCrashHandler from './WebviewCrashHandler';
-import WebviewErrorHandler from './WebviewErrorHandler';
 import ServiceDisabled from './ServiceDisabled';
 import ServiceWebview from './ServiceWebview';
-import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
-import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config';
-import { RealStores } from '../../../stores';
+import WebviewCrashHandler from './WebviewCrashHandler';
+import WebviewErrorHandler from './WebviewErrorHandler';
 
 interface IProps {
   service: ServiceModel;
diff --git a/src/components/services/content/ServiceWebview.tsx b/src/components/services/content/ServiceWebview.tsx
index c598d4be6..0cf34c14b 100644
--- a/src/components/services/content/ServiceWebview.tsx
+++ b/src/components/services/content/ServiceWebview.tsx
@@ -1,9 +1,9 @@
 import { join } from 'node:path';
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
 import { action, makeObservable, observable, reaction } from 'mobx';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 import ElectronWebView from 'react-electron-web-view';
-import ServiceModel from '../../../models/Service';
+import type ServiceModel from '../../../models/Service';
 
 const debug = require('../../../preload-safe-debug')('Ferdium:Services');
 
diff --git a/src/components/services/content/Services.tsx b/src/components/services/content/Services.tsx
index 5766e0d75..65359d0b4 100644
--- a/src/components/services/content/Services.tsx
+++ b/src/components/services/content/Services.tsx
@@ -1,13 +1,17 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import { Link } from 'react-router-dom';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import Confetti from 'react-confetti';
 import ms from 'ms';
-import withStyles, { WithStylesProps } from 'react-jss';
-import ServiceView from './ServiceView';
+import { Component, type ReactElement } from 'react';
+import Confetti from 'react-confetti';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import { Link } from 'react-router-dom';
+import type Service from '../../../models/Service';
 import Appear from '../../ui/effects/Appear';
-import Service from '../../../models/Service';
+import ServiceView from './ServiceView';
 
 const messages = defineMessages({
   getStarted: {
diff --git a/src/components/services/content/WebviewCrashHandler.tsx b/src/components/services/content/WebviewCrashHandler.tsx
index 91c9cf927..0306dcbda 100644
--- a/src/components/services/content/WebviewCrashHandler.tsx
+++ b/src/components/services/content/WebviewCrashHandler.tsx
@@ -1,7 +1,11 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import ms from 'ms';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import Button from '../../ui/button';
 import { H1 } from '../../ui/headline';
 
diff --git a/src/components/services/content/WebviewErrorHandler.tsx b/src/components/services/content/WebviewErrorHandler.tsx
index b99c15006..1d33ae117 100644
--- a/src/components/services/content/WebviewErrorHandler.tsx
+++ b/src/components/services/content/WebviewErrorHandler.tsx
@@ -1,7 +1,11 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import withStyles, { WithStylesProps } from 'react-jss';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import Button from '../../ui/button';
 import { H1 } from '../../ui/headline';
 
diff --git a/src/components/services/tabs/TabBarSortableList.tsx b/src/components/services/tabs/TabBarSortableList.tsx
index a30587470..2f76c17f1 100644
--- a/src/components/services/tabs/TabBarSortableList.tsx
+++ b/src/components/services/tabs/TabBarSortableList.tsx
@@ -1,9 +1,9 @@
-import { Component } from 'react';
 import { observer } from 'mobx-react';
+import { Component } from 'react';
 import { SortableContainer } from 'react-sortable-hoc';
 
+import type Service from '../../../models/Service';
 import TabItem from './TabItem';
-import Service from '../../../models/Service';
 
 interface IProps {
   showMessageBadgeWhenMutedSetting: boolean;
diff --git a/src/components/services/tabs/TabItem.tsx b/src/components/services/tabs/TabItem.tsx
index 804efe8a5..bf193e136 100644
--- a/src/components/services/tabs/TabItem.tsx
+++ b/src/components/services/tabs/TabItem.tsx
@@ -1,19 +1,23 @@
-import { app, dialog, Menu } from '@electron/remote';
+import { Menu, app, dialog } from '@electron/remote';
+import { mdiExclamation, mdiVolumeSource } from '@mdi/js';
+import classnames from 'classnames';
 import { noop } from 'lodash';
-import { Component } from 'react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { autorun, makeObservable, observable, reaction } from 'mobx';
 import { inject, observer } from 'mobx-react';
-import classnames from 'classnames';
-import { SortableElement } from 'react-sortable-hoc';
-import injectSheet, { WithStylesProps } from 'react-jss';
 import ms from 'ms';
-import { autorun, makeObservable, observable, reaction } from 'mobx';
-import { mdiExclamation, mdiVolumeSource } from '@mdi/js';
-import Service from '../../../models/Service';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import injectSheet, { type WithStylesProps } from 'react-jss';
+import { SortableElement } from 'react-sortable-hoc';
+import type { Stores } from '../../../@types/stores.types';
 import { altKey, cmdOrCtrlShortcutKey, shiftKey } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
+import type Service from '../../../models/Service';
 import Icon from '../../ui/icon';
-import { Stores } from '../../../@types/stores.types';
 import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
 import { acceleratorString } from '../../../jsUtils';
 
diff --git a/src/components/services/tabs/Tabbar.tsx b/src/components/services/tabs/Tabbar.tsx
index d19a4b8de..164051aae 100644
--- a/src/components/services/tabs/Tabbar.tsx
+++ b/src/components/services/tabs/Tabbar.tsx
@@ -1,8 +1,8 @@
-import { Component } from 'react';
 import { observer } from 'mobx-react';
+import { Component } from 'react';
 
+import type Service from '../../../models/Service';
 import TabBarSortableList from './TabBarSortableList';
-import Service from '../../../models/Service';
 
 interface IProps {
   useHorizontalStyle: boolean;
diff --git a/src/components/settings/SettingsLayout.tsx b/src/components/settings/SettingsLayout.tsx
index f96ad7394..17f8c3e33 100644
--- a/src/components/settings/SettingsLayout.tsx
+++ b/src/components/settings/SettingsLayout.tsx
@@ -1,12 +1,16 @@
-import { Component, PropsWithChildren, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiClose } from '@mdi/js';
+import { observer } from 'mobx-react';
+import { Component, type PropsWithChildren, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { Outlet } from 'react-router-dom';
-import ErrorBoundary from '../util/ErrorBoundary';
+import { isEscKeyPress } from '../../jsUtils';
 import Appear from '../ui/effects/Appear';
 import Icon from '../ui/icon';
-import { isEscKeyPress } from '../../jsUtils';
+import ErrorBoundary from '../util/ErrorBoundary';
 
 const messages = defineMessages({
   closeSettings: {
diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx
index eab019084..76b4ce14e 100644
--- a/src/components/settings/account/AccountDashboard.tsx
+++ b/src/components/settings/account/AccountDashboard.tsx
@@ -1,18 +1,22 @@
-import { Component } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
 import { H1, H2 } from '../../ui/headline';
 
-import Loader from '../../ui/loader';
-import Button from '../../ui/button';
-import Infobox from '../../ui/infobox/index';
 import {
   DEFAULT_LOADER_COLOR,
-  LOCAL_SERVER,
   LIVE_FRANZ_API,
+  LOCAL_SERVER,
 } from '../../../config';
-import User from '../../../models/User';
+import type User from '../../../models/User';
+import Button from '../../ui/button';
+import Infobox from '../../ui/infobox/index';
+import Loader from '../../ui/loader';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/settings/navigation/SettingsNavigation.tsx b/src/components/settings/navigation/SettingsNavigation.tsx
index 66763c6a6..0504b6553 100644
--- a/src/components/settings/navigation/SettingsNavigation.tsx
+++ b/src/components/settings/navigation/SettingsNavigation.tsx
@@ -1,12 +1,16 @@
-import { Component } from 'react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { inject, observer } from 'mobx-react';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { NavLink } from 'react-router-dom';
-import { StoresProps } from '../../../@types/ferdium-components.types';
+import type { StoresProps } from '../../../@types/ferdium-components.types';
 import {
-  LOCAL_SERVER,
   LIVE_FERDIUM_API,
   LIVE_FRANZ_API,
+  LOCAL_SERVER,
 } from '../../../config';
 import globalMessages from '../../../i18n/globalMessages';
 
diff --git a/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx b/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx
index 9b17e551c..1afc17491 100644
--- a/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx
+++ b/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx
@@ -1,7 +1,7 @@
-import { Component } from 'react';
-import { observer } from 'mobx-react';
-import { IntlShape, defineMessages, injectIntl } from 'react-intl';
 import Markdown from 'markdown-to-jsx';
+import { observer } from 'mobx-react';
+import { Component } from 'react';
+import { type IntlShape, defineMessages, injectIntl } from 'react-intl';
 import { ferdiumVersion } from '../../../environment-remote';
 import {
   getFerdiumVersion,
diff --git a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
index 4a6fe54f4..23db7141e 100644
--- a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
+++ b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
@@ -1,14 +1,18 @@
-import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 
 import { mdiClose } from '@mdi/js';
 import { Outlet } from 'react-router-dom';
-import ErrorBoundary from '../../util/ErrorBoundary';
+import type { Actions } from '../../../actions/lib/actions';
+import { isEscKeyPress } from '../../../jsUtils';
 import Appear from '../../ui/effects/Appear';
 import Icon from '../../ui/icon';
-import { isEscKeyPress } from '../../../jsUtils';
-import { Actions } from '../../../actions/lib/actions';
+import ErrorBoundary from '../../util/ErrorBoundary';
 
 const messages = defineMessages({
   closeSettings: {
diff --git a/src/components/settings/services/EditServiceForm.tsx b/src/components/settings/services/EditServiceForm.tsx
index 520cb3c46..69893c16c 100644
--- a/src/components/settings/services/EditServiceForm.tsx
+++ b/src/components/settings/services/EditServiceForm.tsx
@@ -1,25 +1,29 @@
-import { Component, FormEvent, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import { Link } from 'react-router-dom';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiInformation } from '@mdi/js';
 import { noop } from 'lodash';
-import Form from '../../../lib/Form';
-import Tabs from '../../ui/Tabs/Tabs';
-import TabItem from '../../ui/Tabs/TabItem';
-import Input from '../../ui/input/index';
-import Toggle from '../../ui/toggle';
-import Slider from '../../ui/Slider';
-import Button from '../../ui/button';
-import ImageUpload from '../../ui/imageUpload';
-import Select from '../../ui/Select';
+import { observer } from 'mobx-react';
+import { Component, type FormEvent, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { Link } from 'react-router-dom';
 import { isMac } from '../../../environment';
+import { normalizedUrl } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
-import Icon from '../../ui/icon';
+import type Form from '../../../lib/Form';
+import type { IRecipe } from '../../../models/Recipe';
+import type Service from '../../../models/Service';
+import Select from '../../ui/Select';
+import Slider from '../../ui/Slider';
+import TabItem from '../../ui/Tabs/TabItem';
+import Tabs from '../../ui/Tabs/Tabs';
+import Button from '../../ui/button';
 import { H3 } from '../../ui/headline';
-import { IRecipe } from '../../../models/Recipe';
-import Service from '../../../models/Service';
-import { normalizedUrl } from '../../../helpers/url-helpers';
+import Icon from '../../ui/icon';
+import ImageUpload from '../../ui/imageUpload';
+import Input from '../../ui/input/index';
+import Toggle from '../../ui/toggle';
 
 const messages = defineMessages({
   saveService: {
diff --git a/src/components/settings/services/ServiceError.tsx b/src/components/settings/services/ServiceError.tsx
index 87efdeb96..426565547 100644
--- a/src/components/settings/services/ServiceError.tsx
+++ b/src/components/settings/services/ServiceError.tsx
@@ -1,7 +1,11 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { Link } from 'react-router-dom';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import Infobox from '../../ui/Infobox';
 import Button from '../../ui/button';
 
diff --git a/src/components/settings/services/ServiceItem.tsx b/src/components/settings/services/ServiceItem.tsx
index 35b63b160..7df59f1d2 100644
--- a/src/components/settings/services/ServiceItem.tsx
+++ b/src/components/settings/services/ServiceItem.tsx
@@ -1,10 +1,14 @@
-import { Component, ReactElement } from 'react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import { Tooltip as ReactTooltip } from 'react-tooltip';
-import { observer } from 'mobx-react';
-import classnames from 'classnames';
 import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js';
-import ServiceModel from '../../../models/Service';
+import classnames from 'classnames';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { Tooltip as ReactTooltip } from 'react-tooltip';
+import type ServiceModel from '../../../models/Service';
 import Icon from '../../ui/icon';
 
 const messages = defineMessages({
diff --git a/src/components/settings/services/ServicesDashboard.tsx b/src/components/settings/services/ServicesDashboard.tsx
index b8c3ce3f0..e63898ae5 100644
--- a/src/components/settings/services/ServicesDashboard.tsx
+++ b/src/components/settings/services/ServicesDashboard.tsx
@@ -1,16 +1,20 @@
-import { Component, ReactElement } from 'react';
+import type { To } from 'history';
 import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { Link } from 'react-router-dom';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import { To } from 'history';
-import SearchInput from '../../ui/SearchInput';
-import Infobox from '../../ui/Infobox';
-import Loader from '../../ui/loader';
+import type Service from '../../../models/Service';
 import FAB from '../../ui/FAB';
-import ServiceItem from './ServiceItem';
+import Infobox from '../../ui/Infobox';
+import SearchInput from '../../ui/SearchInput';
 import Appear from '../../ui/effects/Appear';
 import { H1 } from '../../ui/headline';
-import Service from '../../../models/Service';
+import Loader from '../../ui/loader';
+import ServiceItem from './ServiceItem';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 81cfe8b12..598158e20 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -1,31 +1,20 @@
 import { systemPreferences } from '@electron/remote';
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import prettyBytes from 'pretty-bytes';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiGithub, mdiOpenInNew, mdiPowerPlug } from '@mdi/js';
 import { noop } from 'lodash';
-import Form from '../../../lib/Form';
-import Button from '../../ui/button';
-import Toggle from '../../ui/toggle';
-import Select from '../../ui/Select';
-import Input from '../../ui/input/index';
-import ColorPickerInput from '../../ui/colorPickerInput';
-import Infobox from '../../ui/Infobox';
-import { H1, H2, H3, H5 } from '../../ui/headline';
+import { observer } from 'mobx-react';
+import prettyBytes from 'pretty-bytes';
+import { Component, type ReactElement } from 'react';
 import {
-  ferdiumVersion,
-  userDataCertsPath,
-  userDataPath,
-  userDataRecipesPath,
-} from '../../../environment-remote';
-import { updateVersionParse } from '../../../helpers/update-helpers';
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import {
   DEFAULT_ACCENT_COLOR,
   DEFAULT_APP_SETTINGS,
   FERDIUM_TRANSLATION,
-  GITHUB_FRANZ_URL,
   GITHUB_FERDIUM_URL,
+  GITHUB_FRANZ_URL,
   SPLIT_COLUMNS_MAX,
   SPLIT_COLUMNS_MIN,
 } from '../../../config';
@@ -35,10 +24,25 @@ import {
   isWindows,
   lockFerdiumShortcutKey,
 } from '../../../environment';
+import {
+  ferdiumVersion,
+  userDataCertsPath,
+  userDataPath,
+  userDataRecipesPath,
+} from '../../../environment-remote';
+import { updateVersionParse } from '../../../helpers/update-helpers';
 import { openExternalUrl, openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
-import Icon from '../../ui/icon';
+import type Form from '../../../lib/Form';
+import Infobox from '../../ui/Infobox';
+import Select from '../../ui/Select';
 import Slider from '../../ui/Slider';
+import Button from '../../ui/button';
+import ColorPickerInput from '../../ui/colorPickerInput';
+import { H1, H2, H3, H5 } from '../../ui/headline';
+import Icon from '../../ui/icon';
+import Input from '../../ui/input/index';
+import Toggle from '../../ui/toggle';
 
 const debug = require('../../../preload-safe-debug')(
   'Ferdium:EditSettingsForm',
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx
index 96613373e..b2d5aa6d5 100644
--- a/src/components/settings/team/TeamDashboard.tsx
+++ b/src/components/settings/team/TeamDashboard.tsx
@@ -1,16 +1,20 @@
 // TODO: Is this feature even being used? If not, then we can cleanup this code
 
-import { Component, ReactElement } from 'react';
+import classnames from 'classnames';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
-import withStyles, { WithStylesProps } from 'react-jss';
-import classnames from 'classnames';
-import Loader from '../../ui/loader';
-import Button from '../../ui/button';
+import { DEFAULT_LOADER_COLOR, LIVE_FRANZ_API } from '../../../config';
 import Infobox from '../../ui/Infobox';
+import Button from '../../ui/button';
 import { H1 } from '../../ui/headline';
-import { DEFAULT_LOADER_COLOR, LIVE_FRANZ_API } from '../../../config';
+import Loader from '../../ui/loader';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/settings/user/EditUserForm.tsx b/src/components/settings/user/EditUserForm.tsx
index 5a2a5a83e..f4b84166a 100644
--- a/src/components/settings/user/EditUserForm.tsx
+++ b/src/components/settings/user/EditUserForm.tsx
@@ -1,14 +1,23 @@
-import { Component, FormEvent, FormEventHandler, ReactElement } from 'react';
+import { noop } from 'lodash';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import {
+  Component,
+  type FormEvent,
+  type FormEventHandler,
+  type ReactElement,
+} from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { Link } from 'react-router-dom';
-import { noop } from 'lodash';
-import Input from '../../ui/input/index';
-import Form from '../../../lib/Form';
-import Button from '../../ui/button';
-import Radio from '../../ui/Radio';
+import type Form from '../../../lib/Form';
 import Infobox from '../../ui/Infobox';
+import Radio from '../../ui/Radio';
+import Button from '../../ui/button';
 import { H2 } from '../../ui/headline';
+import Input from '../../ui/input/index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx
index 4b5828ef4..a2133e174 100644
--- a/src/components/ui/AppLoader/index.tsx
+++ b/src/components/ui/AppLoader/index.tsx
@@ -1,9 +1,9 @@
-import { Component, ReactElement } from 'react';
 import classnames from 'classnames';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { Theme } from '../../../themes';
-import FullscreenLoader from '../FullscreenLoader';
+import { Component, type ReactElement } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import shuffleArray from '../../../helpers/array-helpers';
+import type { Theme } from '../../../themes';
+import FullscreenLoader from '../FullscreenLoader';
 
 import styles from './styles';
 
diff --git a/src/components/ui/FAB.tsx b/src/components/ui/FAB.tsx
index acb0f690e..b4eeace8b 100644
--- a/src/components/ui/FAB.tsx
+++ b/src/components/ui/FAB.tsx
@@ -1,7 +1,7 @@
-import { Component, ReactElement, ReactNode } from 'react';
-import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { noop } from 'lodash';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement, type ReactNode } from 'react';
 
 interface IProps {
   className: string;
diff --git a/src/components/ui/FullscreenLoader/index.tsx b/src/components/ui/FullscreenLoader/index.tsx
index 09c1d5fbb..40b04abe8 100644
--- a/src/components/ui/FullscreenLoader/index.tsx
+++ b/src/components/ui/FullscreenLoader/index.tsx
@@ -1,11 +1,11 @@
-import { Component, ReactElement, ReactNode } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
 import classnames from 'classnames';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement, type ReactNode } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type { Theme } from '../../../themes';
+import { H1 } from '../headline';
 import Loader from '../loader/index';
 import styles from './styles';
-import { H1 } from '../headline';
-import { Theme } from '../../../themes';
 
 interface IProps extends WithStylesProps<typeof styles> {
   className?: string;
diff --git a/src/components/ui/InfoBar.tsx b/src/components/ui/InfoBar.tsx
index f3f1adbe7..5fd27f61a 100644
--- a/src/components/ui/InfoBar.tsx
+++ b/src/components/ui/InfoBar.tsx
@@ -1,14 +1,18 @@
-import { Component, MouseEventHandler, ReactNode } from 'react';
-import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { observer } from 'mobx-react';
+import { Component, type MouseEventHandler, type ReactNode } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 
 import { mdiClose } from '@mdi/js';
 import { noop } from 'lodash';
-import Loader from './loader/index';
+import { DEFAULT_LOADER_COLOR } from '../../config';
 import Appear from './effects/Appear';
 import Icon from './icon';
-import { DEFAULT_LOADER_COLOR } from '../../config';
+import Loader from './loader/index';
 
 const messages = defineMessages({
   hide: {
diff --git a/src/components/ui/Infobox.tsx b/src/components/ui/Infobox.tsx
index 14e1a581c..fc88c4654 100644
--- a/src/components/ui/Infobox.tsx
+++ b/src/components/ui/Infobox.tsx
@@ -1,12 +1,21 @@
-import { Component, MouseEventHandler, ReactElement, ReactNode } from 'react';
-import classnames from 'classnames';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { mdiAlert, mdiCheckboxMarkedCircleOutline, mdiClose } from '@mdi/js';
+import classnames from 'classnames';
 import { noop } from 'lodash';
 import { observer } from 'mobx-react';
-import Loader from './loader/index';
-import Icon from './icon';
+import {
+  Component,
+  type MouseEventHandler,
+  type ReactElement,
+  type ReactNode,
+} from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 import { DEFAULT_LOADER_COLOR } from '../../config';
+import Icon from './icon';
+import Loader from './loader/index';
 
 const icons = {
   'checkbox-marked-circle-outline': mdiCheckboxMarkedCircleOutline,
diff --git a/src/components/ui/Link.tsx b/src/components/ui/Link.tsx
index f9fdd57f9..816798d79 100644
--- a/src/components/ui/Link.tsx
+++ b/src/components/ui/Link.tsx
@@ -1,9 +1,14 @@
-import { Component, CSSProperties, ReactNode, MouseEvent } from 'react';
-import { inject, observer } from 'mobx-react';
 import classnames from 'classnames';
+import { inject, observer } from 'mobx-react';
+import {
+  type CSSProperties,
+  Component,
+  type MouseEvent,
+  type ReactNode,
+} from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import matchRoute from '../../helpers/routing-helpers';
 import { openExternalUrl } from '../../helpers/url-helpers';
-import { StoresProps } from '../../@types/ferdium-components.types';
 
 interface IProps extends Partial<StoresProps> {
   children: ReactNode;
@@ -54,7 +59,6 @@ class Link extends Component<IProps> {
     });
 
     return (
-      // biome-ignore lint/a11y/useValidAnchor: <explanation>
       <a
         href={router.history.createHref(to)}
         className={linkClasses}
diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx
index 154beef0c..15326a289 100644
--- a/src/components/ui/Modal/index.tsx
+++ b/src/components/ui/Modal/index.tsx
@@ -1,8 +1,8 @@
-import { Component, ReactNode } from 'react';
-import ReactModal from 'react-modal';
-import classnames from 'classnames';
-import injectCSS, { WithStylesProps } from 'react-jss';
 import { mdiClose } from '@mdi/js';
+import classnames from 'classnames';
+import { Component, type ReactNode } from 'react';
+import injectCSS, { type WithStylesProps } from 'react-jss';
+import ReactModal from 'react-modal';
 
 import Icon from '../icon';
 import styles from './styles';
diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx
index 901958c78..b556eb4ca 100644
--- a/src/components/ui/Radio.tsx
+++ b/src/components/ui/Radio.tsx
@@ -1,7 +1,7 @@
-import { Component } from 'react';
-import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import FieldInterface from 'mobx-react-form/lib/models/FieldInterface';
+import { observer } from 'mobx-react';
+import type FieldInterface from 'mobx-react-form/lib/models/FieldInterface';
+import { Component } from 'react';
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from './error';
 
diff --git a/src/components/ui/SearchInput.tsx b/src/components/ui/SearchInput.tsx
index b2caaa1de..2e70d1b35 100644
--- a/src/components/ui/SearchInput.tsx
+++ b/src/components/ui/SearchInput.tsx
@@ -1,8 +1,8 @@
-import { ChangeEvent, Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
+import { mdiCloseCircleOutline, mdiMagnify } from '@mdi/js';
 import classnames from 'classnames';
 import { debounce, noop } from 'lodash';
-import { mdiCloseCircleOutline, mdiMagnify } from '@mdi/js';
+import { observer } from 'mobx-react';
+import { type ChangeEvent, Component, type ReactElement } from 'react';
 import Icon from './icon';
 
 interface IProps {
diff --git a/src/components/ui/Select.tsx b/src/components/ui/Select.tsx
index a2ed4216f..4abed849d 100644
--- a/src/components/ui/Select.tsx
+++ b/src/components/ui/Select.tsx
@@ -1,14 +1,14 @@
+import classnames from 'classnames';
+import { observer } from 'mobx-react';
 import {
-  createRef,
+  type ChangeEvent,
   Component,
-  ReactElement,
-  RefObject,
-  ChangeEvent,
-  ReactNode,
+  type ReactElement,
+  type ReactNode,
+  type RefObject,
+  createRef,
 } from 'react';
-import { observer } from 'mobx-react';
-import classnames from 'classnames';
-import { Field } from '../../@types/mobx-form.types';
+import type { Field } from '../../@types/mobx-form.types';
 
 interface IProps {
   field: Field;
diff --git a/src/components/ui/ServiceIcon.tsx b/src/components/ui/ServiceIcon.tsx
index 6920611d0..03a345c23 100644
--- a/src/components/ui/ServiceIcon.tsx
+++ b/src/components/ui/ServiceIcon.tsx
@@ -1,8 +1,8 @@
-import { Component, ReactNode } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
 import classnames from 'classnames';
-import ServiceModel from '../../models/Service';
+import { observer } from 'mobx-react';
+import { Component, type ReactNode } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type ServiceModel from '../../models/Service';
 
 const styles = theme => ({
   root: {
diff --git a/src/components/ui/Slider.tsx b/src/components/ui/Slider.tsx
index aa351ccd2..4f22290ef 100644
--- a/src/components/ui/Slider.tsx
+++ b/src/components/ui/Slider.tsx
@@ -1,7 +1,7 @@
-import { ChangeEvent, Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { noop } from 'lodash';
+import { observer } from 'mobx-react';
+import { type ChangeEvent, Component, type ReactElement } from 'react';
 
 interface IProps {
   field: any;
diff --git a/src/components/ui/StatusBarTargetUrl.tsx b/src/components/ui/StatusBarTargetUrl.tsx
index d969267eb..92cb6c36d 100644
--- a/src/components/ui/StatusBarTargetUrl.tsx
+++ b/src/components/ui/StatusBarTargetUrl.tsx
@@ -1,6 +1,6 @@
-import { Component } from 'react';
-import { observer } from 'mobx-react';
 import classnames from 'classnames';
+import { observer } from 'mobx-react';
+import { Component } from 'react';
 import Appear from './effects/Appear';
 
 interface IProps {
diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx
index 55dee42c6..df99a8bfb 100644
--- a/src/components/ui/Tabs/TabItem.tsx
+++ b/src/components/ui/Tabs/TabItem.tsx
@@ -1,4 +1,4 @@
-import { Fragment, ReactElement } from 'react';
+import { Fragment, type ReactElement } from 'react';
 
 export interface IProps {
   children:
diff --git a/src/components/ui/Tabs/Tabs.tsx b/src/components/ui/Tabs/Tabs.tsx
index d7f75c8b8..a5ec148aa 100644
--- a/src/components/ui/Tabs/Tabs.tsx
+++ b/src/components/ui/Tabs/Tabs.tsx
@@ -1,7 +1,12 @@
-import { Children, Component, ReactElement, ReactPortal } from 'react';
-import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import { IProps as TabItemProps } from './TabItem';
+import { observer } from 'mobx-react';
+import {
+  Children,
+  Component,
+  type ReactElement,
+  type ReactPortal,
+} from 'react';
+import type { IProps as TabItemProps } from './TabItem';
 
 interface IProps {
   children:
diff --git a/src/components/ui/WebviewLoader/index.tsx b/src/components/ui/WebviewLoader/index.tsx
index c4e9c724c..53e10d3b9 100644
--- a/src/components/ui/WebviewLoader/index.tsx
+++ b/src/components/ui/WebviewLoader/index.tsx
@@ -1,7 +1,11 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import injectSheet, { WithStylesProps } from 'react-jss';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import injectSheet, { type WithStylesProps } from 'react-jss';
 import FullscreenLoader from '../FullscreenLoader';
 
 const messages = defineMessages({
diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx
index a5947d3a8..fd5752ed0 100644
--- a/src/components/ui/badge/ProBadge.tsx
+++ b/src/components/ui/badge/ProBadge.tsx
@@ -1,9 +1,9 @@
 import { mdiStar } from '@mdi/js';
 import classnames from 'classnames';
 import { Component } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import injectStyle, { type WithStylesProps } from 'react-jss';
 
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 import Icon from '../icon';
 import Badge from './index';
 
diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx
index 44fbf2d4a..e464c07ec 100644
--- a/src/components/ui/badge/index.tsx
+++ b/src/components/ui/badge/index.tsx
@@ -1,8 +1,8 @@
 import classnames from 'classnames';
-import { Component, ReactNode } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import { Component, type ReactNode } from 'react';
+import injectStyle, { type WithStylesProps } from 'react-jss';
 
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 
 const badgeStyles = (theme: Theme) => {
   const styles = {};
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index 3247072a9..5c606f274 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -1,14 +1,14 @@
 /* eslint-disable no-use-before-define */
 import Icon from '@mdi/react';
 import classnames from 'classnames';
-import { Property } from 'csstype';
+import type { Property } from 'csstype';
 import { noop } from 'lodash';
-import { Component, MouseEventHandler } from 'react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import Loader from '../loader/index';
-import { Theme } from '../../../themes';
-import { IFormField } from '../typings/generic';
+import { Component, type MouseEventHandler } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { DEFAULT_LOADER_COLOR } from '../../../config';
+import type { Theme } from '../../../themes';
+import Loader from '../loader/index';
+import type { IFormField } from '../typings/generic';
 
 type ButtonType =
   | 'primary'
@@ -206,7 +206,6 @@ class ButtonComponent extends Component<IProps, IState> {
     );
 
     const wrapperComponent = href ? (
-      // biome-ignore lint/a11y/useValidAnchor: <explanation>
       <a
         href={href}
         target={target}
diff --git a/src/components/ui/colorPickerInput/index.tsx b/src/components/ui/colorPickerInput/index.tsx
index 39fd0220a..4870a3675 100644
--- a/src/components/ui/colorPickerInput/index.tsx
+++ b/src/components/ui/colorPickerInput/index.tsx
@@ -1,15 +1,15 @@
+import classnames from 'classnames';
+import { noop } from 'lodash';
+import { observer } from 'mobx-react';
 import {
-  ChangeEvent,
+  type ChangeEvent,
   Component,
+  type InputHTMLAttributes,
+  type RefObject,
   createRef,
-  InputHTMLAttributes,
-  RefObject,
 } from 'react';
-import { observer } from 'mobx-react';
-import classnames from 'classnames';
-import { Color, ColorResult, SliderPicker } from 'react-color';
-import { noop } from 'lodash';
-import { FormFields } from '../../../@types/mobx-form.types';
+import { type Color, type ColorResult, SliderPicker } from 'react-color';
+import type { FormFields } from '../../../@types/mobx-form.types';
 
 interface IProps extends InputHTMLAttributes<HTMLInputElement>, FormFields {
   onColorChange: (event: ChangeEvent<HTMLInputElement>) => void;
diff --git a/src/components/ui/effects/Appear.tsx b/src/components/ui/effects/Appear.tsx
index 06f63a029..c32c339fd 100644
--- a/src/components/ui/effects/Appear.tsx
+++ b/src/components/ui/effects/Appear.tsx
@@ -1,4 +1,4 @@
-import { ReactElement, ReactNode, useEffect, useState } from 'react';
+import { type ReactElement, type ReactNode, useEffect, useState } from 'react';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 
 interface IProps {
diff --git a/src/components/ui/error/index.tsx b/src/components/ui/error/index.tsx
index 01fb5ca27..d0008529f 100644
--- a/src/components/ui/error/index.tsx
+++ b/src/components/ui/error/index.tsx
@@ -1,4 +1,4 @@
-import { Classes } from 'jss';
+import type { Classes } from 'jss';
 import { Component } from 'react';
 import injectSheet from 'react-jss';
 
diff --git a/src/components/ui/error/styles.ts b/src/components/ui/error/styles.ts
index 9da95705a..ac781052f 100644
--- a/src/components/ui/error/styles.ts
+++ b/src/components/ui/error/styles.ts
@@ -1,4 +1,4 @@
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 
 export default (theme: Theme) => ({
   message: {
diff --git a/src/components/ui/headline/index.tsx b/src/components/ui/headline/index.tsx
index 8e40fa896..2070745bb 100644
--- a/src/components/ui/headline/index.tsx
+++ b/src/components/ui/headline/index.tsx
@@ -1,15 +1,15 @@
 import classnames from 'classnames';
 import {
   Component,
+  type MouseEventHandler,
+  type ReactElement,
+  type ReactNode,
   createElement,
-  MouseEventHandler,
-  ReactElement,
-  ReactNode,
 } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import injectStyle, { type WithStylesProps } from 'react-jss';
 
-import { Theme } from '../../../themes';
-import { Omit } from '../typings/generic';
+import type { Theme } from '../../../themes';
+import type { Omit } from '../typings/generic';
 
 const styles = (theme: Theme) => ({
   headline: {
diff --git a/src/components/ui/icon/index.tsx b/src/components/ui/icon/index.tsx
index 04a00d0e0..ad9f43730 100644
--- a/src/components/ui/icon/index.tsx
+++ b/src/components/ui/icon/index.tsx
@@ -1,9 +1,9 @@
 import MdiIcon from '@mdi/react';
 import classnames from 'classnames';
-import { Component, ReactElement } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import { Component, type ReactElement } from 'react';
+import injectStyle, { type WithStylesProps } from 'react-jss';
 
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 
 const styles = (theme: Theme) => ({
   icon: {
diff --git a/src/components/ui/imageUpload/index.tsx b/src/components/ui/imageUpload/index.tsx
index 3b164ed41..876572484 100644
--- a/src/components/ui/imageUpload/index.tsx
+++ b/src/components/ui/imageUpload/index.tsx
@@ -1,11 +1,11 @@
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import classnames from 'classnames';
-import Dropzone from 'react-dropzone';
 import { mdiDelete, mdiFileImage } from '@mdi/js';
+import classnames from 'classnames';
+import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
-import Icon from '../icon';
+import { Component, type ReactElement } from 'react';
+import Dropzone from 'react-dropzone';
 import { isWindows } from '../../../environment';
+import Icon from '../icon';
 
 interface IProps {
   field: any;
diff --git a/src/components/ui/infobox/index.tsx b/src/components/ui/infobox/index.tsx
index a1c4f9d21..36ea6a59f 100644
--- a/src/components/ui/infobox/index.tsx
+++ b/src/components/ui/infobox/index.tsx
@@ -2,9 +2,9 @@
 import { mdiClose } from '@mdi/js';
 import classnames from 'classnames';
 import { noop } from 'lodash';
-import { Component, ReactElement, ReactNode } from 'react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { Theme } from '../../../themes';
+import { Component, type ReactElement, type ReactNode } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type { Theme } from '../../../themes';
 import Icon from '../icon';
 
 const buttonStyles = (theme: Theme) => {
diff --git a/src/components/ui/input/index.tsx b/src/components/ui/input/index.tsx
index 68cc9ee22..c61efe570 100644
--- a/src/components/ui/input/index.tsx
+++ b/src/components/ui/input/index.tsx
@@ -1,22 +1,26 @@
 import { mdiEye, mdiEyeOff } from '@mdi/js';
 import classnames from 'classnames';
+import { noop } from 'lodash';
+import { observer } from 'mobx-react';
 import {
   Component,
+  type InputHTMLAttributes,
+  type KeyboardEvent,
+  type ReactElement,
+  type RefObject,
   createRef,
-  InputHTMLAttributes,
-  ReactElement,
-  RefObject,
-  KeyboardEvent,
 } from 'react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { noop } from 'lodash';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import Icon from '../icon';
-import { IFormField } from '../typings/generic';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from '../error';
+import Icon from '../icon';
 import Label from '../label';
+import type { IFormField } from '../typings/generic';
 import Wrapper from '../wrapper';
 import { scorePasswordFunc } from './scorePassword';
 import styles from './styles';
diff --git a/src/components/ui/input/styles.ts b/src/components/ui/input/styles.ts
index ebae0e40d..580c72889 100644
--- a/src/components/ui/input/styles.ts
+++ b/src/components/ui/input/styles.ts
@@ -1,6 +1,6 @@
-import { Property } from 'csstype';
+import type { Property } from 'csstype';
 
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 
 const prefixStyles = (theme: Theme) => ({
   background: theme.inputPrefixBackground,
diff --git a/src/components/ui/label/index.tsx b/src/components/ui/label/index.tsx
index 5f5cc5c8e..c0a3903b0 100644
--- a/src/components/ui/label/index.tsx
+++ b/src/components/ui/label/index.tsx
@@ -1,8 +1,8 @@
 import classnames from 'classnames';
-import { Component, LabelHTMLAttributes } from 'react';
-import injectSheet, { WithStylesProps } from 'react-jss';
+import { Component, type LabelHTMLAttributes } from 'react';
+import injectSheet, { type WithStylesProps } from 'react-jss';
 
-import { IFormField } from '../typings/generic';
+import type { IFormField } from '../typings/generic';
 
 import styles from './styles';
 
diff --git a/src/components/ui/label/styles.ts b/src/components/ui/label/styles.ts
index faa44ae5b..fecfa1816 100644
--- a/src/components/ui/label/styles.ts
+++ b/src/components/ui/label/styles.ts
@@ -1,4 +1,4 @@
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 
 export default (theme: Theme) => ({
   content: {},
diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx
index c0ae15028..8757985b9 100644
--- a/src/components/ui/loader/index.tsx
+++ b/src/components/ui/loader/index.tsx
@@ -1,9 +1,9 @@
 import classnames from 'classnames';
+import { inject } from 'mobx-react';
 import { Component } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import injectStyle, { type WithStylesProps } from 'react-jss';
 import { Oval } from 'react-loader-spinner';
-import { inject } from 'mobx-react';
-import { FerdiumStores } from '../../../@types/stores.types';
+import type { FerdiumStores } from '../../../@types/stores.types';
 import { DEFAULT_LOADER_COLOR } from '../../../config';
 
 const styles = () => ({
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 0d8520f58..2716ebc2d 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -5,14 +5,19 @@ import {
 } from '@mdi/js';
 import Icon from '@mdi/react';
 import classnames from 'classnames';
-import { ChangeEvent, Component, createRef, ReactElement } from 'react';
-import withStyles, { WithStylesProps } from 'react-jss';
 import { noop } from 'lodash';
-import { Theme } from '../../../themes';
-import { IFormField } from '../typings/generic';
+import {
+  type ChangeEvent,
+  Component,
+  type ReactElement,
+  createRef,
+} from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type { Theme } from '../../../themes';
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from '../error';
 import Label from '../label';
+import type { IFormField } from '../typings/generic';
 import Wrapper from '../wrapper';
 
 let popupTransition: string = 'none';
diff --git a/src/components/ui/textarea/index.tsx b/src/components/ui/textarea/index.tsx
index 0967c4c25..4a0e77afe 100644
--- a/src/components/ui/textarea/index.tsx
+++ b/src/components/ui/textarea/index.tsx
@@ -1,9 +1,9 @@
 import classnames from 'classnames';
-import { Component, createRef, TextareaHTMLAttributes } from 'react';
-import injectSheet, { WithStylesProps } from 'react-jss';
+import { Component, type TextareaHTMLAttributes, createRef } from 'react';
+import injectSheet, { type WithStylesProps } from 'react-jss';
 
 import { noop } from 'lodash';
-import { IFormField } from '../typings/generic';
+import type { IFormField } from '../typings/generic';
 
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from '../error';
diff --git a/src/components/ui/textarea/styles.ts b/src/components/ui/textarea/styles.ts
index 36fc2a82e..c4c27b95d 100644
--- a/src/components/ui/textarea/styles.ts
+++ b/src/components/ui/textarea/styles.ts
@@ -1,6 +1,6 @@
-import { Property } from 'csstype';
+import type { Property } from 'csstype';
 
-import { Theme } from '../../../themes';
+import type { Theme } from '../../../themes';
 
 export default (theme: Theme) => ({
   label: {
diff --git a/src/components/ui/toggle/index.tsx b/src/components/ui/toggle/index.tsx
index 878ffecdc..dc426b3a1 100644
--- a/src/components/ui/toggle/index.tsx
+++ b/src/components/ui/toggle/index.tsx
@@ -1,13 +1,13 @@
 import classnames from 'classnames';
-import { Property } from 'csstype';
+import type { Property } from 'csstype';
 import { noop } from 'lodash';
-import { Component, InputHTMLAttributes, ReactElement } from 'react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { Theme } from '../../../themes';
+import { Component, type InputHTMLAttributes, type ReactElement } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type { Theme } from '../../../themes';
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from '../error';
 import Label from '../label';
-import { IFormField } from '../typings/generic';
+import type { IFormField } from '../typings/generic';
 import Wrapper from '../wrapper';
 
 const buttonTransition: string = window?.matchMedia(
diff --git a/src/components/ui/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx
index 450d09fd1..081b13b36 100644
--- a/src/components/ui/wrapper/index.tsx
+++ b/src/components/ui/wrapper/index.tsx
@@ -1,6 +1,6 @@
 import classnames from 'classnames';
-import { Component, ReactNode } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import { Component, type ReactNode } from 'react';
+import injectStyle, { type WithStylesProps } from 'react-jss';
 
 // eslint-disable-next-line no-use-before-define
 interface IProps extends WithStylesProps<typeof styles> {
diff --git a/src/components/util/ErrorBoundary/index.tsx b/src/components/util/ErrorBoundary/index.tsx
index 66f860835..a37d1b33a 100644
--- a/src/components/util/ErrorBoundary/index.tsx
+++ b/src/components/util/ErrorBoundary/index.tsx
@@ -1,6 +1,6 @@
-import { Component, ReactNode } from 'react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { defineMessages, injectIntl, IntlShape } from 'react-intl';
+import { Component, type ReactNode } from 'react';
+import { type IntlShape, defineMessages, injectIntl } from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 
 import Button from '../../ui/button';
 import { H1 } from '../../ui/headline';
diff --git a/src/containers/auth/AuthLayoutContainer.tsx b/src/containers/auth/AuthLayoutContainer.tsx
index 6a1fed0d7..6c9834ece 100644
--- a/src/containers/auth/AuthLayoutContainer.tsx
+++ b/src/containers/auth/AuthLayoutContainer.tsx
@@ -1,8 +1,8 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 import { ThemeProvider } from 'react-jss';
 import { Outlet } from 'react-router-dom';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import AuthLayout from '../../components/auth/AuthLayout';
 import AppLoader from '../../components/ui/AppLoader';
 
diff --git a/src/containers/auth/AuthReleaseNotesScreen.tsx b/src/containers/auth/AuthReleaseNotesScreen.tsx
index c9d2286e1..3191ba139 100644
--- a/src/containers/auth/AuthReleaseNotesScreen.tsx
+++ b/src/containers/auth/AuthReleaseNotesScreen.tsx
@@ -1,16 +1,16 @@
-import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component } from 'react';
 
-import { IntlShape, defineMessages, injectIntl } from 'react-intl';
-import Markdown from 'markdown-to-jsx';
 import { mdiArrowLeftCircle } from '@mdi/js';
-import { openExternalUrl } from '../../helpers/url-helpers';
+import Markdown from 'markdown-to-jsx';
+import { type IntlShape, defineMessages, injectIntl } from 'react-intl';
 import Icon from '../../components/ui/icon';
 import { ferdiumVersion } from '../../environment-remote';
 import {
   getFerdiumVersion,
   getUpdateInfoFromGH,
 } from '../../helpers/update-helpers';
+import { openExternalUrl } from '../../helpers/url-helpers';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/containers/auth/ChangeServerScreen.tsx b/src/containers/auth/ChangeServerScreen.tsx
index db48479cc..00715a0a2 100644
--- a/src/containers/auth/ChangeServerScreen.tsx
+++ b/src/containers/auth/ChangeServerScreen.tsx
@@ -1,9 +1,9 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
+import type { Actions } from '../../actions/lib/actions';
 import ChangeServer from '../../components/auth/ChangeServer';
-import { Actions } from '../../actions/lib/actions';
-import { RealStores } from '../../stores';
+import type { RealStores } from '../../stores';
 
 interface IProps {
   stores?: RealStores;
diff --git a/src/containers/auth/InviteScreen.tsx b/src/containers/auth/InviteScreen.tsx
index 2dfc3c88c..ed656a33a 100644
--- a/src/containers/auth/InviteScreen.tsx
+++ b/src/containers/auth/InviteScreen.tsx
@@ -1,6 +1,6 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Invite from '../../components/auth/Invite';
 
 class InviteScreen extends Component<StoresProps> {
diff --git a/src/containers/auth/LockedScreen.tsx b/src/containers/auth/LockedScreen.tsx
index a4cb43f73..cf4d5bd53 100644
--- a/src/containers/auth/LockedScreen.tsx
+++ b/src/containers/auth/LockedScreen.tsx
@@ -1,11 +1,11 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Locked from '../../components/auth/Locked';
 
+import type { Actions } from '../../actions/lib/actions';
 import { hash } from '../../helpers/password-helpers';
-import { Actions } from '../../actions/lib/actions';
-import { RealStores } from '../../stores';
+import type { RealStores } from '../../stores';
 
 interface IProps {
   actions?: Actions;
diff --git a/src/containers/auth/LoginScreen.tsx b/src/containers/auth/LoginScreen.tsx
index 100736d19..89d002584 100644
--- a/src/containers/auth/LoginScreen.tsx
+++ b/src/containers/auth/LoginScreen.tsx
@@ -1,8 +1,8 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import {
-  StoresProps,
+import { Component, type ReactElement } from 'react';
+import type {
   GlobalError,
+  StoresProps,
 } from '../../@types/ferdium-components.types';
 import Login from '../../components/auth/Login';
 
diff --git a/src/containers/auth/PasswordScreen.tsx b/src/containers/auth/PasswordScreen.tsx
index c7539f21e..e0f25db3e 100644
--- a/src/containers/auth/PasswordScreen.tsx
+++ b/src/containers/auth/PasswordScreen.tsx
@@ -1,6 +1,6 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Password from '../../components/auth/Password';
 
 class PasswordScreen extends Component<StoresProps> {
diff --git a/src/containers/auth/SetupAssistantScreen.tsx b/src/containers/auth/SetupAssistantScreen.tsx
index 1a20ab002..d15b4e6e1 100644
--- a/src/containers/auth/SetupAssistantScreen.tsx
+++ b/src/containers/auth/SetupAssistantScreen.tsx
@@ -1,9 +1,9 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import sleep from '../../helpers/async-helpers';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
+import type { ILegacyServices } from '../../@types/legacy-types';
 import SetupAssistant from '../../components/auth/SetupAssistant';
-import { ILegacyServices } from '../../@types/legacy-types';
+import sleep from '../../helpers/async-helpers';
 
 interface IProps extends StoresProps {}
 
diff --git a/src/containers/auth/SignupScreen.tsx b/src/containers/auth/SignupScreen.tsx
index bf7ffe778..cf5d8006e 100644
--- a/src/containers/auth/SignupScreen.tsx
+++ b/src/containers/auth/SignupScreen.tsx
@@ -1,9 +1,9 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 
-import {
-  StoresProps,
+import type {
   GlobalError,
+  StoresProps,
 } from '../../@types/ferdium-components.types';
 import Signup from '../../components/auth/Signup';
 
diff --git a/src/containers/auth/WelcomeScreen.tsx b/src/containers/auth/WelcomeScreen.tsx
index 1f3f50e4a..8a95ded80 100644
--- a/src/containers/auth/WelcomeScreen.tsx
+++ b/src/containers/auth/WelcomeScreen.tsx
@@ -1,6 +1,6 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Welcome from '../../components/auth/Welcome';
 
 interface IProps extends Partial<StoresProps> {}
diff --git a/src/containers/download-manager/DownloadManagerScreen.tsx b/src/containers/download-manager/DownloadManagerScreen.tsx
index 5d395a180..cd9686f4d 100644
--- a/src/containers/download-manager/DownloadManagerScreen.tsx
+++ b/src/containers/download-manager/DownloadManagerScreen.tsx
@@ -1,6 +1,6 @@
-import { Component, ReactElement } from 'react';
-import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { Component, type ReactElement } from 'react';
 import DownloadManager from '../../components/downloadManager/DownloadManagerDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 class DownloadManagerScreen extends Component {
   render(): ReactElement {
diff --git a/src/containers/download-manager/DownloadManagerWindow.tsx b/src/containers/download-manager/DownloadManagerWindow.tsx
index e13e51774..4aacd50b6 100644
--- a/src/containers/download-manager/DownloadManagerWindow.tsx
+++ b/src/containers/download-manager/DownloadManagerWindow.tsx
@@ -1,9 +1,9 @@
 import { inject, observer } from 'mobx-react';
-import { Component, ReactPortal } from 'react';
+import { Component, type ReactPortal } from 'react';
 import ReactDOM from 'react-dom';
 import { Outlet } from 'react-router-dom';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Layout from '../../components/downloadManager/DownloadManagerLayout';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
diff --git a/src/containers/layout/AppLayoutContainer.tsx b/src/containers/layout/AppLayoutContainer.tsx
index 8748f1032..3f8aad0ac 100644
--- a/src/containers/layout/AppLayoutContainer.tsx
+++ b/src/containers/layout/AppLayoutContainer.tsx
@@ -1,15 +1,15 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 import { ThemeProvider } from 'react-jss';
 import { Outlet } from 'react-router-dom';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import AppLayout from '../../components/layout/AppLayout';
 import Sidebar from '../../components/layout/Sidebar';
 import Services from '../../components/services/content/Services';
 import AppLoader from '../../components/ui/AppLoader';
-import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
 import { workspaceStore } from '../../features/workspaces';
+import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
 
 interface IProps extends StoresProps {}
 
diff --git a/src/containers/settings/AccountScreen.tsx b/src/containers/settings/AccountScreen.tsx
index 55aa1e5c9..f1ef1ae3e 100644
--- a/src/containers/settings/AccountScreen.tsx
+++ b/src/containers/settings/AccountScreen.tsx
@@ -1,7 +1,7 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index 3c65877c8..dde69ef2d 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -1,23 +1,27 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import { Params } from 'react-router-dom';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import { IRecipe } from '../../models/Recipe';
-import Service from '../../models/Service';
-import { FormFields } from '../../@types/mobx-form.types';
-import Form from '../../lib/Form';
-import ServiceError from '../../components/settings/services/ServiceError';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import type { Params } from 'react-router-dom';
+import type { StoresProps } from '../../@types/ferdium-components.types';
+import type { FormFields } from '../../@types/mobx-form.types';
 import EditServiceForm from '../../components/settings/services/EditServiceForm';
+import ServiceError from '../../components/settings/services/ServiceError';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
-import { required, url, oneRequired } from '../../helpers/validation-helpers';
-import { getSelectOptions } from '../../helpers/i18n-helpers';
+import withParams from '../../components/util/WithParams';
+import { DEFAULT_APP_SETTINGS, DEFAULT_SERVICE_SETTINGS } from '../../config';
 import { config as proxyFeature } from '../../features/serviceProxy';
-import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
+import { getSelectOptions } from '../../helpers/i18n-helpers';
+import { url, oneRequired, required } from '../../helpers/validation-helpers';
 import globalMessages from '../../i18n/globalMessages';
-import { DEFAULT_APP_SETTINGS, DEFAULT_SERVICE_SETTINGS } from '../../config';
-import withParams from '../../components/util/WithParams';
+import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import { ifUndefined } from '../../jsUtils';
+import Form from '../../lib/Form';
+import type { IRecipe } from '../../models/Recipe';
+import type Service from '../../models/Service';
 
 const messages = defineMessages({
   name: {
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index 5d1b09296..b731ad50a 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -1,32 +1,36 @@
 import { ipcRenderer } from 'electron';
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
 
-import { FormFields } from '../../@types/mobx-form.types';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import Form from '../../lib/Form';
-import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
+import type { StoresProps } from '../../@types/ferdium-components.types';
+import type { FormFields } from '../../@types/mobx-form.types';
 import {
   DEFAULT_APP_SETTINGS,
+  GOOGLE_TRANSLATOR_LANGUAGES,
   HIBERNATION_STRATEGIES,
-  SIDEBAR_WIDTH,
-  SIDEBAR_SERVICES_LOCATION,
   ICON_SIZES,
+  LIBRETRANSLATE_TRANSLATOR_LANGUAGES,
   NAVIGATION_BAR_BEHAVIOURS,
   SEARCH_ENGINE_NAMES,
-  TRANSLATOR_ENGINE_NAMES,
-  GOOGLE_TRANSLATOR_LANGUAGES,
-  TRANSLATOR_ENGINE_GOOGLE,
-  LIBRETRANSLATE_TRANSLATOR_LANGUAGES,
+  SIDEBAR_SERVICES_LOCATION,
+  SIDEBAR_WIDTH,
+  SPLIT_COLUMNS_MAX,
+  SPLIT_COLUMNS_MIN,
   TODO_APPS,
-  WAKE_UP_STRATEGIES,
+  TRANSLATOR_ENGINE_GOOGLE,
+  TRANSLATOR_ENGINE_NAMES,
   WAKE_UP_HIBERNATION_STRATEGIES,
-  SPLIT_COLUMNS_MIN,
-  SPLIT_COLUMNS_MAX,
+  WAKE_UP_STRATEGIES,
   WEBRTC_IP_HANDLING_POLICY,
 } from '../../config';
 import { isMac } from '../../environment';
+import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
+import Form from '../../lib/Form';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
@@ -35,8 +39,8 @@ import defaultUserAgent from '../../helpers/userAgent-helpers';
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-import globalMessages from '../../i18n/globalMessages';
 import { importExportURL } from '../../api/apiBase';
+import globalMessages from '../../i18n/globalMessages';
 import { ifUndefined } from '../../jsUtils';
 
 const debug = require('../../preload-safe-debug')('Ferdium:EditSettingsScreen');
diff --git a/src/containers/settings/EditUserScreen.tsx b/src/containers/settings/EditUserScreen.tsx
index 62df170fc..27fe87988 100644
--- a/src/containers/settings/EditUserScreen.tsx
+++ b/src/containers/settings/EditUserScreen.tsx
@@ -1,14 +1,14 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { IntlShape, defineMessages, injectIntl } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import { type IntlShape, defineMessages, injectIntl } from 'react-intl';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
-import { FormFields } from '../../@types/mobx-form.types';
-import Form from '../../lib/Form';
+import type { StoresProps } from '../../@types/ferdium-components.types';
+import type { FormFields } from '../../@types/mobx-form.types';
 import EditUserForm from '../../components/settings/user/EditUserForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import Form from '../../lib/Form';
 
-import { required, email, minLength } from '../../helpers/validation-helpers';
+import { email, minLength, required } from '../../helpers/validation-helpers';
 
 const messages = defineMessages({
   firstname: {
diff --git a/src/containers/settings/InviteScreen.tsx b/src/containers/settings/InviteScreen.tsx
index c67b892bd..057c36c86 100644
--- a/src/containers/settings/InviteScreen.tsx
+++ b/src/containers/settings/InviteScreen.tsx
@@ -1,7 +1,7 @@
-import { Component, ReactNode } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactNode } from 'react';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
diff --git a/src/containers/settings/RecipesScreen.tsx b/src/containers/settings/RecipesScreen.tsx
index a46510d54..5540b602c 100644
--- a/src/containers/settings/RecipesScreen.tsx
+++ b/src/containers/settings/RecipesScreen.tsx
@@ -1,20 +1,20 @@
 import { readJsonSync } from 'fs-extra';
-import { Component, ReactElement } from 'react';
-import { autorun, IReactionDisposer } from 'mobx';
+import { type IReactionDisposer, autorun } from 'mobx';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 
-import { Params } from 'react-router-dom';
-import Recipe from '../../models/Recipe';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { Params } from 'react-router-dom';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import withParams from '../../components/util/WithParams';
 import { CUSTOM_WEBSITE_RECIPE_ID, FERDIUM_DEV_DOCS } from '../../config';
 import { userDataRecipesPath } from '../../environment-remote';
-import { asarRecipesPath } from '../../helpers/asar-helpers';
 import { communityRecipesStore } from '../../features/communityRecipes';
-import RecipePreview from '../../models/RecipePreview';
+import { asarRecipesPath } from '../../helpers/asar-helpers';
 import { openPath } from '../../helpers/url-helpers';
-import withParams from '../../components/util/WithParams';
+import type Recipe from '../../models/Recipe';
+import RecipePreview from '../../models/RecipePreview';
 
 interface IProps extends Partial<StoresProps> {
   params: Params;
diff --git a/src/containers/settings/ReleaseNotesScreen.tsx b/src/containers/settings/ReleaseNotesScreen.tsx
index c3014d187..482364817 100644
--- a/src/containers/settings/ReleaseNotesScreen.tsx
+++ b/src/containers/settings/ReleaseNotesScreen.tsx
@@ -1,4 +1,4 @@
-import { Component, ReactElement } from 'react';
+import { Component, type ReactElement } from 'react';
 
 import ReleaseNotes from '../../components/settings/releaseNotes/ReleaseNotesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
diff --git a/src/containers/settings/ReleaseNotesWindow.tsx b/src/containers/settings/ReleaseNotesWindow.tsx
index 8215c9f36..a12c821e7 100644
--- a/src/containers/settings/ReleaseNotesWindow.tsx
+++ b/src/containers/settings/ReleaseNotesWindow.tsx
@@ -1,9 +1,9 @@
 import { inject, observer } from 'mobx-react';
-import { Component, ReactPortal } from 'react';
+import { Component, type ReactPortal } from 'react';
 import ReactDOM from 'react-dom';
 import { Outlet } from 'react-router-dom';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Layout from '../../components/settings/releaseNotes/ReleaseNotesLayout';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
diff --git a/src/containers/settings/ServicesScreen.tsx b/src/containers/settings/ServicesScreen.tsx
index 6b648f038..b8f115e9a 100644
--- a/src/containers/settings/ServicesScreen.tsx
+++ b/src/containers/settings/ServicesScreen.tsx
@@ -1,6 +1,6 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../@types/ferdium-components.types';
+import { Component, type ReactElement } from 'react';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
diff --git a/src/containers/settings/SettingsWindow.tsx b/src/containers/settings/SettingsWindow.tsx
index d2cdf3eb3..67d6c8969 100644
--- a/src/containers/settings/SettingsWindow.tsx
+++ b/src/containers/settings/SettingsWindow.tsx
@@ -1,10 +1,10 @@
 import { inject, observer } from 'mobx-react';
-import { Component, ReactElement, ReactPortal } from 'react';
+import { Component, type ReactElement, type ReactPortal } from 'react';
 import ReactDOM from 'react-dom';
 import { Outlet } from 'react-router-dom';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import Navigation from '../../components/settings/navigation/SettingsNavigation';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Layout from '../../components/settings/SettingsLayout';
+import Navigation from '../../components/settings/navigation/SettingsNavigation';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 
diff --git a/src/containers/settings/SupportScreen.tsx b/src/containers/settings/SupportScreen.tsx
index c2f25ad8c..4c50869bb 100644
--- a/src/containers/settings/SupportScreen.tsx
+++ b/src/containers/settings/SupportScreen.tsx
@@ -1,4 +1,4 @@
-import { Component, ReactElement } from 'react';
+import { Component, type ReactElement } from 'react';
 
 import SupportFerdium from '../../components/settings/supportFerdium/SupportFerdiumDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
diff --git a/src/containers/settings/TeamScreen.tsx b/src/containers/settings/TeamScreen.tsx
index 9d155f01c..ff2a1fb43 100644
--- a/src/containers/settings/TeamScreen.tsx
+++ b/src/containers/settings/TeamScreen.tsx
@@ -1,7 +1,7 @@
-import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 
-import { StoresProps } from '../../@types/ferdium-components.types';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 
 import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
diff --git a/src/electron-util.ts b/src/electron-util.ts
index 6250366dc..697684232 100644
--- a/src/electron-util.ts
+++ b/src/electron-util.ts
@@ -1,7 +1,7 @@
 // Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/api.js
 
+import { enable, initialize } from '@electron/remote/main';
 import * as electron from 'electron';
-import { initialize, enable } from '@electron/remote/main';
 
 export const initializeRemote = (): void => {
   if (process.type !== 'browser') {
diff --git a/src/electron/Settings.ts b/src/electron/Settings.ts
index 7bb12338e..e15a2e65c 100644
--- a/src/electron/Settings.ts
+++ b/src/electron/Settings.ts
@@ -1,5 +1,5 @@
+import { outputJsonSync, pathExistsSync, readJsonSync } from 'fs-extra';
 import { makeObservable, observable, toJS } from 'mobx';
-import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
 import { userDataPath } from '../environment-remote';
 
 const debug = require('../preload-safe-debug')('Ferdium:Settings');
diff --git a/src/electron/deepLinking.ts b/src/electron/deepLinking.ts
index 14cb8e5b1..33ec025f7 100644
--- a/src/electron/deepLinking.ts
+++ b/src/electron/deepLinking.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow } from 'electron';
+import type { BrowserWindow } from 'electron';
 import { protocolClient } from '../environment-remote';
 
 export default function handleDeepLink(
diff --git a/src/electron/ipc-api/appIndicator.ts b/src/electron/ipc-api/appIndicator.ts
index f4a5ba480..2837a75f0 100644
--- a/src/electron/ipc-api/appIndicator.ts
+++ b/src/electron/ipc-api/appIndicator.ts
@@ -1,8 +1,8 @@
 import { join } from 'node:path';
-import { app, ipcMain, BrowserWindow } from 'electron';
+import { type BrowserWindow, app, ipcMain } from 'electron';
 import { autorun } from 'mobx';
-import { isMac, isWindows, isLinux } from '../../environment';
-import TrayIcon from '../../lib/Tray';
+import { isLinux, isMac, isWindows } from '../../environment';
+import type TrayIcon from '../../lib/Tray';
 
 const INDICATOR_TASKBAR = 'taskbar';
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index 14214aacb..775daf602 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -1,4 +1,4 @@
-import { ipcMain, BrowserWindow } from 'electron';
+import { BrowserWindow, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import { appEvents } from '../..';
 
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index 44eec9fc1..d749cb889 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -1,5 +1,5 @@
-import { PathLike } from 'node:fs';
-import { ipcMain, dialog, BrowserWindow } from 'electron';
+import type { PathLike } from 'node:fs';
+import { BrowserWindow, dialog, ipcMain } from 'electron';
 import { download } from 'electron-dl';
 import { writeFileSync } from 'fs-extra';
 
diff --git a/src/electron/ipc-api/focusState.ts b/src/electron/ipc-api/focusState.ts
index 01aa1a971..bfda92b1e 100644
--- a/src/electron/ipc-api/focusState.ts
+++ b/src/electron/ipc-api/focusState.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow } from 'electron';
+import type { BrowserWindow } from 'electron';
 
 export default (params: { mainWindow: BrowserWindow }) => {
   params.mainWindow.on('focus', () => {
diff --git a/src/electron/ipc-api/index.ts b/src/electron/ipc-api/index.ts
index b57a9d881..48c6d142c 100644
--- a/src/electron/ipc-api/index.ts
+++ b/src/electron/ipc-api/index.ts
@@ -1,15 +1,15 @@
-import { BrowserWindow } from 'electron';
-import autoUpdate from './autoUpdate';
-import settings from './settings';
-import sessionStorage from './sessionStorage';
+import type { BrowserWindow } from 'electron';
+import type TrayIcon from '../../lib/Tray';
 import appIndicator from './appIndicator';
-import download from './download';
-import processManager from './processManager';
-import localServer from './localServer';
-import languageDetect from './languageDetect';
+import autoUpdate from './autoUpdate';
 import dnd from './dnd';
+import download from './download';
 import focusState from './focusState';
-import TrayIcon from '../../lib/Tray';
+import languageDetect from './languageDetect';
+import localServer from './localServer';
+import processManager from './processManager';
+import sessionStorage from './sessionStorage';
+import settings from './settings';
 
 export default (params: {
   mainWindow: BrowserWindow;
diff --git a/src/electron/ipc-api/localServer.ts b/src/electron/ipc-api/localServer.ts
index bcc2f9d78..99c40dfd6 100644
--- a/src/electron/ipc-api/localServer.ts
+++ b/src/electron/ipc-api/localServer.ts
@@ -1,6 +1,6 @@
 import { randomBytes } from 'node:crypto';
 import { createServer } from 'node:net';
-import { ipcMain, BrowserWindow } from 'electron';
+import { type BrowserWindow, ipcMain } from 'electron';
 import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
 import { userDataPath } from '../../environment-remote';
 import { server } from '../../internal-server/start';
diff --git a/src/electron/ipc-api/processManager.ts b/src/electron/ipc-api/processManager.ts
index 96501eeaa..6e9069666 100644
--- a/src/electron/ipc-api/processManager.ts
+++ b/src/electron/ipc-api/processManager.ts
@@ -1,5 +1,5 @@
-import { ipcMain } from 'electron';
 import { openProcessManager } from '@krisdages/electron-process-manager';
+import { ipcMain } from 'electron';
 
 export default () => {
   ipcMain.on('openProcessManager', () => {
diff --git a/src/electron/ipc-api/sessionStorage.ts b/src/electron/ipc-api/sessionStorage.ts
index 39e84d42b..0f32cd6de 100644
--- a/src/electron/ipc-api/sessionStorage.ts
+++ b/src/electron/ipc-api/sessionStorage.ts
@@ -1,4 +1,4 @@
-import { ipcMain, Session, session } from 'electron';
+import { type Session, ipcMain, session } from 'electron';
 
 import { TODOS_PARTITION_ID } from '../../config';
 
diff --git a/src/electron/ipc-api/settings.ts b/src/electron/ipc-api/settings.ts
index 72de6866d..3cc001080 100644
--- a/src/electron/ipc-api/settings.ts
+++ b/src/electron/ipc-api/settings.ts
@@ -1,4 +1,4 @@
-import { ipcMain, BrowserWindow, Settings } from 'electron';
+import { type BrowserWindow, type Settings, ipcMain } from 'electron';
 
 export default (params: { mainWindow: BrowserWindow; settings: Settings }) => {
   ipcMain.on('getAppSettings', (_event, type) => {
diff --git a/src/electron/macOSPermissions.ts b/src/electron/macOSPermissions.ts
index 2ad3d6cd0..90f0f4028 100644
--- a/src/electron/macOSPermissions.ts
+++ b/src/electron/macOSPermissions.ts
@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
-import { systemPreferences, BrowserWindow, dialog } from 'electron';
-import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
+import { type BrowserWindow, dialog, systemPreferences } from 'electron';
+import { mkdirSync, pathExistsSync, writeFileSync } from 'fs-extra';
 import macosVersion from 'macos-version';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error
 // @ts-ignore
diff --git a/src/enforce-macos-app-location.ts b/src/enforce-macos-app-location.ts
index 222127acf..298ef4d09 100644
--- a/src/enforce-macos-app-location.ts
+++ b/src/enforce-macos-app-location.ts
@@ -1,8 +1,8 @@
 // Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/enforce-macos-app-location.js
 
+import { api } from './electron-util';
 import { isMac } from './environment';
 import { isDevMode } from './environment-remote';
-import { api } from './electron-util';
 
 export default function enforceMacOSAppLocation(): void {
   if (isDevMode || !isMac || api.app.isInApplicationsFolder()) {
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
index 346a75e97..629131658 100644
--- a/src/environment-remote.ts
+++ b/src/environment-remote.ts
@@ -1,16 +1,16 @@
 import { join } from 'node:path';
-import { api as electronApi } from './electron-util';
 import {
-  LIVE_FERDIUM_API,
-  DEV_FRANZ_API,
-  LOCAL_API,
-  LOCAL_API_WEBSITE,
   DEV_API_FRANZ_WEBSITE,
+  DEV_FRANZ_API,
+  DEV_WS_API,
   LIVE_API_FERDIUM_WEBSITE,
+  LIVE_FERDIUM_API,
   LIVE_WS_API,
+  LOCAL_API,
+  LOCAL_API_WEBSITE,
   LOCAL_WS_API,
-  DEV_WS_API,
 } from './config';
+import { api as electronApi } from './electron-util';
 import { isWindows } from './environment';
 
 export const { app } = electronApi;
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts
index 46403275e..049080505 100644
--- a/src/features/appearance/index.ts
+++ b/src/features/appearance/index.ts
@@ -3,14 +3,14 @@ import { reaction } from 'mobx';
 import TopBarProgress from 'react-topbar-progress-indicator';
 
 import { pathExistsSync, readFileSync } from 'fs-extra';
-import { isWindows, isLinux } from '../../environment';
 import {
   DEFAULT_APP_SETTINGS,
-  iconSizeBias,
-  SIDEBAR_SERVICES_LOCATION_TOPLEFT,
-  SIDEBAR_SERVICES_LOCATION_CENTER,
   SIDEBAR_SERVICES_LOCATION_BOTTOMRIGHT,
+  SIDEBAR_SERVICES_LOCATION_CENTER,
+  SIDEBAR_SERVICES_LOCATION_TOPLEFT,
+  iconSizeBias,
 } from '../../config';
+import { isLinux, isWindows } from '../../environment';
 import { userDataPath } from '../../environment-remote';
 
 const STYLE_ELEMENT_ID = 'custom-appearance-style';
diff --git a/src/features/basicAuth/Component.tsx b/src/features/basicAuth/Component.tsx
index e20f7641b..7c901344d 100644
--- a/src/features/basicAuth/Component.tsx
+++ b/src/features/basicAuth/Component.tsx
@@ -1,17 +1,21 @@
-import { Component, FormEvent, ReactElement } from 'react';
-import injectSheet, { WithStylesProps } from 'react-jss';
-import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import classnames from 'classnames';
 import { noop } from 'lodash';
+import { observer } from 'mobx-react';
+import { Component, type FormEvent, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import injectSheet, { type WithStylesProps } from 'react-jss';
 import Modal from '../../components/ui/Modal';
-import Input from '../../components/ui/input/index';
 import Button from '../../components/ui/button';
-import { state, resetState, sendCredentials, cancelLogin } from './store';
+import { H1 } from '../../components/ui/headline';
+import Input from '../../components/ui/input/index';
+import globalMessages from '../../i18n/globalMessages';
 import Form from './Form';
+import { cancelLogin, resetState, sendCredentials, state } from './store';
 import styles from './styles';
-import globalMessages from '../../i18n/globalMessages';
-import { H1 } from '../../components/ui/headline';
 
 const messages = defineMessages({
   signIn: {
diff --git a/src/features/basicAuth/index.ts b/src/features/basicAuth/index.ts
index ae698cba8..bedb57309 100644
--- a/src/features/basicAuth/index.ts
+++ b/src/features/basicAuth/index.ts
@@ -1,4 +1,4 @@
-import { AuthInfo, BrowserWindow, ipcRenderer } from 'electron';
+import { type AuthInfo, type BrowserWindow, ipcRenderer } from 'electron';
 
 import { state as ModalState } from './store';
 
diff --git a/src/features/basicAuth/mainIpcHandler.ts b/src/features/basicAuth/mainIpcHandler.ts
index d9cedc974..d46657748 100644
--- a/src/features/basicAuth/mainIpcHandler.ts
+++ b/src/features/basicAuth/mainIpcHandler.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow } from 'electron';
+import type { BrowserWindow } from 'electron';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:basicAuth:main',
diff --git a/src/features/basicAuth/store.ts b/src/features/basicAuth/store.ts
index 0fc289916..489eac087 100644
--- a/src/features/basicAuth/store.ts
+++ b/src/features/basicAuth/store.ts
@@ -1,5 +1,5 @@
-import { observable } from 'mobx';
 import { ipcRenderer } from 'electron';
+import { observable } from 'mobx';
 
 const debug = require('../../preload-safe-debug')('Ferdium:feature:basicAuth');
 
diff --git a/src/features/publishDebugInfo/Component.tsx b/src/features/publishDebugInfo/Component.tsx
index 3c6729ba0..8b38ba5af 100644
--- a/src/features/publishDebugInfo/Component.tsx
+++ b/src/features/publishDebugInfo/Component.tsx
@@ -1,15 +1,19 @@
 import { inject, observer } from 'mobx-react';
-import { Component, ReactElement } from 'react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import { state as ModalState } from './store';
-import { H1 } from '../../components/ui/headline';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import { sendAuthRequest } from '../../api/utils/auth';
+import Modal from '../../components/ui/Modal';
 import Button from '../../components/ui/button';
+import { H1 } from '../../components/ui/headline';
 import Input from '../../components/ui/input/index';
-import Modal from '../../components/ui/Modal';
 import { DEBUG_API } from '../../config';
+import { state as ModalState } from './store';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:publishDebugInfo',
diff --git a/src/features/quickSwitch/Component.tsx b/src/features/quickSwitch/Component.tsx
index 7f6ad6432..a5c102386 100644
--- a/src/features/quickSwitch/Component.tsx
+++ b/src/features/quickSwitch/Component.tsx
@@ -1,15 +1,24 @@
-import { ChangeEvent, Component, createRef, ReactElement } from 'react';
 import { getCurrentWindow } from '@electron/remote';
-import { observer, inject } from 'mobx-react';
-import { reaction } from 'mobx';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { compact, invoke, noop } from 'lodash';
-import { StoresProps } from '../../@types/ferdium-components.types';
-import Service from '../../models/Service';
-import Input from '../../components/ui/input/index';
-import { H1 } from '../../components/ui/headline';
+import { reaction } from 'mobx';
+import { inject, observer } from 'mobx-react';
+import {
+  type ChangeEvent,
+  Component,
+  type ReactElement,
+  createRef,
+} from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type { StoresProps } from '../../@types/ferdium-components.types';
 import Modal from '../../components/ui/Modal';
+import { H1 } from '../../components/ui/headline';
+import Input from '../../components/ui/input/index';
+import type Service from '../../models/Service';
 import { state as ModalState } from './store';
 
 const messages = defineMessages({
diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts
index c98ae00a7..68415c31e 100644
--- a/src/features/serviceProxy/index.ts
+++ b/src/features/serviceProxy/index.ts
@@ -1,5 +1,5 @@
-import { autorun, action, observable } from 'mobx';
 import { session } from '@electron/remote';
+import { action, autorun, observable } from 'mobx';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:serviceProxy',
diff --git a/src/features/todos/actions.ts b/src/features/todos/actions.ts
index 5273cc858..c2000752f 100644
--- a/src/features/todos/actions.ts
+++ b/src/features/todos/actions.ts
@@ -1,5 +1,5 @@
-import { Webview } from 'react-electron-web-view';
 import PropTypes from 'prop-types';
+import type { Webview } from 'react-electron-web-view';
 import { createActionsFromDefinitions } from '../../actions/lib/actions';
 
 export interface TodoClientMessage {
diff --git a/src/features/todos/components/TodosWebview.tsx b/src/features/todos/components/TodosWebview.tsx
index 1ccfa3cdd..f9493d519 100644
--- a/src/features/todos/components/TodosWebview.tsx
+++ b/src/features/todos/components/TodosWebview.tsx
@@ -1,10 +1,15 @@
-import { Component, createRef, ReactElement, MouseEvent } from 'react';
+import classnames from 'classnames';
 import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
+import {
+  Component,
+  type MouseEvent,
+  type ReactElement,
+  createRef,
+} from 'react';
 import Webview from 'react-electron-web-view';
-import classnames from 'classnames';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { TODOS_PARTITION_ID } from '../../../config';
-import { TodoClientMessage } from '../actions';
+import type { TodoClientMessage } from '../actions';
 
 const styles = theme => ({
   root: {
diff --git a/src/features/todos/containers/TodosScreen.tsx b/src/features/todos/containers/TodosScreen.tsx
index 8941a4b39..29ecd5a0e 100644
--- a/src/features/todos/containers/TodosScreen.tsx
+++ b/src/features/todos/containers/TodosScreen.tsx
@@ -1,11 +1,11 @@
-import { Component, ReactElement } from 'react';
-import { observer, inject } from 'mobx-react';
-import TodosWebview from '../components/TodosWebview';
-import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 import { todosStore } from '..';
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { TODOS_MIN_WIDTH } from '../../../config';
+import type { RealStores } from '../../../stores';
 import { todoActions } from '../actions';
-import { RealStores } from '../../../stores';
+import TodosWebview from '../components/TodosWebview';
 
 interface IProps {
   stores?: RealStores;
diff --git a/src/features/todos/store.ts b/src/features/todos/store.ts
index 50704c73f..b3f7195e7 100644
--- a/src/features/todos/store.ts
+++ b/src/features/todos/store.ts
@@ -1,25 +1,26 @@
-import { Webview } from 'react-electron-web-view';
-import { computed, action, observable, makeObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
-import { Actions } from '../../actions/lib/actions';
+import type { Webview } from 'react-electron-web-view';
+import type { Actions } from '../../actions/lib/actions';
 
-import { ThemeType } from '../../themes';
-import { todoActions } from './actions';
 import {
   CUSTOM_TODO_SERVICE,
-  TODO_SERVICE_RECIPE_IDS,
+  DEFAULT_IS_TODO_FEATURE_ENABLED_BY_USER,
+  DEFAULT_TODOS_VISIBLE,
   DEFAULT_TODOS_WIDTH,
   TODOS_MIN_WIDTH,
-  DEFAULT_TODOS_VISIBLE,
-  DEFAULT_IS_TODO_FEATURE_ENABLED_BY_USER,
+  TODO_SERVICE_RECIPE_IDS,
 } from '../../config';
 import { isValidExternalURL } from '../../helpers/url-helpers';
-import FeatureStore from '../utils/FeatureStore';
-import Reaction, { createReactions } from '../../stores/lib/Reaction';
+import { ifUndefined } from '../../jsUtils';
+import UserAgent from '../../models/UserAgent';
+import type Reaction from '../../stores/lib/Reaction';
+import { createReactions } from '../../stores/lib/Reaction';
+import { ThemeType } from '../../themes';
 import { createActionBindings } from '../utils/ActionBinding';
+import FeatureStore from '../utils/FeatureStore';
+import { todoActions } from './actions';
 import { IPC, TODOS_ROUTES } from './constants';
-import UserAgent from '../../models/UserAgent';
-import { ifUndefined } from '../../jsUtils';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:todos:store',
diff --git a/src/features/utils/FeatureStore.ts b/src/features/utils/FeatureStore.ts
index 2bdd167f3..df82a7bd0 100644
--- a/src/features/utils/FeatureStore.ts
+++ b/src/features/utils/FeatureStore.ts
@@ -1,4 +1,4 @@
-import Reaction from '../../stores/lib/Reaction';
+import type Reaction from '../../stores/lib/Reaction';
 
 export default class FeatureStore {
   _actions: any = [];
diff --git a/src/features/webControls/components/WebControls.tsx b/src/features/webControls/components/WebControls.tsx
index 54f45c843..aee568a7d 100644
--- a/src/features/webControls/components/WebControls.tsx
+++ b/src/features/webControls/components/WebControls.tsx
@@ -1,14 +1,18 @@
-import { createRef, Component, ReactElement, RefObject } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import {
-  mdiReload,
-  mdiArrowRight,
   mdiArrowLeft,
-  mdiHomeOutline,
+  mdiArrowRight,
   mdiEarth,
+  mdiHomeOutline,
+  mdiReload,
 } from '@mdi/js';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement, type RefObject, createRef } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
 import Icon from '../../../components/ui/icon';
 
diff --git a/src/features/webControls/containers/WebControlsScreen.tsx b/src/features/webControls/containers/WebControlsScreen.tsx
index f6f1cddb8..b492264bf 100644
--- a/src/features/webControls/containers/WebControlsScreen.tsx
+++ b/src/features/webControls/containers/WebControlsScreen.tsx
@@ -1,17 +1,17 @@
-import { Component, ReactElement } from 'react';
-import { observer, inject } from 'mobx-react';
 import {
-  autorun,
+  type IReactionDisposer,
   action,
+  autorun,
   makeObservable,
   observable,
-  IReactionDisposer,
 } from 'mobx';
-import ElectronWebView from 'react-electron-web-view';
-import WebControls from '../components/WebControls';
-import Service from '../../../models/Service';
+import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import type ElectronWebView from 'react-electron-web-view';
+import type { StoresProps } from '../../../@types/ferdium-components.types';
 import { SEARCH_ENGINE_URLS } from '../../../config';
-import { StoresProps } from '../../../@types/ferdium-components.types';
+import type Service from '../../../models/Service';
+import WebControls from '../components/WebControls';
 
 const URL_EVENTS = [
   'load-commit',
diff --git a/src/features/workspaces/actions.ts b/src/features/workspaces/actions.ts
index cfe4f9e8e..7970c042c 100644
--- a/src/features/workspaces/actions.ts
+++ b/src/features/workspaces/actions.ts
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import Workspace from './models/Workspace';
 import { createActionsFromDefinitions } from '../../actions/lib/actions';
+import Workspace from './models/Workspace';
 
 type WorkspaceArg = { workspace: Workspace };
 
diff --git a/src/features/workspaces/api.ts b/src/features/workspaces/api.ts
index b8bb703cd..6ae71a930 100644
--- a/src/features/workspaces/api.ts
+++ b/src/features/workspaces/api.ts
@@ -1,8 +1,8 @@
 import { pick } from 'lodash';
+import apiBase from '../../api/apiBase';
 import { sendAuthRequest } from '../../api/utils/auth';
 import Request from '../../stores/lib/Request';
 import Workspace from './models/Workspace';
-import apiBase from '../../api/apiBase';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:workspaces:api',
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.tsx b/src/features/workspaces/components/CreateWorkspaceForm.tsx
index b72052fe2..0c365564a 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.tsx
+++ b/src/features/workspaces/components/CreateWorkspaceForm.tsx
@@ -1,11 +1,15 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import withStyles, { WithStylesProps } from 'react-jss';
-import Input from '../../../components/ui/input/index';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import Button from '../../../components/ui/button';
-import Form from '../../../lib/Form';
+import Input from '../../../components/ui/input/index';
 import { required } from '../../../helpers/validation-helpers';
+import Form from '../../../lib/Form';
 import { workspaceStore } from '../index';
 
 const messages = defineMessages({
diff --git a/src/features/workspaces/components/EditWorkspaceForm.tsx b/src/features/workspaces/components/EditWorkspaceForm.tsx
index d902d29be..18e7c251e 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.tsx
+++ b/src/features/workspaces/components/EditWorkspaceForm.tsx
@@ -1,21 +1,25 @@
-import { Component, ReactElement } from 'react';
+import { noop } from 'lodash';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { Link } from 'react-router-dom';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { noop } from 'lodash';
+import Button from '../../../components/ui/button';
+import { H2 } from '../../../components/ui/headline';
 import Infobox from '../../../components/ui/infobox/index';
 import Input from '../../../components/ui/input';
-import Button from '../../../components/ui/button';
-import Workspace from '../models/Workspace';
-import Service from '../../../models/Service';
-import Form from '../../../lib/Form';
+import Toggle from '../../../components/ui/toggle';
+import { KEEP_WS_LOADED_USID } from '../../../config';
 import { required } from '../../../helpers/validation-helpers';
+import Form from '../../../lib/Form';
+import type Service from '../../../models/Service';
+import type Request from '../../../stores/lib/Request';
+import type Workspace from '../models/Workspace';
 import WorkspaceServiceListItem from './WorkspaceServiceListItem';
-import Request from '../../../stores/lib/Request';
-import { KEEP_WS_LOADED_USID } from '../../../config';
-import Toggle from '../../../components/ui/toggle';
-import { H2 } from '../../../components/ui/headline';
 
 const messages = defineMessages({
   buttonDelete: {
diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx
index 3e05cb7de..2826b741a 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.tsx
+++ b/src/features/workspaces/components/WorkspaceDrawer.tsx
@@ -1,17 +1,21 @@
-import { Component, ReactElement } from 'react';
+import { mdiCog, mdiPlusBox } from '@mdi/js';
+import { noop } from 'lodash';
 import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
-import { mdiPlusBox, mdiCog } from '@mdi/js';
-import { noop } from 'lodash';
 import { H1 } from '../../../components/ui/headline';
 import Icon from '../../../components/ui/icon';
-import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import workspaceActions from '../actions';
-import { workspaceStore } from '../index';
 import { getUserWorkspacesRequest } from '../api';
-import Workspace from '../models/Workspace';
+import { workspaceStore } from '../index';
+import type Workspace from '../models/Workspace';
+import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx
index 85ed4c38c..1e4b57dba 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx
@@ -1,11 +1,15 @@
-import { Component, MouseEventHandler, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
+import { Menu } from '@electron/remote';
 import classnames from 'classnames';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import type { MenuItemConstructorOptions } from 'electron';
 import { noop } from 'lodash';
-import { Menu } from '@electron/remote';
-import { MenuItemConstructorOptions } from 'electron';
+import { observer } from 'mobx-react';
+import { Component, type MouseEventHandler, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import { altKey, cmdOrCtrlShortcutKey } from '../../../environment';
 import { acceleratorString } from '../../../jsUtils';
 
diff --git a/src/features/workspaces/components/WorkspaceItem.tsx b/src/features/workspaces/components/WorkspaceItem.tsx
index 36c6ed2f5..f24e6a85d 100644
--- a/src/features/workspaces/components/WorkspaceItem.tsx
+++ b/src/features/workspaces/components/WorkspaceItem.tsx
@@ -1,8 +1,8 @@
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
 import { noop } from 'lodash';
-import Workspace from '../models/Workspace';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import type Workspace from '../models/Workspace';
 
 const styles = theme => ({
   row: {
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
index 9034be37c..6f61f8a51 100644
--- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
@@ -1,11 +1,11 @@
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
 import classnames from 'classnames';
 import { noop } from 'lodash';
-import Toggle from '../../../components/ui/toggle';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import ServiceIcon from '../../../components/ui/ServiceIcon';
-import Service from '../../../models/Service';
+import Toggle from '../../../components/ui/toggle';
+import type Service from '../../../models/Service';
 
 const styles = theme => ({
   listItem: {
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
index 19dd9037d..7fddd8553 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
@@ -1,11 +1,15 @@
-import { Component, ReactElement } from 'react';
-import { observer } from 'mobx-react';
-import withStyles, { WithStylesProps } from 'react-jss';
 import classnames from 'classnames';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
+import { observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
 import Loader from '../../../components/ui/loader';
-import { workspaceStore } from '../index';
 import { DEFAULT_LOADER_COLOR } from '../../../config';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   switchingTo: {
diff --git a/src/features/workspaces/components/WorkspacesDashboard.tsx b/src/features/workspaces/components/WorkspacesDashboard.tsx
index 0a417bffd..8fb2cf923 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.tsx
+++ b/src/features/workspaces/components/WorkspacesDashboard.tsx
@@ -1,15 +1,19 @@
-import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
-import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import withStyles, { WithStylesProps } from 'react-jss';
+import { Component, type ReactElement } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import withStyles, { type WithStylesProps } from 'react-jss';
+import Appear from '../../../components/ui/effects/Appear';
+import { H1 } from '../../../components/ui/headline';
 import Infobox from '../../../components/ui/infobox/index';
 import Loader from '../../../components/ui/loader';
-import WorkspaceItem from './WorkspaceItem';
+import type Request from '../../../stores/lib/Request';
+import type Workspace from '../models/Workspace';
 import CreateWorkspaceForm from './CreateWorkspaceForm';
-import Request from '../../../stores/lib/Request';
-import Appear from '../../../components/ui/effects/Appear';
-import { H1 } from '../../../components/ui/headline';
-import Workspace from '../models/Workspace';
+import WorkspaceItem from './WorkspaceItem';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.tsx b/src/features/workspaces/containers/EditWorkspaceScreen.tsx
index abc747c33..92450d685 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.tsx
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.tsx
@@ -1,12 +1,12 @@
-import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
+import { Component } from 'react';
 
-import { StoresProps } from '../../../@types/ferdium-components.types';
+import type { StoresProps } from '../../../@types/ferdium-components.types';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
 import EditWorkspaceForm from '../components/EditWorkspaceForm';
-import Workspace from '../models/Workspace';
 import { workspaceStore } from '../index';
-import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
+import Workspace from '../models/Workspace';
 
 class EditWorkspaceScreen extends Component<StoresProps> {
   onDelete = () => {
diff --git a/src/features/workspaces/containers/WorkspacesScreen.tsx b/src/features/workspaces/containers/WorkspacesScreen.tsx
index 39f19935f..92565b45c 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.tsx
+++ b/src/features/workspaces/containers/WorkspacesScreen.tsx
@@ -1,16 +1,16 @@
-import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
-import { StoresProps } from '../../../@types/ferdium-components.types';
-import WorkspacesDashboard from '../components/WorkspacesDashboard';
+import { Component } from 'react';
+import type { StoresProps } from '../../../@types/ferdium-components.types';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
-import { workspaceStore } from '../index';
 import {
   createWorkspaceRequest,
   deleteWorkspaceRequest,
   getUserWorkspacesRequest,
   updateWorkspaceRequest,
 } from '../api';
-import Workspace from '../models/Workspace';
+import WorkspacesDashboard from '../components/WorkspacesDashboard';
+import { workspaceStore } from '../index';
+import type Workspace from '../models/Workspace';
 
 interface IProps extends StoresProps {}
 
diff --git a/src/features/workspaces/store.ts b/src/features/workspaces/store.ts
index f97009186..41bf5d6f4 100644
--- a/src/features/workspaces/store.ts
+++ b/src/features/workspaces/store.ts
@@ -1,8 +1,10 @@
-import { computed, observable, action, makeObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 import matchRoute from '../../helpers/routing-helpers';
-import workspaceActions from './actions';
+import { createReactions } from '../../stores/lib/Reaction';
+import { createActionBindings } from '../utils/ActionBinding';
 import FeatureStore from '../utils/FeatureStore';
+import workspaceActions from './actions';
 import {
   createWorkspaceRequest,
   deleteWorkspaceRequest,
@@ -10,12 +12,10 @@ import {
   updateWorkspaceRequest,
 } from './api';
 import { WORKSPACES_ROUTES } from './constants';
-import { createReactions } from '../../stores/lib/Reaction';
-import { createActionBindings } from '../utils/ActionBinding';
 
+import type { Actions } from '../../actions/lib/actions';
 import { KEEP_WS_LOADED_USID } from '../../config';
-import Workspace from './models/Workspace';
-import { Actions } from '../../actions/lib/actions';
+import type Workspace from './models/Workspace';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:workspaces:store',
diff --git a/src/helpers/certs-helpers.ts b/src/helpers/certs-helpers.ts
index a6c83f5c4..fdbc495bc 100644
--- a/src/helpers/certs-helpers.ts
+++ b/src/helpers/certs-helpers.ts
@@ -1,5 +1,5 @@
-import { readdirSync, readFileSync, ensureDirSync } from 'fs-extra';
 import { join } from 'node:path';
+import { ensureDirSync, readFileSync, readdirSync } from 'fs-extra';
 import { userDataCertsPath } from '../environment-remote';
 import { removeNewLines } from '../jsUtils';
 
diff --git a/src/helpers/password-helpers.ts b/src/helpers/password-helpers.ts
index 75ef5606a..a628ea51e 100644
--- a/src/helpers/password-helpers.ts
+++ b/src/helpers/password-helpers.ts
@@ -1,4 +1,4 @@
-import { createHash, BinaryLike } from 'node:crypto';
+import { type BinaryLike, createHash } from 'node:crypto';
 
 export function hash(password: BinaryLike): string {
   return createHash('sha256').update(password).digest('base64');
diff --git a/src/helpers/update-helpers.ts b/src/helpers/update-helpers.ts
index ca541c4b0..3e548c69b 100644
--- a/src/helpers/update-helpers.ts
+++ b/src/helpers/update-helpers.ts
@@ -1,5 +1,5 @@
 import { Octokit } from '@octokit/core';
-import { defineMessages, IntlShape } from 'react-intl';
+import { type IntlShape, defineMessages } from 'react-intl';
 
 export function getFerdiumVersion(
   currentLocation: string,
diff --git a/src/helpers/url-helpers.ts b/src/helpers/url-helpers.ts
index fe637bb08..b30c2cd83 100644
--- a/src/helpers/url-helpers.ts
+++ b/src/helpers/url-helpers.ts
@@ -1,7 +1,7 @@
 // This is taken from: https://benjamin-altpeter.de/shell-openexternal-dangers/
 import { URL } from 'node:url';
-import { ensureDirSync, existsSync } from 'fs-extra';
 import { shell } from 'electron';
+import { ensureDirSync, existsSync } from 'fs-extra';
 import normalizeUrl from 'normalize-url';
 import { ALLOWED_PROTOCOLS } from '../config';
 
diff --git a/src/helpers/userAgent-helpers.ts b/src/helpers/userAgent-helpers.ts
index 42e3a9851..fd9b8c835 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -3,9 +3,9 @@ import macosVersion from 'macos-version';
 import { chrome } from 'useragent-generator';
 import {
   chromeVersion,
+  is64Bit,
   isMac,
   isWindows,
-  is64Bit,
   osArch,
   osRelease,
 } from '../environment';
diff --git a/src/index.ts b/src/index.ts
index fe254b4f6..a2fcfb890 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,22 +1,22 @@
 /* eslint-disable import/first */
 
-import { join } from 'node:path';
 import { EventEmitter } from 'node:events';
+import { join } from 'node:path';
 import {
-  app,
   BrowserWindow,
+  app,
+  desktopCapturer,
+  dialog,
   globalShortcut,
   ipcMain,
   session,
-  dialog,
-  desktopCapturer,
 } from 'electron';
 
-import { emptyDirSync, ensureFileSync } from 'fs-extra';
+import { initialize } from 'electron-react-titlebar/main';
 import windowStateKeeper from 'electron-window-state';
+import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import minimist from 'minimist';
 import ms from 'ms';
-import { initialize } from 'electron-react-titlebar/main';
 import { enableWebContents, initializeRemote } from './electron-util';
 import enforceMacOSAppLocation from './enforce-macos-app-location';
 
@@ -24,33 +24,33 @@ initializeRemote();
 
 import { DEFAULT_APP_SETTINGS, DEFAULT_WINDOW_OPTIONS } from './config';
 
-import { isMac, isWindows, isLinux, altKey } from './environment';
+import { altKey, isLinux, isMac, isWindows } from './environment';
 import {
   isDevMode,
-  userDataRecipesPath,
-  userDataPath,
   protocolClient,
+  userDataPath,
+  userDataRecipesPath,
 } from './environment-remote';
 import { ifUndefined } from './jsUtils';
 
-import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
-// eslint-disable-next-line import/no-cycle
-import ipcApi from './electron/ipc-api';
-import TrayIcon from './lib/Tray';
-import DBus from './lib/DBus';
 import Settings from './electron/Settings';
 import handleDeepLink from './electron/deepLinking';
+import './electron/exception';
+// eslint-disable-next-line import/no-cycle
+import ipcApi from './electron/ipc-api';
 import isPositionValid from './electron/windowUtils';
+import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
+import DBus from './lib/DBus';
+import TrayIcon from './lib/Tray';
 // @ts-expect-error Cannot find module './package.json' or its corresponding type declarations.
 import { appId } from './package.json';
-import './electron/exception';
 
 import { asarPath } from './helpers/asar-helpers';
+import { checkIfCertIsPresent } from './helpers/certs-helpers';
+import { translateTo } from './helpers/translation-helpers';
 import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
-import { translateTo } from './helpers/translation-helpers';
 import { darkThemeGrayDarkest } from './themes/legacy';
-import { checkIfCertIsPresent } from './helpers/certs-helpers';
 
 const debug = require('./preload-safe-debug')('Ferdium:App');
 
diff --git a/src/internal-server/start.ts b/src/internal-server/start.ts
index bcd3ee3a1..c88a61fec 100644
--- a/src/internal-server/start.ts
+++ b/src/internal-server/start.ts
@@ -18,7 +18,7 @@
 import { join } from 'node:path';
 import fold from '@adonisjs/fold';
 import { Ignitor, hooks } from '@adonisjs/ignitor';
-import { readFile, stat, chmod, writeFile } from 'fs-extra';
+import { chmod, readFile, stat, writeFile } from 'fs-extra';
 import { LOCAL_HOSTNAME } from '../config';
 import { isWindows } from '../environment';
 
diff --git a/src/lib/DBus.ts b/src/lib/DBus.ts
index 530e30c85..70c8132a3 100644
--- a/src/lib/DBus.ts
+++ b/src/lib/DBus.ts
@@ -1,9 +1,9 @@
 import { ipcMain } from 'electron';
 import { comparer } from 'mobx';
 
-import { MessageBus, sessionBus } from 'dbus-next';
+import { type MessageBus, sessionBus } from 'dbus-next';
 import { isLinux } from '../environment';
-import TrayIcon from './Tray';
+import type TrayIcon from './Tray';
 import Ferdium, { type UnreadServices } from './dbus/Ferdium';
 
 export default class DBus {
diff --git a/src/lib/Form.ts b/src/lib/Form.ts
index 2b25eb193..c60506446 100644
--- a/src/lib/Form.ts
+++ b/src/lib/Form.ts
@@ -1,6 +1,6 @@
 import Form from 'mobx-react-form';
 import vjf from 'mobx-react-form/lib/validators/VJF';
-import { FormFields } from '../@types/mobx-form.types';
+import type { FormFields } from '../@types/mobx-form.types';
 
 export default class DefaultForm extends Form {
   // eslint-disable-next-line @typescript-eslint/no-useless-constructor
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index 12dc1e42c..f7ed3b310 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -1,54 +1,54 @@
 import os from 'node:os';
-import { clipboard, MenuItemConstructorOptions } from 'electron';
 import {
-  app,
   Menu,
+  app,
   dialog,
-  webContents,
-  systemPreferences,
   getCurrentWindow,
+  systemPreferences,
+  webContents,
 } from '@electron/remote';
-import { autorun, action, makeObservable, observable } from 'mobx';
-import { defineMessages, IntlShape } from 'react-intl';
-import osName from 'os-name';
+import { type MenuItemConstructorOptions, clipboard } from 'electron';
 import { fromJS } from 'immutable';
+import { action, autorun, makeObservable, observable } from 'mobx';
+import osName from 'os-name';
+import { type IntlShape, defineMessages } from 'react-intl';
 import semver from 'semver';
+import type { StoresProps } from '../@types/ferdium-components.types';
+import { importExportURL, serverBase, serverName } from '../api/apiBase';
+// @ts-expect-error Cannot find module '../buildInfo.json' or its corresponding type declarations.
+import { gitBranch, gitHashShort, timestamp } from '../buildInfo.json';
+import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config';
 import {
-  isWindows,
-  cmdOrCtrlShortcutKey,
+  addNewServiceShortcutKey,
   altKey,
-  shiftKey,
-  settingsShortcutKey,
+  chromeVersion,
+  cmdOrCtrlShortcutKey,
+  downloadsShortcutKey,
+  electronVersion,
   isLinux,
   isMac,
+  isWindows,
   lockFerdiumShortcutKey,
-  todosToggleShortcutKey,
-  workspaceToggleShortcutKey,
-  addNewServiceShortcutKey,
-  splitModeToggleShortcutKey,
   muteFerdiumShortcutKey,
-  electronVersion,
-  chromeVersion,
   nodeVersion,
   osArch,
+  settingsShortcutKey,
+  shiftKey,
+  splitModeToggleShortcutKey,
+  todosToggleShortcutKey,
   toggleFullScreenKey,
-  downloadsShortcutKey,
+  workspaceToggleShortcutKey,
 } from '../environment';
-import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config';
 import { ferdiumVersion } from '../environment-remote';
 import { todoActions } from '../features/todos/actions';
 import workspaceActions from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
-import { importExportURL, serverBase, serverName } from '../api/apiBase';
+import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
 import { openExternalUrl } from '../helpers/url-helpers';
 import globalMessages from '../i18n/globalMessages';
-import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
-// @ts-expect-error Cannot find module '../buildInfo.json' or its corresponding type declarations.
-import { timestamp, gitHashShort, gitBranch } from '../buildInfo.json';
-import Service from '../models/Service';
-import { StoresProps } from '../@types/ferdium-components.types';
-import { RealStores } from '../stores';
 import { acceleratorString } from '../jsUtils';
+import type Service from '../models/Service';
+import type { RealStores } from '../stores';
 
 const menuItems = defineMessages({
   edit: {
@@ -688,11 +688,9 @@ class FranzMenu implements StoresProps {
   }
 
   getOsName(): string {
-    let osNameParse = osName();
-    const isWin11 = semver.satisfies(os.release(), '>=10.0.22000');
-    osNameParse = isWindows && isWin11 ? 'Windows 11' : osNameParse;
-
-    return osNameParse;
+    return isWindows && semver.satisfies(os.release(), '>=10.0.22000')
+      ? 'Windows 11'
+      : osName(os.platform(), os.release());
   }
 
   _build(): void {
diff --git a/src/lib/TouchBar.ts b/src/lib/TouchBar.ts
index 417e20411..5adeb84b5 100644
--- a/src/lib/TouchBar.ts
+++ b/src/lib/TouchBar.ts
@@ -1,6 +1,6 @@
-import semver from 'semver';
 import { TouchBar, getCurrentWindow } from '@electron/remote';
 import { autorun } from 'mobx';
+import semver from 'semver';
 
 import { isMac, osRelease } from '../environment';
 
diff --git a/src/lib/Tray.ts b/src/lib/Tray.ts
index 726d32b23..447096b4c 100644
--- a/src/lib/Tray.ts
+++ b/src/lib/Tray.ts
@@ -1,17 +1,17 @@
 import { join } from 'node:path';
 import {
-  app,
+  BrowserWindow,
   Menu,
+  type NativeImage,
+  Tray,
+  app,
+  ipcMain,
   nativeImage,
   nativeTheme,
   systemPreferences,
-  Tray,
-  ipcMain,
-  BrowserWindow,
-  NativeImage,
 } from 'electron';
 import macosVersion from 'macos-version';
-import { isMac, isWindows, isLinux } from '../environment';
+import { isLinux, isMac, isWindows } from '../environment';
 
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 const INDICATOR_TRAY_PLAIN = 'tray';
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 53d6c4b89..e8f11df5f 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -1,6 +1,6 @@
 import { join } from 'node:path';
-import semver from 'semver';
 import { pathExistsSync } from 'fs-extra';
+import semver from 'semver';
 import { DEFAULT_SERVICE_SETTINGS } from '../config';
 import { ifUndefined } from '../jsUtils';
 
diff --git a/src/models/Service.ts b/src/models/Service.ts
index da9fa43dd..6d19f44f1 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -1,17 +1,17 @@
-import { join, basename } from 'node:path';
-import { autorun, action, computed, makeObservable, observable } from 'mobx';
-import { ipcRenderer } from 'electron';
+import { basename, join } from 'node:path';
 import { webContents } from '@electron/remote';
-import ElectronWebView from 'react-electron-web-view';
+import { ipcRenderer } from 'electron';
+import { action, autorun, computed, makeObservable, observable } from 'mobx';
+import type ElectronWebView from 'react-electron-web-view';
 
 import { v4 as uuidV4 } from 'uuid';
+import { needsToken } from '../api/apiBase';
+import { DEFAULT_SERVICE_ORDER, DEFAULT_SERVICE_SETTINGS } from '../config';
 import { todosStore } from '../features/todos';
 import { isValidExternalURL, normalizedUrl } from '../helpers/url-helpers';
-import UserAgent from './UserAgent';
-import { DEFAULT_SERVICE_ORDER, DEFAULT_SERVICE_SETTINGS } from '../config';
 import { ifUndefined } from '../jsUtils';
-import { IRecipe } from './Recipe';
-import { needsToken } from '../api/apiBase';
+import type { IRecipe } from './Recipe';
+import UserAgent from './UserAgent';
 
 const debug = require('../preload-safe-debug')('Ferdium:Service');
 
diff --git a/src/models/UserAgent.ts b/src/models/UserAgent.ts
index d54286ee8..817dea4a1 100644
--- a/src/models/UserAgent.ts
+++ b/src/models/UserAgent.ts
@@ -1,6 +1,6 @@
 import { action, computed, makeObservable, observable, observe } from 'mobx';
 
-import ElectronWebView from 'react-electron-web-view';
+import type ElectronWebView from 'react-electron-web-view';
 import defaultUserAgent from '../helpers/userAgent-helpers';
 
 const debug = require('../preload-safe-debug')('Ferdium:UserAgent');
diff --git a/src/routes.tsx b/src/routes.tsx
index 436f25ea4..d2a88950f 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -1,42 +1,42 @@
-import { Component, ReactElement } from 'react';
+import type { HashHistory } from 'history';
 import { inject, observer } from 'mobx-react';
+import { Component, type ReactElement } from 'react';
 import {
+  unstable_HistoryRouter as HistoryRouter,
   Navigate,
   Route,
   Routes,
-  unstable_HistoryRouter as HistoryRouter,
 } from 'react-router-dom';
-import { HashHistory } from 'history';
+import type { StoresProps } from './@types/ferdium-components.types';
+import type { Actions } from './actions/lib/actions';
+import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
+import AuthReleaseNotesScreen from './containers/auth/AuthReleaseNotesScreen';
+import ChangeServerScreen from './containers/auth/ChangeServerScreen';
+import InviteScreen from './containers/auth/InviteScreen';
+import LoginScreen from './containers/auth/LoginScreen';
+import PasswordScreen from './containers/auth/PasswordScreen';
+import SetupAssistantScreen from './containers/auth/SetupAssistantScreen';
+import SignupScreen from './containers/auth/SignupScreen';
+import WelcomeScreen from './containers/auth/WelcomeScreen';
+import DownloadManagerScreen from './containers/download-manager/DownloadManagerScreen';
+import DownloadManagerWindow from './containers/download-manager/DownloadManagerWindow';
 import AppLayoutContainer from './containers/layout/AppLayoutContainer';
-import SettingsWindow from './containers/settings/SettingsWindow';
-import ReleaseNotesWindow from './containers/settings/ReleaseNotesWindow';
-import RecipesScreen from './containers/settings/RecipesScreen';
-import ServicesScreen from './containers/settings/ServicesScreen';
-import EditServiceScreen from './containers/settings/EditServiceScreen';
 import AccountScreen from './containers/settings/AccountScreen';
-import TeamScreen from './containers/settings/TeamScreen';
-import EditUserScreen from './containers/settings/EditUserScreen';
+import EditServiceScreen from './containers/settings/EditServiceScreen';
 import EditSettingsScreen from './containers/settings/EditSettingsScreen';
+import EditUserScreen from './containers/settings/EditUserScreen';
 import InviteSettingsScreen from './containers/settings/InviteScreen';
-import SupportFerdiumScreen from './containers/settings/SupportScreen';
+import RecipesScreen from './containers/settings/RecipesScreen';
 import ReleaseNotesScreen from './containers/settings/ReleaseNotesScreen';
-import WelcomeScreen from './containers/auth/WelcomeScreen';
-import LoginScreen from './containers/auth/LoginScreen';
-import AuthReleaseNotesScreen from './containers/auth/AuthReleaseNotesScreen';
-import PasswordScreen from './containers/auth/PasswordScreen';
-import ChangeServerScreen from './containers/auth/ChangeServerScreen';
-import SignupScreen from './containers/auth/SignupScreen';
-import SetupAssistantScreen from './containers/auth/SetupAssistantScreen';
-import InviteScreen from './containers/auth/InviteScreen';
-import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
-import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
-import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
+import ReleaseNotesWindow from './containers/settings/ReleaseNotesWindow';
+import ServicesScreen from './containers/settings/ServicesScreen';
+import SettingsWindow from './containers/settings/SettingsWindow';
+import SupportFerdiumScreen from './containers/settings/SupportScreen';
+import TeamScreen from './containers/settings/TeamScreen';
 import { WORKSPACES_ROUTES } from './features/workspaces/constants';
-import { StoresProps } from './@types/ferdium-components.types';
-import { Actions } from './actions/lib/actions';
-import { RealStores } from './stores';
-import DownloadManagerScreen from './containers/download-manager/DownloadManagerScreen';
-import DownloadManagerWindow from './containers/download-manager/DownloadManagerWindow';
+import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
+import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
+import type { RealStores } from './stores';
 
 interface IProps {
   history: HashHistory;
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index b8356bd56..b0a925411 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -1,46 +1,46 @@
 import { URL } from 'node:url';
-import { ipcRenderer } from 'electron';
 import {
   app,
-  screen,
-  powerMonitor,
-  nativeTheme,
   getCurrentWindow,
+  nativeTheme,
+  powerMonitor,
   process as remoteProcess,
+  screen,
 } from '@electron/remote';
+import AutoLaunch from 'auto-launch';
+import { ipcRenderer } from 'electron';
+import { readJsonSync } from 'fs-extra';
 import { action, computed, makeObservable, observable } from 'mobx';
 import moment from 'moment';
-import AutoLaunch from 'auto-launch';
 import ms from 'ms';
-import { readJsonSync } from 'fs-extra';
 
-import { Stores } from '../@types/stores.types';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
-import TypedStore from './lib/TypedStore';
-import Request from './lib/Request';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { cleanseJSObject } from '../jsUtils';
 import {
+  electronVersion,
   isMac,
   isWinPortable,
-  electronVersion,
   osRelease,
 } from '../environment';
 import {
+  ferdiumLocale,
   ferdiumVersion,
   userDataPath,
-  ferdiumLocale,
 } from '../environment-remote';
-import generatedTranslations from '../i18n/translations';
 import { getLocale } from '../helpers/i18n-helpers';
+import generatedTranslations from '../i18n/translations';
+import { cleanseJSObject } from '../jsUtils';
+import Request from './lib/Request';
+import TypedStore from './lib/TypedStore';
 
+import sleep from '../helpers/async-helpers';
 import {
   getServiceIdsFromPartitions,
   removeServicePartitionDirectory,
 } from '../helpers/service-helpers';
 import { openExternalUrl } from '../helpers/url-helpers';
-import sleep from '../helpers/async-helpers';
 
 const debug = require('../preload-safe-debug')('Ferdium:AppStore');
 
diff --git a/src/stores/FeaturesStore.ts b/src/stores/FeaturesStore.ts
index 8584b6060..6167d0e22 100644
--- a/src/stores/FeaturesStore.ts
+++ b/src/stores/FeaturesStore.ts
@@ -5,18 +5,18 @@ import {
   observable,
   runInAction,
 } from 'mobx';
-import { Stores } from '../@types/stores.types';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
-import CachedRequest from './lib/CachedRequest';
-import serviceProxy from '../features/serviceProxy';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
+import appearance from '../features/appearance';
 import basicAuth from '../features/basicAuth';
-import workspaces from '../features/workspaces';
-import quickSwitch from '../features/quickSwitch';
-import publishDebugInfo from '../features/publishDebugInfo';
 import communityRecipes from '../features/communityRecipes';
+import publishDebugInfo from '../features/publishDebugInfo';
+import quickSwitch from '../features/quickSwitch';
+import serviceProxy from '../features/serviceProxy';
 import todos from '../features/todos';
-import appearance from '../features/appearance';
+import workspaces from '../features/workspaces';
+import CachedRequest from './lib/CachedRequest';
 import TypedStore from './lib/TypedStore';
 
 export default class FeaturesStore extends TypedStore {
diff --git a/src/stores/GlobalErrorStore.ts b/src/stores/GlobalErrorStore.ts
index 74a43100b..1da81eaa3 100644
--- a/src/stores/GlobalErrorStore.ts
+++ b/src/stores/GlobalErrorStore.ts
@@ -1,8 +1,8 @@
-import { observable, action, makeObservable } from 'mobx';
-import { Response } from 'electron';
-import { Actions } from '../actions/lib/actions';
-import { ApiInterface } from '../api';
-import { Stores } from '../@types/stores.types';
+import type { Response } from 'electron';
+import { action, makeObservable, observable } from 'mobx';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
 import Request from './lib/Request';
 import TypedStore from './lib/TypedStore';
 
diff --git a/src/stores/RecipePreviewsStore.ts b/src/stores/RecipePreviewsStore.ts
index 1c95e6b54..f851f3203 100644
--- a/src/stores/RecipePreviewsStore.ts
+++ b/src/stores/RecipePreviewsStore.ts
@@ -1,14 +1,14 @@
 import { action, computed, makeObservable, observable } from 'mobx';
 
-import { Actions } from '../actions/lib/actions';
-import { ApiInterface } from '../api';
-import Recipe from '../models/Recipe';
-import { Stores } from '../@types/stores.types';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
+import type Recipe from '../models/Recipe';
 
+import type RecipePreview from '../models/RecipePreview';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import TypedStore from './lib/TypedStore';
-import RecipePreview from '../models/RecipePreview';
 
 export default class RecipePreviewsStore extends TypedStore {
   @observable allRecipePreviewsRequest = new CachedRequest(
diff --git a/src/stores/RecipesStore.ts b/src/stores/RecipesStore.ts
index 9b5565dcf..3cd81807a 100644
--- a/src/stores/RecipesStore.ts
+++ b/src/stores/RecipesStore.ts
@@ -1,15 +1,15 @@
-import { action, computed, makeObservable, observable } from 'mobx';
 import { readJSONSync } from 'fs-extra';
+import { action, computed, makeObservable, observable } from 'mobx';
 import semver from 'semver';
 
-import Recipe from '../models/Recipe';
-import { Stores } from '../@types/stores.types';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
+import { asarRecipesPath } from '../helpers/asar-helpers';
+import matchRoute from '../helpers/routing-helpers';
+import type Recipe from '../models/Recipe';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
-import matchRoute from '../helpers/routing-helpers';
-import { asarRecipesPath } from '../helpers/asar-helpers';
 import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:RecipeStore');
diff --git a/src/stores/RequestStore.ts b/src/stores/RequestStore.ts
index 807f2d126..bad9f39ea 100644
--- a/src/stores/RequestStore.ts
+++ b/src/stores/RequestStore.ts
@@ -2,11 +2,11 @@ import { ipcRenderer } from 'electron';
 import { action, computed, makeObservable, observable } from 'mobx';
 import ms from 'ms';
 
-import { Actions } from '../actions/lib/actions';
-import { ApiInterface } from '../api';
-import { Stores } from '../@types/stores.types';
-import CachedRequest from './lib/CachedRequest';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
 import { LOCAL_HOSTNAME, LOCAL_PORT } from '../config';
+import type CachedRequest from './lib/CachedRequest';
 
 import TypedStore from './lib/TypedStore';
 
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index d7804a3fe..8105aa084 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -1,29 +1,29 @@
 import { join } from 'node:path';
 import { clipboard, ipcRenderer, shell } from 'electron';
-import { action, reaction, computed, observable, makeObservable } from 'mobx';
+import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra';
 import { debounce, remove } from 'lodash';
+import { action, computed, makeObservable, observable, reaction } from 'mobx';
 import ms from 'ms';
-import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra';
 
-import { Stores } from '../@types/stores.types';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
-import Request from './lib/Request';
-import CachedRequest from './lib/CachedRequest';
-import matchRoute from '../helpers/routing-helpers';
-import { isInTimeframe } from '../helpers/schedule-helpers';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
+import { DEFAULT_SERVICE_SETTINGS, KEEP_WS_LOADED_USID } from '../config';
+import { ferdiumVersion } from '../environment-remote';
+import { workspaceStore } from '../features/workspaces';
 import {
-  getRecipeDirectory,
   getDevRecipeDirectory,
+  getRecipeDirectory,
 } from '../helpers/recipe-helpers';
-import Service from '../models/Service';
-import { workspaceStore } from '../features/workspaces';
-import { DEFAULT_SERVICE_SETTINGS, KEEP_WS_LOADED_USID } from '../config';
-import { cleanseJSObject } from '../jsUtils';
+import matchRoute from '../helpers/routing-helpers';
+import { isInTimeframe } from '../helpers/schedule-helpers';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
-import { ferdiumVersion } from '../environment-remote';
-import TypedStore from './lib/TypedStore';
+import { cleanseJSObject } from '../jsUtils';
 import type { UnreadServices } from '../lib/dbus/Ferdium';
+import type Service from '../models/Service';
+import CachedRequest from './lib/CachedRequest';
+import Request from './lib/Request';
+import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:ServiceStore');
 
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 010290a4a..72d6331cb 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -1,10 +1,10 @@
-import { ipcRenderer } from 'electron';
 import { getCurrentWindow } from '@electron/remote';
+import { ipcRenderer } from 'electron';
 import { action, computed, makeObservable, observable, reaction } from 'mobx';
 import localStorage from 'mobx-localstorage';
-import { Stores } from '../@types/stores.types';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
 import {
   DEFAULT_APP_SETTINGS,
   FILE_SYSTEM_SETTINGS_TYPES,
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index a3330c2e6..614c16763 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -1,10 +1,10 @@
-import { action, observable, computed, reaction, makeObservable } from 'mobx';
 import { nativeTheme } from '@electron/remote';
+import { action, computed, makeObservable, observable, reaction } from 'mobx';
 
-import { Stores } from '../@types/stores.types';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
-import { Theme, theme, ThemeType } from '../themes';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
+import { type Theme, ThemeType, theme } from '../themes';
 import TypedStore from './lib/TypedStore';
 
 export default class UIStore extends TypedStore {
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index 9c3fcd3b9..ade68e4d4 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -1,16 +1,16 @@
-import { observable, computed, action, makeObservable } from 'mobx';
-import moment from 'moment';
+import { ipcRenderer } from 'electron';
 import jwt from 'jsonwebtoken';
+import { action, computed, makeObservable, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
-import { ipcRenderer } from 'electron';
+import moment from 'moment';
 
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
-import { Stores } from '../@types/stores.types';
+import type { Stores } from '../@types/stores.types';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
 import { TODOS_PARTITION_ID } from '../config';
 import { isDevMode } from '../environment-remote';
-import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
+import Request from './lib/Request';
 import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:UserStore');
diff --git a/src/stores/index.ts b/src/stores/index.ts
index f9927d9a3..5b96e6efb 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -1,19 +1,19 @@
-import { RouterStore } from '@superwf/mobx-react-router';
-import { ApiInterface } from '../api';
-import { Actions } from '../actions/lib/actions';
+import type { RouterStore } from '@superwf/mobx-react-router';
+import type { Actions } from '../actions/lib/actions';
+import type { ApiInterface } from '../api';
+import { communityRecipesStore } from '../features/communityRecipes';
+import { todosStore } from '../features/todos';
+import { workspaceStore } from '../features/workspaces';
 import AppStore from './AppStore';
-import UserStore from './UserStore';
 import FeaturesStore from './FeaturesStore';
-import SettingsStore from './SettingsStore';
-import ServicesStore from './ServicesStore';
-import RecipesStore from './RecipesStore';
+import GlobalErrorStore from './GlobalErrorStore';
 import RecipePreviewsStore from './RecipePreviewsStore';
-import UIStore from './UIStore';
+import RecipesStore from './RecipesStore';
 import RequestStore from './RequestStore';
-import GlobalErrorStore from './GlobalErrorStore';
-import { workspaceStore } from '../features/workspaces';
-import { communityRecipesStore } from '../features/communityRecipes';
-import { todosStore } from '../features/todos';
+import ServicesStore from './ServicesStore';
+import SettingsStore from './SettingsStore';
+import UIStore from './UIStore';
+import UserStore from './UserStore';
 
 export interface RealStores {
   router: RouterStore;
diff --git a/src/stores/lib/CachedRequest.ts b/src/stores/lib/CachedRequest.ts
index b24336fe6..3b15fcf3f 100644
--- a/src/stores/lib/CachedRequest.ts
+++ b/src/stores/lib/CachedRequest.ts
@@ -1,5 +1,5 @@
-import { action } from 'mobx';
 import { isEqual } from 'lodash';
+import { action } from 'mobx';
 import Request from './Request';
 
 export default class CachedRequest extends Request {
diff --git a/src/stores/lib/Reaction.ts b/src/stores/lib/Reaction.ts
index 3966c8073..d418d8db8 100644
--- a/src/stores/lib/Reaction.ts
+++ b/src/stores/lib/Reaction.ts
@@ -1,4 +1,4 @@
-import { autorun, IReactionDisposer, IReactionPublic } from 'mobx';
+import { type IReactionDisposer, type IReactionPublic, autorun } from 'mobx';
 
 export default class Reaction {
   public reaction: (r: IReactionPublic) => any;
diff --git a/src/stores/lib/Request.ts b/src/stores/lib/Request.ts
index 587af87d7..e7739bba1 100644
--- a/src/stores/lib/Request.ts
+++ b/src/stores/lib/Request.ts
@@ -1,4 +1,4 @@
-import { observable, action, computed, makeObservable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
 // eslint-disable-next-line no-use-before-define
 type Hook = (request: Request) => void;
diff --git a/src/stores/lib/TypedStore.ts b/src/stores/lib/TypedStore.ts
index 8bae529ba..6d499b637 100644
--- a/src/stores/lib/TypedStore.ts
+++ b/src/stores/lib/TypedStore.ts
@@ -1,13 +1,13 @@
 import {
+  type IReactionPublic,
   action,
   computed,
-  IReactionPublic,
   makeObservable,
   observable,
 } from 'mobx';
-import { Actions } from '../../actions/lib/actions';
-import { ApiInterface } from '../../api';
-import { Stores } from '../../@types/stores.types';
+import type { Stores } from '../../@types/stores.types';
+import type { Actions } from '../../actions/lib/actions';
+import type { ApiInterface } from '../../api';
 import Reaction from './Reaction';
 
 export default abstract class TypedStore {
diff --git a/src/themes/default/index.ts b/src/themes/default/index.ts
index ac04a6e3b..8df7ff06e 100644
--- a/src/themes/default/index.ts
+++ b/src/themes/default/index.ts
@@ -1,9 +1,9 @@
 import color from 'color';
 import { cloneDeep } from 'lodash';
 
-import * as legacyStyles from '../legacy';
-import type IStyleTypes from '../IStyleTypes';
 import { DEFAULT_LOADER_COLOR } from '../../config';
+import type IStyleTypes from '../IStyleTypes';
+import * as legacyStyles from '../legacy';
 
 export default (brandPrimary: string) => {
   if (!brandPrimary) {
diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts
index ee55fbe62..155e533e9 100644
--- a/src/webview/contextMenuBuilder.ts
+++ b/src/webview/contextMenuBuilder.ts
@@ -7,20 +7,25 @@
  * Source: https://github.com/electron-userland/electron-spellchecker/blob/master/src/context-menu-builder.js
  */
 
-import { clipboard, ipcRenderer, nativeImage, WebContents } from 'electron';
 import { Menu, MenuItem } from '@electron/remote';
+import {
+  type WebContents,
+  clipboard,
+  ipcRenderer,
+  nativeImage,
+} from 'electron';
 import { cmdOrCtrlShortcutKey, isMac } from '../environment';
 
 import {
+  GOOGLE_TRANSLATOR_LANGUAGES,
+  LIBRETRANSLATE_TRANSLATOR_LANGUAGES,
   SEARCH_ENGINE_NAMES,
   SEARCH_ENGINE_URLS,
-  GOOGLE_TRANSLATOR_LANGUAGES,
   TRANSLATOR_ENGINE_GOOGLE,
   TRANSLATOR_ENGINE_LIBRETRANSLATE,
-  LIBRETRANSLATE_TRANSLATOR_LANGUAGES,
 } from '../config';
 import { openExternalUrl } from '../helpers/url-helpers';
-import IContextMenuParams from '../models/IContextMenuParams';
+import type IContextMenuParams from '../models/IContextMenuParams';
 
 function matchesWord(string: string) {
   const regex =
diff --git a/src/webview/lib/RecipeWebview.ts b/src/webview/lib/RecipeWebview.ts
index 31e9a288d..3b6b9cc88 100644
--- a/src/webview/lib/RecipeWebview.ts
+++ b/src/webview/lib/RecipeWebview.ts
@@ -1,6 +1,6 @@
-import { ipcRenderer } from 'electron';
 import { BrowserWindow } from '@electron/remote';
-import { pathExistsSync, readFileSync, existsSync } from 'fs-extra';
+import { ipcRenderer } from 'electron';
+import { existsSync, pathExistsSync, readFileSync } from 'fs-extra';
 import { safeParseInt } from '../../jsUtils';
 
 const debug = require('../../preload-safe-debug')(
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts
index 148ea6fab..d6db39779 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -1,26 +1,24 @@
 /* eslint-disable global-require */
 /* eslint-disable import/no-dynamic-require */
 
-import { join } from 'node:path';
 import { existsSync } from 'node:fs';
-import { noop, debounce } from 'lodash';
-import { contextBridge, ipcRenderer } from 'electron';
-import { autorun, computed, makeObservable, observable } from 'mobx';
-import { pathExistsSync, readFileSync } from 'fs-extra';
+import { join } from 'node:path';
 import {
   disable as disableDarkMode,
   enable as enableDarkMode,
 } from 'darkreader';
+import { contextBridge, ipcRenderer } from 'electron';
+import { pathExistsSync, readFileSync } from 'fs-extra';
+import { debounce, noop } from 'lodash';
+import { autorun, computed, makeObservable, observable } from 'mobx';
 
-import ignoreList from './darkmode/ignore';
 import customDarkModeCss from './darkmode/custom';
+import ignoreList from './darkmode/ignore';
 
 import RecipeWebview from './lib/RecipeWebview';
 import Userscript from './lib/Userscript';
 
 import BadgeHandler from './badge';
-import DialogTitleHandler from './dialogTitle';
-import SessionHandler from './sessionHandler';
 import contextMenu from './contextMenu';
 import {
   darkModeStyleExists,
@@ -28,25 +26,27 @@ import {
   isDarkModeStyleInjected,
   removeDarkModeStyle,
 } from './darkmode';
+import DialogTitleHandler from './dialogTitle';
 import FindInPage from './find';
 import {
-  notificationsClassDefinition,
   NotificationsHandler,
+  notificationsClassDefinition,
 } from './notifications';
 import {
   getDisplayMediaSelector,
   screenShareCss,
   screenShareJs,
 } from './screenshare';
+import SessionHandler from './sessionHandler';
 import {
   getSpellcheckerLocaleByFuzzyIdentifier,
   switchDict,
 } from './spellchecker';
 
+import type { AppStore } from '../@types/stores.types';
 import { DEFAULT_APP_SETTINGS } from '../config';
 import { cleanseJSObject, ifUndefined, safeParseInt } from '../jsUtils';
-import { AppStore } from '../@types/stores.types';
-import Service from '../models/Service';
+import type Service from '../models/Service';
 
 // For some services darkreader tries to use the chrome extension message API
 // This will cause the service to fail loading
diff --git a/src/webview/spellchecker.ts b/src/webview/spellchecker.ts
index 8e452c791..92024b9b0 100644
--- a/src/webview/spellchecker.ts
+++ b/src/webview/spellchecker.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron';
-import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 import { isMac } from '../environment';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
 const debug = require('../preload-safe-debug')('Ferdium:spellchecker');