31 files changed, 906 insertions, 328 deletions

diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
index c4c2d0cae..da801b548 100644
--- a/src/i18n/messages/src/components/AppUpdateInfoBar.json
+++ b/src/i18n/messages/src/components/AppUpdateInfoBar.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "infobar.updateAvailable",
-    "defaultMessage": "!!!A new update for Franz is available.",
+    "defaultMessage": "!!!A new update for Ferdi is available.",
     "file": "src/components/AppUpdateInfoBar.js",
     "start": {
       "line": 9,
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
index 264fc729b..98ae2e61f 100644
--- a/src/i18n/messages/src/components/auth/Import.json
+++ b/src/i18n/messages/src/components/auth/Import.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "import.headline",
-    "defaultMessage": "!!!Import your Franz 4 services",
+    "defaultMessage": "!!!Import your Ferdi 4 services",
     "file": "src/components/auth/Import.js",
     "start": {
       "line": 13,
@@ -14,7 +14,7 @@
   },
   {
     "id": "import.notSupportedHeadline",
-    "defaultMessage": "!!!Services not yet supported in Franz 5",
+    "defaultMessage": "!!!Services not yet supported in Ferdi 5",
     "file": "src/components/auth/Import.js",
     "start": {
       "line": 17,
diff --git a/src/i18n/messages/src/components/auth/Locked.json b/src/i18n/messages/src/components/auth/Locked.json
new file mode 100644
index 000000000..86b1cae90
--- /dev/null
+++ b/src/i18n/messages/src/components/auth/Locked.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "locked.headline",
+    "defaultMessage": "!!!Locked",
+    "file": "src/components/auth/Locked.js",
+    "start": {
+      "line": 15,
+      "column": 12
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "locked.info",
+    "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
+    "file": "src/components/auth/Locked.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "locked.password.label",
+    "defaultMessage": "!!!Password",
+    "file": "src/components/auth/Locked.js",
+    "start": {
+      "line": 23,
+      "column": 17
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "locked.submit.label",
+    "defaultMessage": "!!!Unlock",
+    "file": "src/components/auth/Locked.js",
+    "start": {
+      "line": 27,
+      "column": 21
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "locked.invalidCredentials",
+    "defaultMessage": "!!!Password invalid",
+    "file": "src/components/auth/Locked.js",
+    "start": {
+      "line": 31,
+      "column": 22
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
index 177f6000b..7e4b32294 100644
--- a/src/i18n/messages/src/components/auth/Login.json
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -65,15 +65,41 @@
     }
   },
   {
+    "id": "login.customServerQuestion",
+    "defaultMessage": "!!!Using a Franz account to log in?",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 37,
+      "column": 24
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.customServerSuggestion",
+    "defaultMessage": "!!!Try importing your Franz account into Ferdi",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 41,
+      "column": 26
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
     "id": "login.tokenExpired",
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 37,
+      "line": 45,
       "column": 16
     },
     "end": {
-      "line": 40,
+      "line": 48,
       "column": 3
     }
   },
@@ -82,11 +108,11 @@
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 41,
+      "line": 49,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 52,
       "column": 3
     }
   },
@@ -95,11 +121,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 45,
+      "line": 53,
       "column": 14
     },
     "end": {
-      "line": 48,
+      "line": 56,
       "column": 3
     }
   },
