28 files changed, 191 insertions, 140 deletions

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',