Removed Franz paid plans features:

- serviceLimit
- planSelection
- trialStatusBar

and other Franz features that were for different tiers of subscription.

58 files changed, 820 insertions, 3829 deletions

diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 190417536..cc219957a 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -33,8 +33,4 @@ export default defineMessages({
     id: 'global.userAgentHelp',
     defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   },
-  proRequired: {
-    id: 'global.franzProRequired',
-    defaultMessage: '!!!Franz Professional Required',
-  },
 });
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index e2af263a5..ef9e3ecee 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.",
   "feature.announcements.changelog.headline": "تغيرات في فريدي {version}",
   "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
-  "feature.delayApp.headline": "رجاء قيم بشراء رخصة الدعم لبرنامج فريدي للتخلص من وقت الانتظار",
-  "feature.delayApp.text": "فريدي سوف يستكمل خلال {seconds} ثانية.",
-  "feature.delayApp.trial.action": "أجل, أريد الحصول على 14 يوم تجريبي مجاني من برنامج فريدي بروفشنال",
-  "feature.delayApp.trial.actionShort": "تفعيل الفتره التجريبية لرنامج فريدي بروفشنال",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "الحصول على ترخيص الدعم لفردي",
-  "feature.delayApp.upgrade.actionShort": "ترقية الحساب",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "إلغاء",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
diff --git a/src/i18n/locales/bg.json b/src/i18n/locales/bg.json
index a2a28c856..188ad3922 100644
--- a/src/i18n/locales/bg.json
+++ b/src/i18n/locales/bg.json
@@ -5,13 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 561fe3c4c..2cdc3e136 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
   "feature.announcements.changelog.headline": "Canvis en Ferdi {version}",
   "feature.debugger.title": "Registra la informació de depuració",
-  "feature.delayApp.headline": "Si us plau, compra una llicència de suport per a Ferdi per saltar l'espera",
-  "feature.delayApp.text": "Ferdi continuarà en {seconds} segons",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Aconsegueix una llicència de suport per a Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Millorar el teu compte",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel·la",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 6f76f74ea..0d2e55ae2 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh nein! Ferdi hat die Verbindung zu {name} verloren.",
   "feature.announcements.changelog.headline": "Was ist neu in Ferdi {version}",
   "feature.debugger.title": "Debug-Informationen veröffentlichen",
-  "feature.delayApp.headline": "Bitte kaufe eine Ferdi Supporter Lizenz, um das Warten zu überspringen",
-  "feature.delayApp.text": "In {seconds} Sekunden geht's weiter!",
-  "feature.delayApp.trial.action": "Ja, ich möchte Ferdi Professional 14 Tage gratis testen",
-  "feature.delayApp.trial.actionShort": "Aktiviere die kostenlose Ferdi Professional Testlizenz",
-  "feature.delayApp.trial.headline": "Hol dir die kostenlose Ferdi Professional Testlizenz und es geht ohne Warten weiter",
-  "feature.delayApp.upgrade.action": "Hol dir Ferdi Premium",
-  "feature.delayApp.upgrade.actionShort": "Account erweitern",
   "feature.nightlyBuilds.activate": "Aktivieren",
   "feature.nightlyBuilds.cancel": "Abbrechen",
   "feature.nightlyBuilds.info": "Nightly builds sind experimentelle Versionen von Ferdi die unfertige Funktionen enthalten kann. Nightly builds werden hauptsächlich von Entwicklern genutzt um neu entwickelte Features zu testen und zu sehen wie sie sich in der finalen Version verhalten. Wenn du nicht genau weisst was du tust, empfehlen wir dir Nightly Builds nicht zu aktivieren.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Auf kostenlosen Plan herunterstufen",
-  "feature.planSelection.cta.stayOnFree": "Auf kostenlosem Plan bleiben",
-  "feature.planSelection.cta.trial": "Starte meine 14-Tage Testversion",
-  "feature.planSelection.cta.upgradePersonal": "Personal Plan wählen",
-  "feature.planSelection.cta.upgradePro": "Professional Plan wählen",
-  "feature.planSelection.free.text": "Einfache Funktionalität",
-  "feature.planSelection.fullFeatureList": "Kompletter Vergleich aller Pläne",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Auf kostenlosen Plan herunterstufen",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Personal Plan wählen",
-  "feature.planSelection.fullscreen.dialog.message": "Du bist dabei, auf ein kostenloses Konto herunterzustufen. Bist du sicher? Klicke stattdessen hier, um mehr Dienste und Funktionen für nur {currency}{price} pro Monat zu erhalten.",
-  "feature.planSelection.fullscreen.dialog.title": "Deinen Ferdi Plan herunterstufen",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Bist du bereit zu wählen, {name}",
-  "feature.planSelection.personal.text": "Weitere Dienste, keine Wartezeiten - ideal für den persönlichen Gebrauch.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "Beim Veröffentlichen der Debug-Informationen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal oder sehe dir die Konsole für weitere Informationen an.",
   "feature.publishDebugInfo.info": "Die Veröffentlichung deiner Debug-Informationen hilft uns, Probleme und Fehler in Ferdi zu finden. Indem du deine Debug-Informationen veröffentlichst, akzeptierst du die Datenschutzbestimmungen und Nutzungsbedingungen vom Ferdi Debugger",
   "feature.publishDebugInfo.privacy": "Datenschutzrichtlinien",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 370a6fb92..37e065d28 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -661,180 +661,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Hi {name}, welcome to Franz",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.headline.pro",