@@ -108,11 +134,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 49,
+      "line": 57,
       "column": 16
     },
     "end": {
-      "line": 52,
+      "line": 60,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json
index f15617ca5..0885f6a20 100644
--- a/src/i18n/messages/src/components/auth/Pricing.json
+++ b/src/i18n/messages/src/components/auth/Pricing.json
@@ -92,7 +92,7 @@
   },
   {
     "id": "pricing.trial.cta.skip",
-    "defaultMessage": "!!!Continue to Franz",
+    "defaultMessage": "!!!Continue to Ferdi",
     "file": "src/components/auth/Pricing.js",
     "start": {
       "line": 43,
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index 2ea71e5ff..9aa7b25ab 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -66,7 +66,7 @@
   },
   {
     "id": "signup.legal.info",
-    "defaultMessage": "!!!By creating a Franz account you accept the",
+    "defaultMessage": "!!!By creating a Ferdi account you accept the",
     "file": "src/components/auth/Signup.js",
     "start": {
       "line": 41,
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 44cf4fab9..0625487b4 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -37,5 +37,18 @@
       "line": 39,
       "column": 3
     }
+  },
+  {
+    "id": "infobar.authRequestFailed",
+    "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": 40,
+      "column": 21
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index 837dc54bc..ddd9cd094 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -102,5 +102,18 @@
       "line": 46,
       "column": 3
     }
+  },
+  {
+    "id": "sidebar.lockFerdi",
+    "defaultMessage": "!!!Lock Ferdi",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 47,
+      "column": 13
+    },
+    "end": {
+      "line": 50,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
index eb466c0ac..c2e57b8b5 100644
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "services.welcome",
-    "defaultMessage": "!!!Welcome to Franz",
+    "defaultMessage": "!!!Welcome to Ferdi",
     "file": "src/components/services/content/Services.js",
     "start": {
       "line": 14,
@@ -24,5 +24,31 @@
       "line": 21,
       "column": 3
     }
+  },
+  {
+    "id": "services.login",
+    "defaultMessage": "!!!Please login to use Ferdi.",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 22,
+      "column": 9
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverInfo",
+    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 26,
+      "column": 14
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 06d53e41d..48078c18d 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -170,7 +170,7 @@
   },
   {
     "id": "settings.account.deleteInfo",
-    "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
+    "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": 70,
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index 7dfb3ce04..b7309469e 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -78,12 +78,12 @@
     }
   },
   {
-    "id": "settings.navigation.inviteFriends",
-    "defaultMessage": "!!!Invite Friends",
+    "id": "settings.navigation.supportFerdi",
+    "defaultMessage": "!!!Support Ferdi",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
       "line": 38,
-      "column": 17
+      "column": 16
     },
     "end": {
       "line": 41,
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index e66db807d..45dc7b690 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -131,7 +131,7 @@
   },
   {
     "id": "settings.service.form.customUrlPremiumInfo",
-    "defaultMessage": "!!!To add self hosted services, you need a Franz Premium Supporter Account.",
+    "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
       "line": 64,
@@ -261,7 +261,7 @@
   },
   {
     "id": "settings.service.form.proxy.restartInfo",
-    "defaultMessage": "!!!Please restart Franz after changing proxy Settings.",
+    "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
       "line": 104,
@@ -274,7 +274,7 @@
   },
   {
     "id": "settings.service.form.proxy.info",
-    "defaultMessage": "!!!Proxy settings will not be synchronized with the Franz servers.",
+    "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
       "line": 108,
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index fa21db10a..97ecf4b5d 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": 16,
+      "line": 26,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 29,
       "column": 3
     }
   },
@@ -17,11 +17,128 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 20,
+      "line": 30,
       "column": 19
     },
     "end": {
-      "line": 23,
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.hibernateInfo",
+    "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": 34,
+      "column": 17
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.serverInfo",
+    "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 38,
+      "column": 14
+    },
+    "end": {
+      "line": 41,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.serverMoneyInfo",
+    "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 42,
+      "column": 19
+    },
+    "end": {
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.todoServerInfo",
+    "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": 46,
+      "column": 18
+    },
+    "end": {
+      "line": 49,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.lockedPassword",
+    "defaultMessage": "!!!Ferdi Lock Password",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 50,
+      "column": 18
+    },
+    "end": {
+      "line": 53,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.lockedPasswordInfo",
+    "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": 54,
+      "column": 22
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.lockInfo",
+    "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi 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": 58,
+      "column": 12
+    },
+    "end": {
+      "line": 61,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.scheduledDNDTimeInfo",
+    "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": 62,
+      "column": 24
+    },
+    "end": {
+      "line": 65,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.scheduledDNDInfo",
+    "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": 66,
+      "column": 20
+    },
+    "end": {
+      "line": 69,
       "column": 3
     }
   },
@@ -30,11 +147,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 24,
+      "line": 70,
       "column": 20
     },
     "end": {
-      "line": 27,
+      "line": 73,
       "column": 3
     }
   },
@@ -43,11 +160,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 28,
+      "line": 74,
       "column": 19
     },
     "end": {
-      "line": 31,
+      "line": 77,
       "column": 3
     }
   },
@@ -56,11 +173,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 32,
+      "line": 78,
       "column": 22
     },
     "end": {
-      "line": 35,
+      "line": 81,
       "column": 3
     }
   },
@@ -69,24 +186,24 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 36,
+      "line": 82,
       "column": 20
     },
     "end": {
-      "line": 39,
+      "line": 85,
       "column": 3
     }
   },
   {
     "id": "settings.app.translationHelp",
-    "defaultMessage": "!!!Help us to translate Franz into your language.",
+    "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 40,
+      "line": 86,
       "column": 19
     },
     "end": {
-      "line": 43,
+      "line": 89,
       "column": 3
     }
   },
@@ -95,24 +212,24 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 44,
+      "line": 90,
       "column": 20
     },
     "end": {
-      "line": 47,
+      "line": 93,
       "column": 3
     }
   },
   {
     "id": "settings.app.cacheInfo",
-    "defaultMessage": "!!!Franz cache is currently using {size} of disk space.",
+    "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 48,
+      "line": 94,
       "column": 13
     },
     "end": {
-      "line": 51,
+      "line": 97,
       "column": 3
     }
   },
@@ -121,11 +238,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 52,
+      "line": 98,
       "column": 23
     },
     "end": {
-      "line": 55,
+      "line": 101,
       "column": 3
     }
   },
