34 files changed, 410 insertions, 1735 deletions

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