-        "start": {
-          "column": 12,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!We have a special treat for you.",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.intro.specialTreat",
-        "start": {
-          "column": 16,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Enjoy the full Franz Professional experience completely free for 14 days.",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.intro.tryPro",
-        "start": {
-          "column": 10,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Happy messaging,",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.intro.happyMessaging",
-        "start": {
-          "column": 18,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!No strings attached",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.headline",
-        "start": {
-          "column": 29,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!No credit card required",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.noCreditCard",
-        "start": {
-          "column": 16,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.automaticTrialEnd",
-        "start": {
-          "column": 21,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Free trial (normally {currency}{price} per month)",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.terms.trialWorth",
-        "start": {
-          "column": 14,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, we could not activate your trial!",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.error",
-        "start": {
-          "column": 19,
-          "line": 46
-        }
-      },
-      {
-        "defaultMessage": "!!!Start my 14-day Franz Professional Trial",
-        "end": {
-          "column": 3,
-          "line": 53
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.cta.accept",
-        "start": {
-          "column": 13,
-          "line": 50
-        }
-      },
-      {
-        "defaultMessage": "!!!Start using Franz",
-        "end": {
-          "column": 3,
-          "line": 57
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.cta.start",
-        "start": {
-          "column": 12,
-          "line": 54
-        }
-      },
-      {
-        "defaultMessage": "!!!Continue to Ferdi",
-        "end": {
-          "column": 3,
-          "line": 61
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.cta.skip",
-        "start": {
-          "column": 11,
-          "line": 58
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional includes:",
-        "end": {
-          "column": 3,
-          "line": 65
-        },
-        "file": "src/components/auth/Pricing.js",
-        "id": "pricing.trial.features.headline",
-        "start": {
-          "column": 20,
-          "line": 62
-        }
-      }
-    ],
-    "path": "src/components/auth/Pricing.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
@@ -1209,52 +1035,52 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 32
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 32
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 36
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 40
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 40
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 44
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.authRequestFailed",
         "start": {
           "column": 21,
-          "line": 44
+          "line": 41
         }
       }
     ],
@@ -2075,273 +1901,195 @@
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 17
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headline",
         "start": {
           "column": 12,
-          "line": 17
+          "line": 14
         }
       },
       {
         "defaultMessage": "!!!Your Subscription",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 21
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineSubscription",
         "start": {
           "column": 24,
-          "line": 21
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!Danger Zone",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 25
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineDangerZone",
         "start": {
           "column": 22,
-          "line": 25
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Manage your subscription",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 29
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.manageSubscription.label",
         "start": {
           "column": 33,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade to Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.upgradeToPro.label",
-        "start": {
-          "column": 23,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Basic Account",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountType.basic",
-        "start": {
-          "column": 20,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Premium Supporter Account",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountType.premium",
-        "start": {
-          "column": 22,
-          "line": 41
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Edit Account",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 33
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.account.editButton",
         "start": {
           "column": 21,
-          "line": 45
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!Invoices",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 37
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineInvoices",
         "start": {
           "column": 18,
-          "line": 49
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Download",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 41
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.invoiceDownload",
         "start": {
           "column": 19,
-          "line": 53
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Could not load user information",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 45
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.userInfoRequestFailed",
         "start": {
           "column": 25,
-          "line": 57
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 49
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.tryReloadUserInfoRequest",
         "start": {
           "column": 28,
-          "line": 61
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Delete account",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 53
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteAccount",
         "start": {
           "column": 17,
-          "line": 65
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 58
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteInfo",
         "start": {
           "column": 14,
-          "line": 69
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 63
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteEmailSent",
         "start": {
           "column": 19,
-          "line": 74
-        }
-      },
-      {
-        "defaultMessage": "!!!Free Trial",
-        "end": {
-          "column": 3,
-          "line": 82
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.trial",
-        "start": {
-          "column": 9,
-          "line": 79
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Your Franz License:",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 67
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.yourLicense",
         "start": {
           "column": 15,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends in {duration}.",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.trialEndsIn",
-        "start": {
-          "column": 15,
-          "line": 87
-        }
-      },
-      {
-        "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.trialUpdateBillingInfo",
-        "start": {
-          "column": 33,
-          "line": 91
+          "line": 64
         }
       },
       {
         "defaultMessage": "Account is unavailable",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 71
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountUnavailable",
         "start": {
           "column": 22,
-          "line": 96
+          "line": 68
         }
       },
       {
         "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 75
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountUnavailableInfo",
         "start": {
           "column": 26,
-          "line": 100
+          "line": 72
         }
       }
     ],
@@ -2353,104 +2101,104 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 18
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 17
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 22
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 21
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 26
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 25
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 30
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 29
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Manage Team",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 34
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.team",
         "start": {
           "column": 8,
-          "line": 33
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 38
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 37
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 42
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.supportFerdi",
         "start": {
           "column": 16,
-          "line": 41
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 46
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 45
+          "line": 43
         }
       }
     ],
@@ -2462,182 +2210,182 @@
         "defaultMessage": "!!!Available Services",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 22
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.headline",
         "start": {
           "column": 12,
-          "line": 21
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Search service",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 26
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.searchService",
         "start": {
           "column": 17,
-          "line": 25
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Most popular",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 30
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.mostPopular",
         "start": {
           "column": 22,
-          "line": 29
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!All services",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 34
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.all",
         "start": {
           "column": 14,
-          "line": 33
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Custom Services",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 38
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.custom",
         "start": {
           "column": 17,
-          "line": 37
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 42
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.nothingFound",
         "start": {
           "column": 16,
-          "line": 41
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Service successfully added",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 46
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.servicesSuccessfulAddedInfo",
         "start": {
           "column": 31,
-          "line": 45
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Missing a service?",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 50
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.missingService",
         "start": {
           "column": 18,
-          "line": 49
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 54
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.intro",
         "start": {
           "column": 21,
-          "line": 53
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Open directory",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 58
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.openFolder",
         "start": {
           "column": 14,
-          "line": 57
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Developer Documentation",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 62
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.openDevDocs",
         "start": {
           "column": 15,
-          "line": 61
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Custom 3rd Party Recipes",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 66
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.headline.customRecipes",
         "start": {
           "column": 25,
-          "line": 65
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Community 3rd Party Recipes",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 70
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.headline.communityRecipes",
         "start": {
           "column": 28,
-          "line": 69
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Your Development Service Recipes",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 74
         },
         "file": "src/components/settings/recipes/RecipesDashboard.js",
         "id": "settings.recipes.customService.headline.devRecipes",
         "start": {
           "column": 22,
-          "line": 73
+          "line": 71
         }
       }
     ],
@@ -2649,364 +2397,338 @@
         "defaultMessage": "!!!Save service",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 26
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.saveButton",
         "start": {
           "column": 15,
-          "line": 27
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 30
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.deleteButton",
         "start": {
           "column": 17,
-          "line": 31
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Open darkmode.css",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 34
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openDarkmodeCss",
         "start": {
           "column": 19,
-          "line": 35
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Open user.css",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 38
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openUserCss",
         "start": {
           "column": 15,
-          "line": 39
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Open user.js",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 42
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.openUserJs",
         "start": {
           "column": 14,
-          "line": 43
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 46
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.recipeFileInfo",
         "start": {
           "column": 18,
-          "line": 47
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 50
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.availableServices",
         "start": {
           "column": 21,
-          "line": 51
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 54
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.yourServices",
         "start": {
           "column": 16,
-          "line": 55
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Add {name}",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 58
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.addServiceHeadline",
         "start": {
           "column": 22,
-          "line": 59
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Edit {name}",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 62
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.editServiceHeadline",
         "start": {
           "column": 23,
-          "line": 63
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Hosted",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 66
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabHosted",
         "start": {
           "column": 13,
-          "line": 67
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Self hosted ⭐️",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 70
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.tabOnPremise",
         "start": {
           "column": 16,
-          "line": 71
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Use the hosted {name} service.",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 74
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.useHostedService",
         "start": {
           "column": 20,
-          "line": 75
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Could not validate custom {name} server.",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 78
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.customUrlValidationError",
         "start": {
           "column": 28,
-          "line": 79
-        }
-      },
-      {
-        "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
-        "end": {
-          "column": 3,
-          "line": 86
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlPremiumInfo",
-        "start": {
-          "column": 24,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your account",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlUpgradeAccount",
-        "start": {
-          "column": 27,
-          "line": 87
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 82
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.indirectMessageInfo",
         "start": {
           "column": 23,
-          "line": 91
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 86
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.isMutedInfo",
         "start": {
           "column": 15,
-          "line": 95
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 90
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.isHibernatedEnabledInfo",
         "start": {
           "column": 28,
-          "line": 99
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Notifications",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 94
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineNotifications",
         "start": {
           "column": 25,
-          "line": 103
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Unread message badges",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 98
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineBadges",
         "start": {
           "column": 18,
-          "line": 107
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 102
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 111
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Settings",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 106
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.headlineDarkReaderSettings",
         "start": {
           "column": 30,
-          "line": 115
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 110
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconDelete",
         "start": {
           "column": 14,
-          "line": 119
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Drop your image, or click here",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 114
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.iconUpload",
         "start": {
           "column": 14,
-          "line": 123
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 118
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.headline",
         "start": {
           "column": 17,
-          "line": 127
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 122
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.restartInfo",
         "start": {
           "column": 20,
-          "line": 131
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 126
         },
         "file": "src/components/settings/services/EditServiceForm.js",
         "id": "settings.service.form.proxy.info",
         "start": {
           "column": 13,
-          "line": 135
+          "line": 123
         }
       }
     ],
@@ -3119,117 +2841,117 @@
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 18
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.headline",
         "start": {
           "column": 12,
-          "line": 16
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Search service",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 22
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.searchService",
         "start": {
           "column": 17,
-          "line": 20
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Start by adding a service.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.noServicesAdded",
         "start": {
           "column": 19,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.recipes.nothingFound",
         "start": {
           "column": 18,
-          "line": 28
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Discover services",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 34
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.discoverServices",
         "start": {
           "column": 20,
-          "line": 32
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Could not load your services",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 38
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.servicesRequestFailed",
         "start": {
           "column": 25,
-          "line": 36
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 42
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.account.tryReloadServices",
         "start": {
           "column": 21,
-          "line": 40
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!Your changes have been saved",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 46
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.updatedInfo",
         "start": {
           "column": 15,
-          "line": 44
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Service has been deleted",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 50
         },
         "file": "src/components/settings/services/ServicesDashboard.js",
         "id": "settings.services.deletedInfo",
         "start": {
           "column": 15,
-          "line": 48
+          "line": 47
         }
       }
     ],
@@ -3241,416 +2963,416 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headline",
         "start": {
           "column": 12,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 28
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 34
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.sentryInfo",
         "start": {
           "column": 14,
-          "line": 32
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!By default, Ferdi 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.",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 38
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.hibernateInfo",
         "start": {
           "column": 17,
-          "line": 36
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 42
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.inactivityLockInfo",
         "start": {
           "column": 22,
-          "line": 40
+          "line": 39
         }
       },
       {
         "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 46
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.todoServerInfo",
         "start": {
           "column": 18,
-          "line": 44
+          "line": 43
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 50
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPassword",
         "start": {
           "column": 18,
-          "line": 48
+          "line": 47
         }
       },
       {
         "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 54
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPasswordInfo",
         "start": {
           "column": 22,
-          "line": 52
+          "line": 51
         }
       },
       {
         "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 58
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockInfo",
         "start": {
           "column": 12,
-          "line": 56
+          "line": 55
         }
       },
       {
         "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 62
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDTimeInfo",
         "start": {
           "column": 24,
-          "line": 60
+          "line": 59
         }
       },
       {
         "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 66
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDInfo",
         "start": {
           "column": 20,
-          "line": 64
+          "line": 63
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 70
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 68
+          "line": 67
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 74
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 72
+          "line": 71
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 78
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 76
+          "line": 75
         }
       },
       {
         "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 82
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.universalDarkModeInfo",
         "start": {
           "column": 25,
-          "line": 80
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 86
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.accentColorInfo",
         "start": {
           "column": 19,
-          "line": 84
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!Privacy",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 90
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlinePrivacy",
         "start": {
           "column": 19,
-          "line": 88
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 94
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 92
+          "line": 91
         }
       },
       {
         "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 98
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 96
+          "line": 95
         }
       },
       {
         "defaultMessage": "!!!Ferdi 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.",
         "end": {
           "column": 3,
-          "line": 103
+          "line": 102
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.spellCheckerLanguageInfo",
         "start": {
           "column": 28,
-          "line": 100
+          "line": 99
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 107
+          "line": 106
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 104
+          "line": 103
         }
       },
       {
         "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 111
+          "line": 110
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 108
+          "line": 107
         }
       },
       {
         "defaultMessage": "!!!Couldn't clear all cache",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 114
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheNotCleared",
         "start": {
           "column": 19,
-          "line": 112
+          "line": 111
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 119
+          "line": 118
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 116
+          "line": 115
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 123
+          "line": 122
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 120
+          "line": 119
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 127
+          "line": 126
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 124
+          "line": 123
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 131
+          "line": 130
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 128
+          "line": 127
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 135
+          "line": 134
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 132
+          "line": 131
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 139
+          "line": 138
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 136
+          "line": 135
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 143
+          "line": 142
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 140
+          "line": 139
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 147
+          "line": 146
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 22,
-          "line": 144
+          "line": 143
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 151
+          "line": 150
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 148
+          "line": 147
         }
       }
     ],
@@ -3880,104 +3602,91 @@
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 18
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.headline",
         "start": {
           "column": 12,
-          "line": 18
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!Franz Team Management",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 22
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.contentHeadline",
         "start": {
           "column": 19,
-          "line": 22
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 26
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.intro",
         "start": {
           "column": 9,
-          "line": 26
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 30
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.copy",
         "start": {
           "column": 8,
-          "line": 30
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!Manage your Team on meetfranz.com",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 34
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.manageAction",
         "start": {
           "column": 16,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your Account",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.upgradeAction",
-        "start": {
-          "column": 17,
-          "line": 38
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Teams are unavailable",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 38
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.teamsUnavailable",
         "start": {
           "column": 20,
-          "line": 42
+          "line": 35
         }
       },
       {
         "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 42
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.teamsUnavailableInfo",
         "start": {
           "column": 24,
-          "line": 46
+          "line": 39
         }
       }
     ],
@@ -4069,509 +3778,146 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Choose your plan",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.cta.choosePlan",
-        "start": {
-          "column": 21,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "settings.account.headlineUpgradeAccount",
-        "start": {
-          "column": 18,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.teaser.intro",
-        "start": {
-          "column": 14,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Paid Franz Plans include:",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.teaser.includedFeatures",
-        "start": {
-          "column": 20,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/components/subscription/SubscriptionForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Cancel",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonCancel",
-        "start": {
-          "column": 16,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Done",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonDone",
-        "start": {
-          "column": 14,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/components/subscription/SubscriptionPopup.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Yes, start the free Franz Professional trial",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "subscription.cta.activateTrial",
-        "start": {
-          "column": 21,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!See all options",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "subscription.cta.allOptions",
-        "start": {
-          "column": 20,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "settings.account.headlineTrialUpgrade",
-        "start": {
-          "column": 18,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!The Franz Professional Plan includes:",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "subscription.includedProFeatures",
-        "start": {
-          "column": 20,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!No strings attached",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "pricing.trial.terms.headline",
-        "start": {
-          "column": 29,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!No credit card required",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "pricing.trial.terms.noCreditCard",
-        "start": {
-          "column": 16,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/subscription/TrialForm.js",
-        "id": "pricing.trial.terms.automaticTrialEnd",
-        "start": {
-          "column": 21,
-          "line": 38
-        }
-      }
-    ],
-    "path": "src/components/subscription/TrialForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your trial was successfully activated. Happy messaging!",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/TrialActivationInfoBar.js",
-        "id": "infobar.trialActivated",
-        "start": {
-          "column": 11,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/TrialActivationInfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Get a Franz Supporter License",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.upgrade.action",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.trial.action",
-        "start": {
-          "column": 15,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade account",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.upgrade.actionShort",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate the free Franz Professional trial",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "feature.delayApp.trial.actionShort",
-        "start": {
-          "column": 20,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!No strings attached",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "pricing.trial.terms.headline",
-        "start": {
-          "column": 29,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!No credit card required",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "pricing.trial.terms.noCreditCard",
-        "start": {
-          "column": 16,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/ui/ActivateTrialButton/index.js",
-        "id": "pricing.trial.terms.automaticTrialEnd",
-        "start": {
-          "column": 21,
-          "line": 37
-        }
-      }
-    ],
-    "path": "src/components/ui/ActivateTrialButton/index.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Choose from more than 70 Services",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 11
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.recipes",
         "start": {
           "column": 20,
-          "line": 9
+          "line": 8
         }
       },
       {
         "defaultMessage": "!!!Account Synchronisation",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 15
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.accountSync",
         "start": {
           "column": 15,
-          "line": 13
+          "line": 12
         }
       },
       {
         "defaultMessage": "!!!Desktop Notifications",
         "end": {
           "column": 3,
-          "line": 20
+          "line": 19
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.desktopNotifications",
         "start": {
           "column": 24,
-          "line": 17
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Add unlimited services",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 23
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.unlimitedServices",
         "start": {
           "column": 21,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Add up to 3 services",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.upToThreeServices",
-        "start": {
-          "column": 21,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Add up to 6 services",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.upToSixServices",
-        "start": {
-          "column": 19,
-          "line": 29
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Spellchecker support",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 27
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.spellchecker",
         "start": {
           "column": 16,
-          "line": 33
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 31
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.workspaces",
         "start": {
           "column": 14,
-          "line": 37
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Add Custom Websites",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 35
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.customWebsites",
         "start": {
           "column": 18,
-          "line": 41
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!On-premise & other Hosted Services",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 39
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.onPremise",
         "start": {
           "column": 13,
-          "line": 45
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Install 3rd party services",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 43
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.thirdPartyServices",
         "start": {
           "column": 22,
-          "line": 49
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Service Proxies",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 47
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.serviceProxies",
         "start": {
           "column": 18,
-          "line": 53
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Team Management",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 51
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.teamManagement",
         "start": {
           "column": 18,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!No Waiting Screens",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.appDelays",
-        "start": {
-          "column": 13,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Forever ad-free",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.adFree",
-        "start": {
-          "column": 10,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Occasional Waiting Screens",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.appDelaysEnabled",
-        "start": {
-          "column": 19,
-          "line": 69
+          "line": 48
         }
       }
     ],
@@ -4634,42 +3980,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Upgrade account",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/ui/PremiumFeatureContainer/index.js",
-        "id": "premiumFeature.button.upgradeAccount",
-        "start": {
-          "column": 10,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/components/ui/PremiumFeatureContainer/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Upgrade to Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/ui/UpgradeButton/index.js",
-        "id": "global.upgradeButton.upgradeToPro",
-        "start": {
-          "column": 16,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/components/ui/UpgradeButton/index.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Loading {service}",
         "end": {
           "column": 3,
@@ -4722,247 +4032,247 @@
         "defaultMessage": "!!!Name",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 31
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.name",
         "start": {
           "column": 8,
-          "line": 29
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Enable service",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 35
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableService",
         "start": {
           "column": 17,
-          "line": 33
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Enable hibernation",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 39
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableHibernation",
         "start": {
           "column": 21,
-          "line": 37
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Enable Notifications",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 43
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableNotification",
         "start": {
           "column": 22,
-          "line": 41
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Show unread message badges",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 47
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableBadge",
         "start": {
           "column": 15,
-          "line": 45
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 51
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableAudio",
         "start": {
           "column": 15,
-          "line": 49
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 55
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.team",
         "start": {
           "column": 8,
-          "line": 53
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Service URL",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 59
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.customUrl",
         "start": {
           "column": 13,
-          "line": 57
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Show message badge for all new messages",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 63
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.indirectMessages",
         "start": {
           "column": 20,
-          "line": 61
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Custom icon",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 67
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.icon",
         "start": {
           "column": 8,
-          "line": 65
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Enable Dark Mode",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 71
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 69
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Brightness",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 75
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderBrightness",
         "start": {
           "column": 24,
-          "line": 73
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Contrast",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 79
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderContrast",
         "start": {
           "column": 22,
-          "line": 77
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Dark Reader Sepia",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 83
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.darkReaderSepia",
         "start": {
           "column": 19,
-          "line": 81
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Use Proxy",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 87
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.isEnabled",
         "start": {
           "column": 15,
-          "line": 85
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Proxy Host/IP",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 91
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.host",
         "start": {
           "column": 13,
-          "line": 89
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Port",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 95
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.port",
         "start": {
           "column": 13,
-          "line": 93
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!User",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 99
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.user",
         "start": {
           "column": 13,
-          "line": 97
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 103
         },
         "file": "src/containers/settings/EditServiceScreen.js",
         "id": "settings.service.form.proxy.password",
         "start": {
           "column": 17,
-          "line": 101
+          "line": 100
         }
       }
     ],
@@ -4974,585 +4284,585 @@
         "defaultMessage": "!!!Launch Ferdi on start",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 33
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchOnStart",
         "start": {
           "column": 21,
-          "line": 31
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Open in background",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 37
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchInBackground",
         "start": {
           "column": 26,
-          "line": 35
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Keep Ferdi in background when closing the window",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 41
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.runInBackground",
         "start": {
           "column": 19,
-          "line": 39
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Start minimized",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 45
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.startMinimized",
         "start": {
           "column": 18,
-          "line": 43
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in System Tray",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 49
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSystemTray",
         "start": {
           "column": 20,
-          "line": 47
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in Menu Bar",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 53
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableMenuBar",
         "start": {
           "column": 17,
-          "line": 51
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi after system resume",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 57
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.reloadAfterResume",
         "start": {
           "column": 21,
-          "line": 55
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 61
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.minimizeToSystemTray",
         "start": {
           "column": 24,
-          "line": 59
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!Close Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 65
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.closeToSystemTray",
         "start": {
           "column": 21,
-          "line": 63
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!Don't show message content in notifications",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 69
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.privateNotifications",
         "start": {
           "column": 24,
-          "line": 67
+          "line": 66
         }
       },
       {
         "defaultMessage": "!!!Don't show notifications for clipboard events",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 73
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.clipboardNotifications",
         "start": {
           "column": 26,
-          "line": 71
+          "line": 70
         }
       },
       {
         "defaultMessage": "!!!Notify TaskBar/Dock on new message",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 77
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.notifyTaskBarOnMessage",
         "start": {
           "column": 26,
-          "line": 75
+          "line": 74
         }
       },
       {
         "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 81
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 79
+          "line": 78
         }
       },
       {
         "defaultMessage": "!!!Search engine",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 85
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.searchEngine",
         "start": {
           "column": 16,
-          "line": 83
+          "line": 82
         }
       },
       {
         "defaultMessage": "!!!Send telemetry data",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 89
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.sentry",
         "start": {
           "column": 10,
-          "line": 87
+          "line": 86
         }
       },
       {
         "defaultMessage": "!!!Enable service hibernation",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 93
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernate",
         "start": {
           "column": 13,
-          "line": 91
+          "line": 90
         }
       },
       {
         "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 97
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernateOnStartup",
         "start": {
           "column": 22,
-          "line": 95
+          "line": 94
         }
       },
       {
         "defaultMessage": "!!!Hibernation strategy",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 101
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernationStrategy",
         "start": {
           "column": 23,
-          "line": 99
+          "line": 98
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 105
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 103
+          "line": 102
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 109
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 107
+          "line": 106
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 113
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 111
+          "line": 110
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 117
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 115
+          "line": 114
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 121
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 119
+          "line": 118
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 125
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 123
+          "line": 122
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 129
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 127
+          "line": 126
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 133
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 131
+          "line": 130
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 137
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 135
+          "line": 134
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 141
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 139
+          "line": 138
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 145
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 143
+          "line": 142
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 150
+          "line": 149
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 147
+          "line": 146
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 154
+          "line": 153
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 151
+          "line": 150
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 157
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 155
+          "line": 154
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 161
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 159
+          "line": 158
         }
       },
       {
         "defaultMessage": "!!!Use vertical style",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 165
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useVerticalStyle",
         "start": {
           "column": 20,
-          "line": 163
+          "line": 162
         }
       },
       {
         "defaultMessage": "!!!Always show workspace drawer",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 169
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.alwaysShowWorkspaces",
         "start": {
           "column": 24,
-          "line": 167
+          "line": 166
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 173
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 171
+          "line": 170
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 177
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 175
+          "line": 174
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 181
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 179
+          "line": 178
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 185
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 183
+          "line": 182
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 189
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 187
+          "line": 186
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 193
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 191
+          "line": 190
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 197
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 195
+          "line": 194
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 201
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 199
+          "line": 198
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 205
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 203
+          "line": 202
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 209
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 207
+          "line": 206
         }
       }
     ],
@@ -5719,76 +5029,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Please purchase license to skip waiting",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.headline",
-        "start": {
-          "column": 12,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.trial.headline",
-        "start": {
-          "column": 17,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade Franz",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.upgrade.action",
-        "start": {
-          "column": 10,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.trial.action",
-        "start": {
-          "column": 15,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/features/delayApp/Component.js",
-        "id": "feature.delayApp.text",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      }
-    ],
-    "path": "src/features/delayApp/Component.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Nightly Builds",
         "end": {
           "column": 3,
@@ -5846,299 +5086,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!per month",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/planSelection/components/PlanItem.js",
-        "id": "subscription.interval.perMonth",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!per month & user",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/planSelection/components/PlanItem.js",
-        "id": "subscription.interval.perMonthPerUser",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Best value",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/planSelection/components/PlanItem.js",
-        "id": "subscription.bestValue",
-        "start": {
-          "column": 13,
-          "line": 23
-        }
-      }
-    ],
-    "path": "src/features/planSelection/components/PlanItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Are you ready to choose, {name}",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.fullscreen.welcome",
-        "start": {
-          "column": 11,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.fullscreen.subheadline",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Basic functionality",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.free.text",
-        "start": {
-          "column": 12,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.personal.text",
-        "start": {
-          "column": 16,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.pro.text",
-        "start": {
-          "column": 20,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Stay on Free",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.stayOnFree",
-        "start": {
-          "column": 17,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Downgrade to Free",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.ctaDowngradeFree",
-        "start": {
-          "column": 20,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Start my free 14-days Trial",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.trial",
-        "start": {
-          "column": 15,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Personal",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.upgradePersonal",
-        "start": {
-          "column": 23,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Professional",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.cta.upgradePro",
-        "start": {
-          "column": 18,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Complete comparison of all plans",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.fullFeatureList",
-        "start": {
-          "column": 19,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!All prices based on yearly payment",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/features/planSelection/components/PlanSelection.js",
-        "id": "feature.planSelection.pricesBasedOnAnnualPayment",
-        "start": {
-          "column": 30,
-          "line": 61
-        }
-      }
-    ],
-    "path": "src/features/planSelection/components/PlanSelection.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!per {interval}",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/planSelection/components/PlanTeaser.js",
-        "id": "subscription.interval.per",
-        "start": {
-          "column": 7,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade Account",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/planSelection/components/PlanTeaser.js",
-        "id": "subscription.planItem.upgradeAccount",
-        "start": {
-          "column": 7,
-          "line": 20
-        }
-      }
-    ],
-    "path": "src/features/planSelection/components/PlanTeaser.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Downgrade your Franz Plan",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.title",
-        "start": {
-          "column": 15,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.message",
-        "start": {
-          "column": 17,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Downgrade to Free",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.cta.downgrade",
-        "start": {
-          "column": 22,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Personal",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-        "id": "feature.planSelection.fullscreen.dialog.cta.upgrade",
-        "start": {
-          "column": 20,
-          "line": 27
-        }
-      }
-    ],
-    "path": "src/features/planSelection/containers/PlanSelectionScreen.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Publish debug information",
         "end": {
           "column": 3,
@@ -6349,55 +5296,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Changes in Franz {version}",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/serviceLimit/components/AnnouncementScreen.js",
-        "id": "feature.announcements.changelog.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      }
-    ],
-    "path": "src/features/serviceLimit/components/AnnouncementScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-        "id": "feature.serviceLimit.limitReached",
-        "start": {
-          "column": 16,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade account",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-        "id": "premiumFeature.button.upgradeAccount",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/features/serviceLimit/components/LimitReachedInfobox.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Ferdi is better together!",
         "end": {
           "column": 3,
@@ -6463,7 +5361,7 @@
         }
       },
       {
-        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+        "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
         "end": {
           "column": 3,
           "line": 40
@@ -6476,7 +5374,7 @@
         }
       },
       {
-        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
+        "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
         "end": {
           "column": 3,
           "line": 44
@@ -6538,107 +5436,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Your Free Franz {plan} Trial ends in {time}.",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-        "id": "feature.trialStatusBar.restTime",
-        "start": {
-          "column": 12,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Your free Franz {plan} Trial has expired, please upgrade your account.",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-        "id": "feature.trialStatusBar.expired",
-        "start": {
-          "column": 11,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade now",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-        "id": "feature.trialStatusBar.cta",
-        "start": {
-          "column": 7,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/features/trialStatusBar/components/TrialStatusBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Downgrade your Franz Plan",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.title",
-        "start": {
-          "column": 15,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.message",
-        "start": {
-          "column": 17,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Downgrade to Free",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.cta.downgrade",
-        "start": {
-          "column": 22,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose Personal",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-        "id": "feature.trialStatusBar.fullscreen.dialog.cta.upgrade",
-        "start": {
-          "column": 20,
-          "line": 28
-        }
-      }
-    ],
-    "path": "src/features/trialStatusBar/containers/TrialStatusBarScreen.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
@@ -6865,104 +5662,78 @@
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 18
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.headline",
         "start": {
           "column": 12,
-          "line": 16
+          "line": 15
         }
       },
       {
         "defaultMessage": "!!!All services",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 22
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.allServices",
         "start": {
           "column": 15,
-          "line": 20
+          "line": 19
         }
       },
       {
         "defaultMessage": "!!!Workspaces settings",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 26
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.workspacesSettingsTooltip",
         "start": {
           "column": 29,
-          "line": 24
+          "line": 23
         }
       },
       {
         "defaultMessage": "!!!Info about workspace feature",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 30
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.workspaceFeatureInfo",
         "start": {
           "column": 24,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Create your first workspace",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.premiumCtaButtonLabel",
-        "start": {
-          "column": 25,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Reactivate premium account",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.reactivatePremiumAccountLabel",
-        "start": {
-          "column": 28,
-          "line": 36
+          "line": 27
         }
       },
       {
         "defaultMessage": "!!!add new workspace",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 34
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.addNewWorkspaceLabel",
         "start": {
           "column": 24,
-          "line": 40
+          "line": 31
         }
       },
       {
         "defaultMessage": "!!!Premium feature",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 38
         },
         "file": "src/features/workspaces/components/WorkspaceDrawer.js",
         "id": "workspaceDrawer.proFeatureBadge",
         "start": {
           "column": 23,
-          "line": 44
+          "line": 35
         }
       }
     ],
@@ -7005,104 +5776,104 @@
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 20
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.headline",
         "start": {
           "column": 12,
-          "line": 20
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!You haven't created any workspaces yet.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 24
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.noWorkspacesAdded",
         "start": {
           "column": 19,
-          "line": 24
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Could not load your workspaces",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 28
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspacesRequestFailed",
         "start": {
           "column": 27,
-          "line": 28
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 32
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.tryReloadWorkspaces",
         "start": {
           "column": 23,
-          "line": 32
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Your changes have been saved",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.updatedInfo",
         "start": {
           "column": 15,
-          "line": 36
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Workspace has been deleted",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 40
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.deletedInfo",
         "start": {
           "column": 15,
-          "line": 40
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Info about workspace feature",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 44
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspaceFeatureInfo",
         "start": {
           "column": 24,
-          "line": 44
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 48
         },
         "file": "src/features/workspaces/components/WorkspacesDashboard.js",
         "id": "settings.workspaces.workspaceFeatureHeadline",
         "start": {
           "column": 28,
-          "line": 48
+          "line": 45
         }
       }
     ],
@@ -7129,146 +5900,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Professional",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.pro",
-        "start": {
-          "column": 15,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Personal",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.personal",
-        "start": {
-          "column": 20,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Free",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.free",
-        "start": {
-          "column": 16,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Premium",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.legacy",
-        "start": {
-          "column": 18,
-          "line": 17
-        }
-      }
-    ],
-    "path": "src/helpers/plan-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Franz Professional Yearly",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.pro-yearly",
-        "start": {
-          "column": 22,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional Monthly",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.pro-monthly",
-        "start": {
-          "column": 23,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Personal Yearly",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.personal-yearly",
-        "start": {
-          "column": 27,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Personal Monthly",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.personal-monthly",
-        "start": {
-          "column": 28,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Free",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.free",
-        "start": {
-          "column": 16,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Premium",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/helpers/pricing-helpers.js",
-        "id": "pricing.plan.legacy",
-        "start": {
-          "column": 18,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/helpers/pricing-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
@@ -7441,19 +6072,6 @@
           "column": 17,
           "line": 32
         }
-      },
-      {
-        "defaultMessage": "!!!Franz Professional Required",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.franzProRequired",
-        "start": {
-          "column": 15,
-          "line": 36
-        }
       }
     ],
     "path": "src/i18n/globalMessages.json"
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index b2a6f5d2d..d77b90b24 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
   "feature.announcements.changelog.headline": "Αλλαγές σχετικά με το Ferdi",
   "feature.debugger.title": "Εγγραφή πληροφοριών εντοπισμού σφαλμάτων",
-  "feature.delayApp.headline": "Παρακαλούμε αγοράστε μία άδεια Ferdi για να παραλείψετε την αναμονή",
-  "feature.delayApp.text": "Ferdi θα συνεχίσει σε {seconds} δευτερόλεπτα.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Αγοράστε μία άδεια Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Αναβαθμίστε τον λογαριασμό σας ",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Ακύρωση",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ab2be014b..003fee163 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Privacy policy",
@@ -49,7 +26,6 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
   "feature.shareFranz.action.twitter": "Share on Twitter",
@@ -60,21 +36,12 @@
   "feature.todos.premium.info": "Ferdi Todos are available to premium users now!",
   "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.",
   "feature.todos.premium.upgrade": "Upgrade Account",
-  "feature.trialStatusBar.cta": "Upgrade now",
-  "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
-  "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.trialStatusBar.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.trialStatusBar.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.trialStatusBar.restTime": "Your Free Ferdi {plan} Trial ends in {time}.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
-  "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
   "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
   "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
@@ -88,7 +55,6 @@
   "infobar.hide": "Hide",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "infobox.dismiss": "Dismiss",
   "invite.email.label": "Email address",
@@ -194,11 +160,7 @@
   "password.noUser": "No user with that email address was found",
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
   "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.appDelaysEnabled": "Occasional Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
   "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
@@ -208,30 +170,7 @@
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "pricing.plan.free": "Ferdi Free",
-  "pricing.plan.legacy": "Ferdi Premium",
-  "pricing.plan.personal": "Ferdi Personal",
-  "pricing.plan.personal-monthly": "Ferdi Personal Monthly",
-  "pricing.plan.personal-yearly": "Ferdi Personal Yearly",
-  "pricing.plan.pro": "Ferdi Professional",
-  "pricing.plan.pro-monthly": "Ferdi Professional Monthly",
-  "pricing.plan.pro-yearly": "Ferdi Professional Yearly",
-  "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional",
-  "pricing.trial.cta.skip": "Continue to Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
-  "pricing.trial.error": "Sorry, we could not activate your trial!",
-  "pricing.trial.features.headline": "Ferdi Professional includes:",
-  "pricing.trial.headline.pro": "Hi {name}, welcome to Ferdi",
-  "pricing.trial.intro.happyMessaging": "Happy messaging,",
-  "pricing.trial.intro.specialTreat": "We have a special treat for you.",
-  "pricing.trial.intro.tryPro": "Enjoy the full Ferdi Professional experience completely free for 14 days.",
-  "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
-  "pricing.trial.terms.headline": "No strings attached",
-  "pricing.trial.terms.noCreditCard": "No credit card required",
-  "pricing.trial.terms.trialWorth": "Free trial (normally {currency}{price} per month)",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.crashHandler.headline": "Oh no!",
@@ -255,8 +194,6 @@
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.accountType.basic": "Basic Account",
-  "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
@@ -270,17 +207,11 @@
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
   "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
-  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience",
   "settings.account.invoiceDownload": "Download",
   "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.trial": "Free Trial",
-  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
-  "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.yourLicense": "Your Ferdi License",
   "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
@@ -391,8 +322,6 @@
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
   "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
@@ -466,7 +395,6 @@
   "settings.team.manageAction": "Manage your Team on meetfranz.com",
   "settings.team.teamsUnavailable": "Teams are unavailable",
   "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
   "settings.user.form.accountType.label": "Account type",
@@ -516,19 +444,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.bestValue": "Best value",
-  "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
-  "subscription.cta.allOptions": "See all options",
-  "subscription.cta.choosePlan": "Choose your plan",
-  "subscription.includedProFeatures": "The Ferdi Professional Plan includes:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
-  "subscription.planItem.upgradeAccount": "Upgrade Account",
-  "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:",
-  "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-  "subscriptionPopup.buttonCancel": "Cancel",
-  "subscriptionPopup.buttonDone": "Done",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
   "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
@@ -556,9 +471,7 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
   "workspaceDrawer.proFeatureBadge": "Premium feature",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 6959a3a78..9226eedf2 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
   "feature.announcements.changelog.headline": "Cambios en Ferdi {version}",
   "feature.debugger.title": "Publica la información de depuración",
-  "feature.delayApp.headline": "Por favor compra una Licencia de Soporte de Ferdi para evitar la espera",
-  "feature.delayApp.text": "Ferdi continuará en {seconds} segundos.",
-  "feature.delayApp.trial.action": "Si! Quiero probar Ferdi Profesional por 14 días, gratis!",
-  "feature.delayApp.trial.actionShort": "Activar el período de prueba de Ferdi Profesional",
-  "feature.delayApp.trial.headline": "Empieza el periodo de prueba de Ferdi Profesional por 14 días y cruza la linea.",
-  "feature.delayApp.upgrade.action": "Consigue una Licencia de Soporte de Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Consigue una mejora para tu cuenta",
   "feature.nightlyBuilds.activate": "Activar",
   "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Las \"Nightly builds\" son versiones altamente experimentales de Ferdi que pueden contener características sin pulir o sin completar. Estas versiones son utilizadas principalmente por los desarrolladores para probar sus nuevas características desarrolladas y cómo se comportarán en la versión final. Si no sabe lo que está haciendo, le sugerimos que no active las estas versiones.",
diff --git a/src/i18n/locales/et.json b/src/i18n/locales/et.json
index 6709db455..386fffd29 100644
--- a/src/i18n/locales/et.json
+++ b/src/i18n/locales/et.json
@@ -5,13 +5,6 @@
   "connectionLostBanner.informationLink": "Mis juhtus?",
   "connectionLostBanner.message": "Oh ei! Ferdi kaotas ühenduse {name} teenusega.",
   "feature.announcements.changelog.headline": "Ferdi {versiooni} uuendused",
-  "feature.delayApp.headline": "Uuendage oma Ferdi'i tellimust, et ootamine vahele jätta",
-  "feature.delayApp.text": "Ferdi jätkab {seconds} sekundi pärast.",
-  "feature.delayApp.trial.action": "Jah, ma tahan Ferdi Professionali tasuta 14-päevast proovitellimust",
-  "feature.delayApp.trial.actionShort": "Aktiveerige tasuta Ferdi Professionali proovitellimus",
-  "feature.delayApp.trial.headline": "Hankige tasuta Ferdi Professionali 14-päevane proovitellimus ja saate ootamise vahele jätta",
-  "feature.delayApp.upgrade.action": "Uuendage Ferdi'it",
-  "feature.delayApp.upgrade.actionShort": "Uuendage oma kontot",
   "feature.planSelection.cta.ctaDowngradeFree": "Minge tagasi tasuta tellimusele",
   "feature.planSelection.cta.stayOnFree": "Jää tasuta tellimuse juurde",
   "feature.planSelection.cta.trial": "Alustage minu tasuta 14-päevast proovitellimust",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index a57caeb47..f7d62e9ed 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -5,13 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "تغییرات فرَنز {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "فرَنز بعد از {seconds} ثانیه ادامه میده.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "ارتقای حساب",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 5b74d709b..10d75c6a8 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "Voi ei! Ferdi menetti yhteyden {name}.",
   "feature.announcements.changelog.headline": "Muutoksia Ferdissä {version}",
   "feature.debugger.title": "Julkaise virheraportti",
-  "feature.delayApp.headline": "Ole hyvä ja osta Ferdin Tukijalisenssi, jotta vältyt odottamiselta",
-  "feature.delayApp.text": "Ferdi jatkaa {seconds} sekunnin kuluttua.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Hanki Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Päivitä tili",
   "feature.nightlyBuilds.activate": "Aktivoi",
   "feature.nightlyBuilds.cancel": "Peruuta",
   "feature.nightlyBuilds.info": "Uusimmat versiot ovat Ferdin kokeellisia versioita, jotka voivat sisältää viimeistelemättömiä tai keskeneräisiä ominaisuuksia. Näitä uusimpia versioita käyttävät pääasiassa kehittäjät testaamaan uusia ominaisuuksia ja miten ne toimivat lopullisessa versiossa. Jos et tiedä mitä olet tekemässä, suosittelemme ettet aktivoi uusimpia versioita.",
diff --git a/src/i18n/locales/fil.json b/src/i18n/locales/fil.json
index 5588d982d..348ed9382 100644
--- a/src/i18n/locales/fil.json
+++ b/src/i18n/locales/fil.json
@@ -5,13 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index e3d3051ec..7e5840bdb 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
   "feature.announcements.changelog.headline": "Les nouveaux changements dans Ferdi {version}",
   "feature.debugger.title": "Publier les informations de débogage",
-  "feature.delayApp.headline": "Achetez la licence Ferdi pour ne plus avoir de temps d'attente",
-  "feature.delayApp.text": "Ferdi s'ouvrira dans {seconds} secondes.",
-  "feature.delayApp.trial.action": "Oui, je veux les 14 jours d'essai gratuits de Ferdi Professionnel",
-  "feature.delayApp.trial.actionShort": "Activer l'essai gratuit de Ferdi Professionnel",
-  "feature.delayApp.trial.headline": "Prendre l'essai gratuit de 14 jours de Ferdi Professionnel et esquiver la ligne",
-  "feature.delayApp.upgrade.action": "Acheter une license Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Mettre à niveau le compte",
   "feature.nightlyBuilds.activate": "Activer",
   "feature.nightlyBuilds.cancel": "Annuler",
   "feature.nightlyBuilds.info": "Les versions de développement sont des versions expérimentales de Ferdi qui peuvent contenir des fonctionnalités non optimisées ou incomplètes. Ces versions de développement sont principalement utilisés par les développeurs pour tester leurs nouvelles fonctionnalités et leurs performances. Si vous ne savez pas ce que vous faites, nous vous suggérons de ne pas activer les versions de développement.",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 7c93c8a63..7c1915ca3 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "Cealaigh",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 08879783a..67d9ceaf0 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "הו לא! פרדי איבד את החיבור ל {name}.",
   "feature.announcements.changelog.headline": "שינויים בגרסת פרדי מספר {version}",
   "feature.debugger.title": "פרסם את פרטי ניפוי השגיאות",
-  "feature.delayApp.headline": "אנא קנה את גרסת התומכים כדי לדלג על ההמתנה",
-  "feature.delayApp.text": "פרדי ימשיך בעוד {seconds} שניות.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "קבל רישיון תומכים של פרדי",
-  "feature.delayApp.upgrade.actionShort": "שדרג חשבון",
   "feature.nightlyBuilds.activate": "הפעל",
   "feature.nightlyBuilds.cancel": "בטל",
   "feature.nightlyBuilds.info": "גרסאות נייטלי הם גרסאות נסיוניות ביותר של פרדי, העשויות להכיל פיצ'רים בלתי גמורים. גרסאות אלה מיועדות בעיקר לשימוש מפתחים על מנת לנסות את הפיצ'רים החדשים הנמצאים בפיתוח - לפני הכנסתם לגרסה הסופית. אם אתה לא יודע מה אתה עושה, אנו ממליצים שלא תפעיל את האופציה הזאת.",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index 2372494e5..333871fbd 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -5,13 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "फ्रांज़ के संस्करण {version} में बदलाव:",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "फ्रांज़ {seconds} सेकंड में जारी रहेगा।",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "खाते का उन्नयन करें",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 2e7d6f61c..5ca0e84e4 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
   "feature.announcements.changelog.headline": "Modifiche in Ferdi {version}",
   "feature.debugger.title": "Pubblica informazioni di debug",
-  "feature.delayApp.headline": "Per favore, compra una Licenza Supporter di Ferdi per saltare l'attesa",
-  "feature.delayApp.text": "Ferdi continuerà tra {seconds} secondi.",
-  "feature.delayApp.trial.action": "Sì, voglio la prova gratuita di 14 giorni di Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Attiva la prova gratuita di Ferdi Professional",
-  "feature.delayApp.trial.headline": "Ottieni la prova gratuita per 14 giorni di Ferdi Professional e salta la coda",
-  "feature.delayApp.upgrade.action": "Ricevi una Licenza Supporter di Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Effettua l'upgrade del tuo account",
   "feature.nightlyBuilds.activate": "Attivato",
   "feature.nightlyBuilds.cancel": "Annulla",
   "feature.nightlyBuilds.info": "Le 'Nightly Builds' sono versioni sperimentali di Ferdi che possono contenere funzionalità incomplete o non perfettamente funzionanti. Queste versioni sono principalmente usate dagli sviluppatori per effettuare dei test sulle nuove caratteristiche e verificare come si integrano nella versione finale di Ferdi. Se non sei sicuro di quello che stai facendo, ti consigliamo di non attivare le 'Nightly Builds'.",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 0aeac2891..4efb26d5e 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "{name}への接続が切断されました。",
   "feature.announcements.changelog.headline": "Ferdi {version}の変更点",
   "feature.debugger.title": "デバッグ情報の記録",
-  "feature.delayApp.headline": "Ferdiをすぐに起動するには、Ferdi サポーターライセンスを購入してください。",
-  "feature.delayApp.text": "Ferdiは{seconds}秒後に起動します。",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Ferdiサポーターライセンスを購入する",
-  "feature.delayApp.upgrade.actionShort": "アカウントをアップグレード",
   "feature.nightlyBuilds.activate": "有効化",
   "feature.nightlyBuilds.cancel": "キャンセル",
   "feature.nightlyBuilds.info": "Nightlyビルドは未検証や未完成の機能が含まれる非常に実験的なバージョンです。このバージョンは、主に新機能のテストや最新ビルドでの検証を行う開発者が使用するものです。これを理解していない方は、Nightlyビルドを有効化しないことをおすすめします。",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 70305c358..dcecd8581 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activate",
   "feature.nightlyBuilds.cancel": "გაუქმება",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
diff --git a/src/i18n/locales/kk.json b/src/i18n/locales/kk.json
index 09bb10fb2..77873d921 100644
--- a/src/i18n/locales/kk.json
+++ b/src/i18n/locales/kk.json
@@ -5,13 +5,6 @@
   "connectionLostBanner.informationLink": "What happened?",
   "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
   "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.delayApp.headline": "Upgrade your Ferdi plan to skip the wait",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14-days trial and skip the wait",
-  "feature.delayApp.upgrade.action": "Upgrade Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
   "feature.planSelection.cta.stayOnFree": "Stay on Free",
   "feature.planSelection.cta.trial": "Start my free 14-days Trial",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index af6171e3d..4f3cbcef3 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -12,13 +12,6 @@
   "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결이 끊겼습니다.",
   "feature.announcements.changelog.headline": "Ferdi {version} 변경점",
   "feature.debugger.title": "디버깅 정보 공개",
-  "feature.delayApp.headline": "Ferdi Supporter License를 구매하여 대기시간을 스킵하세요.",
-  "feature.delayApp.text": "Ferdi가 {seconds} 초 안에 재개합니다.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Ferdi Supporter License 얻기",
-  "feature.delayApp.upgrade.actionShort": "계정 업그레이드",
   "feature.nightlyBuilds.activate": "활성화",
   "feature.nightlyBuilds.cancel": "취소",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 07c6df438..7235f04b9 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh não! O Ferdi perdeu a ligação com {name}.",
   "feature.announcements.changelog.headline": "Alterações no Ferdi {version}",
   "feature.debugger.title": "Publicar informações de depuração",
-  "feature.delayApp.headline": "Por favor, adquira uma licença de apoiante Ferdi para não ficar à espera",
-  "feature.delayApp.text": "Ferdi continuará em {seconds} segundos.",
-  "feature.delayApp.trial.action": "Sim, eu quero o período de testes gratuito de 14 dias do Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Ativar período de testes gratuito do Ferdi Professional",
-  "feature.delayApp.trial.headline": "Empieza el periodo de prueba de Ferdi Profesional por 14 días y cruza la linea.",
-  "feature.delayApp.upgrade.action": "Adquira uma licença de suporte Ferdi",
-  "feature.delayApp.upgrade.actionShort": "Faça upgrade da conta",
   "feature.nightlyBuilds.activate": "Activar",
   "feature.nightlyBuilds.cancel": "Cancelar",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Despromover para Gratuito",
-  "feature.planSelection.cta.stayOnFree": "Continuar em Gratuito",
-  "feature.planSelection.cta.trial": "Iniciar meu teste grátis de 14 dias",
-  "feature.planSelection.cta.upgradePersonal": "Escolha Pessoal",
-  "feature.planSelection.cta.upgradePro": "Escolha Profissional",
-  "feature.planSelection.free.text": "Funcionalidade básica",
-  "feature.planSelection.fullFeatureList": "Comparação completa de todos os planos",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Despromover para Gratuito",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Escolha Pessoal",
-  "feature.planSelection.fullscreen.dialog.message": "Você está prestes a fazer a despromoção para nossa conta gratuita. Você tem certeza? Clique aqui para obter mais serviços e funcionalidade por apenas {currency}{price} por mês.",
-  "feature.planSelection.fullscreen.dialog.title": "Despromover o seu Plano Ferdi",
-  "feature.planSelection.fullscreen.subheadline": "Agora tem de fazer uma escolha. O Ferdi trabalha melhor em nossos planos pessoais e profissionais. Por favor, compare estes planos e escolha o que melhor se adapta a si.",
-  "feature.planSelection.fullscreen.welcome": "Está prestes a escolher, {name}",
-  "feature.planSelection.personal.text": "Mais serviços, sem espera - ideal para uso pessoal.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "Todos os preços são baseados no pagamento anual",
-  "feature.planSelection.pro.text": "Serviços ilimitados e recursos profissionais para si - e para a sua equipa.",
   "feature.publishDebugInfo.error": "Houve um erro ao tentar publicar as informações de depuração. Por favor, tente novamente mais tarde ou visualize a consola para mais informações.",
   "feature.publishDebugInfo.info": "Publicar as suas informações de depuração ajuda-nos a encontrar problemas e erros no Ferdi. Ao publicar as suas informações de depuração, aceita a política de privacidade e termos de serviço do depurador Ferdi",
   "feature.publishDebugInfo.privacy": "Política de Privacidade",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index b210f3316..bb1005426 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -12,33 +12,10 @@
   "connectionLostBanner.message": "Oh nu! Ferdi a pierdut conexiunea cu {name}.",
   "feature.announcements.changelog.headline": "Modificări în Ferdi {version}",
   "feature.debugger.title": "Publish debugging information",
-  "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting",
-  "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.",
-  "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional",
-  "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial",
-  "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line",
-  "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License",
-  "feature.delayApp.upgrade.actionShort": "Upgrade account",
   "feature.nightlyBuilds.activate": "Activare",
   "feature.nightlyBuilds.cancel": "Cancel",
   "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
   "feature.nightlyBuilds.title": "Nightly Builds",
-  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
-  "feature.planSelection.cta.stayOnFree": "Stay on Free",
-  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
-  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
-  "feature.planSelection.cta.upgradePro": "Choose Professional",
-  "feature.planSelection.free.text": "Basic functionality",
-  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
-  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
-  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
-  "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-  "feature.planSelection.fullscreen.dialog.title": "Downgrade your Ferdi Plan",
-  "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
-  "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
-  "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
   "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
   "feature.publishDebugInfo.privacy": "Politică de confidențialitate",
diff --git a/src/i18n/messages/src/components/TrialActivationInfoBar.json b/src/i18n/messages/src/components/TrialActivationInfoBar.json
deleted file mode 100644
index 65dd964a6..000000000
--- a/src/i18n/messages/src/components/TrialActivationInfoBar.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobar.trialActivated",
-    "defaultMessage": "!!!Your trial was successfully activated. Happy messaging!",
-    "file": "src/components/TrialActivationInfoBar.js",
-    "start": {
-      "line": 11,
-      "column": 11
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json
deleted file mode 100644
index b5b7d72a8..000000000
--- a/src/i18n/messages/src/components/auth/Pricing.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "pricing.trial.headline.pro",
-    "defaultMessage": "!!!Hi {name}, welcome to Franz",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 14,
-      "column": 12
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.intro.specialTreat",
-    "defaultMessage": "!!!We have a special treat for you.",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 18,
-      "column": 16
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.intro.tryPro",
-    "defaultMessage": "!!!Enjoy the full Franz Professional experience completely free for 14 days.",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 22,
-      "column": 10
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.intro.happyMessaging",
-    "defaultMessage": "!!!Happy messaging,",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 26,
-      "column": 18
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 30,
-      "column": 29
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 34,
-      "column": 16
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 38,
-      "column": 21
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.trialWorth",
-    "defaultMessage": "!!!Free trial (normally {currency}{price} per month)",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 42,
-      "column": 14
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.error",
-    "defaultMessage": "!!!Sorry, we could not activate your trial!",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 46,
-      "column": 19
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.cta.accept",
-    "defaultMessage": "!!!Start my 14-day Franz Professional Trial",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 50,
-      "column": 13
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.cta.start",
-    "defaultMessage": "!!!Start using Franz",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 54,
-      "column": 12
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.cta.skip",
-    "defaultMessage": "!!!Continue to Ferdi",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 58,
-      "column": 11
-    },
-    "end": {
-      "line": 61,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.features.headline",
-    "defaultMessage": "!!!Franz Professional includes:",
-    "file": "src/components/auth/Pricing.js",
-    "start": {
-      "line": 62,
-      "column": 20
-    },
-    "end": {
-      "line": 65,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 554758f82..d14c30077 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services have been updated.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 32,
+      "line": 29,
       "column": 19
     },
     "end": {
-      "line": 35,
+      "line": 32,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Reload services",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 24
     },
     "end": {
-      "line": 39,
+      "line": 36,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Could not load services and user information",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 40,
+      "line": 37,
       "column": 26
     },
     "end": {
-      "line": 43,
+      "line": 40,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 44,
+      "line": 41,
       "column": 21
     },
     "end": {
-      "line": 47,
+      "line": 44,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index f0bb087d6..f5b75fc25 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 17,
+      "line": 14,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 17,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your Subscription",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 21,
+      "line": 18,
       "column": 24
     },
     "end": {
-      "line": 24,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!Danger Zone",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 25,
+      "line": 22,
       "column": 22
     },
     "end": {
-      "line": 28,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,50 +43,11 @@
     "defaultMessage": "!!!Manage your subscription",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 29,
+      "line": 26,
       "column": 33
     },
     "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.upgradeToPro.label",
-    "defaultMessage": "!!!Upgrade to Franz Professional",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 33,
-      "column": 23
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountType.basic",
-    "defaultMessage": "!!!Basic Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 37,
-      "column": 20
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountType.premium",
-    "defaultMessage": "!!!Premium Supporter Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 41,
-      "column": 22
-    },
-    "end": {
-      "line": 44,
+      "line": 29,
       "column": 3
     }
   },
@@ -95,11 +56,11 @@
     "defaultMessage": "!!!Edit Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 45,
+      "line": 30,
       "column": 21
     },
     "end": {
-      "line": 48,
+      "line": 33,
       "column": 3
     }
   },
@@ -108,11 +69,11 @@
     "defaultMessage": "!!Invoices",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 49,
+      "line": 34,
       "column": 18
     },
     "end": {
-      "line": 52,
+      "line": 37,
       "column": 3
     }
   },
@@ -121,11 +82,11 @@
     "defaultMessage": "!!!Download",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 53,
+      "line": 38,
       "column": 19
     },
     "end": {
-      "line": 56,
+      "line": 41,
       "column": 3
     }
   },
@@ -134,11 +95,11 @@
     "defaultMessage": "!!!Could not load user information",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 57,
+      "line": 42,
       "column": 25
     },
     "end": {
-      "line": 60,
+      "line": 45,
       "column": 3
     }
   },
@@ -147,11 +108,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 61,
+      "line": 46,
       "column": 28
     },
     "end": {
-      "line": 64,
+      "line": 49,
       "column": 3
     }
   },
@@ -160,11 +121,11 @@
     "defaultMessage": "!!!Delete account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 65,
+      "line": 50,
       "column": 17
     },
     "end": {
-      "line": 68,
+      "line": 53,
       "column": 3
     }
   },
@@ -173,11 +134,11 @@
     "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 69,
+      "line": 54,
       "column": 14
     },
     "end": {
-      "line": 73,
+      "line": 58,
       "column": 3
     }
   },
@@ -186,24 +147,11 @@
     "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 74,
+      "line": 59,
       "column": 19
     },
     "end": {
-      "line": 78,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.trial",
-    "defaultMessage": "!!!Free Trial",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 79,
-      "column": 9
-    },
-    "end": {
-      "line": 82,
+      "line": 63,
       "column": 3
     }
   },
@@ -212,37 +160,11 @@
     "defaultMessage": "!!!Your Franz License:",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 83,
-      "column": 15
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.trialEndsIn",
-    "defaultMessage": "!!!Your free trial ends in {duration}.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 87,
+      "line": 64,
       "column": 15
     },
     "end": {
-      "line": 90,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.trialUpdateBillingInfo",
-    "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 91,
-      "column": 33
-    },
-    "end": {
-      "line": 95,
+      "line": 67,
       "column": 3
     }
   },
@@ -251,11 +173,11 @@
     "defaultMessage": "Account is unavailable",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 96,
+      "line": 68,
       "column": 22
     },
     "end": {
-      "line": 99,
+      "line": 71,
       "column": 3
     }
   },
@@ -264,11 +186,11 @@
     "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 100,
+      "line": 72,
       "column": 26
     },
     "end": {
-      "line": 103,
+      "line": 75,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index d7906fa7d..705b7cee3 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 17,
+      "line": 15,
       "column": 21
     },
     "end": {
-      "line": 20,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 21,
+      "line": 19,
       "column": 16
     },
     "end": {
-      "line": 24,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 25,
+      "line": 23,
       "column": 18
     },
     "end": {
-      "line": 28,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 29,
+      "line": 27,
       "column": 11
     },
     "end": {
-      "line": 32,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Manage Team",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 33,
+      "line": 31,
       "column": 8
     },
     "end": {
-      "line": 36,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 37,
+      "line": 35,
       "column": 12
     },
     "end": {
-      "line": 40,
+      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 41,
+      "line": 39,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 42,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 45,
+      "line": 43,
       "column": 10
     },
     "end": {
-      "line": 48,
+      "line": 46,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
index bbb55c7a0..ce7bb2c9d 100644
--- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
+++ b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available Services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 21,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 24,
+      "line": 22,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Search service",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 25,
+      "line": 23,
       "column": 17
     },
     "end": {
-      "line": 28,
+      "line": 26,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Most popular",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 29,
+      "line": 27,
       "column": 22
     },
     "end": {
-      "line": 32,
+      "line": 30,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 33,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 36,
+      "line": 34,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Custom Services",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 37,
+      "line": 35,
       "column": 17
     },
     "end": {
-      "line": 40,
+      "line": 38,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 41,
+      "line": 39,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 42,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Service successfully added",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 45,
+      "line": 43,
       "column": 31
     },
     "end": {
-      "line": 48,
+      "line": 46,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Missing a service?",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 49,
+      "line": 47,
       "column": 18
     },
     "end": {
-      "line": 52,
+      "line": 50,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 53,
+      "line": 51,
       "column": 21
     },
     "end": {
-      "line": 56,
+      "line": 54,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Open directory",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 57,
+      "line": 55,
       "column": 14
     },
     "end": {
-      "line": 60,
+      "line": 58,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Developer Documentation",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 61,
+      "line": 59,
       "column": 15
     },
     "end": {
-      "line": 64,
+      "line": 62,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Custom 3rd Party Recipes",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 65,
+      "line": 63,
       "column": 25
     },
     "end": {
-      "line": 68,
+      "line": 66,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Community 3rd Party Recipes",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 69,
+      "line": 67,
       "column": 28
     },
     "end": {
-      "line": 72,
+      "line": 70,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Your Development Service Recipes",
     "file": "src/components/settings/recipes/RecipesDashboard.js",
     "start": {
-      "line": 73,
+      "line": 71,
       "column": 22
     },
     "end": {
-      "line": 76,
+      "line": 74,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index 0aee52148..d7830f198 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Save service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 27,
+      "line": 23,
       "column": 15
     },
     "end": {
-      "line": 30,
+      "line": 26,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 31,
+      "line": 27,
       "column": 17
     },
     "end": {
-      "line": 34,
+      "line": 30,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Open darkmode.css",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 35,
+      "line": 31,
       "column": 19
     },
     "end": {
-      "line": 38,
+      "line": 34,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Open user.css",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 39,
+      "line": 35,
       "column": 15
     },
     "end": {
-      "line": 42,
+      "line": 38,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open user.js",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 43,
+      "line": 39,
       "column": 14
     },
     "end": {
-      "line": 46,
+      "line": 42,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 47,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 50,
+      "line": 46,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 51,
+      "line": 47,
       "column": 21
     },
     "end": {
-      "line": 54,
+      "line": 50,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 55,
+      "line": 51,
       "column": 16
     },
     "end": {
-      "line": 58,
+      "line": 54,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Add {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 59,
+      "line": 55,
       "column": 22
     },
     "end": {
-      "line": 62,
+      "line": 58,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Edit {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 63,
+      "line": 59,
       "column": 23
     },
     "end": {
-      "line": 66,
+      "line": 62,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Hosted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 67,
+      "line": 63,
       "column": 13
     },
     "end": {
-      "line": 70,
+      "line": 66,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Self hosted ⭐️",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 71,
+      "line": 67,
       "column": 16
     },
     "end": {
-      "line": 74,
+      "line": 70,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Use the hosted {name} service.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 75,
+      "line": 71,
       "column": 20
     },
     "end": {
-      "line": 78,
+      "line": 74,
       "column": 3
     }
   },
@@ -173,37 +173,11 @@
     "defaultMessage": "!!!Could not validate custom {name} server.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 79,
+      "line": 75,
       "column": 28
     },
     "end": {
-      "line": 82,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlPremiumInfo",
-    "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 83,
-      "column": 24
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlUpgradeAccount",
-    "defaultMessage": "!!!Upgrade your account",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 87,
-      "column": 27
-    },
-    "end": {
-      "line": 90,
+      "line": 78,
       "column": 3
     }
   },
@@ -212,11 +186,11 @@
     "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 91,
+      "line": 79,
       "column": 23
     },
     "end": {
-      "line": 94,
+      "line": 82,
       "column": 3
     }
   },
@@ -225,11 +199,11 @@
     "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 95,
+      "line": 83,
       "column": 15
     },
     "end": {
-      "line": 98,
+      "line": 86,
       "column": 3
     }
   },
@@ -238,11 +212,11 @@
     "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 99,
+      "line": 87,
       "column": 28
     },
     "end": {
-      "line": 102,
+      "line": 90,
       "column": 3
     }
   },
@@ -251,11 +225,11 @@
     "defaultMessage": "!!!Notifications",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 103,
+      "line": 91,
       "column": 25
     },
     "end": {
-      "line": 106,
+      "line": 94,
       "column": 3
     }
   },
@@ -264,11 +238,11 @@
     "defaultMessage": "!!!Unread message badges",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 107,
+      "line": 95,
       "column": 18
     },
     "end": {
-      "line": 110,
+      "line": 98,
       "column": 3
     }
   },
@@ -277,11 +251,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 111,
+      "line": 99,
       "column": 19
     },
     "end": {
-      "line": 114,
+      "line": 102,
       "column": 3
     }
   },
@@ -290,11 +264,11 @@
     "defaultMessage": "!!!Dark Reader Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 115,
+      "line": 103,
       "column": 30
     },
     "end": {
-      "line": 118,
+      "line": 106,
       "column": 3
     }
   },
@@ -303,11 +277,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 119,
+      "line": 107,
       "column": 14
     },
     "end": {
-      "line": 122,
+      "line": 110,
       "column": 3
     }
   },
@@ -316,11 +290,11 @@
     "defaultMessage": "!!!Drop your image, or click here",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 123,
+      "line": 111,
       "column": 14
     },
     "end": {
-      "line": 126,
+      "line": 114,
       "column": 3
     }
   },
@@ -329,11 +303,11 @@
     "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 127,
+      "line": 115,
       "column": 17
     },
     "end": {
-      "line": 130,
+      "line": 118,
       "column": 3
     }
   },
@@ -342,11 +316,11 @@
     "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 131,
+      "line": 119,
       "column": 20
     },
     "end": {
-      "line": 134,
+      "line": 122,
       "column": 3
     }
   },
@@ -355,11 +329,11 @@
     "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 135,
+      "line": 123,
       "column": 13
     },
     "end": {
-      "line": 138,
+      "line": 126,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
index fed05111e..7e7c5d67e 100644
--- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
+++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 16,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Search service",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 20,
+      "line": 19,
       "column": 17
     },
     "end": {
-      "line": 23,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Start by adding a service.",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 19
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 18
     },
     "end": {
-      "line": 31,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 32,
+      "line": 31,
       "column": 20
     },
     "end": {
-      "line": 35,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Could not load your services",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 36,
+      "line": 35,
       "column": 25
     },
     "end": {
-      "line": 39,
+      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 40,
+      "line": 39,
       "column": 21
     },
     "end": {
-      "line": 43,
+      "line": 42,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Your changes have been saved",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 44,
+      "line": 43,
       "column": 15
     },
     "end": {
-      "line": 47,
+      "line": 46,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Service has been deleted",
     "file": "src/components/settings/services/ServicesDashboard.js",
     "start": {
-      "line": 48,
+      "line": 47,
       "column": 15
     },
     "end": {
-      "line": 51,
+      "line": 50,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index a1e8c714e..c96a1de22 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 12
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 19
     },
     "end": {
-      "line": 31,
+      "line": 30,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 32,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 35,
+      "line": 34,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!By default, Ferdi 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.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 36,
+      "line": 35,
       "column": 17
     },
     "end": {
-      "line": 39,
+      "line": 38,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 40,
+      "line": 39,
       "column": 22
     },
     "end": {
-      "line": 43,
+      "line": 42,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 44,
+      "line": 43,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 46,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 48,
+      "line": 47,
       "column": 18
     },
     "end": {
-      "line": 51,
+      "line": 50,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 52,
+      "line": 51,
       "column": 22
     },
     "end": {
-      "line": 55,
+      "line": 54,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 56,
+      "line": 55,
       "column": 12
     },
     "end": {
-      "line": 59,
+      "line": 58,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 60,
+      "line": 59,
       "column": 24
     },
     "end": {
-      "line": 63,
+      "line": 62,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 64,
+      "line": 63,
       "column": 20
     },
     "end": {
-      "line": 67,
+      "line": 66,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 68,
+      "line": 67,
       "column": 20
     },
     "end": {
-      "line": 71,
+      "line": 70,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 72,
+      "line": 71,
       "column": 19
     },
     "end": {
-      "line": 75,
+      "line": 74,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 76,
+      "line": 75,
       "column": 22
     },
     "end": {
-      "line": 79,
+      "line": 78,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 80,
+      "line": 79,
       "column": 25
     },
     "end": {
-      "line": 83,
+      "line": 82,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 84,
+      "line": 83,
       "column": 19
     },
     "end": {
-      "line": 87,
+      "line": 86,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Privacy",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 88,
+      "line": 87,
       "column": 19
     },
     "end": {
-      "line": 91,
+      "line": 90,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 92,
+      "line": 91,
       "column": 20
     },
     "end": {
-      "line": 95,
+      "line": 94,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 96,
+      "line": 95,
       "column": 19
     },
     "end": {
-      "line": 99,
+      "line": 98,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Ferdi 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.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 100,
+      "line": 99,
       "column": 28
     },
     "end": {
-      "line": 103,
+      "line": 102,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 104,
+      "line": 103,
       "column": 20
     },
     "end": {
-      "line": 107,
+      "line": 106,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 108,
+      "line": 107,
       "column": 13
     },
     "end": {
-      "line": 111,
+      "line": 110,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Couldn't clear all cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 112,
+      "line": 111,
       "column": 19
     },
     "end": {
-      "line": 115,
+      "line": 114,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 116,
+      "line": 115,
       "column": 23
     },
     "end": {
-      "line": 119,
+      "line": 118,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 120,
+      "line": 119,
       "column": 25
     },
     "end": {
-      "line": 123,
+      "line": 122,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 124,
+      "line": 123,
       "column": 23
     },
     "end": {
-      "line": 127,
+      "line": 126,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 128,
+      "line": 127,
       "column": 25
     },
     "end": {
-      "line": 131,
+      "line": 130,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 132,
+      "line": 131,
       "column": 25
     },
     "end": {
-      "line": 135,
+      "line": 134,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 136,
+      "line": 135,
       "column": 24
     },
     "end": {
-      "line": 139,
+      "line": 138,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 140,
+      "line": 139,
       "column": 18
     },
     "end": {
-      "line": 143,
+      "line": 142,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 144,
+      "line": 143,
       "column": 22
     },
     "end": {
-      "line": 147,
+      "line": 146,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 148,
+      "line": 147,
       "column": 22
     },
     "end": {
-      "line": 151,
+      "line": 150,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 0a3b818a7..ac42ad98a 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 18,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 21,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Franz Team Management",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 22,
+      "line": 19,
       "column": 19
     },
     "end": {
-      "line": 25,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 26,
+      "line": 23,
       "column": 9
     },
     "end": {
-      "line": 29,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 30,
+      "line": 27,
       "column": 8
     },
     "end": {
-      "line": 33,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Manage your Team on meetfranz.com",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 34,
+      "line": 31,
       "column": 16
     },
     "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.upgradeAction",
-    "defaultMessage": "!!!Upgrade your Account",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 38,
-      "column": 17
-    },
-    "end": {
-      "line": 41,
+      "line": 34,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Teams are unavailable",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 42,
+      "line": 35,
       "column": 20
     },
     "end": {
-      "line": 45,
+      "line": 38,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
-      "line": 46,
+      "line": 39,
       "column": 24
     },
     "end": {
-      "line": 49,
+      "line": 42,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
deleted file mode 100644
index 6d235254e..000000000
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "subscription.cta.choosePlan",
-    "defaultMessage": "!!!Choose your plan",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 13,
-      "column": 21
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineUpgradeAccount",
-    "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 17,
-      "column": 18
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.teaser.intro",
-    "defaultMessage": "!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 21,
-      "column": 14
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.teaser.includedFeatures",
-    "defaultMessage": "!!!Paid Franz Plans include:",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 25,
-      "column": 20
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
deleted file mode 100644
index c06da7531..000000000
--- a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "subscriptionPopup.buttonCancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/components/subscription/SubscriptionPopup.js",
-    "start": {
-      "line": 11,
-      "column": 16
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscriptionPopup.buttonDone",
-    "defaultMessage": "!!!Done",
-    "file": "src/components/subscription/SubscriptionPopup.js",
-    "start": {
-      "line": 15,
-      "column": 14
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/TrialForm.json b/src/i18n/messages/src/components/subscription/TrialForm.json
deleted file mode 100644
index 8b387ba36..000000000
--- a/src/i18n/messages/src/components/subscription/TrialForm.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "subscription.cta.activateTrial",
-    "defaultMessage": "!!!Yes, start the free Franz Professional trial",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 14,
-      "column": 21
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.cta.allOptions",
-    "defaultMessage": "!!!See all options",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 18,
-      "column": 20
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineTrialUpgrade",
-    "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 22,
-      "column": 18
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.includedProFeatures",
-    "defaultMessage": "!!!The Franz Professional Plan includes:",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 26,
-      "column": 20
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 30,
-      "column": 29
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 34,
-      "column": 16
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-    "file": "src/components/subscription/TrialForm.js",
-    "start": {
-      "line": 38,
-      "column": 21
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
deleted file mode 100644
index fd969da78..000000000
--- a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "feature.delayApp.upgrade.action",
-    "defaultMessage": "!!!Get a Franz Supporter License",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.action",
-    "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 17,
-      "column": 15
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.upgrade.actionShort",
-    "defaultMessage": "!!!Upgrade account",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.actionShort",
-    "defaultMessage": "!!!Activate the free Franz Professional trial",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 25,
-      "column": 20
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 29,
-      "column": 29
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 33,
-      "column": 16
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
-    "file": "src/components/ui/ActivateTrialButton/index.js",
-    "start": {
-      "line": 37,
-      "column": 21
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
index 8d1dc4360..eb4bc483b 100644
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ b/src/i18n/messages/src/components/ui/FeatureList.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Choose from more than 70 Services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 9,
+      "line": 8,
       "column": 20
     },
     "end": {
-      "line": 12,
+      "line": 11,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Account Synchronisation",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 13,
+      "line": 12,
       "column": 15
     },
     "end": {
-      "line": 16,
+      "line": 15,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Desktop Notifications",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 17,
+      "line": 16,
       "column": 24
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   },
@@ -43,37 +43,11 @@
     "defaultMessage": "!!!Add unlimited services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 21,
+      "line": 20,
       "column": 21
     },
     "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.upToThreeServices",
-    "defaultMessage": "!!!Add up to 3 services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 25,
-      "column": 21
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.upToSixServices",
-    "defaultMessage": "!!!Add up to 6 services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 29,
-      "column": 19
-    },
-    "end": {
-      "line": 32,
+      "line": 23,
       "column": 3
     }
   },
@@ -82,11 +56,11 @@
     "defaultMessage": "!!!Spellchecker support",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 33,
+      "line": 24,
       "column": 16
     },
     "end": {
-      "line": 36,
+      "line": 27,
       "column": 3
     }
   },
@@ -95,11 +69,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 37,
+      "line": 28,
       "column": 14
     },
     "end": {
-      "line": 40,
+      "line": 31,
       "column": 3
     }
   },
@@ -108,11 +82,11 @@
     "defaultMessage": "!!!Add Custom Websites",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 41,
+      "line": 32,
       "column": 18
     },
     "end": {
-      "line": 44,
+      "line": 35,
       "column": 3
     }
   },
@@ -121,11 +95,11 @@
     "defaultMessage": "!!!On-premise & other Hosted Services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 45,
+      "line": 36,
       "column": 13
     },
     "end": {
-      "line": 48,
+      "line": 39,
       "column": 3
     }
   },
@@ -134,11 +108,11 @@
     "defaultMessage": "!!!Install 3rd party services",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 49,
+      "line": 40,
       "column": 22
     },
     "end": {
-      "line": 52,
+      "line": 43,
       "column": 3
     }
   },
@@ -147,11 +121,11 @@
     "defaultMessage": "!!!Service Proxies",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 53,
+      "line": 44,
       "column": 18
     },
     "end": {
-      "line": 56,
+      "line": 47,
       "column": 3
     }
   },
@@ -160,50 +134,11 @@
     "defaultMessage": "!!!Team Management",
     "file": "src/components/ui/FeatureList.js",
     "start": {
-      "line": 57,
+      "line": 48,
       "column": 18
     },
     "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.appDelays",
-    "defaultMessage": "!!!No Waiting Screens",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 61,
-      "column": 13
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.adFree",
-    "defaultMessage": "!!!Forever ad-free",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 65,
-      "column": 10
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.appDelaysEnabled",
-    "defaultMessage": "!!!Occasional Waiting Screens",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 69,
-      "column": 19
-    },
-    "end": {
-      "line": 72,
+      "line": 51,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
deleted file mode 100644
index 0cde4cee5..000000000
--- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "premiumFeature.button.upgradeAccount",
-    "defaultMessage": "!!!Upgrade account",
-    "file": "src/components/ui/PremiumFeatureContainer/index.js",
-    "start": {
-      "line": 16,
-      "column": 10
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/UpgradeButton/index.json b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
deleted file mode 100644
index 28e44cb66..000000000
--- a/src/i18n/messages/src/components/ui/UpgradeButton/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "global.upgradeButton.upgradeToPro",
-    "defaultMessage": "!!!Upgrade to Franz Professional",
-    "file": "src/components/ui/UpgradeButton/index.js",
-    "start": {
-      "line": 13,
-      "column": 16
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index ad97781c4..6744a9ff3 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 29,
+      "line": 28,
       "column": 8
     },
     "end": {
-      "line": 32,
+      "line": 31,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Enable service",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 33,
+      "line": 32,
       "column": 17
     },
     "end": {
-      "line": 36,
+      "line": 35,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Enable hibernation",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 37,
+      "line": 36,
       "column": 21
     },
     "end": {
-      "line": 40,
+      "line": 39,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable Notifications",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 41,
+      "line": 40,
       "column": 22
     },
     "end": {
-      "line": 44,
+      "line": 43,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Show unread message badges",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 45,
+      "line": 44,
       "column": 15
     },
     "end": {
-      "line": 48,
+      "line": 47,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 49,
+      "line": 48,
       "column": 15
     },
     "end": {
-      "line": 52,
+      "line": 51,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Team",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 53,
+      "line": 52,
       "column": 8
     },
     "end": {
-      "line": 56,
+      "line": 55,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Service URL",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 57,
+      "line": 56,
       "column": 13
     },
     "end": {
-      "line": 60,
+      "line": 59,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Show message badge for all new messages",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 61,
+      "line": 60,
       "column": 20
     },
     "end": {
-      "line": 64,
+      "line": 63,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Custom icon",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 65,
+      "line": 64,
       "column": 8
     },
     "end": {
-      "line": 68,
+      "line": 67,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Enable Dark Mode",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 69,
+      "line": 68,
       "column": 18
     },
     "end": {
-      "line": 72,
+      "line": 71,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Dark Reader Brightness",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 73,
+      "line": 72,
       "column": 24
     },
     "end": {
-      "line": 76,
+      "line": 75,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Dark Reader Contrast",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 77,
+      "line": 76,
       "column": 22
     },
     "end": {
-      "line": 80,
+      "line": 79,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Dark Reader Sepia",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 81,
+      "line": 80,
       "column": 19
     },
     "end": {
-      "line": 84,
+      "line": 83,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Use Proxy",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 85,
+      "line": 84,
       "column": 15
     },
     "end": {
-      "line": 88,
+      "line": 87,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Proxy Host/IP",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 89,
+      "line": 88,
       "column": 13
     },
     "end": {
-      "line": 92,
+      "line": 91,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Port",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 93,
+      "line": 92,
       "column": 13
     },
     "end": {
-      "line": 96,
+      "line": 95,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!User",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 97,
+      "line": 96,
       "column": 13
     },
     "end": {
-      "line": 100,
+      "line": 99,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
-      "line": 101,
+      "line": 100,
       "column": 17
     },
     "end": {
-      "line": 104,
+      "line": 103,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index cd5462b59..5c15933e4 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 31,
+      "line": 30,
       "column": 21
     },
     "end": {
-      "line": 34,
+      "line": 33,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Open in background",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 35,
+      "line": 34,
       "column": 26
     },
     "end": {
-      "line": 38,
+      "line": 37,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 39,
+      "line": 38,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 41,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Start minimized",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 43,
+      "line": 42,
       "column": 18
     },
     "end": {
-      "line": 46,
+      "line": 45,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Always show Ferdi in System Tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 47,
+      "line": 46,
       "column": 20
     },
     "end": {
-      "line": 50,
+      "line": 49,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Always show Ferdi in Menu Bar",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 51,
+      "line": 50,
       "column": 17
     },
     "end": {
-      "line": 54,
+      "line": 53,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Reload Ferdi after system resume",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 55,
+      "line": 54,
       "column": 21
     },
     "end": {
-      "line": 58,
+      "line": 57,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 59,
+      "line": 58,
       "column": 24
     },
     "end": {
-      "line": 62,
+      "line": 61,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Close Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 63,
+      "line": 62,
       "column": 21
     },
     "end": {
-      "line": 66,
+      "line": 65,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Don't show message content in notifications",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 67,
+      "line": 66,
       "column": 24
     },
     "end": {
-      "line": 70,
+      "line": 69,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Don't show notifications for clipboard events",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 71,
+      "line": 70,
       "column": 26
     },
     "end": {
-      "line": 74,
+      "line": 73,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Notify TaskBar/Dock on new message",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 75,
+      "line": 74,
       "column": 26
     },
     "end": {
-      "line": 78,
+      "line": 77,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Navigation bar behaviour",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 79,
+      "line": 78,
       "column": 26
     },
     "end": {
-      "line": 82,
+      "line": 81,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Search engine",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 83,
+      "line": 82,
       "column": 16
     },
     "end": {
-      "line": 86,
+      "line": 85,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Send telemetry data",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 87,
+      "line": 86,
       "column": 10
     },
     "end": {
-      "line": 90,
+      "line": 89,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Enable service hibernation",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 91,
+      "line": 90,
       "column": 13
     },
     "end": {
-      "line": 94,
+      "line": 93,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Keep services in hibernation on startup",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 95,
+      "line": 94,
       "column": 22
     },
     "end": {
-      "line": 98,
+      "line": 97,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 99,
+      "line": 98,
       "column": 23
     },
     "end": {
-      "line": 102,
+      "line": 101,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 103,
+      "line": 102,
       "column": 24
     },
     "end": {
-      "line": 106,
+      "line": 105,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 107,
+      "line": 106,
       "column": 20
     },
     "end": {
-      "line": 110,
+      "line": 109,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 111,
+      "line": 110,
       "column": 14
     },
     "end": {
-      "line": 114,
+      "line": 113,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 115,
+      "line": 114,
       "column": 16
     },
     "end": {
-      "line": 118,
+      "line": 117,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 119,
+      "line": 118,
       "column": 22
     },
     "end": {
-      "line": 122,
+      "line": 121,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 123,
+      "line": 122,
       "column": 18
     },
     "end": {
-      "line": 126,
+      "line": 125,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 127,
+      "line": 126,
       "column": 23
     },
     "end": {
-      "line": 130,
+      "line": 129,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 131,
+      "line": 130,
       "column": 21
     },
     "end": {
-      "line": 134,
+      "line": 133,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 135,
+      "line": 134,
       "column": 19
     },
     "end": {
-      "line": 138,
+      "line": 137,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 139,
+      "line": 138,
       "column": 12
     },
     "end": {
-      "line": 142,
+      "line": 141,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 143,
+      "line": 142,
       "column": 12
     },
     "end": {
-      "line": 146,
+      "line": 145,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 147,
+      "line": 146,
       "column": 21
     },
     "end": {
-      "line": 150,
+      "line": 149,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 151,
+      "line": 150,
       "column": 21
     },
     "end": {
-      "line": 154,
+      "line": 153,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 155,
+      "line": 154,
       "column": 22
     },
     "end": {
-      "line": 158,
+      "line": 157,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 159,
+      "line": 158,
       "column": 12
     },
     "end": {
-      "line": 162,
+      "line": 161,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Use vertical style",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 163,
+      "line": 162,
       "column": 20
     },
     "end": {
-      "line": 166,
+      "line": 165,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Always show workspace drawer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 167,
+      "line": 166,
       "column": 24
     },
     "end": {
-      "line": 170,
+      "line": 169,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 171,
+      "line": 170,
       "column": 15
     },
     "end": {
-      "line": 174,
+      "line": 173,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 175,
+      "line": 174,
       "column": 24
     },
     "end": {
-      "line": 178,
+      "line": 177,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 179,
+      "line": 178,
       "column": 29
     },
     "end": {
-      "line": 182,
+      "line": 181,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 183,
+      "line": 182,
       "column": 16
     },
     "end": {
-      "line": 186,
+      "line": 185,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 187,
+      "line": 186,
       "column": 23
     },
     "end": {
-      "line": 190,
+      "line": 189,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 191,
+      "line": 190,
       "column": 25
     },
     "end": {
-      "line": 194,
+      "line": 193,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 195,
+      "line": 194,
       "column": 8
     },
     "end": {
-      "line": 198,
+      "line": 197,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 199,
+      "line": 198,
       "column": 20
     },
     "end": {
-      "line": 202,
+      "line": 201,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 203,
+      "line": 202,
       "column": 15
     },
     "end": {
-      "line": 206,
+      "line": 205,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 207,
+      "line": 206,
       "column": 27
     },
     "end": {
-      "line": 210,
+      "line": 209,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
deleted file mode 100644
index 7ec0e69a0..000000000
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "feature.delayApp.headline",
-    "defaultMessage": "!!!Please purchase license to skip waiting",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 16,
-      "column": 12
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.headline",
-    "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 20,
-      "column": 17
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.upgrade.action",
-    "defaultMessage": "!!!Upgrade Franz",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 24,
-      "column": 10
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.trial.action",
-    "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 28,
-      "column": 15
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.delayApp.text",
-    "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
-    "file": "src/features/delayApp/Component.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanItem.json b/src/i18n/messages/src/features/planSelection/components/PlanItem.json
deleted file mode 100644
index 5a94f32ee..000000000
--- a/src/i18n/messages/src/features/planSelection/components/PlanItem.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "subscription.interval.perMonth",
-    "defaultMessage": "!!!per month",
-    "file": "src/features/planSelection/components/PlanItem.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.interval.perMonthPerUser",
-    "defaultMessage": "!!!per month & user",
-    "file": "src/features/planSelection/components/PlanItem.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.bestValue",
-    "defaultMessage": "!!!Best value",
-    "file": "src/features/planSelection/components/PlanItem.js",
-    "start": {
-      "line": 23,
-      "column": 13
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
deleted file mode 100644
index ed354146e..000000000
--- a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-  {
-    "id": "feature.planSelection.fullscreen.welcome",
-    "defaultMessage": "!!!Are you ready to choose, {name}",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 17,
-      "column": 11
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.subheadline",
-    "defaultMessage": "!!!It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.free.text",
-    "defaultMessage": "!!!Basic functionality",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 25,
-      "column": 12
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.personal.text",
-    "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 29,
-      "column": 16
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.pro.text",
-    "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 33,
-      "column": 20
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.stayOnFree",
-    "defaultMessage": "!!!Stay on Free",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 37,
-      "column": 17
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.ctaDowngradeFree",
-    "defaultMessage": "!!!Downgrade to Free",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 41,
-      "column": 20
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.trial",
-    "defaultMessage": "!!!Start my free 14-days Trial",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 45,
-      "column": 15
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.upgradePersonal",
-    "defaultMessage": "!!!Choose Personal",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 49,
-      "column": 23
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.cta.upgradePro",
-    "defaultMessage": "!!!Choose Professional",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 53,
-      "column": 18
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullFeatureList",
-    "defaultMessage": "!!!Complete comparison of all plans",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 57,
-      "column": 19
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.pricesBasedOnAnnualPayment",
-    "defaultMessage": "!!!All prices based on yearly payment",
-    "file": "src/features/planSelection/components/PlanSelection.js",
-    "start": {
-      "line": 61,
-      "column": 30
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanTeaser.json b/src/i18n/messages/src/features/planSelection/components/PlanTeaser.json
deleted file mode 100644
index 015304a2e..000000000
--- a/src/i18n/messages/src/features/planSelection/components/PlanTeaser.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "subscription.interval.per",
-    "defaultMessage": "!!!per {interval}",
-    "file": "src/features/planSelection/components/PlanTeaser.js",
-    "start": {
-      "line": 16,
-      "column": 7
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.planItem.upgradeAccount",
-    "defaultMessage": "!!!Upgrade Account",
-    "file": "src/features/planSelection/components/PlanTeaser.js",
-    "start": {
-      "line": 20,
-      "column": 7
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json b/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
deleted file mode 100644
index 40e08c233..000000000
--- a/src/i18n/messages/src/features/planSelection/containers/PlanSelectionScreen.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "feature.planSelection.fullscreen.dialog.title",
-    "defaultMessage": "!!!Downgrade your Franz Plan",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 15,
-      "column": 15
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.dialog.message",
-    "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 19,
-      "column": 17
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.dialog.cta.downgrade",
-    "defaultMessage": "!!!Downgrade to Free",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 23,
-      "column": 22
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.planSelection.fullscreen.dialog.cta.upgrade",
-    "defaultMessage": "!!!Choose Personal",
-    "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
-    "start": {
-      "line": 27,
-      "column": 20
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json b/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json
deleted file mode 100644
index e6e3cef99..000000000
--- a/src/i18n/messages/src/features/serviceLimit/components/AnnouncementScreen.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.announcements.changelog.headline",
-    "defaultMessage": "!!!Changes in Franz {version}",
-    "file": "src/features/serviceLimit/components/AnnouncementScreen.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
deleted file mode 100644
index e35ad8dd8..000000000
--- a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "feature.serviceLimit.limitReached",
-    "defaultMessage": "!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.",
-    "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-    "start": {
-      "line": 9,
-      "column": 16
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "premiumFeature.button.upgradeAccount",
-    "defaultMessage": "!!!Upgrade account",
-    "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index 402865ec5..428bd5fbc 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -66,7 +66,7 @@
   },
   {
     "id": "feature.shareFranz.shareText.email",
-    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+    "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 37,
@@ -79,7 +79,7 @@
   },
   {
     "id": "feature.shareFranz.shareText.twitter",
-    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
+    "defaultMessage": "!!! I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 41,
diff --git a/src/i18n/messages/src/features/trialStatusBar/components/TrialStatusBar.json b/src/i18n/messages/src/features/trialStatusBar/components/TrialStatusBar.json
deleted file mode 100644
index bf211a016..000000000
--- a/src/i18n/messages/src/features/trialStatusBar/components/TrialStatusBar.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.trialStatusBar.restTime",
-    "defaultMessage": "!!!Your Free Franz {plan} Trial ends in {time}.",
-    "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-    "start": {
-      "line": 13,
-      "column": 12
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.expired",
-    "defaultMessage": "!!!Your free Franz {plan} Trial has expired, please upgrade your account.",
-    "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-    "start": {
-      "line": 17,
-      "column": 11
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.cta",
-    "defaultMessage": "!!!Upgrade now",
-    "file": "src/features/trialStatusBar/components/TrialStatusBar.js",
-    "start": {
-      "line": 21,
-      "column": 7
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/trialStatusBar/containers/TrialStatusBarScreen.json b/src/i18n/messages/src/features/trialStatusBar/containers/TrialStatusBarScreen.json
deleted file mode 100644
index 306cd0fee..000000000
--- a/src/i18n/messages/src/features/trialStatusBar/containers/TrialStatusBarScreen.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.title",
-    "defaultMessage": "!!!Downgrade your Franz Plan",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 16,
-      "column": 15
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.message",
-    "defaultMessage": "!!!You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 20,
-      "column": 17
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.cta.downgrade",
-    "defaultMessage": "!!!Downgrade to Free",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 24,
-      "column": 22
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.trialStatusBar.fullscreen.dialog.cta.upgrade",
-    "defaultMessage": "!!!Choose Personal",
-    "file": "src/features/trialStatusBar/containers/TrialStatusBarScreen.js",
-    "start": {
-      "line": 28,
-      "column": 20
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
index 9f0935620..0c7ff2bc8 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 16,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 20,
+      "line": 19,
       "column": 15
     },
     "end": {
-      "line": 23,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Workspaces settings",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 24,
+      "line": 23,
       "column": 29
     },
     "end": {
-      "line": 27,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,37 +43,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 28,
+      "line": 27,
       "column": 24
     },
     "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.premiumCtaButtonLabel",
-    "defaultMessage": "!!!Create your first workspace",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 32,
-      "column": 25
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.reactivatePremiumAccountLabel",
-    "defaultMessage": "!!!Reactivate premium account",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 36,
-      "column": 28
-    },
-    "end": {
-      "line": 39,
+      "line": 30,
       "column": 3
     }
   },
@@ -82,11 +56,11 @@
     "defaultMessage": "!!!add new workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 40,
+      "line": 31,
       "column": 24
     },
     "end": {
-      "line": 43,
+      "line": 34,
       "column": 3
     }
   },
@@ -95,11 +69,11 @@
     "defaultMessage": "!!!Premium feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 44,
+      "line": 35,
       "column": 23
     },
     "end": {
-      "line": 47,
+      "line": 38,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
index d67bc492d..39c9c30fb 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 20,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 23,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!You haven't created any workspaces yet.",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 24,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 27,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Could not load your workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 28,
+      "line": 25,
       "column": 27
     },
     "end": {
-      "line": 31,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 32,
+      "line": 29,
       "column": 23
     },
     "end": {
-      "line": 35,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Your changes have been saved",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 36,
+      "line": 33,
       "column": 15
     },
     "end": {
-      "line": 39,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Workspace has been deleted",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 40,
+      "line": 37,
       "column": 15
     },
     "end": {
-      "line": 43,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 44,
+      "line": 41,
       "column": 24
     },
     "end": {
-      "line": 47,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
-      "line": 48,
+      "line": 45,
       "column": 28
     },
     "end": {
-      "line": 51,
+      "line": 48,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/helpers/plan-helpers.json b/src/i18n/messages/src/helpers/plan-helpers.json
deleted file mode 100644
index 3f3e7e85d..000000000
--- a/src/i18n/messages/src/helpers/plan-helpers.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "pricing.plan.pro",
-    "defaultMessage": "!!!Professional",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 15
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal",
-    "defaultMessage": "!!!Personal",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 20
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.free",
-    "defaultMessage": "!!!Free",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 16
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.legacy",
-    "defaultMessage": "!!!Premium",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 18
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/pricing-helpers.json b/src/i18n/messages/src/helpers/pricing-helpers.json
deleted file mode 100644
index 4030a3e3b..000000000
--- a/src/i18n/messages/src/helpers/pricing-helpers.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "pricing.plan.pro-yearly",
-    "defaultMessage": "!!!Franz Professional Yearly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 22
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.pro-monthly",
-    "defaultMessage": "!!!Franz Professional Monthly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 23
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal-yearly",
-    "defaultMessage": "!!!Franz Personal Yearly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 27
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal-monthly",
-    "defaultMessage": "!!!Franz Personal Monthly",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 28
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.free",
-    "defaultMessage": "!!!Franz Free",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 21,
-      "column": 16
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.legacy",
-    "defaultMessage": "!!!Franz Premium",
-    "file": "src/helpers/pricing-helpers.js",
-    "start": {
-      "line": 25,
-      "column": 18
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index 5778a3389..ed2bfa092 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -102,18 +102,5 @@
       "line": 35,
       "column": 3
     }
-  },
-  {
-    "id": "global.franzProRequired",
-    "defaultMessage": "!!!Franz Professional Required",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 36,
-      "column": 15
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
   }
 ]
\ No newline at end of file