@@ -134,11 +251,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 56,
+      "line": 102,
       "column": 25
     },
     "end": {
-      "line": 59,
+      "line": 105,
       "column": 3
     }
   },
@@ -147,11 +264,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 60,
+      "line": 106,
       "column": 23
     },
     "end": {
-      "line": 63,
+      "line": 109,
       "column": 3
     }
   },
@@ -160,11 +277,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 64,
+      "line": 110,
       "column": 25
     },
     "end": {
-      "line": 67,
+      "line": 113,
       "column": 3
     }
   },
@@ -173,24 +290,24 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 68,
+      "line": 114,
       "column": 25
     },
     "end": {
-      "line": 71,
+      "line": 117,
       "column": 3
     }
   },
   {
     "id": "settings.app.updateStatusUpToDate",
-    "defaultMessage": "!!!You are using the latest version of Franz",
+    "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 72,
+      "line": 118,
       "column": 24
     },
     "end": {
-      "line": 75,
+      "line": 121,
       "column": 3
     }
   },
@@ -199,11 +316,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 76,
+      "line": 122,
       "column": 18
     },
     "end": {
-      "line": 79,
+      "line": 125,
       "column": 3
     }
   },
@@ -212,11 +329,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 80,
+      "line": 126,
       "column": 29
     },
     "end": {
-      "line": 83,
+      "line": 129,
       "column": 3
     }
   },
@@ -225,11 +342,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 84,
+      "line": 130,
       "column": 22
     },
     "end": {
-      "line": 87,
+      "line": 133,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
new file mode 100644
index 000000000..bf8df6468
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "settings.supportFerdi.headline",
+    "defaultMessage": "!!!Support Ferdi",
+    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
+    "start": {
+      "line": 8,
+      "column": 12
+    },
+    "end": {
+      "line": 11,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.supportFerdi.title",
+    "defaultMessage": "!!!Do you like Ferdi? Spread the love!",
+    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
+    "start": {
+      "line": 12,
+      "column": 9
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.supportFerdi.github",
+    "defaultMessage": "!!!Star on GitHub",
+    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
+    "start": {
+      "line": 16,
+      "column": 10
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.supportFerdi.share",
+    "defaultMessage": "!!!Tell your Friends",
+    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
+    "start": {
+      "line": 20,
+      "column": 9
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.supportFerdi.openCollective",
+    "defaultMessage": "!!!Support our Open Collective",
+    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
+    "start": {
+      "line": 24,
+      "column": 18
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 0c33fee5f..80adadb67 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -14,7 +14,7 @@
   },
   {
     "id": "settings.team.contentHeadline",
-    "defaultMessage": "!!!Franz for Teams",
+    "defaultMessage": "!!!Ferdi for Teams",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
       "line": 21,
@@ -40,7 +40,7 @@
   },
   {
     "id": "settings.team.copy",
-    "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+    "defaultMessage": "!!!Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
       "line": 29,
diff --git a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
index fd969da78..6370e4bb9 100644
--- a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
+++ b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Get a Franz Supporter License",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 13,
+      "line": 12,
       "column": 10
     },
     "end": {
-      "line": 16,
+      "line": 15,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 17,
+      "line": 16,
       "column": 15
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 21,
+      "line": 20,
       "column": 15
     },
     "end": {
-      "line": 24,
+      "line": 23,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Activate the free Franz Professional trial",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 25,
+      "line": 24,
       "column": 20
     },
     "end": {
-      "line": 28,
+      "line": 27,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!No strings attached",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 29,
+      "line": 28,
       "column": 29
     },
     "end": {
-      "line": 32,
+      "line": 31,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!No credit card required",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 33,
+      "line": 32,
       "column": 16
     },
     "end": {
-      "line": 36,
+      "line": 35,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Your free trial ends automatically after 14 days",
     "file": "src/components/ui/ActivateTrialButton/index.js",
     "start": {
-      "line": 37,
+      "line": 36,
       "column": 21
     },
     "end": {
-      "line": 40,
+      "line": 39,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
index 0cde4cee5..320d3ca3e 100644
--- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
+++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/components/ui/PremiumFeatureContainer/index.js",
     "start": {
-      "line": 16,
+      "line": 15,
       "column": 10
     },
     "end": {
-      "line": 19,
+      "line": 18,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/UpgradeButton/index.json b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
index 28e44cb66..f270f5a65 100644
--- a/src/i18n/messages/src/components/ui/UpgradeButton/index.json
+++ b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Upgrade to Franz Professional",
     "file": "src/components/ui/UpgradeButton/index.js",
     "start": {
-      "line": 13,
+      "line": 12,
       "column": 16
     },
     "end": {
-      "line": 16,
+      "line": 15,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index d0a243ec0..d40d5ba97 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -1,14 +1,14 @@
 [
   {
     "id": "settings.app.form.autoLaunchOnStart",
-    "defaultMessage": "!!!Launch Franz on start",
+    "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 26,
+      "line": 29,
       "column": 21
     },
     "end": {
-      "line": 29,
+      "line": 32,
       "column": 3
     }
   },
@@ -17,50 +17,180 @@
     "defaultMessage": "!!!Open in background",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 30,
+      "line": 33,
       "column": 26
     },
     "end": {
-      "line": 33,
+      "line": 36,
       "column": 3
     }
   },
   {
     "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Franz in background when closing the window",
+    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 34,
+      "line": 37,
       "column": 19
     },
     "end": {
-      "line": 37,
+      "line": 40,
       "column": 3
     }
   },
   {
     "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Show Franz in system tray",
+    "defaultMessage": "!!!Show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 38,
+      "line": 41,
       "column": 20
     },
     "end": {
-      "line": 41,
+      "line": 44,
       "column": 3
     }
   },
   {
     "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Franz to system tray",
+    "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 42,
+      "line": 45,
       "column": 24
     },
     "end": {
-      "line": 45,
+      "line": 48,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.privateNotifications",
+    "defaultMessage": "!!!Don't show message content in notifications",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 49,
+      "column": 24
+    },
+    "end": {
+      "line": 52,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.hibernate",
+    "defaultMessage": "!!!Enable service hibernation",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 53,
+      "column": 13
+    },
+    "end": {
+      "line": 56,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.hibernationStrategy",
+    "defaultMessage": "!!!Hibernation strategy",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 57,
+      "column": 23
+    },
+    "end": {
+      "line": 60,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.server",
+    "defaultMessage": "!!!Server",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 61,
+      "column": 10
+    },
+    "end": {
+      "line": 64,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.todoServer",
+    "defaultMessage": "!!!Todo Server",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 65,
+      "column": 14
+    },
+    "end": {
+      "line": 68,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.enableLock",
+    "defaultMessage": "!!!Enable Ferdi password lock",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 69,
+      "column": 14
+    },
+    "end": {
+      "line": 72,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.lockPassword",
+    "defaultMessage": "!!!Ferdi Lock password",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 73,
+      "column": 16
+    },
+    "end": {
+      "line": 76,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.scheduledDNDEnabled",
+    "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 77,
+      "column": 23
+    },
+    "end": {
+      "line": 80,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.scheduledDNDStart",
+    "defaultMessage": "!!!From",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 81,
+      "column": 21
+    },
+    "end": {
+      "line": 84,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.scheduledDNDEnd",
+    "defaultMessage": "!!!To",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 85,
+      "column": 19
+    },
+    "end": {
+      "line": 88,
       "column": 3
     }
   },
@@ -69,11 +199,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 46,
+      "line": 89,
       "column": 12
     },
     "end": {
-      "line": 49,
+      "line": 92,
       "column": 3
     }
   },
@@ -82,11 +212,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 50,
+      "line": 93,
       "column": 12
     },
     "end": {
-      "line": 53,
+      "line": 96,
       "column": 3
     }
   },
