41 files changed, 440 insertions, 163 deletions
diff --git a/src/@types/stores.types.ts b/src/@types/stores.types.ts
index 973889802..c2d7bd78a 100644
--- a/src/@types/stores.types.ts
+++ b/src/@types/stores.types.ts
@@ -87,12 +87,14 @@ export interface AppStore extends TypedStore {
  authRequestFailed: () => void;
  autoLaunchOnStart: () => void;
  automaticUpdates: boolean;
+  isTwoFactorAutoCatcherEnabled: boolean;
+  twoFactorAutoCatcherMatcher: string;
  clearAppCacheRequest: () => void;
  clipboardNotifications: boolean;
  darkMode: boolean;
-  dictionaries: [];
  enableSpellchecking: boolean;
  enableTranslator: boolean;
+  useSelfSignedCertificates: boolean;
  fetchDataInterval: 4;
  get(key: string): any;
  getAppCacheSizeRequest: () => void;
@@ -234,7 +236,6 @@ interface SettingsStore extends TypedStore {
  remove: (value: any) => void;
  fileSystemSettingsTypes: any[];
  loaded: boolean;
-  updateAppSettingsRequest: () => void;
  _fileSystemSettingsCache: () => void;
  all: ISettings;
  app: AppStore;
@@ -304,7 +305,6 @@ interface UserStore extends TypedStore {
  accountType: () => void;
  authToken: () => void;
  deleteAccountRequest: () => void;
-  fetchUserInfoInterval: null;
  getLegacyServicesRequest: () => void;
  getUserInfoRequest: CachedRequest;
  hasCompletedSignup: () => void;
@@ -327,15 +327,10 @@ interface UserStore extends TypedStore {
  _retrievePassword: () => void;
  changeServerRoute: () => void;
  data: User;
-  importRoute: string;
-  inviteRoute: string;
  isLoggedIn: boolean;
  isTokenExpired: boolean;
-  legacyServices: () => void;
  loginRoute: string;
-  logoutRoute: string;
  passwordRoute: string;
-  setupRoute: string;
  signupRoute: string;
  team: () => void;
 }
diff --git a/src/api/UserApi.ts b/src/api/UserApi.ts
index 9364b3383..38f489131 100644
--- a/src/api/UserApi.ts
+++ b/src/api/UserApi.ts
@@ -52,10 +52,6 @@ export default class UserApi {
    return this.server.updateUserInfo(userData);
  }
-  getLegacyServices() {
-    return this.server.getLegacyServices();
-  }
  delete() {
    return this.server.deleteAccount();
  }
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index 1530dd478..9e7582e1e 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -22,7 +22,7 @@ import UserModel from '../../models/User';
 import sleep from '../../helpers/async-helpers';
 import { SERVER_NOT_LOADED } from '../../config';
-import { userDataRecipesPath, userDataPath } from '../../environment-remote';
+import { userDataRecipesPath } from '../../environment-remote';
 import { asarRecipesPath } from '../../helpers/asar-helpers';
 import apiBase from '../apiBase';
 import {
@@ -500,40 +500,6 @@ export default class ServerApi {
    debug('ServerApi::healthCheck resolves');
  }
-  async getLegacyServices() {
-    const file = userDataPath('settings', 'services.json');
-    try {
-      const config = readJsonSync(file);
-      if (Object.hasOwn(config, 'services')) {
-        const services = await Promise.all(
-          config.services.map(async (s: { service: any }) => {
-            const service = s;
-            const request = await sendAuthRequest(
-              `${apiBase()}/recipes/${s.service}`,
-            );
-            if (request.status === 200) {
-              const data = await request.json();
-              // @ts-expect-error Property 'recipe' does not exist on type '{ service: any; }'.
-              service.recipe = new RecipePreviewModel(data);
-            }
-            return service;
-          }),
-        );
-        debug('ServerApi::getLegacyServices resolves', services);
-        return services;
-      }
-    } catch {
-      console.error('ServerApi::getLegacyServices no config found');
-    }
-    return [];
-  }
  // Helper
  async _mapServiceModels(services: any[]) {
    const recipes = services.map((s: { recipeId: string }) => s.recipeId);
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index e423e408b..1106113f0 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -318,7 +318,7 @@ class Sidebar extends Component<IProps, IState> {
            <Icon icon={mdiCheckAll} size={1.5} />
          </button>
        ) : null}
-        {stores!.settings.all.app.lockingFeatureEnabled ? (
+        {stores!.settings.all.app.isLockingFeatureEnabled ? (
          <button
            type="button"
            className="sidebar__button"
diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx
index ffa684458..eab019084 100644
--- a/src/components/settings/account/AccountDashboard.tsx
+++ b/src/components/settings/account/AccountDashboard.tsx
@@ -7,7 +7,11 @@ import { H1, H2 } from '../../ui/headline';
 import Loader from '../../ui/loader';
 import Button from '../../ui/button';
 import Infobox from '../../ui/infobox/index';
-import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
+import {
+  DEFAULT_LOADER_COLOR,
+  LOCAL_SERVER,
+  LIVE_FRANZ_API,
+} from '../../../config';
 import User from '../../../models/User';
 const messages = defineMessages({
@@ -123,7 +127,7 @@ class AccountDashboard extends Component<IProp> {
          )}
          {!isUsingWithoutAccount && (
            <>
-              {isLoading && <Loader color="#FFFFFF" />}
+              {isLoading && <Loader color={DEFAULT_LOADER_COLOR} />}
              {!isLoading && userInfoRequestFailed && (
                <Infobox
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 1672a1411..81cfe8b12 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -15,6 +15,7 @@ import Infobox from '../../ui/Infobox';
 import { H1, H2, H3, H5 } from '../../ui/headline';
 import {
  ferdiumVersion,
+  userDataCertsPath,
  userDataPath,
  userDataRecipesPath,
 } from '../../../environment-remote';
@@ -238,6 +239,10 @@ const messages = defineMessages({
    id: 'settings.app.updateStatusUpToDate',
    defaultMessage: 'You are using the latest version of Ferdium',
  },
+  servicesUpdateStatusUpToDate: {
+    id: 'settings.app.servicesUpdateStatusUpToDate',
+    defaultMessage: 'Your services are up-to-date',
+  },
  currentVersion: {
    id: 'settings.app.currentVersion',
    defaultMessage: 'Current version:',
@@ -258,6 +263,20 @@ const messages = defineMessages({
    id: 'settings.app.form.splitColumns',
    defaultMessage: 'Number of columns',
  },
+  warningSelfSignedCertificates: {
+    id: 'settings.app.warningSelfSignedCertificates',
+    defaultMessage:
+      'WARNING: Only enable this feature if you know what you are doing. Enabling this is a security risk and should only be used for testing purposes.',
+  },
+  infoOpenCertificatesFolder: {
+    id: 'settings.app.infoOpenCertificatesFolder',
+    defaultMessage:
+      'To install a certificate, click the button below to open the certificates folder and copy it into the folder. After that you can refresh the service (CTRL/CMD + R). To remove/uninstall, simply delete the certificate file and restart Ferdium.',
+  },
+  buttonOpenFerdiumCertsFolder: {
+    id: 'settings.app.buttonOpenFerdiumCertsFolder',
+    defaultMessage: 'Open certificates folder',
+  },
 });
 const Hr = (): ReactElement => (
@@ -284,10 +303,12 @@ interface IProps extends WrappedComponentProps {
  isClearingAllCache: boolean;
  isTodosActivated: boolean;
  automaticUpdates: boolean;
+  isTwoFactorAutoCatcherEnabled: boolean;
+  twoFactorAutoCatcherMatcher: string;
  isDarkmodeEnabled: boolean;
  isAdaptableDarkModeEnabled: boolean;
  isUseGrayscaleServicesEnabled: boolean;
-  lockingFeatureEnabled: boolean;
+  isLockingFeatureEnabled: boolean;
  isSplitModeEnabled: boolean;
  isOnline: boolean;
  showServicesUpdatedInfoBar: boolean;
@@ -335,7 +356,8 @@ class EditSettingsForm extends Component<IProps, IState> {
    this.props.form.submit({
      onSuccess: (form: Form) => {
        const values = form.values();
-        const { accentColor } = values;
+        const { accentColor, isTwoFactorAutoCatcherEnabled } = values;
        if (accentColor.trim().length === 0) {
          values.accentColor = DEFAULT_ACCENT_COLOR;
        }
@@ -343,6 +365,15 @@ class EditSettingsForm extends Component<IProps, IState> {
        if (progressbarAccentColor.trim().length === 0) {
          values.progressbarAccentColor = DEFAULT_ACCENT_COLOR;
        }
+        // set twoFactorAutoCatcherMatcher to the default value, if its get enabled the input is prefilled
+        if (
+          !isTwoFactorAutoCatcherEnabled &&
+          values.twoFactorAutoCatcherMatcher.length === 0
+        ) {
+          values.twoFactorAutoCatcherMatcher =
+            DEFAULT_APP_SETTINGS.twoFactorAutoCatcherMatcher;
+        }
        this.props.onSubmit(values);
      },
      onError: noop,
@@ -367,6 +398,7 @@ class EditSettingsForm extends Component<IProps, IState> {
      onClearAllCache,
      getCacheSize,
      automaticUpdates,
+      isTwoFactorAutoCatcherEnabled,
      isDarkmodeEnabled,
      isSplitModeEnabled,
      openProcessManager,
@@ -383,8 +415,12 @@ class EditSettingsForm extends Component<IProps, IState> {
      updateButtonLabelMessage = messages.updateStatusAvailable;
    }
-    const { lockingFeatureEnabled, scheduledDNDEnabled, reloadAfterResume } =
+    const {
-      window['ferdium'].stores.settings.all.app;
+      isLockingFeatureEnabled,
+      scheduledDNDEnabled,
+      reloadAfterResume,
+      useSelfSignedCertificates,
+    } = window['ferdium'].stores.settings.all.app;
    let cacheSize;
    let notCleared;
@@ -407,6 +443,7 @@ class EditSettingsForm extends Component<IProps, IState> {
    const profileFolder = userDataPath();
    const recipeFolder = userDataRecipesPath();
+    const certsFolder = userDataCertsPath();
    return (
      <div className="settings__main">
@@ -813,6 +850,15 @@ class EditSettingsForm extends Component<IProps, IState> {
                  <Toggle {...form.$('notifyTaskBarOnMessage').bind()} />
                )}
+                <Toggle {...form.$('isTwoFactorAutoCatcherEnabled').bind()} />
+                {isTwoFactorAutoCatcherEnabled && (
+                  <Input
+                    onChange={e => this.submit(e)}
+                    {...form.$('twoFactorAutoCatcherMatcher').bind()}
+                  />
+                )}
                <Hr />
                <Select field={form.$('webRTCIPHandlingPolicy')} />
@@ -836,8 +882,8 @@ class EditSettingsForm extends Component<IProps, IState> {
                <Hr />
-                <Toggle {...form.$('lockingFeatureEnabled').bind()} />
+                <Toggle {...form.$('isLockingFeatureEnabled').bind()} />
-                {lockingFeatureEnabled && (
+                {isLockingFeatureEnabled && (
                  <>
                    {isMac && systemPreferences.canPromptTouchID() && (
                      <Toggle {...form.$('useTouchIdToUnlock').bind()} />
@@ -943,6 +989,43 @@ class EditSettingsForm extends Component<IProps, IState> {
                  {intl.formatMessage(messages.appRestartRequired)}
                </p>
+                <Toggle {...form.$('useSelfSignedCertificates').bind()} />
+                {useSelfSignedCertificates && (
+                  <div className="settings__settings-group">
+                    <p
+                      style={{
+                        padding: '0rem 0rem 1rem 0rem',
+                        textAlign: 'justify',
+                        fontSize: '1.1rem',
+                      }}
+                    >
+                      {intl.formatMessage(messages.infoOpenCertificatesFolder)}
+                    </p>
+                    <div className="settings__open-settings-cache-container">
+                      <Button
+                        buttonType="secondary"
+                        label={intl.formatMessage(
+                          messages.buttonOpenFerdiumCertsFolder,
+                        )}
+                        className="settings__open-settings-file-button"
+                        onClick={() => openPath(certsFolder)}
+                      />
+                    </div>
+                  </div>
+                )}
+                <p
+                  className="settings__help"
+                  style={{
+                    padding: useSelfSignedCertificates
+                      ? '1rem 0rem 0rem 0rem'
+                      : undefined,
+                  }}
+                >
+                  {intl.formatMessage(messages.warningSelfSignedCertificates)}
+                </p>
                <Hr />
                <Input
@@ -1117,7 +1200,10 @@ class EditSettingsForm extends Component<IProps, IState> {
                    ) : (
                      <p>
                        <Icon icon={mdiPowerPlug} />
-                        &nbsp;Your services are up-to-date.
+                        &nbsp;
+                        {intl.formatMessage(
+                          messages.servicesUpdateStatusUpToDate,
+                        )}
                      </p>
                    )}
                  </>
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx
index 406656160..96613373e 100644
--- a/src/components/settings/team/TeamDashboard.tsx
+++ b/src/components/settings/team/TeamDashboard.tsx
@@ -10,7 +10,7 @@ import Loader from '../../ui/loader';
 import Button from '../../ui/button';
 import Infobox from '../../ui/Infobox';
 import { H1 } from '../../ui/headline';
-import { LIVE_FRANZ_API } from '../../../config';
+import { DEFAULT_LOADER_COLOR, LIVE_FRANZ_API } from '../../../config';
 const messages = defineMessages({
  headline: {
@@ -128,7 +128,7 @@ class TeamDashboard extends Component<IProps> {
          </span>
        </div>
        <div className="settings__body">
-          {isLoading && <Loader color="#FFFFFF" />}
+          {isLoading && <Loader color={DEFAULT_LOADER_COLOR} />}
          {!isLoading && userInfoRequestFailed && (
            <Infobox
diff --git a/src/components/ui/InfoBar.tsx b/src/components/ui/InfoBar.tsx
index ae37546df..f3f1adbe7 100644
--- a/src/components/ui/InfoBar.tsx
+++ b/src/components/ui/InfoBar.tsx
@@ -8,6 +8,7 @@ import { noop } from 'lodash';
 import Loader from './loader/index';
 import Appear from './effects/Appear';
 import Icon from './icon';
+import { DEFAULT_LOADER_COLOR } from '../../config';
 const messages = defineMessages({
  hide: {
@@ -71,7 +72,11 @@ class InfoBar extends Component<IProps> {
                className="contentWrapper"
                style={{ display: 'flex', gap: '8px' }}
              >
-                <Loader size={18} loaded={!ctaLoading} color="#FFFFFF" />
+                <Loader
+                  size={18}
+                  loaded={!ctaLoading}
+                  color={DEFAULT_LOADER_COLOR}
+                />
                {ctaLabel}
              </div>
            </button>
diff --git a/src/components/ui/Infobox.tsx b/src/components/ui/Infobox.tsx
index 742717ed7..14e1a581c 100644
--- a/src/components/ui/Infobox.tsx
+++ b/src/components/ui/Infobox.tsx
@@ -6,6 +6,7 @@ import { noop } from 'lodash';
 import { observer } from 'mobx-react';
 import Loader from './loader/index';
 import Icon from './icon';
+import { DEFAULT_LOADER_COLOR } from '../../config';
 const icons = {
  'checkbox-marked-circle-outline': mdiCheckboxMarkedCircleOutline,
@@ -84,7 +85,11 @@ class Infobox extends Component<IProps, IState> {
              className="contentWrapper"
              style={{ display: 'flex', gap: '8px' }}
            >
-              <Loader size={18} loaded={!ctaLoading} color="#FFFFFF" />
+              <Loader
+                size={18}
+                loaded={!ctaLoading}
+                color={DEFAULT_LOADER_COLOR}
+              />
              {ctaLabel}
            </div>
          </button>
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index a2194e34d..3247072a9 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -8,6 +8,7 @@ import withStyles, { WithStylesProps } from 'react-jss';
 import Loader from '../loader/index';
 import { Theme } from '../../../themes';
 import { IFormField } from '../typings/generic';
+import { DEFAULT_LOADER_COLOR } from '../../../config';
 type ButtonType =
  | 'primary'
@@ -194,7 +195,7 @@ class ButtonComponent extends Component<IProps, IState> {
      <>
        {showLoader && (
          <div className={classes.loaderContainer}>
-            <Loader size={18} color="#FFFFFF" />
+            <Loader size={18} color={DEFAULT_LOADER_COLOR} />
          </div>
        )}
        <div className={classes.label}>
diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx
index 2cee00d96..c0ae15028 100644
--- a/src/components/ui/loader/index.tsx
+++ b/src/components/ui/loader/index.tsx
@@ -4,6 +4,7 @@ import injectStyle, { WithStylesProps } from 'react-jss';
 import { Oval } from 'react-loader-spinner';
 import { inject } from 'mobx-react';
 import { FerdiumStores } from '../../../@types/stores.types';
+import { DEFAULT_LOADER_COLOR } from '../../../config';
 const styles = () => ({
  container: {
@@ -29,11 +30,11 @@ class LoaderComponent extends Component<IProps> {
    const {
      classes,
      className,
-      size = 36,
+      size = 100,
      color = this.props.stores?.settings.app.accentColor,
      loaded = false,
    } = this.props;
-    const loaderColor = color || '#FFFFFF';
+    const loaderColor = color ?? DEFAULT_LOADER_COLOR;
    return (
      <div
diff --git a/src/config.ts b/src/config.ts
index d8b028104..5b9a5eaba 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -27,12 +27,8 @@ export const LIVE_API_FERDIUM_WEBSITE = 'https://ferdium.org';
 export const LIVE_API_FERDIUM_LIBRETRANSLATE =
  'https://translator.ferdium.org/translate';
-export const STATS_API = 'https://stats.franzinfra.com';
 export const LOCAL_TODOS_FRONTEND_URL = 'http://localhost:4000';
 export const PRODUCTION_TODOS_FRONTEND_URL = 'https://app.franztodos.com';
-export const DEVELOPMENT_TODOS_FRONTEND_URL =
-  'https://development--franz-todos.netlify.com';
 export const CDN_URL = 'https://cdn.franzinfra.com';
@@ -282,11 +278,6 @@ export const TODO_APPS = {
  [CUSTOM_TODO_SERVICE]: 'Other service',
 };
-export const DEFAULT_TODO_SERVICE = TODO_TODOIST_URL;
-export const DEFAULT_TODO_RECIPE_ID =
-  TODO_SERVICE_RECIPE_IDS[DEFAULT_TODO_SERVICE];
-export const DEFAULT_TODO_SERVICE_NAME = TODO_APPS[DEFAULT_TODO_SERVICE];
 export const SIDEBAR_WIDTH = {
  35: 'Extremely slim sidebar',
  45: 'Very slim sidebar',
@@ -329,7 +320,8 @@ export const GITHUB_FRANZ_URL = 'https://github.com/meetfranz';
 export const GITHUB_FERDIUM_URL = 'https://github.com/ferdium';
 export const FERDIUM_SERVICE_REQUEST = `${GITHUB_FERDIUM_URL}/ferdium-app/issues`;
 export const FERDIUM_TRANSLATION = 'https://crowdin.com/project/ferdium-app';
-export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub';
+export const FERDIUM_DEV_DOCS =
+  'https://github.com/ferdium/ferdium-recipes/blob/main/docs/integration.md';
 export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy'];
@@ -351,6 +343,8 @@ export const DEFAULT_SERVICE_ORDER = 99; // something high enough that it gets a
 export const SPLIT_COLUMNS_MIN = 1;
 export const SPLIT_COLUMNS_MAX = 5;
+export const DEFAULT_LOADER_COLOR = '#FFFFFF';
 export const DEFAULT_APP_SETTINGS = {
  autoLaunchOnStart: false,
  autoLaunchInBackground: false,
@@ -366,6 +360,8 @@ export const DEFAULT_APP_SETTINGS = {
  clipboardNotifications: true,
  notifyTaskBarOnMessage: false,
  showDisabledServices: true,
+  isTwoFactorAutoCatcherEnabled: false,
+  twoFactorAutoCatcherMatcher: 'token, code, sms, verify',
  showServiceName: false,
  showMessageBadgeWhenMuted: true,
  showDragArea: false,
@@ -384,9 +380,9 @@ export const DEFAULT_APP_SETTINGS = {
  // Ferdium specific options
  server: LIVE_FERDIUM_API,
-  predefinedTodoServer: DEFAULT_TODO_SERVICE,
+  predefinedTodoServer: TODO_TODOIST_URL,
  autohideMenuBar: false,
-  lockingFeatureEnabled: false,
+  isLockingFeatureEnabled: false,
  locked: false,
  lockedPassword: '',
  useTouchIdToUnlock: true,
@@ -432,6 +428,7 @@ export const DEFAULT_APP_SETTINGS = {
  customTodoServer: '',
  locale: 'en-US',
  keepAllWorkspacesLoaded: false,
+  useSelfSignedCertificates: false,
 };
 export const DEFAULT_SERVICE_SETTINGS = {
@@ -457,7 +454,7 @@ export const DEFAULT_SERVICE_SETTINGS = {
  disablewebsecurity: false,
  spellcheckerLanguage: false,
  onlyShowFavoritesInUnreadCount: false,
-  proxyFeatureEnabled: false,
+  isProxyFeatureEnabled: false,
  proxyHost: '',
  proxyPort: 0,
  proxyUser: '',
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index 946ec09d3..3c65877c8 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -409,9 +409,9 @@ class EditServiceScreen extends Component<IProps> {
              label: intl.formatMessage(messages.enableProxy),
              value: ifUndefined<boolean>(
                serviceProxyConfig.isEnabled,
-                DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled,
+                DEFAULT_SERVICE_SETTINGS.isProxyFeatureEnabled,
              ),
-              default: DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled,
+              default: DEFAULT_SERVICE_SETTINGS.isProxyFeatureEnabled,
              type: 'checkbox',
            },
            host: {
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index 8190bef3e..5d1b09296 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -99,6 +99,16 @@ const messages = defineMessages({
    id: 'settings.app.form.notifyTaskBarOnMessage',
    defaultMessage: 'Notify TaskBar/Dock on new message',
  },
+  isTwoFactorAutoCatcherEnabled: {
+    id: 'settings.app.form.isTwoFactorAutoCatcherEnabled',
+    defaultMessage:
+      'Auto-catch two-factor codes from notifications (Ex.: android messages) and copy to clipboard',
+  },
+  twoFactorAutoCatcherMatcher: {
+    id: 'settings.app.form.twoFactorAutoCatcherMatcher',
+    defaultMessage:
+      'Comma-separated and case-insensitive words/expressions to catch two-factor codes from. Ex.: token, code, sms, verify',
+  },
  navigationBarBehaviour: {
    id: 'settings.app.form.navigationBarBehaviour',
    defaultMessage: 'Navigation bar behaviour',
@@ -295,6 +305,10 @@ const messages = defineMessages({
    id: 'settings.app.form.enableTranslator',
    defaultMessage: 'Enable Translator',
  },
+  useSelfSignedCertificates: {
+    id: 'settings.app.form.useSelfSignedCertificates',
+    defaultMessage: 'Enable self-signed certificates',
+  },
  enableGPUAcceleration: {
    id: 'settings.app.form.enableGPUAcceleration',
    defaultMessage: 'Enable GPU Acceleration',
@@ -379,6 +393,10 @@ class EditSettingsScreen extends Component<
        privateNotifications: Boolean(settingsData.privateNotifications),
        clipboardNotifications: Boolean(settingsData.clipboardNotifications),
        notifyTaskBarOnMessage: Boolean(settingsData.notifyTaskBarOnMessage),
+        isTwoFactorAutoCatcherEnabled: Boolean(
+          settingsData.isTwoFactorAutoCatcherEnabled,
+        ),
+        twoFactorAutoCatcherMatcher: settingsData.twoFactorAutoCatcherMatcher,
        navigationBarBehaviour: settingsData.navigationBarBehaviour,
        webRTCIPHandlingPolicy: settingsData.webRTCIPHandlingPolicy,
        searchEngine: settingsData.searchEngine,
@@ -394,7 +412,7 @@ class EditSettingsScreen extends Component<
        wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay),
        predefinedTodoServer: settingsData.predefinedTodoServer,
        customTodoServer: settingsData.customTodoServer,
-        lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled),
+        isLockingFeatureEnabled: Boolean(settingsData.isLockingFeatureEnabled),
        lockedPassword: useOriginalPassword
          ? this.props.stores.settings.all.app.lockedPassword
          : hash(String(settingsData.lockedPassword)),
@@ -439,6 +457,9 @@ class EditSettingsScreen extends Component<
        showDragArea: Boolean(settingsData.showDragArea),
        enableSpellchecking: Boolean(settingsData.enableSpellchecking),
        enableTranslator: Boolean(settingsData.enableTranslator),
+        useSelfSignedCertificates: Boolean(
+          settingsData.useSelfSignedCertificates,
+        ),
        spellcheckerLanguage: settingsData.spellcheckerLanguage,
        userAgentPref: settingsData.userAgentPref,
        beta: Boolean(settingsData.beta), // we need this info in the main process as well
@@ -673,6 +694,23 @@ class EditSettingsScreen extends Component<
          default: DEFAULT_APP_SETTINGS.notifyTaskBarOnMessage,
          type: 'checkbox',
        },
+        isTwoFactorAutoCatcherEnabled: {
+          label: intl.formatMessage(messages.isTwoFactorAutoCatcherEnabled),
+          value: ifUndefined<boolean>(
+            settings.all.app.isTwoFactorAutoCatcherEnabled,
+            DEFAULT_APP_SETTINGS.isTwoFactorAutoCatcherEnabled,
+          ),
+          default: DEFAULT_APP_SETTINGS.isTwoFactorAutoCatcherEnabled,
+          type: 'checkbox',
+        },
+        twoFactorAutoCatcherMatcher: {
+          label: intl.formatMessage(messages.twoFactorAutoCatcherMatcher),
+          value: ifUndefined<string>(
+            settings.all.app.twoFactorAutoCatcherMatcher,
+            DEFAULT_APP_SETTINGS.twoFactorAutoCatcherMatcher,
+          ),
+          default: DEFAULT_APP_SETTINGS.twoFactorAutoCatcherMatcher,
+        },
        navigationBarBehaviour: {
          label: intl.formatMessage(messages.navigationBarBehaviour),
          value: ifUndefined<string>(
@@ -789,13 +827,13 @@ class EditSettingsScreen extends Component<
          ),
          default: DEFAULT_APP_SETTINGS.customTodoServer,
        },
-        lockingFeatureEnabled: {
+        isLockingFeatureEnabled: {
          label: intl.formatMessage(messages.enableLock),
          value: ifUndefined<boolean>(
-            settings.all.app.lockingFeatureEnabled,
+            settings.all.app.isLockingFeatureEnabled,
-            DEFAULT_APP_SETTINGS.lockingFeatureEnabled,
+            DEFAULT_APP_SETTINGS.isLockingFeatureEnabled,
          ),
-          default: DEFAULT_APP_SETTINGS.lockingFeatureEnabled,
+          default: DEFAULT_APP_SETTINGS.isLockingFeatureEnabled,
          type: 'checkbox',
        },
        lockedPassword: {
@@ -906,6 +944,15 @@ class EditSettingsScreen extends Component<
          default: DEFAULT_APP_SETTINGS.enableTranslator,
          type: 'checkbox',
        },
+        useSelfSignedCertificates: {
+          label: intl.formatMessage(messages.useSelfSignedCertificates),
+          value: ifUndefined<boolean>(
+            settings.all.app.useSelfSignedCertificates,
+            DEFAULT_APP_SETTINGS.useSelfSignedCertificates,
+          ),
+          default: DEFAULT_APP_SETTINGS.useSelfSignedCertificates,
+          type: 'checkbox',
+        },
        spellcheckerLanguage: {
          label: intl.formatMessage(globalMessages.spellcheckerLanguage),
          value: ifUndefined<string>(
@@ -1207,7 +1254,7 @@ class EditSettingsScreen extends Component<
      updateVersion,
      updateStatusTypes,
      isClearingAllCache,
-      lockingFeatureEnabled,
+      isLockingFeatureEnabled,
    } = app;
    const { checkForUpdates, installUpdate, clearAllCache } =
      this.props.actions.app;
@@ -1231,7 +1278,7 @@ class EditSettingsScreen extends Component<
          getCacheSize={() => app.cacheSize}
          isClearingAllCache={isClearingAllCache}
          onClearAllCache={clearAllCache}
-          lockingFeatureEnabled={lockingFeatureEnabled}
+          isLockingFeatureEnabled={isLockingFeatureEnabled}
          automaticUpdates={this.props.stores.settings.app.automaticUpdates}
          isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
          isAdaptableDarkModeEnabled={
@@ -1241,6 +1288,12 @@ class EditSettingsScreen extends Component<
            this.props.stores.settings.app.useGrayscaleServices
          }
          isSplitModeEnabled={this.props.stores.settings.app.splitMode}
+          isTwoFactorAutoCatcherEnabled={
+            this.props.stores.settings.app.isTwoFactorAutoCatcherEnabled
+          }
+          twoFactorAutoCatcherMatcher={
+            this.props.stores.settings.app.twoFactorAutoCatcherMatcher
+          }
          isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
          openProcessManager={() => this.openProcessManager()}
          isOnline={app.isOnline}
diff --git a/src/containers/settings/RecipesScreen.tsx b/src/containers/settings/RecipesScreen.tsx
index 1fb2673a8..a46510d54 100644
--- a/src/containers/settings/RecipesScreen.tsx
+++ b/src/containers/settings/RecipesScreen.tsx
@@ -8,7 +8,7 @@ import Recipe from '../../models/Recipe';
 import { StoresProps } from '../../@types/ferdium-components.types';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
-import { CUSTOM_WEBSITE_RECIPE_ID, FRANZ_DEV_DOCS } from '../../config';
+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';
@@ -176,7 +176,7 @@ class RecipesScreen extends Component<IProps, IState> {
          recipeDirectory={recipeDirectory}
          openRecipeDirectory={() => openPath(recipeDirectory)}
          openDevDocs={() =>
-            appActions.openExternalUrl({ url: FRANZ_DEV_DOCS })
+            appActions.openExternalUrl({ url: FERDIUM_DEV_DOCS })
          }
        />
      </ErrorBoundary>
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
index da1477346..346a75e97 100644
--- a/src/environment-remote.ts
+++ b/src/environment-remote.ts
@@ -10,8 +10,6 @@ import {
  LIVE_WS_API,
  LOCAL_WS_API,
  DEV_WS_API,
-  LOCAL_TODOS_FRONTEND_URL,
-  PRODUCTION_TODOS_FRONTEND_URL,
 } from './config';
 import { isWindows } from './environment';
@@ -50,34 +48,33 @@ export function userDataRecipesPath(...segments: string[]): string {
  return userDataPath('recipes', ...[segments].flat());
 }
+export function userDataCertsPath(...segments: string[]): string {
+  return userDataPath('certs', ...[segments].flat());
+}
 const useLocalAPI = process.env.USE_LOCAL_API;
 export const useLiveAPI = process.env.USE_LIVE_API;
 let api: string;
 let wsApi: string;
 let web: string;
-let todos: string;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
  api = LIVE_FERDIUM_API;
  wsApi = LIVE_WS_API;
  web = LIVE_API_FERDIUM_WEBSITE;
-  todos = PRODUCTION_TODOS_FRONTEND_URL;
 } else if (isDevMode && useLocalAPI) {
  api = LOCAL_API;
  wsApi = LOCAL_WS_API;
  web = LOCAL_API_WEBSITE;
-  todos = LOCAL_TODOS_FRONTEND_URL;
 } else {
  api = DEV_FRANZ_API;
  wsApi = DEV_WS_API;
  web = DEV_API_FRANZ_WEBSITE;
-  todos = PRODUCTION_TODOS_FRONTEND_URL;
 }
 export const API: string = api;
 export const API_VERSION: string = 'v1';
 export const WS_API: string = wsApi;
 export const WEBSITE: string = web;
-export const TODOS_FRONTEND: string = todos;
 // For deeplink protocol: 'ferdium' or 'ferdium-dev' if we want '{DEEPLINK_PROTOCOL_CLIENT}://'
 export const protocolClient = isDevMode ? 'ferdium-dev' : 'ferdium';
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
index 0fce811e5..19dd9037d 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
@@ -5,6 +5,7 @@ import classnames from 'classnames';
 import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import Loader from '../../../components/ui/loader';
 import { workspaceStore } from '../index';
+import { DEFAULT_LOADER_COLOR } from '../../../config';
 const messages = defineMessages({
  switchingTo: {
@@ -70,7 +71,7 @@ class WorkspaceSwitchingIndicator extends Component<IProps> {
    return (
      <div className={classnames([classes.wrapper])}>
        <div className={classes.component}>
-          <Loader className={classes.spinner} color="#FFFFFF" />
+          <Loader className={classes.spinner} color={DEFAULT_LOADER_COLOR} />
          <p className={classes.message}>
            {`${intl.formatMessage(messages.switchingTo)} ${nextWorkspaceName}`}
          </p>
diff --git a/src/features/workspaces/store.ts b/src/features/workspaces/store.ts
index 34a4126c8..f97009186 100644
--- a/src/features/workspaces/store.ts
+++ b/src/features/workspaces/store.ts
@@ -51,11 +51,6 @@ export default class WorkspacesStore extends FeatureStore {
    return getUserWorkspacesRequest.result || [];
  }
-  @computed get isLoadingWorkspaces() {
-    if (!this.isFeatureActive) return false;
-    return getUserWorkspacesRequest.isExecutingFirstTime;
-  }
  @computed get settings() {
    return localStorage.getItem('workspaces') || {};
  }
diff --git a/src/helpers/certs-helpers.ts b/src/helpers/certs-helpers.ts
new file mode 100644
index 000000000..a6c83f5c4
--- /dev/null
+++ b/src/helpers/certs-helpers.ts
@@ -0,0 +1,22 @@
+import { readdirSync, readFileSync, ensureDirSync } from 'fs-extra';
+import { join } from 'node:path';
+import { userDataCertsPath } from '../environment-remote';
+import { removeNewLines } from '../jsUtils';
+export function checkIfCertIsPresent(certData: string): boolean {
+  const certsFolder = userDataCertsPath();
+  ensureDirSync(certsFolder);
+  const certs: string[] = [];
+  for (const file of readdirSync(certsFolder)) {
+    const cert = readFileSync(join(certsFolder, file), {
+      encoding: 'utf8',
+      flag: 'r',
+    });
+    certs.push(removeNewLines(cert));
+  }
+  return certs.length > 0 && certs.includes(removeNewLines(certData));
+}
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 66514ad8f..fda047798 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -187,6 +187,7 @@
  "settings.account.yourLicense": "Ihre Ferdium-Lizenz:",
  "settings.app.accentColorInfo": "Geben Sie Ihre Farbwahl in einem CSS-kompatiblen Format an. (Standardwert: {defaultAccentColor} oder leeren Sie das Eingabefeld)",
  "settings.app.buttonInstallUpdate": "Neu starten und Aktualisierungen installieren",
+  "settings.app.buttonOpenFerdiumCertsFolder": "Ordner „Zertifikate” öffnen",
  "settings.app.buttonOpenFerdiumProfileFolder": "Profilordner anzeigen",
  "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Rezeptordner öffnen",
  "settings.app.buttonOpenImportExport": "Importieren/Exportieren",
@@ -228,6 +229,7 @@
  "settings.app.form.hideWorkspacesButton": "Schaltfläche „Arbeitsbereich” ausblenden",
  "settings.app.form.iconSize": "Symbolgröße des Dienstes",
  "settings.app.form.inactivityLock": "Nach Inaktivität sperren",
+  "settings.app.form.isTwoFactorAutoCatcherEnabled": "Automatisches Erfassen von Zwei-Faktor-Codes aus Benachrichtigungen (z. B.: Android-Nachrichten) und Kopieren in die Zwischenablage",
  "settings.app.form.keepAllWorkspacesLoaded": "Alle Arbeitsbereiche geladen lassen",
  "settings.app.form.language": "Sprache",
  "settings.app.form.lockPassword": "Passwort",
@@ -257,9 +259,11 @@
  "settings.app.form.startMinimized": "Minimiert starten",
  "settings.app.form.translatorEngine": "Übersetzungsmaschine",
  "settings.app.form.translatorLanguage": "Standard-Übersetzungssprache",
+  "settings.app.form.twoFactorAutoCatcherMatcher": "Durch Kommata getrennte Wörter/Ausdrücke ohne Berücksichtigung der Groß-/Kleinschreibung, um Zwei-Faktor-Codes abzufangen. Bsp.: Token, Code, SMS, Verifizieren",
  "settings.app.form.universalDarkMode": "Universellen Dunkelmodus aktivieren",
  "settings.app.form.useGrayscaleServices": "Graustufendienste verwenden",
  "settings.app.form.useHorizontalStyle": "Horizontalen Stil verwenden",
+  "settings.app.form.useSelfSignedCertificates": "Selbstsignierte Zertifikate aktivieren",
  "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdium erlauben",
  "settings.app.form.wakeUpHibernationSplay": "Splay Ruhe/Weckzyklen, um die Last zu reduzieren",
  "settings.app.form.wakeUpHibernationStrategy": "Ruhezustand Strategie nach automatischem Aufwachen",
@@ -274,6 +278,7 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdium alle deine Dienste im Hintergrund, sodass diese bereit sind, wenn du sie verwenden möchtest. \"Service Hibernation\" wird deine Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu sparen oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
  "settings.app.inactivityLockInfo": "Minuten der Inaktivität, nach denen Ferdium automatisch sperren soll. Verwenden Sie 0, um dies zu deaktivieren",
+  "settings.app.infoOpenCertificatesFolder": "Um ein Zertifikat zu installieren, klicken Sie auf die Schaltfläche unten, um den Zertifikatsordner zu öffnen, und kopieren Sie es in den Ordner. Danach können Sie den Dienst aktualisieren (STRG/CMD + R). Zum Entfernen/Deinstallieren löschen Sie einfach die Zertifikatsdatei und starten Ferdium neu.",
  "settings.app.lockInfo": "Die Passwort-Sperre erlaubt es dir, deine Nachrichten zu schützen.\nMit der Passwort-Sperre wirst du sowohl beim Starten von Ferdium als auch wenn du das Programm manuell sperrst darum gebeten, dein Passwort einzugeben.\nDu kannst Ferdium über das Sperrsymbol in der unteren linken Ecke oder mit dem Shortcut {lockShortcut} sperren.",
  "settings.app.lockedPassword": "Passwort",
  "settings.app.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdium neu installieren.",
@@ -294,6 +299,7 @@
  "settings.app.sectionUpdates": "App-Aktualisierungseinstellungen",
  "settings.app.sentryInfo": "Das Senden von Telemetriedaten ermöglicht es uns, Fehler in Ferdium zu finden - es werden keine persönlichen Informationen wie Ihre Nachrichtendaten gesendet!",
  "settings.app.serverHelp": "Verbunden mit dem Server unter {serverURL}",
+  "settings.app.servicesUpdateStatusUpToDate": "Ihre Dienste sind auf dem neuesten Stand",
  "settings.app.spellCheckerLanguageInfo": "Ferdium verwendet den eingebauten Rechtschreibprüfer deines Macs, um nach Tippfehlern zu suchen. Wenn du die zu überprüfenden Sprachen ändern möchtest, kannst du das in deinen Systemeinstellungen tun.",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.subheadlineFerdiumProfile": "Ferdium Profil",
@@ -303,6 +309,7 @@
  "settings.app.updateStatusAvailable": "Update verfügbar, lädt herunter...",
  "settings.app.updateStatusSearching": "Suche nach Updates...",
  "settings.app.updateStatusUpToDate": "Sie verwenden die neueste Version von Ferdium",
+  "settings.app.warningSelfSignedCertificates": "Warnhinweis: Aktivieren Sie diese Funktion nur, wenn Sie wissen, was Sie tun. Das Aktivieren dieser Funktion stellt ein Sicherheitsrisiko dar und sollte nur zu Testzwecken verwendet werden.",
  "settings.invite.headline": "Lade drei Deiner Freunde ein",
  "settings.navigation.account": "Konto",
  "settings.navigation.availableServices": "Verfügbare Dienste",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index da6d825b6..90a45e83c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -188,6 +188,7 @@
  "settings.account.yourLicense": "Your Ferdium License:",
  "settings.app.accentColorInfo": "Write your color choice in a CSS-compatible format. (Default: {defaultAccentColor} or clear the input field)",
  "settings.app.buttonInstallUpdate": "Restart & install update",
+  "settings.app.buttonOpenFerdiumCertsFolder": "Open certificates folder",
  "settings.app.buttonOpenFerdiumProfileFolder": "Open Profile folder",
  "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Open Service Recipes folder",
  "settings.app.buttonOpenImportExport": "Import / Export",
@@ -230,6 +231,7 @@
  "settings.app.form.hideWorkspacesButton": "Hide Workspace Drawer button",
  "settings.app.form.iconSize": "Service icon size",
  "settings.app.form.inactivityLock": "Lock after inactivity",
+  "settings.app.form.isTwoFactorAutoCatcherEnabled": "Auto-catch two-factor codes from notifications (Ex.: android messages) and copy to clipboard",
  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
  "settings.app.form.language": "Language",
  "settings.app.form.lockPassword": "Password",
@@ -259,9 +261,11 @@
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.translatorEngine": "Translator Engine",
  "settings.app.form.translatorLanguage": "Default Translator language",
+  "settings.app.form.twoFactorAutoCatcherMatcher": "Comma-separated and case-insensitive words/expressions to catch two-factor codes from. Ex.: token, code, sms, verify",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useGrayscaleServices": "Use grayscale services",
  "settings.app.form.useHorizontalStyle": "Use horizontal style",
+  "settings.app.form.useSelfSignedCertificates": "Enable self-signed certificates",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdium",
  "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
  "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
@@ -276,6 +280,7 @@
  "settings.app.headlineUpdates": "Updates",
  "settings.app.hibernateInfo": "By default, Ferdium will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdium should automatically lock. Use 0 to disable",
+  "settings.app.infoOpenCertificatesFolder": "To install a certificate, click the button below to open the certificates folder and copy it into the folder. After that you can refresh the service (CTRL/CMD + R). To remove/uninstall, simply delete the certificate file and restart Ferdium.",
  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdium or lock Ferdium yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdium.",
@@ -296,6 +301,7 @@
  "settings.app.sectionUpdates": "App Updates Settings",
  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdium - we will not send any personal information like your message data!",
  "settings.app.serverHelp": "Connected to server at {serverURL}",
+  "settings.app.servicesUpdateStatusUpToDate": "Your services are up-to-date",
  "settings.app.spellCheckerLanguageInfo": "Ferdium uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.subheadlineFerdiumProfile": "Ferdium Profile",
@@ -305,6 +311,7 @@
  "settings.app.updateStatusAvailable": "Update available, downloading...",
  "settings.app.updateStatusSearching": "Searching for updates...",
  "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdium",
+  "settings.app.warningSelfSignedCertificates": "WARNING: Only enable this feature if you know what you are doing. Enabling this is a security risk and should only be used for testing purposes.",
  "settings.invite.headline": "Invite Friends",
  "settings.navigation.account": "Account",
  "settings.navigation.availableServices": "Available services",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index b87168320..7017f3e75 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -9,6 +9,8 @@
  "connectionLostBanner.cta": "Muat ulang Layanan",
  "connectionLostBanner.informationLink": "Ada apa ini?",
  "connectionLostBanner.message": "Yah! Ferdium terputus dari {name}.",
+  "downloadManager.empty": "Daftar unduhan Anda kosong.",
+  "downloadManager.headline": "Pengelola unduhan",
  "feature.basicAuth.signIn": "Masuk",
  "feature.publishDebugInfo.error": "Ada kesalahan saat mencoba memublikasikan informasi debug. Silakan coba lagi nanti atau lihat konsol untuk informasi lebih lanjut.",
  "feature.publishDebugInfo.info": "Mempublikasikan informasi debug Anda membantu kami menemukan masalah dan kesalahan di Ferdium. Dengan mempublikasikan informasi debug anda, Anda menerima kebijakan privasi dan persyaratan layanan Ferdium Debugger",
@@ -21,6 +23,9 @@
  "feature.quickSwitch.search": "Mencari...",
  "global.api.unhealthy": "Tidak dapat terhubung ke layanan {serverNameParse}",
  "global.cancel": "Batalkan",
+  "global.clearCache": "Hapus cache",
+  "global.downloads": "Unduhan",
+  "global.edit": "Edit",
  "global.no": "Tidak",
  "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
  "global.ok": "Oke",
@@ -35,6 +40,7 @@
  "global.submit": "Kirim",
  "global.userAgentHelp": "Gunakan 'https://whatmyuseragent.com/' (untuk menemukan) atau 'https://developers.whatismybrowser.com/useragents/explore/' (untuk memilih) agen pengguna yang Anda inginkan dan salin di sini.",
  "global.yes": "Ya",
+  "infobar.authRequestFailed": "Terjadi kesalahan saat mencoba melakukan permintaan yang diautentikasi. Silakan coba logout dan login kembali jika kesalahan ini berlanjut.",
  "infobar.buttonChangelog": "Yang baru",
  "infobar.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
  "infobar.buttonReloadServices": "Muat ulang layanan",
@@ -42,6 +48,7 @@
  "infobar.requiredRequestsFailed": "Gagal memuat layanan dan informasi pengguna",
  "infobar.servicesUpdated": "Layanan Anda telah diperbarui.",
  "infobar.updateAvailable": "Versi baru Ferdium tersedia.",
+  "infobox.dismiss": "Menolak",
  "invite.email.label": "Alamat email",
  "invite.headline.friends": "Undang 3 teman atau kolega Anda",
  "invite.name.label": "Nama",
@@ -93,18 +100,29 @@
  "menu.file": "Berkas",
  "menu.help": "Bantuan",
  "menu.help.changelog": "Log Perubahan",
+  "menu.help.debugInfo": "Salin Informasi Debug",
+  "menu.help.debugInfoCopiedBody": "Informasi Debug Anda telah disalin ke clipboard Anda.",
+  "menu.help.debugInfoCopiedHeadline": "Informasi Debug Ferdium",
+  "menu.help.importExportData": "Impor/Ekspor Data Konfigurasi",
  "menu.help.learnMore": "Pelajari Lebih Lanjut",
  "menu.help.privacy": "Pernyataan Privasi",
+  "menu.help.publishDebugInfo": "Publikasikan Informasi Debug",
  "menu.help.support": "Dukungan",
  "menu.help.tos": "Ketentuan Layanan",
  "menu.services": "Layanan",
  "menu.services.activatePreviousService": "Aktifkan layanan sebelumnya",
  "menu.services.addNewService": "Tambahkan Layanan Baru...",
+  "menu.services.copyToClipboard": "Salin ke clipboard",
+  "menu.services.goHome": "Beranda",
  "menu.services.setNextServiceActive": "Aktifkan layanan berikutnya",
  "menu.view": "Tampilan",
+  "menu.view.back": "Kembali",
+  "menu.view.forward": "Maju",
+  "menu.view.lockFerdium": "Kunci Ferdium",
  "menu.view.reloadFerdium": "Muat Ulang Ferdium",
  "menu.view.reloadService": "Muat ulang Layanan",
  "menu.view.resetZoom": "Ukuran Sebenarnya",
+  "menu.view.toggleDarkMode": "Aktifkan Mode Gelap",
  "menu.view.toggleDevTools": "Aktif/Nonaktifkan alat pengembang",
  "menu.view.toggleFullScreen": "Aktif/Nonaktifkan Layar Penuh",
  "menu.view.toggleServiceDevTools": "Aktif/Nonaktifkan layanan alat pengembang",
@@ -123,6 +141,7 @@
  "password.link.login": "Masuk ke akun Anda",
  "password.link.signup": "Buat akun gratis",
  "password.noUser": "Tidak ditemukan pengguna dengan email tersebut",
+  "password.successInfo": "Kata sandi baru Anda telah dikirim ke alamat email Anda",
  "service.crashHandler.action": "Muat Ulang {name}",
  "service.crashHandler.autoReload": "Mencoba memulihkan {name} secara otomatis dalam {seconds} detik",
  "service.crashHandler.headline": "Ya Ampun!",
@@ -130,11 +149,18 @@
  "service.disabledHandler.action": "Aktifkan {name}",
  "service.disabledHandler.headline": "{name} dinonaktifkan",
  "service.errorHandler.action": "Muat Ulang {name}",
+  "service.errorHandler.editAction": "Edit {name}",
  "service.errorHandler.headline": "Ya Ampun!",
  "service.errorHandler.message": "Kesalahan",
  "service.errorHandler.text": "{name} gagal dimuat",
+  "service.webviewLoader.loading": "Memuat {service}",
  "services.getStarted": "Memulai",
+  "services.login": "Silahkan login untuk menggunakan Ferdium.",
+  "services.serverInfo": "Sebagai pilihan, Anda dapat mengubah server Ferdium dengan mengeklik roda gigi di pojok kiri bawah. Jika Anda beralih (dari salah satu server yang dihosting) untuk menggunakan Ferdium tanpa akun, mohon diperhatikan bahwa Anda dapat mengekspor data Anda dari server itu dan kemudian mengimpornya menggunakan menu Bantuan untuk menggunakan kembali semua ruang kerja dan layanan yang dikonfigurasi!",
+  "services.serverless": "Gunakan Ferdium tanpa Akun",
  "settings.account.account.editButton": "Edit akun",
+  "settings.account.accountUnavailable": "Akun tidak tersedia",
+  "settings.account.accountUnavailableInfo": "Anda menggunakan Ferdium tanpa akun. Jika Anda ingin menggunakan Ferdium dengan akun dan menjaga layanan Anda tetap tersinkronisasi di seluruh instalasi, silahkan pilih server di tab Pengaturan lalu login.",
  "settings.account.buttonSave": "Perbarui profil",
  "settings.account.deleteAccount": "Hapus akun",
  "settings.account.deleteEmailSent": "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
@@ -149,12 +175,26 @@
  "settings.account.tryReloadServices": "Coba lagi",
  "settings.account.tryReloadUserInfoRequest": "Coba lagi",
  "settings.account.userInfoRequestFailed": "Gagal memuat informasi pengguna",
+  "settings.account.yourLicense": "Lisensi Ferdium Anda:",
+  "settings.app.accentColorInfo": "Tulis pilihan warna Anda dalam format yang kompatibel dengan CSS. (Default: {defaultAccentColor} atau kosongkan kolom input)",
  "settings.app.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
+  "settings.app.buttonOpenFerdiumCertsFolder": "Buka folder sertifikat",
+  "settings.app.buttonOpenFerdiumProfileFolder": "Buka folder Profil",
+  "settings.app.buttonOpenImportExport": "Impor / Ekspor",
  "settings.app.buttonSearchForUpdate": "Periksa versi baru",
+  "settings.app.buttonShowChangelog": "Tampilkan daftar perubahan",
  "settings.app.cacheInfo": "Singgahan Ferdium sedang menggunakan ruang disk {size}.",
+  "settings.app.cacheNotCleared": "Tidak dapat menghapus semua cache",
+  "settings.app.closeSettings": "Tutup pengaturan",
  "settings.app.currentVersion": "Versi saat ini:",
+  "settings.app.form.accentColor": "Warna aksen",
+  "settings.app.form.adaptableDarkMode": "Sinkronkan mode gelap dengan pengaturan mode gelap OS saya",
+  "settings.app.form.alwaysShowWorkspaces": "Selalu tampilkan laci ruang kerja",
  "settings.app.form.autoLaunchInBackground": "Buka di latar belakang",
  "settings.app.form.autoLaunchOnStart": "Jalankan Ferdium saat komputer dimulai",
+  "settings.app.form.automaticUpdates": "Aktifkan pembaruan",
+  "settings.app.form.beta": "Sertakan pra-rilis",
+  "settings.app.form.confirmOnQuit": "Konfirmasikan saat keluar dari Ferdium",
  "settings.app.form.darkMode": "Aktifkan Mode Gelap",
  "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU",
  "settings.app.form.enableLock": "Aktifkan Kunci Kata Sandi",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index ed2c60736..b9bf4def7 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -296,6 +296,7 @@
  "settings.app.sectionUpdates": "アプリのアップデート設定",
  "settings.app.sentryInfo": "統計情報を送信すると開発者がFerdiumのエラーを発見するのに役立ちます。メッセージのデータのような個人情報は一切送信しません。",
  "settings.app.serverHelp": "{serverURL}でサーバーに接続しました",
+  "settings.app.servicesUpdateStatusUpToDate": "サービスは最新です",
  "settings.app.spellCheckerLanguageInfo": "FerdiumはスペルチェックにmacOSシステムのスペルチェッカーを使用しています。スペルチェッカーでチェックする言語を変更するには、macOSのシステム環境設定から行ってください。",
  "settings.app.subheadlineCache": "キャッシュ",
  "settings.app.subheadlineFerdiumProfile": "Ferdiumプロフィール",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 110341565..317b1eda2 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -9,6 +9,8 @@
  "connectionLostBanner.cta": "Перезапустить сервис",
  "connectionLostBanner.informationLink": "Что случилось?",
  "connectionLostBanner.message": "О нет! Ferdium потерял связь с {name}.",
+  "downloadManager.empty": "Ваш список загрузок пуст.",
+  "downloadManager.headline": "Менеджер загрузок",
  "feature.basicAuth.signIn": "Войти",
  "feature.publishDebugInfo.error": "При попытке опубликовать отладочную информацию произошла ошибка. Пожалуйста, повторите попытку позже или просмотрите консоль для получения дополнительной информации.",
  "feature.publishDebugInfo.info": "Публикация вашей отладочной информации помогает нам найти проблемы и ошибки в Ferdium. Публикуя вашу отладочную информацию, вы принимаете политику конфиденциальности Ferdium Debugger'ов и условия предоставления услуг",
@@ -20,10 +22,14 @@
  "feature.quickSwitch.info": "Выберите сервис с Tab, вверх и вниз. Откройте сервис нажав на ENTER.",
  "feature.quickSwitch.search": "Поиск...",
  "feature.quickSwitch.title": "Быстрое переключение",
+  "global.api.unhealthy": "Не удается подключиться к онлайн-сервисам {serverNameParse}",
  "global.cancel": "Отмена",
+  "global.clearCache": "Очистить кэш",
+  "global.downloads": "Загрузки",
  "global.edit": "Правка",
  "global.no": "Нет",
  "global.notConnectedToTheInternet": "Вы не подключены к сети Интернет.",
+  "global.ok": "Ok",
  "global.quit": "Выйти",
  "global.quitConfirmation": "Вы действительно хотите выйти из Ferdium?",
  "global.save": "Сохранить",
@@ -57,6 +63,7 @@
  "locked.submit.label": "Разблокировать",
  "locked.touchId": "Разблокировать с Touch ID",
  "locked.unlockWithPassword": "Разблокировать паролем",
+  "login.customServerQuestion": "Использовать пользовательский сервер Ferdium?",
  "login.email.label": "Адрес электронной почты",
  "login.headline": "Вход",
  "login.invalidCredentials": "Неправильный адрес электронной почты или пароль",
@@ -104,9 +111,11 @@
  "menu.services": "Сервис",
  "menu.services.activatePreviousService": "Активировать предыдущий сервис",
  "menu.services.addNewService": "Добавить новый сервис...",
+  "menu.services.copyToClipboard": "Копировать в буфер обмена",
  "menu.services.goHome": "Домой",
  "menu.services.setNextServiceActive": "Активировать следующий сервис",
  "menu.todos": "Задачи",
+  "menu.todos.disableTodos": "Отключить задачи",
  "menu.todos.enableTodos": "Включить задачи",
  "menu.view": "Вид",
  "menu.view.back": "Назад",
@@ -175,7 +184,9 @@
  "settings.app.buttonInstallUpdate": "Перезапустить и установить обновления",
  "settings.app.buttonOpenFerdiumProfileFolder": "Открыть папку профиля",
  "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Открыть папку сервисных протоколов",
+  "settings.app.buttonOpenImportExport": "Импорт / Экспорт",
  "settings.app.buttonSearchForUpdate": "Проверить обновления",
+  "settings.app.buttonShowChangelog": "Показать историю изменений",
  "settings.app.cacheInfo": "Кэш занимает {size} на диске.",
  "settings.app.cacheNotCleared": "Не удалось очистить весь кэш",
  "settings.app.closeSettings": "Закрыть настройки",
@@ -202,6 +213,9 @@
  "settings.app.form.enableTodos": "Включить задания Ferdium",
  "settings.app.form.hibernateOnStartup": "Оставлять сервисы в состоянии глубокого сна во время запуска",
  "settings.app.form.hibernationStrategy": "Стратегия гибернации",
+  "settings.app.form.hideDownloadButton": "Скрыть кнопку \"Загрузки\"",
+  "settings.app.form.hideNotificationsButton": "Скрыть кнопки уведомлений и звука",
+  "settings.app.form.hideSettingsButton": "Скрыть кнопку настроек",
  "settings.app.form.iconSize": "Размер иконки сервиса",
  "settings.app.form.inactivityLock": "Заблокировать после бездействия",
  "settings.app.form.keepAllWorkspacesLoaded": "Сохранить все рабочие окружения загруженными",
@@ -219,6 +233,7 @@
  "settings.app.form.scheduledDNDEnd": "Кому",
  "settings.app.form.scheduledDNDStart": "От",
  "settings.app.form.searchEngine": "Поисковая система",
+  "settings.app.form.sentry": "Отправить данные телеметрии",
  "settings.app.form.serviceRibbonWidth": "Ширина боковой панели",
  "settings.app.form.showDisabledServices": "Показывать вкладки отключённых служб",
  "settings.app.form.showDragArea": "Показать перетаскиваемую область в окне",
@@ -246,6 +261,11 @@
  "settings.app.restartRequired": "Изменения требуют перезагрузки приложения",
  "settings.app.scheduledDNDInfo": "Запланированный режим \"не беспокоить\" позволяет вам определить период времени, в течение которого вы не желаете получать уведомления от Ferdium.",
  "settings.app.scheduledDNDTimeInfo": "Время в 24-часовом формате. Время окончания может быть раньше времени начала (например, начало 17:00, конец 09:00), чтобы включить ночной режим \"не беспокоить\".",
+  "settings.app.sectionLanguage": "Настройка языка",
+  "settings.app.sectionUpdates": "Настройки обновления приложения",
+  "settings.app.sentryInfo": "Отправка телеметрии позволяет нам находить ошибки в Ferdium - мы не будем отправлять никакой личной информации, включая ваши сообщения!",
+  "settings.app.serverHelp": "Подключен к серверу {serverURL}",
+  "settings.app.servicesUpdateStatusUpToDate": "Ваши сервисы актуальны",
  "settings.app.spellCheckerLanguageInfo": "Ferdium использует встроенную проверку орфографии вашего устройства. Если вы желаете изменить язык проверки орфографии, вы можете произвести это в системных настройках вашего устройства.",
  "settings.app.subheadlineCache": "Кэш",
  "settings.app.subheadlineFerdiumProfile": "Профиль Ferdium",
@@ -255,10 +275,12 @@
  "settings.app.updateStatusAvailable": "Доступно обновление, идёт загрузка...",
  "settings.app.updateStatusSearching": "Поиск обновлений...",
  "settings.app.updateStatusUpToDate": "Вы используете актуальную версию Ferdium",
+  "settings.app.warningSelfSignedCertificates": "ВНИМАНИЕ: Включите эту функцию, только если вы знаете, что делаете. Включение этой опции представляет собой угрозу безопасности и должно использоваться только в целях тестирования.",
  "settings.invite.headline": "Пригласить друзей",
  "settings.navigation.account": "Учетная запись",
  "settings.navigation.availableServices": "Доступные сервисы",
  "settings.navigation.logout": "Выход",
+  "settings.navigation.releaseNotes": "Информация о выпуске",
  "settings.navigation.supportFerdium": "О Ferdium",
  "settings.navigation.team": "Управление Командой",
  "settings.navigation.yourServices": "Ваши сервисы",
@@ -275,6 +297,7 @@
  "settings.recipes.missingService": "Не можете найти сервис?",
  "settings.recipes.nothingFound": "Извините, но сервис не соответствует вашему поисковому запросу - но вы все еще можете добавить его, используя опцию \"Пользовательский сайт\". Пожалуйста, обратите внимание, что на сайте может отображаться больше служб, которые могли быть добавлены в новых версиях Ferdium. Для получения новых сервисов, пожалуйста, обновите Ferdium до актуальной версии.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
+  "settings.releasenotes.headline": "Информация о выпуске",
  "settings.searchService": "Найти сервис",
  "settings.service.error.goBack": "Вернуться к сервисам",
  "settings.service.error.headline": "Ошибка",
@@ -306,6 +329,8 @@
  "settings.service.form.indirectMessages": "Показывать значок уведомлений для всех новых сообщений",
  "settings.service.form.isHibernatedEnabledInfo": "Когда включено, служба будет отключена по истечении времени, чтобы сохранить системные ресурсы.",
  "settings.service.form.isMutedInfo": "Когда выключено, все звуковые уведомления будут отключены",
+  "settings.service.form.maxFileSize": "Максимальный размер файла:",
+  "settings.service.form.maxFileSizeError": "Файл, который вы пытаетесь отправить, слишком большой.",
  "settings.service.form.name": "Имя",
  "settings.service.form.onlyShowFavoritesInUnreadCount": "Отображение только \"Избранного\" в количестве непрочитанного",
  "settings.service.form.openDarkmodeCss": "Открыть darkmode.css",
@@ -326,6 +351,7 @@
  "settings.service.form.team": "Команда",
  "settings.service.form.useHostedService": "Использовать собственный сервис {name}.",
  "settings.service.form.yourServices": "Ваши сервисы",
+  "settings.service.reloadRequired": "Изменения требуют перезагрузки службы",
  "settings.services.deletedInfo": "Сервис был удален",
  "settings.services.discoverServices": "Найти сервисы",
  "settings.services.headline": "Ваши сервисы",
@@ -346,6 +372,7 @@
  "settings.team.manageAction": "Управляйте вашей командой на meetfranz.com",
  "settings.team.teamsUnavailable": "Команды недоступны",
  "settings.team.teamsUnavailableInfo": "Команды на текущий момент доступны только при использовании сервера Franz и после приобретения Franz Professional. Пожалуйста, измените Ваш сервер на https://api.franzinfra.com для использования Teams.",
+  "settings.team.tryReloadUserInfoRequest": "Попробуйте перезагрузить",
  "settings.user.form.accountType.company": "Компания",
  "settings.user.form.accountType.individual": "Индивидуальный",
  "settings.user.form.accountType.label": "Тип аккаунта",
@@ -377,6 +404,7 @@
  "setupAssistant.submit.label": "Начнем",
  "sidebar.muteApp": "Отключить уведомления и звук",
  "sidebar.unmuteApp": "Включить уведомления и звук",
+  "signup.company.label": "Компания",
  "signup.email.label": "Адрес электронной почты",
  "signup.emailDuplicate": "Пользователь с таким адресом электронной почты уже существует",
  "signup.firstname.label": "Имя",
diff --git a/src/i18n/locales/zh-HANS.json b/src/i18n/locales/zh-HANS.json
index 8aa0e15f6..ab76b9141 100644
--- a/src/i18n/locales/zh-HANS.json
+++ b/src/i18n/locales/zh-HANS.json
@@ -9,6 +9,8 @@
  "connectionLostBanner.cta": "重启服务",
  "connectionLostBanner.informationLink": "发生了什么？",
  "connectionLostBanner.message": "不好！Ferdium失去了与 {name} 的连接。",
+  "downloadManager.empty": "您的下载列表是空的。",
+  "downloadManager.headline": "下载管理器",
  "feature.basicAuth.signIn": "登入",
  "feature.publishDebugInfo.error": "试图发布调试信息时出错。请稍后再试或查看控制台以获取更多信息。",
  "feature.publishDebugInfo.info": "发布您的调试信息有助于我们在 Ferdium 中找到问题和错误。 通过发布您的调试信息，您接受 Ferdium 调试器的隐私政策和服务条款",
@@ -22,6 +24,8 @@
  "feature.quickSwitch.title": "快速切换",
  "global.api.unhealthy": "无法连接 {serverNameParse} 在线服务",
  "global.cancel": "取消",
+  "global.clearCache": "清除缓存",
+  "global.downloads": "下载",
  "global.edit": "编辑",
  "global.no": "否",
  "global.notConnectedToTheInternet": "没有网络服务",
@@ -218,6 +222,7 @@
  "settings.app.form.hibernateOnStartup": "启动时保持休眠服务",
  "settings.app.form.hibernationStrategy": "休眠策略",
  "settings.app.form.hideCollapseButton": "隐藏折叠按钮",
+  "settings.app.form.hideDownloadButton": "隐藏下载按钮",
  "settings.app.form.hideNotificationsButton": "隐藏通知和声音按钮",
  "settings.app.form.hideRecipesButton": "隐藏配方按钮",
  "settings.app.form.hideSettingsButton": "隐藏设置按钮",
@@ -271,6 +276,8 @@
  "settings.app.headlineUpdates": "更新",
  "settings.app.hibernateInfo": "默认情况下，Ferdium将保持您所有的服务在后台打开并加载，这样当您想要使用它们时他们就可以了。 服务休眠将在指定数量后卸载您的服务。这有助于保存内存或保持服务以减慢您的计算机速度。",
  "settings.app.inactivityLockInfo": "停止活动的分钟，然后Ferdium将自动锁定。使用 0 禁用。",
+  "settings.app.lockInfo": "密码锁可以使您的消息受到保护。\n\n使用密码锁，每当您启动Ferdium或使用锁定符号 {lockShortcut} 在左下角或快捷键中锁定Ferdium时，都会提示您输入密码。",
+  "settings.app.lockedPassword": "密码",
  "settings.app.restartRequired": "重启后生效",
  "settings.app.subheadlineCache": "缓存",
  "settings.app.translationHelp": "帮助我们将Ferdium翻译至您的语言。",
diff --git a/src/index.ts b/src/index.ts
index e466b4ab1..fe254b4f6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -50,6 +50,7 @@ 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');
@@ -752,3 +753,26 @@ app.on('will-finish-launching', () => {
    });
  });
 });
+app.on(
+  'certificate-error',
+  (event, _webContents, _url, _error, certificate, callback) => {
+    // On certificate error we disable default behaviour (stop loading the page)
+    // and we then say "it is all fine - true" to the callback
+    event.preventDefault();
+    const useSelfSignedCertificates =
+      retrieveSettingValue(
+        'useSelfSignedCertificates',
+        DEFAULT_APP_SETTINGS.useSelfSignedCertificates,
+      ) === true;
+    // Check if the certificate is trusted
+    if (!useSelfSignedCertificates) {
+      callback(false);
+      return;
+    }
+    callback(checkIfCertIsPresent(certificate.data));
+  },
+);
diff --git a/src/jsUtils.ts b/src/jsUtils.ts
index 0095028ef..31d6a2121 100644
--- a/src/jsUtils.ts
+++ b/src/jsUtils.ts
@@ -30,3 +30,6 @@ export const acceleratorString = (
  prefix: string = '(',
  suffix: string = ')',
 ) => (index <= 10 ? `${prefix}${keyCombo}+${index % 10}${suffix}` : '');
+export const removeNewLines = (input: string): string =>
+  input.replaceAll(/\r?\n|\r/g, '');
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index 8ad4441d2..12dc1e42c 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -709,7 +709,7 @@ class FranzMenu implements StoresProps {
    const { intl } = window['ferdium'];
    const locked =
      this.stores.settings.app.locked &&
-      this.stores.settings.app.lockingFeatureEnabled &&
+      this.stores.settings.app.isLockingFeatureEnabled &&
      this.stores.user.isLoggedIn;
    const { actions } = this;
    const tpl = titleBarTemplateFactory(intl, locked);
@@ -847,7 +847,7 @@ class FranzMenu implements StoresProps {
          accelerator: `${lockFerdiumShortcutKey()}`,
          enabled:
            this.stores.user.isLoggedIn &&
-            this.stores.settings.app.lockingFeatureEnabled,
+            this.stores.settings.app.isLockingFeatureEnabled,
          click() {
            actions.settings.update({
              type: 'app',
diff --git a/src/lib/Tray.ts b/src/lib/Tray.ts
index d83f91478..726d32b23 100644
--- a/src/lib/Tray.ts
+++ b/src/lib/Tray.ts
@@ -208,7 +208,7 @@ export default class TrayIcon {
    if (indicator === '•') {
      assetFromIndicator = INDICATOR_TRAY_INDIRECT;
    }
-    if (indicator !== 0) {
+    if (indicator !== 0 && indicator !== '•') {
      assetFromIndicator = INDICATOR_TRAY_UNREAD;
    }
    return assetFromIndicator;
diff --git a/src/lib/dbus/Ferdium.ts b/src/lib/dbus/Ferdium.ts
index b2a9105f4..853be68e1 100644
--- a/src/lib/dbus/Ferdium.ts
+++ b/src/lib/dbus/Ferdium.ts
@@ -31,6 +31,10 @@ export default class Ferdium extends dbus.interface.Interface {
    this.dbus.trayIcon._toggleWindow();
  }
+  ToggleToTalk(): void {
+    this.dbus.trayIcon.mainWindow?.webContents.send('toggle-to-talk');
+  }
  emitUnreadChanged(): void {
    Ferdium.emitPropertiesChanged(
      this,
@@ -66,6 +70,10 @@ Ferdium.configureMembers({
      inSignature: '',
      outSignature: '',
    },
+    ToggleToTalk: {
+      inSignature: '',
+      outSignature: '',
+    },
  },
  properties: {
    Muted: {
diff --git a/src/models/Service.ts b/src/models/Service.ts
index b1f0bc271..da9fa43dd 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -641,4 +641,8 @@ export default class Service {
    this.unreadDirectMessageCount = 0;
    this.unreadIndirectMessageCount = 0;
  }
+  toggleToTalk(): void {
+    this.webview?.send('toggle-to-talk');
+  }
 }
diff --git a/src/models/User.ts b/src/models/User.ts
index 6540a14e9..f89ea0465 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -27,8 +27,6 @@ export default class User {
  @observable accountType: string | null = null;
-  @observable emailIsConfirmed = true;
  // Note: Kept around to be able to handle the response from Franz server
  // better assume it's confirmed to avoid noise
  @observable subscription = {};
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index 9af0a9a4f..b8356bd56 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -121,13 +121,11 @@ export default class AppStore extends TypedStore {
  @observable isFocused = true;
-  @observable lockingFeatureEnabled =
+  @observable isLockingFeatureEnabled =
-    DEFAULT_APP_SETTINGS.lockingFeatureEnabled;
+    DEFAULT_APP_SETTINGS.isLockingFeatureEnabled;
  @observable launchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
-  dictionaries = [];
  fetchDataInterval: NodeJS.Timeout | null = null;
  @observable downloads: Download[] = [];
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 95aae6ccb..d7804a3fe 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { ipcRenderer, shell } from 'electron';
+import { clipboard, ipcRenderer, shell } from 'electron';
 import { action, reaction, computed, observable, makeObservable } from 'mobx';
 import { debounce, remove } from 'lodash';
 import ms from 'ms';
@@ -65,6 +65,8 @@ export default class ServicesStore extends TypedStore {
  // No service ID should be in the list multiple times, not all service IDs have to be in the list
  @observable lastUsedServices: string[] = [];
+  private toggleToTalkCallback = () => this.active?.toggleToTalk();
  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
    super(stores, api, actions);
@@ -239,6 +241,8 @@ export default class ServicesStore extends TypedStore {
  initialize() {
    super.initialize();
+    ipcRenderer.on('toggle-to-talk', this.toggleToTalkCallback);
    // Check services to become hibernated
    this.serviceMaintenanceTick();
  }
@@ -246,6 +250,8 @@ export default class ServicesStore extends TypedStore {
  teardown() {
    super.teardown();
+    ipcRenderer.off('toggle-to-talk', this.toggleToTalkCallback);
    // Stop checking services for hibernation
    this.serviceMaintenanceTick.cancel();
  }
@@ -828,6 +834,54 @@ export default class ServicesStore extends TypedStore {
        break;
      }
      case 'notification': {
+        const { notificationId, options } = args[0];
+        const { isTwoFactorAutoCatcherEnabled, twoFactorAutoCatcherMatcher } =
+          this.stores.settings.all.app;
+        debug(
+          'Settings for catch tokens',
+          isTwoFactorAutoCatcherEnabled,
+          twoFactorAutoCatcherMatcher,
+        );
+        if (isTwoFactorAutoCatcherEnabled) {
+          /*
+        parse the token digits from sms body, find "token" or "code" in options.body which reflect the sms content
+        ---
+        Token: 03624 / SMS-Code = PIN Token
+        ---
+        Prüfcode 010313 für Microsoft-Authentifizierung verwenden.
+        ---
+        483133 is your GitHub authentication code. @github.com #483133
+        ---
+        eBay: Ihr Sicherheitscode lautet 080090. \nEr läuft in 15 Minuten ab. Geben Sie den Code nicht an andere weiter.
+        ---
+        PayPal: Ihr Sicherheitscode lautet: 989605. Geben Sie diesen Code nicht weiter.
+      */
+          const rawBody = options.body;
+          const { 0: token } = /\d{5,6}/.exec(options.body) || [];
+          const wordsToCatch = twoFactorAutoCatcherMatcher
+            .replaceAll(', ', ',')
+            .split(',');
+          debug('wordsToCatch', wordsToCatch);
+          if (
+            token &&
+            wordsToCatch.some(a =>
+              options.body.toLowerCase().includes(a.toLowerCase()),
+            )
+          ) {
+            // with the extra "+ " it shows its copied to clipboard in the notification
+            options.body = `+ ${rawBody}`;
+            clipboard.writeText(token);
+            debug('Token parsed and copied to clipboard');
+          }
+        }
        // Check if we are in scheduled Do-not-Disturb time
        const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
          this.stores.settings.all.app;
@@ -839,8 +893,6 @@ export default class ServicesStore extends TypedStore {
          return;
        }
-        const { notificationId, options } = args[0];
        if (service.isMuted || this.stores.settings.all.app.isAppMuted) {
          Object.assign(options, {
            silent: true,
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 90cd82690..010290a4a 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -11,17 +11,11 @@ import {
  LOCAL_SERVER,
 } from '../config';
 import { hash } from '../helpers/password-helpers';
-import Request from './lib/Request';
 import TypedStore from './lib/TypedStore';
 const debug = require('../preload-safe-debug')('Ferdium:SettingsStore');
 export default class SettingsStore extends TypedStore {
-  @observable updateAppSettingsRequest = new Request(
-    this.api.local,
-    'updateAppSettings',
-  );
  @observable loaded: boolean = false;
  fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
@@ -67,7 +61,7 @@ export default class SettingsStore extends TypedStore {
    let inactivityTimer;
    getCurrentWindow().on('blur', () => {
      if (
-        this.all.app.lockingFeatureEnabled &&
+        this.all.app.isLockingFeatureEnabled &&
        this.all.app.inactivityLock !== 0
      ) {
        inactivityTimer = setTimeout(
@@ -94,7 +88,7 @@ export default class SettingsStore extends TypedStore {
      if (
        !this.loaded &&
        resp.type === 'app' &&
-        resp.data.lockingFeatureEnabled
+        resp.data.isLockingFeatureEnabled
      ) {
        process.nextTick(() => {
          if (!this.all.app.locked) {
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index f98f7d340..9c3fcd3b9 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -60,11 +60,6 @@ export default class UserStore extends TypedStore {
    'updateInfo',
  );
-  @observable getLegacyServicesRequest: CachedRequest = new CachedRequest(
-    this.api.user,
-    'getLegacyServices',
-  );
  @observable deleteAccountRequest: CachedRequest = new CachedRequest(
    this.api.user,
    'delete',
@@ -93,8 +88,6 @@ export default class UserStore extends TypedStore {
  @observable logoutReason: string | null = null;
-  fetchUserInfoInterval = null;
  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
    super(stores, api, actions);
@@ -132,26 +125,10 @@ export default class UserStore extends TypedStore {
    return this.LOGIN_ROUTE;
  }
-  get logoutRoute(): string {
-    return this.LOGOUT_ROUTE;
-  }
  get signupRoute(): string {
    return this.SIGNUP_ROUTE;
  }
-  get setupRoute(): string {
-    return this.SETUP_ROUTE;
-  }
-  get inviteRoute(): string {
-    return this.INVITE_ROUTE;
-  }
-  get importRoute(): string {
-    return this.IMPORT_ROUTE;
-  }
  get passwordRoute(): string {
    return this.PASSWORD_ROUTE;
  }
@@ -191,10 +168,6 @@ export default class UserStore extends TypedStore {
    return this.data.team || null;
  }
-  @computed get legacyServices(): any {
-    return this.getLegacyServicesRequest.execute() || {};
-  }
  // Actions
  @action async _login({ email, password }): Promise<void> {
    const authToken = await this.loginRequest.execute(email, password).promise;
diff --git a/src/stores/lib/Request.ts b/src/stores/lib/Request.ts
index 911c5ccfb..587af87d7 100644
--- a/src/stores/lib/Request.ts
+++ b/src/stores/lib/Request.ts
@@ -1,5 +1,4 @@
 import { observable, action, computed, makeObservable } from 'mobx';
-import { isEqual } from 'lodash/fp';
 // eslint-disable-next-line no-use-before-define
 type Hook = (request: Request) => void;
@@ -123,14 +122,6 @@ export default class Request {
    return this.execute(...args);
  }
-  isExecutingWithArgs(...args: any[]): boolean {
-    return (
-      this.isExecuting &&
-      this.currentApiCall &&
-      isEqual(this.currentApiCall.args, args)
-    );
-  }
  @computed get isExecutingFirstTime(): boolean {
    return !this.wasExecuted && this.isExecuting;
  }
diff --git a/src/themes/default/index.ts b/src/themes/default/index.ts
index cc886f299..ac04a6e3b 100644
--- a/src/themes/default/index.ts
+++ b/src/themes/default/index.ts
@@ -3,6 +3,7 @@ import { cloneDeep } from 'lodash';
 import * as legacyStyles from '../legacy';
 import type IStyleTypes from '../IStyleTypes';
+import { DEFAULT_LOADER_COLOR } from '../../config';
 export default (brandPrimary: string) => {
  if (!brandPrimary) {
@@ -14,7 +15,7 @@ export default (brandPrimary: string) => {
  const brandDanger = '#d9534f';
  const uiFontSize = 14;
  const colorBackground = legacyStyles.themeGrayLighter;
-  const colorContentBackground = '#FFFFFF';
+  const colorContentBackground = DEFAULT_LOADER_COLOR;
  const colorText = legacyStyles.themeGrayDark;
  const inputColor = legacyStyles.themeGray;
  const inputBackground = legacyStyles.themeGrayLightest;
diff --git a/src/webview/lib/RecipeWebview.ts b/src/webview/lib/RecipeWebview.ts
index 44b3c5ab4..31e9a288d 100644
--- a/src/webview/lib/RecipeWebview.ts
+++ b/src/webview/lib/RecipeWebview.ts
@@ -40,6 +40,8 @@ class RecipeWebview {
  loopFunc = () => null;
+  toggleToTalkFunc = () => null;
  darkModeHandler: ((darkMode: boolean, config: any) => void) | null = null;
  // TODO Remove this once we implement a proper wrapper.
@@ -199,6 +201,10 @@ class RecipeWebview {
  openNewWindow(url) {
    ipcRenderer.sendToHost('new-window', url);
  }
+  toggleToTalk(fn) {
+    this.toggleToTalkFunc = fn;
+  }
 }
 export default RecipeWebview;
diff --git a/src/webview/notifications.ts b/src/webview/notifications.ts
index aa88f13a2..e4401ab6e 100644
--- a/src/webview/notifications.ts
+++ b/src/webview/notifications.ts
@@ -37,7 +37,7 @@ export const notificationsClassDefinition = `(() => {
    constructor(title = '', options = {}) {
      this.title = title;
      this.options = options;
-      try{
+      try {
        window.ferdium.displayNotification(title, options)
          .then(() => {
            if (typeof (this.onClick) === 'function') {
@@ -51,7 +51,7 @@ export const notificationsClassDefinition = `(() => {
              if (typeof (this.onClick) === 'function') {
                this.onClick();
              }
-            });      
+            });
      }
    }
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts
index b394f1517..148ea6fab 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -44,7 +44,7 @@ import {
 } from './spellchecker';
 import { DEFAULT_APP_SETTINGS } from '../config';
-import { ifUndefined, safeParseInt } from '../jsUtils';
+import { cleanseJSObject, ifUndefined, safeParseInt } from '../jsUtils';
 import { AppStore } from '../@types/stores.types';
 import Service from '../models/Service';
@@ -124,8 +124,14 @@ contextBridge.exposeInMainWorld('ferdium', {
    safeParseInt(text),
  setDialogTitle: (title: string | null | undefined) =>
    dialogTitleHandler.setDialogTitle(title),
-  displayNotification: (title: string, options: any) =>
+  displayNotification: (title: string, options: any) => {
-    notificationsHandler.displayNotification(title, options),
+    notificationsHandler.displayNotification(
+      title,
+      // The following line is needed so that a proper clone of the "options" object is made.
+      // This line was causing issues with some services.
+      cleanseJSObject(options),
+    );
+  },
  getDisplayMediaSelector,
 });
@@ -158,6 +164,7 @@ class RecipeController {
    'service-settings-update': 'updateServiceSettings',
    'get-service-id': 'serviceIdEcho',
    'find-in-page': 'openFindInPage',
+    'toggle-to-talk': 'toggleToTalk',
  };
  universalDarkModeInjected = false;
@@ -483,6 +490,10 @@ class RecipeController {
      }, 225),
    );
  }
+  toggleToTalk() {
+    this.recipe?.toggleToTalkFunc?.();
+  }
 }
 /* eslint-disable no-new */