@@ -95,11 +225,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 54,
+      "line": 97,
       "column": 24
     },
     "end": {
-      "line": 57,
+      "line": 100,
       "column": 3
     }
   },
@@ -108,11 +238,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 58,
+      "line": 101,
       "column": 29
     },
     "end": {
-      "line": 61,
+      "line": 104,
       "column": 3
     }
   },
@@ -121,11 +251,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 62,
+      "line": 105,
       "column": 23
     },
     "end": {
-      "line": 65,
+      "line": 108,
       "column": 3
     }
   },
@@ -134,11 +264,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 66,
+      "line": 109,
       "column": 25
     },
     "end": {
-      "line": 69,
+      "line": 112,
       "column": 3
     }
   },
@@ -147,11 +277,24 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 70,
+      "line": 113,
       "column": 8
     },
     "end": {
-      "line": 73,
+      "line": 116,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.noUpdates",
+    "defaultMessage": "!!!Disable updates",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 117,
+      "column": 13
+    },
+    "end": {
+      "line": 120,
       "column": 3
     }
   },
@@ -160,11 +303,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 74,
+      "line": 121,
       "column": 15
     },
     "end": {
-      "line": 77,
+      "line": 124,
       "column": 3
     }
   },
@@ -173,11 +316,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 78,
+      "line": 125,
       "column": 27
     },
     "end": {
-      "line": 81,
+      "line": 128,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
index eb1b66916..ba8b624a1 100644
--- a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
+++ b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
@@ -1,14 +1,14 @@
 [
   {
     "id": "feature.announcements.changelog.headline",
-    "defaultMessage": "!!!Changes in Franz {version}",
+    "defaultMessage": "!!!Changes in Ferdi {version}",
     "file": "src/features/announcements/components/AnnouncementScreen.js",
     "start": {
-      "line": 20,
+      "line": 19,
       "column": 12
     },
     "end": {
-      "line": 23,
+      "line": 22,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json
index 0d345a47b..77fabf236 100644
--- a/src/i18n/messages/src/features/delayApp/Component.json
+++ b/src/i18n/messages/src/features/delayApp/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Please purchase license to skip waiting",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 17,
+      "line": 14,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 17,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Get the free Franz Professional 14 day trial and skip the line",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 21,
+      "line": 18,
       "column": 17
     },
     "end": {
-      "line": 24,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Get a Franz Supporter License",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 25,
+      "line": 22,
       "column": 10
     },
     "end": {
-      "line": 28,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,24 +43,24 @@
     "defaultMessage": "!!!Yes, I want the free 14 day trial of Franz Professional",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 29,
+      "line": 26,
       "column": 15
     },
     "end": {
-      "line": 32,
+      "line": 29,
       "column": 3
     }
   },
   {
     "id": "feature.delayApp.text",
-    "defaultMessage": "!!!Franz will continue in {seconds} seconds.",
+    "defaultMessage": "!!!Ferdi will continue in {seconds} seconds.",
     "file": "src/features/delayApp/Component.js",
     "start": {
-      "line": 33,
+      "line": 30,
       "column": 8
     },
     "end": {
-      "line": 36,
+      "line": 33,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/quickSwitch/Component.json b/src/i18n/messages/src/features/quickSwitch/Component.json
new file mode 100644
index 000000000..f42e1af49
--- /dev/null
+++ b/src/i18n/messages/src/features/quickSwitch/Component.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "feature.quickSwitch.search",
+    "defaultMessage": "!!!Search...",
+    "file": "src/features/quickSwitch/Component.js",
+    "start": {
+      "line": 15,
+      "column": 10
+    },
+    "end": {
+      "line": 18,
+      "column": 3
+    }
+  },
+  {
+    "id": "feature.quickSwitch.info",
+    "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
+    "file": "src/features/quickSwitch/Component.js",
+    "start": {
+      "line": 19,
+      "column": 8
+    },
+    "end": {
+      "line": 22,
+      "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
index df5bc03e8..e35ad8dd8 100644
--- a/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
+++ b/src/i18n/messages/src/features/serviceLimit/components/LimitReachedInfobox.json
@@ -4,11 +4,11 @@
     "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": 11,
+      "line": 9,
       "column": 16
     },
     "end": {
-      "line": 14,
+      "line": 12,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
     "start": {
-      "line": 15,
+      "line": 13,
       "column": 10
     },
     "end": {
-      "line": 18,
+      "line": 16,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index 72150f2b0..402865ec5 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -1,27 +1,27 @@
 [
   {
     "id": "feature.shareFranz.headline",
-    "defaultMessage": "!!!Franz is better together!",
+    "defaultMessage": "!!!Ferdi is better together!",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 18,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 21,
+      "line": 20,
       "column": 3
     }
   },
   {
     "id": "feature.shareFranz.text",
-    "defaultMessage": "!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+    "defaultMessage": "!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 22,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 25,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Share as email",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 26,
+      "line": 25,
       "column": 16
     },
     "end": {
-      "line": 29,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Share on Facebook",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 30,
+      "line": 29,
       "column": 19
     },
     "end": {
-      "line": 33,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Share on Twitter",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 34,
+      "line": 33,
       "column": 18
     },
     "end": {
-      "line": 37,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 38,
+      "line": 37,
       "column": 18
     },
     "end": {
-      "line": 41,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "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",
     "file": "src/features/shareFranz/Component.js",
     "start": {
-      "line": 42,
+      "line": 41,
       "column": 20
     },
     "end": {
-      "line": 45,
+      "line": 44,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
index 7f230e82a..19ea81171 100644
--- a/src/i18n/messages/src/features/todos/components/TodosWebview.json
+++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Franz Todos are available to premium users now!",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 15,
+      "line": 17,
       "column": 15
     },
     "end": {
-      "line": 18,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Upgrade Account",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 19,
+      "line": 21,
       "column": 14
     },
     "end": {
-      "line": 22,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Everyone else will have to wait a little longer.",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 23,
+      "line": 25,
       "column": 15
     },
     "end": {
-      "line": 26,
+      "line": 28,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
index f62bac42c..1aabfb520 100644
--- a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
+++ b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Create workspace",
     "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
     "start": {
-      "line": 13,
+      "line": 12,
       "column": 16
     },
     "end": {
-      "line": 16,
+      "line": 15,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
     "start": {
-      "line": 17,
+      "line": 16,
       "column": 8
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
index 20ed99f8d..4b047eac1 100644
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Delete workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 19,
+      "line": 21,
       "column": 16
     },
     "end": {
-      "line": 22,
+      "line": 24,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Save workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 23,
+      "line": 25,
       "column": 14
     },
     "end": {
-      "line": 26,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 27,
+      "line": 29,
       "column": 8
     },
     "end": {
-      "line": 30,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,37 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 31,
+      "line": 33,
       "column": 18
     },
     "end": {
-      "line": 34,
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.keepLoaded",
+    "defaultMessage": "!!!Keep this workspace loaded*",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 37,
+      "column": 14
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.keepLoadedInfo",
+    "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 41,
+      "column": 18
+    },
+    "end": {
+      "line": 44,
       "column": 3
     }
   },
@@ -56,11 +82,11 @@
     "defaultMessage": "!!!Services in this Workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 35,
+      "line": 45,
       "column": 31
     },
     "end": {
-      "line": 38,
+      "line": 48,
       "column": 3
     }
   },
@@ -69,11 +95,11 @@
     "defaultMessage": "!!!You haven't added any services yet.",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 39,
+      "line": 49,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 52,
       "column": 3
     }
   },
@@ -82,11 +108,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 43,
+      "line": 53,
       "column": 20
     },
     "end": {
-      "line": 46,
+      "line": 56,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
index 2f340f1e9..9f0935620 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": 17,
+      "line": 16,
       "column": 12
     },
     "end": {
-      "line": 20,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!All services",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 21,
+      "line": 20,
       "column": 15
     },
     "end": {
-      "line": 24,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Workspaces settings",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 25,
+      "line": 24,
       "column": 29
     },
     "end": {
-      "line": 28,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Info about workspace feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 29,
+      "line": 28,
       "column": 24
     },
     "end": {
-      "line": 32,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Create your first workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 33,
+      "line": 32,
       "column": 25
     },
     "end": {
-      "line": 36,
+      "line": 35,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Reactivate premium account",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 37,
+      "line": 36,
       "column": 28
     },
     "end": {
-      "line": 40,
+      "line": 39,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!add new workspace",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 41,
+      "line": 40,
       "column": 24
     },
     "end": {
-      "line": 44,
+      "line": 43,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Premium feature",
     "file": "src/features/workspaces/components/WorkspaceDrawer.js",
     "start": {
-      "line": 45,
+      "line": 44,
       "column": 23
     },
     "end": {
-      "line": 48,
+      "line": 47,
       "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 7eb4fab50..4111ba760 100644
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -92,7 +92,7 @@
   },
   {
     "id": "settings.workspaces.workspaceFeatureHeadline",
-    "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+    "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
     "file": "src/features/workspaces/components/WorkspacesDashboard.js",
     "start": {
       "line": 47,
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index f4fd5b8b0..903de64cb 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "global.api.unhealthy",
-    "defaultMessage": "!!!Can't connect to Franz Online Services",
+    "defaultMessage": "!!!Can't connect to Ferdi Online Services",
     "file": "src/i18n/globalMessages.js",
     "start": {
       "line": 4,
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 08c8da77d..c09148b2f 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 18,
+      "line": 16,
       "column": 8
     },
     "end": {
-      "line": 21,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 22,
+      "line": 20,
       "column": 8
     },
     "end": {
-      "line": 25,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 26,
+      "line": 24,
       "column": 8
     },
     "end": {
-      "line": 29,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 30,
+      "line": 28,
       "column": 7
     },
     "end": {
-      "line": 33,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 34,
+      "line": 32,
       "column": 8
     },
     "end": {
-      "line": 37,
+      "line": 35,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 38,
+      "line": 36,
       "column": 9
     },
     "end": {
-      "line": 41,
+      "line": 39,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 42,
+      "line": 40,
       "column": 22
     },
     "end": {
-      "line": 45,
+      "line": 43,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 46,
+      "line": 44,
       "column": 10
     },
     "end": {
-      "line": 49,
+      "line": 47,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 50,
+      "line": 48,
       "column": 13
     },
     "end": {
-      "line": 53,
+      "line": 51,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 54,
+      "line": 52,
       "column": 10
     },
     "end": {
-      "line": 57,
+      "line": 55,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 58,
+      "line": 56,
       "column": 17
     },
     "end": {
-      "line": 61,
+      "line": 59,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 62,
+      "line": 60,
       "column": 16
     },
     "end": {
-      "line": 65,
+      "line": 63,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 66,
+      "line": 64,
       "column": 18
     },
     "end": {
-      "line": 69,
+      "line": 67,
       "column": 3
     }
   },
@@ -173,11 +173,50 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 70,
+      "line": 68,
       "column": 16
     },
     "end": {
-      "line": 73,
+      "line": 71,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.openQuickSwitch",
+    "defaultMessage": "!!!Open Quick Switch",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 72,
+      "column": 19
+    },
+    "end": {
+      "line": 75,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.back",
+    "defaultMessage": "!!!Back",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 76,
+      "column": 8
+    },
+    "end": {
+      "line": 79,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.forward",
+    "defaultMessage": "!!!Forward",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 80,
+      "column": 11
+    },
+    "end": {
+      "line": 83,
       "column": 3
     }
   },
@@ -186,11 +225,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 74,
+      "line": 84,
       "column": 13
     },
     "end": {
-      "line": 77,
+      "line": 87,
       "column": 3
     }
   },
@@ -199,11 +238,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 78,
+      "line": 88,
       "column": 10
     },
     "end": {
-      "line": 81,
+      "line": 91,
       "column": 3
     }
   },
@@ -212,11 +251,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 82,
+      "line": 92,
       "column": 11
     },
     "end": {
-      "line": 85,
+      "line": 95,
       "column": 3
     }
   },
@@ -225,11 +264,11 @@
     "defaultMessage": "!!!Enter Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 86,
+      "line": 96,
       "column": 19
     },
     "end": {
-      "line": 89,
+      "line": 99,
       "column": 3
     }
   },
@@ -238,11 +277,11 @@
     "defaultMessage": "!!!Exit Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 90,
+      "line": 100,
       "column": 18
     },
     "end": {
-      "line": 93,
+      "line": 103,
       "column": 3
     }
   },
@@ -251,11 +290,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 94,
+      "line": 104,
       "column": 20
     },
     "end": {
-      "line": 97,
+      "line": 107,
       "column": 3
     }
   },
@@ -264,11 +303,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 98,
+      "line": 108,
       "column": 18
     },
     "end": {
-      "line": 101,
+      "line": 111,
       "column": 3
     }
   },
@@ -277,11 +316,11 @@
     "defaultMessage": "!!!Toggle Todos Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 102,
+      "line": 112,
       "column": 23
     },
     "end": {
-      "line": 105,
+      "line": 115,
       "column": 3
     }
   },
@@ -290,11 +329,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 106,
+      "line": 116,
       "column": 25
     },
     "end": {
-      "line": 109,
+      "line": 119,
       "column": 3
     }
   },
@@ -303,24 +342,37 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 110,
+      "line": 120,
       "column": 17
     },
     "end": {
-      "line": 113,
+      "line": 123,
       "column": 3
     }
   },
   {
     "id": "menu.view.reloadFranz",
-    "defaultMessage": "!!!Reload Franz",
+    "defaultMessage": "!!!Reload Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 114,
+      "line": 124,
       "column": 15
     },
     "end": {
-      "line": 117,
+      "line": 127,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.view.lockFerdi",
+    "defaultMessage": "!!!Lock Ferdi",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 128,
+      "column": 13
+    },
+    "end": {
+      "line": 131,
       "column": 3
     }
   },
@@ -329,11 +381,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 118,
+      "line": 132,
       "column": 12
     },
     "end": {
-      "line": 121,
+      "line": 135,
       "column": 3
     }
   },
@@ -342,11 +394,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 122,
+      "line": 136,
       "column": 9
     },
     "end": {
-      "line": 125,
+      "line": 139,
       "column": 3
     }
   },
@@ -355,11 +407,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 126,
+      "line": 140,
       "column": 13
     },
     "end": {
-      "line": 129,
+      "line": 143,
       "column": 3
     }
   },
@@ -368,11 +420,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 130,
+      "line": 144,
       "column": 13
     },
     "end": {
-      "line": 133,
+      "line": 147,
       "column": 3
     }
   },
@@ -381,11 +433,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 134,
+      "line": 148,
       "column": 11
     },
     "end": {
-      "line": 137,
+      "line": 151,
       "column": 3
     }
   },
@@ -394,24 +446,24 @@
     "defaultMessage": "!!!Copy Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 138,
+      "line": 152,
       "column": 13
     },
     "end": {
-      "line": 141,
+      "line": 155,
       "column": 3
     }
   },
   {
     "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Franz Debug Information",
+    "defaultMessage": "!!!Ferdi Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 142,
+      "line": 156,
       "column": 27
     },
     "end": {
-      "line": 145,
+      "line": 159,
       "column": 3
     }
   },
@@ -420,11 +472,11 @@
     "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 146,
+      "line": 160,
       "column": 23
     },
     "end": {
-      "line": 149,
+      "line": 163,
       "column": 3
     }
   },
@@ -433,11 +485,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 150,
+      "line": 164,
       "column": 7
     },
     "end": {
-      "line": 153,
+      "line": 167,
       "column": 3
     }
   },
@@ -446,11 +498,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 154,
+      "line": 168,
       "column": 11
     },
     "end": {
-      "line": 157,
+      "line": 171,
       "column": 3
     }
   },
@@ -459,11 +511,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 158,
+      "line": 172,
       "column": 8
     },
     "end": {
-      "line": 161,
+      "line": 175,
       "column": 3
     }
   },
@@ -472,11 +524,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 162,
+      "line": 176,
       "column": 8
     },
     "end": {
-      "line": 165,
+      "line": 179,
       "column": 3
     }
   },
@@ -485,11 +537,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 166,
+      "line": 180,
       "column": 12
     },
     "end": {
-      "line": 169,
+      "line": 183,
       "column": 3
     }
   },
@@ -498,11 +550,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 170,
+      "line": 184,
       "column": 10
     },
     "end": {
-      "line": 173,
+      "line": 187,
       "column": 3
     }
   },
@@ -511,24 +563,24 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 174,
+      "line": 188,
       "column": 8
     },
     "end": {
-      "line": 177,
+      "line": 191,
       "column": 3
     }
   },
   {
     "id": "menu.app.about",
-    "defaultMessage": "!!!About Franz",
+    "defaultMessage": "!!!About Ferdi",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 178,
+      "line": 192,
       "column": 9
     },
     "end": {
-      "line": 181,
+      "line": 195,
       "column": 3
     }
   },
@@ -537,11 +589,11 @@
     "defaultMessage": "!!!What's new?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 182,
+      "line": 196,
       "column": 16
     },
     "end": {
-      "line": 185,
+      "line": 199,
       "column": 3
     }
   },
@@ -550,11 +602,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 186,
+      "line": 200,
       "column": 12
     },
     "end": {
-      "line": 189,
+      "line": 203,
       "column": 3
     }
   },
@@ -563,11 +615,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 190,
+      "line": 204,
       "column": 19
     },
     "end": {
-      "line": 193,
+      "line": 207,
       "column": 3
     }
   },
@@ -576,11 +628,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 194,
+      "line": 208,
       "column": 8
     },
     "end": {
-      "line": 197,
+      "line": 211,
       "column": 3
     }
   },
@@ -589,11 +641,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 198,
+      "line": 212,
       "column": 14
     },
     "end": {
-      "line": 201,
+      "line": 215,
       "column": 3
     }
   },
@@ -602,11 +654,24 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 202,
+      "line": 216,
       "column": 10
     },
     "end": {
-      "line": 205,
+      "line": 219,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.autohideMenuBar",
+    "defaultMessage": "!!!Auto-hide menu bar",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 220,
+      "column": 19
+    },
+    "end": {
+      "line": 223,
       "column": 3
     }
   },
@@ -615,11 +680,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 206,
+      "line": 224,
       "column": 8
     },
     "end": {
-      "line": 209,
+      "line": 227,
       "column": 3
     }
   },
@@ -628,11 +693,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 210,
+      "line": 228,
       "column": 17
     },
     "end": {
-      "line": 213,
+      "line": 231,
       "column": 3
     }
   },
@@ -641,11 +706,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 214,
+      "line": 232,
       "column": 19
     },
     "end": {
-      "line": 217,
+      "line": 235,
       "column": 3
     }
   },
@@ -654,11 +719,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 218,
+      "line": 236,
       "column": 23
     },
     "end": {
-      "line": 221,
+      "line": 239,
       "column": 3
     }
   },
@@ -667,11 +732,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 222,
+      "line": 240,
       "column": 24
     },
     "end": {
-      "line": 225,
+      "line": 243,
       "column": 3
     }
   },
@@ -680,11 +745,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 226,
+      "line": 244,
       "column": 23
     },
     "end": {
-      "line": 229,
+      "line": 247,
       "column": 3
     }
   },
@@ -693,11 +758,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 230,
+      "line": 248,
       "column": 27
     },
     "end": {
-      "line": 233,
+      "line": 251,
       "column": 3
     }
   },
@@ -706,11 +771,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 234,
+      "line": 252,
       "column": 11
     },
     "end": {
-      "line": 237,
+      "line": 255,
       "column": 3
     }
   },
@@ -719,11 +784,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 238,
+      "line": 256,
       "column": 13
     },
     "end": {
-      "line": 241,
+      "line": 259,
       "column": 3
     }
   },
@@ -732,11 +797,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 242,
+      "line": 260,
       "column": 14
     },
     "end": {
-      "line": 245,
+      "line": 263,
       "column": 3
     }
   },
@@ -745,11 +810,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 246,
+      "line": 264,
       "column": 20
     },
     "end": {
-      "line": 249,
+      "line": 267,
       "column": 3
     }
   },
@@ -758,11 +823,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 250,
+      "line": 268,
       "column": 9
     },
     "end": {
-      "line": 253,
+      "line": 271,
       "column": 3
     }
   },
@@ -771,11 +836,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 254,
+      "line": 272,
       "column": 19
     },
     "end": {
-      "line": 257,
+      "line": 275,
       "column": 3
     }
   },
@@ -784,11 +849,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 258,
+      "line": 276,
       "column": 20
     },
     "end": {
-      "line": 261,
+      "line": 279,
       "column": 3
     }
   },
@@ -797,24 +862,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 262,
+      "line": 280,
       "column": 15
     },
     "end": {
-      "line": 265,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 266,
-      "column": 17
-    },
-    "end": {
-      "line": 269,
+      "line": 283,
       "column": 3
     }
   }