53 files changed, 804 insertions, 456 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 764151b5d..8ec44a2b9 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -400,8 +400,17 @@
      "contributions": [
        "translation"
      ]
+    },
+    {
+      "login": "n0emis",
+      "name": "n0emis",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/22817873?v=4",
+      "profile": "http://twitter.com/noemis_exec",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 6,
  "skipCi": true
-}
-\ No newline at end of file
+}
diff --git a/README.md b/README.md
index cd3eb7a24..dcee800a9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@
 <p align="center">
 <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF">
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --><a href='#contributors-'><img src='https://img.shields.io/badge/contributors-38-default.svg?logo=github' alt='Contributors'/></a><!-- ALL-CONTRIBUTORS-BADGE:END --> 
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-39-default.svg?logo=github' alt='Contributors'/></a>
+<!-- ALL-CONTRIBUTORS-BADGE:END --> 
 <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
 <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a>
 <a href="https://ci.appveyor.com/project/kytwb/ferdi"><img alt="Build Status Windows" src="https://img.shields.io/appveyor/ci/kytwb/ferdi/master?logo=appveyor"></a>
@@ -236,56 +238,57 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt="Bennett"/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">🌍</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">🐛</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Avantezzen" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://vantezzen.io"><img src="https://avatars2.githubusercontent.com/u/10333196?v=4" width="40px;" alt=""/><br /><sub><b>Bennett</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Code">💻</a> <a href="#design-vantezzen" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=vantezzen" title="Documentation">📖</a> <a href="#ideas-vantezzen" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-vantezzen" title="Translation">🌍</a> <a href="#example-vantezzen" title="Examples">💡</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Avantezzen" title="Bug reports">🐛</a> <a href="#content-vantezzen" title="Content">🖋</a> <a href="#infra-vantezzen" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-vantezzen" title="User Testing">📓</a> <a href="#question-vantezzen" title="Answering Questions">💬</a> <a href="#projectManagement-vantezzen" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Avantezzen" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt="Amine Mouafik"/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="#design-kytwb" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">📖</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Akytwb" title="Bug reports">🐛</a> <a href="#content-kytwb" title="Content">🖋</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-kytwb" title="User Testing">📓</a> <a href="#question-kytwb" title="Answering Questions">💬</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Akytwb" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#fundingFinding-kytwb" title="Funding Finding">🔍</a> <a href="#blog-kytwb" title="Blogposts">📝</a></td>
+    <td align="center"><a href="https://twitter.com/kytwb"><img src="https://avatars0.githubusercontent.com/u/412895?v=4" width="40px;" alt=""/><br /><sub><b>Amine Mouafik</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Code">💻</a> <a href="#design-kytwb" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=kytwb" title="Documentation">📖</a> <a href="#ideas-kytwb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Akytwb" title="Bug reports">🐛</a> <a href="#content-kytwb" title="Content">🖋</a> <a href="#infra-kytwb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#userTesting-kytwb" title="User Testing">📓</a> <a href="#question-kytwb" title="Answering Questions">💬</a> <a href="#projectManagement-kytwb" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/pulls?q=is%3Apr+reviewed-by%3Akytwb" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-kytwb" title="Maintenance">🚧</a> <a href="#platform-kytwb" title="Packaging/porting to new platform">📦</a> <a href="#fundingFinding-kytwb" title="Funding Finding">🔍</a> <a href="#blog-kytwb" title="Blogposts">📝</a></td>
-    <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt="Stefan Malzner"/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠️</a> <a href="#translation-adlk" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://www.adlk.io"><img src="https://avatars1.githubusercontent.com/u/3265004?v=4" width="40px;" alt=""/><br /><sub><b>Stefan Malzner</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Code">💻</a> <a href="#content-adlk" title="Content">🖋</a> <a href="#design-adlk" title="Design">🎨</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Documentation">📖</a> <a href="#ideas-adlk" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-adlk" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#projectManagement-adlk" title="Project Management">📆</a> <a href="https://github.com/getferdi/ferdi/commits?author=adlk" title="Tests">⚠️</a> <a href="#translation-adlk" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt="Makazzz"/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">🌍</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/Makazzz"><img src="https://avatars2.githubusercontent.com/u/49844464?v=4" width="40px;" alt=""/><br /><sub><b>Makazzz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3AMakazzz" title="Bug reports">🐛</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Code">💻</a> <a href="#translation-Makazzz" title="Translation">🌍</a> <a href="#content-Makazzz" title="Content">🖋</a> <a href="https://github.com/getferdi/ferdi/commits?author=Makazzz" title="Documentation">📖</a> <a href="#platform-Makazzz" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt="ZeroCool"/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://seriesgt.com"><img src="https://avatars3.githubusercontent.com/u/5977640?v=4" width="40px;" alt=""/><br /><sub><b>ZeroCool</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=ZeroCool940711" title="Code">💻</a> <a href="#ideas-ZeroCool940711" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt="rseitbekov"/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/rseitbekov"><img src="https://avatars2.githubusercontent.com/u/35684439?v=4" width="40px;" alt=""/><br /><sub><b>rseitbekov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=rseitbekov" title="Code">💻</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt="Peter Bittner"/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://djangogigs.com/developers/peter-bittner/"><img src="https://avatars2.githubusercontent.com/u/665072?v=4" width="40px;" alt=""/><br /><sub><b>Peter Bittner</b></sub></a><br /><a href="#ideas-bittner" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3Abittner" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt="Justus Saul"/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">🐛</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/justus-saul"><img src="https://avatars1.githubusercontent.com/u/5861826?v=4" width="40px;" alt=""/><br /><sub><b>Justus Saul</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Ajustus-saul" title="Bug reports">🐛</a> <a href="#ideas-justus-saul" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt="igreil"/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/igreil"><img src="https://avatars0.githubusercontent.com/u/17239151?v=4" width="40px;" alt=""/><br /><sub><b>igreil</b></sub></a><br /><a href="#ideas-igreil" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt="Marco Lopes"/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://marcolopes.eu"><img src="https://avatars1.githubusercontent.com/u/431889?v=4" width="40px;" alt=""/><br /><sub><b>Marco Lopes</b></sub></a><br /><a href="#ideas-marcolopes" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt="dayzlun"/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/dayzlun"><img src="https://avatars3.githubusercontent.com/u/17259690?v=4" width="40px;" alt=""/><br /><sub><b>dayzlun</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Adayzlun" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt="Tobias Günther"/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://twitter.com/tobigue_"><img src="https://avatars2.githubusercontent.com/u/1560152?v=4" width="40px;" alt=""/><br /><sub><b>Tobias Günther</b></sub></a><br /><a href="#ideas-tobigue" title="Ideas, Planning, & Feedback">🤔</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt="AGCaesar"/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/AGCaesar"><img src="https://avatars3.githubusercontent.com/u/7844066?v=4" width="40px;" alt=""/><br /><sub><b>AGCaesar</b></sub></a><br /><a href="#platform-AGCaesar" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt="xthursdayx"/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="https://github.com/xthursdayx"><img src="https://avatars0.githubusercontent.com/u/18044308?v=4" width="40px;" alt=""/><br /><sub><b>xthursdayx</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Code">💻</a> <a href="https://github.com/getferdi/ferdi/commits?author=xthursdayx" title="Documentation">📖</a> <a href="#infra-xthursdayx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-xthursdayx" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt="Gaboris"/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/Gaboris"><img src="https://avatars2.githubusercontent.com/u/9462372?v=4" width="40px;" alt=""/><br /><sub><b>Gaboris</b></sub></a><br /><a href="#question-Gaboris" title="Answering Questions">💬</a> <a href="https://github.com/getferdi/ferdi/issues?q=author%3AGaboris" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt="Ce"/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.cu3ed.com/"><img src="https://avatars1.githubusercontent.com/u/61343?v=4" width="40px;" alt=""/><br /><sub><b>Ce</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aincace" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt="Stanislav N."/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://pztrn.name/"><img src="https://avatars1.githubusercontent.com/u/869402?v=4" width="40px;" alt=""/><br /><sub><b>Stanislav N.</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Apztrn" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt="Patrick Curl"/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://www.patrickcurl.com"><img src="https://avatars1.githubusercontent.com/u/1470061?v=4" width="40px;" alt=""/><br /><sub><b>Patrick Curl</b></sub></a><br /><a href="#ideas-patrickcurl" title="Ideas, Planning, & Feedback">🤔</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt=""/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td>
+    <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt=""/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">🐛</a> <a href="#security-ammarmalhas" title="Security">🛡️</a></td>
-    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt=""/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt="Bror Winther"/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt=""/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt="Felix W. Dekker"/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt=""/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt="Sauceee"/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt=""/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt="Lennart Weller"/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td>
+    <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt=""/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="https://github.com/jereksel"><img src="https://avatars0.githubusercontent.com/u/1307829?v=4" width="40px;" alt="Andrzej Ressel"/><br /><sub><b>Andrzej Ressel</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=jereksel" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jereksel"><img src="https://avatars0.githubusercontent.com/u/1307829?v=4" width="40px;" alt=""/><br /><sub><b>Andrzej Ressel</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=jereksel" title="Code">💻</a></td>
-    <td align="center"><a href="https://gitlab.com/dpeukert"><img src="https://avatars2.githubusercontent.com/u/3451904?v=4" width="40px;" alt="Daniel Peukert"/><br /><sub><b>Daniel Peukert</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dpeukert" title="Code">💻</a></td>
+    <td align="center"><a href="https://gitlab.com/dpeukert"><img src="https://avatars2.githubusercontent.com/u/3451904?v=4" width="40px;" alt=""/><br /><sub><b>Daniel Peukert</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=dpeukert" title="Code">💻</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Ali_Shiple"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg" width="40px;" alt="Ali M. Shiple"/><br /><sub><b>Ali M. Shiple</b></sub></a><br /><a href="#translation-Ali_Shiple" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Ali_Shiple"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12895436/small/00917d09ca1b4b6d8e0ef36af07ecf6b.jpg" width="40px;" alt=""/><br /><sub><b>Ali M. Shiple</b></sub></a><br /><a href="#translation-Ali_Shiple" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/elviseras"><img src="https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f" width="40px;" alt="elviseras"/><br /><sub><b>elviseras</b></sub></a><br /><a href="#translation-elviseras" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/elviseras"><img src="https://www.gravatar.com/avatar/25c2cf0d8cb4a4141e71c3b8a2e9324f" width="40px;" alt=""/><br /><sub><b>elviseras</b></sub></a><br /><a href="#translation-elviseras" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/J370"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png" width="40px;" alt="J370"/><br /><sub><b>J370</b></sub></a><br /><a href="#translation-J370" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/J370"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14141203/small/7b12b5db419d8796450221c2eaaf6003.png" width="40px;" alt=""/><br /><sub><b>J370</b></sub></a><br /><a href="#translation-J370" title="Translation">🌍</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://crowdin.com/profile/keunes"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png" width="40px;" alt="Koen"/><br /><sub><b>Koen</b></sub></a><br /><a href="#translation-keunes" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/keunes"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13018172/small/829115c606347b10218f34c637a2100c.png" width="40px;" alt=""/><br /><sub><b>Koen</b></sub></a><br /><a href="#translation-keunes" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/leandrogehlen"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg" width="40px;" alt="Leandro Gehlen"/><br /><sub><b>Leandro Gehlen</b></sub></a><br /><a href="#translation-leandrogehlen" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/leandrogehlen"><img src="https://crowdin-static.downloads.crowdin.com/avatar/14099621/small/1d9503523839c310dbce0af3c226e894.jpeg" width="40px;" alt=""/><br /><sub><b>Leandro Gehlen</b></sub></a><br /><a href="#translation-leandrogehlen" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Matthieu42"><img src="https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19" width="40px;" alt="Matthieu42"/><br /><sub><b>Matthieu42</b></sub></a><br /><a href="#translation-Matthieu42" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Matthieu42"><img src="https://www.gravatar.com/avatar/735217ccccf11ba97573deee517ddb19" width="40px;" alt=""/><br /><sub><b>Matthieu42</b></sub></a><br /><a href="#translation-Matthieu42" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/nicky18013"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png" width="40px;" alt="Nikita Bibanaev"/><br /><sub><b>Nikita Bibanaev</b></sub></a><br /><a href="#translation-nicky18013" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/nicky18013"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13468928/small/2b31e7ac19645d950a79b33ffd5721b8.png" width="40px;" alt=""/><br /><sub><b>Nikita Bibanaev</b></sub></a><br /><a href="#translation-nicky18013" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/Tatjana1998"><img src="https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e" width="40px;" alt="Tatjana1998"/><br /><sub><b>Tatjana1998</b></sub></a><br /><a href="#translation-Tatjana1998" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Tatjana1998"><img src="https://www.gravatar.com/avatar/ade202a04fcbb2c177e4f1d9936af29e" width="40px;" alt=""/><br /><sub><b>Tatjana1998</b></sub></a><br /><a href="#translation-Tatjana1998" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/seayko"><img src="https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918" width="40px;" alt="tinect"/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-seayko" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/seayko"><img src="https://www.gravatar.com/avatar/65e2aef738ddf828f822d8463fd04918" width="40px;" alt=""/><br /><sub><b>tinect</b></sub></a><br /><a href="#translation-seayko" title="Translation">🌍</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://crowdin.com/profile/Pusnow"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg" width="40px;" alt="Wonsup Yoon"/><br /><sub><b>Wonsup Yoon</b></sub></a><br /><a href="#translation-Pusnow" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/Pusnow"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13514833/small/65f0b45587cc7e34f2827830cd324b16.jpeg" width="40px;" alt=""/><br /><sub><b>Wonsup Yoon</b></sub></a><br /><a href="#translation-Pusnow" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://crowdin.com/profile/zutt"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG" width="40px;" alt="zutt"/><br /><sub><b>zutt</b></sub></a><br /><a href="#translation-zutt" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/zutt"><img src="https://crowdin-static.downloads.crowdin.com/avatar/13320003/small/50fdf9f8c7e54a446925bd79696ea625.JPG" width="40px;" alt=""/><br /><sub><b>zutt</b></sub></a><br /><a href="#translation-zutt" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://twitter.com/noemis_exec"><img src="https://avatars3.githubusercontent.com/u/22817873?v=4" width="40px;" alt=""/><br /><sub><b>n0emis</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=n0emis" title="Code">💻</a></td>
  </tr>
 </table>
diff --git a/package-lock.json b/package-lock.json
index 497e19a62..3fefbfdfc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9774,6 +9774,11 @@
        "encoding": "^0.1.12"
      }
    },
+    "electron-find": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/electron-find/-/electron-find-1.0.6.tgz",
+      "integrity": "sha512-RenjzlCCzX7edLywLy+qRYvzds11sBv8+SrJu/3l3eVLt9d9uNqCPk+uFZ525uAhSUaUalgZWDlhQdxIgT1khg=="
+    },
    "electron-hunspell": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.1.1.tgz",
diff --git a/package.json b/package.json
index 0e54b0f95..56b3c86f8 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
    "du": "^0.1.0",
    "electron-dl": "1.14.0",
    "electron-fetch": "1.4.0",
+    "electron-find": "1.0.6",
    "electron-hunspell": "1.1.1",
    "electron-is-dev": "1.1.0",
    "electron-process-manager": "git+https://git@github.com/dizer/electron-process-manager.git",
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 33822ec5d..9564d837b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -255,6 +255,7 @@ export default @observer class EditSettingsForm extends Component {
            <Toggle field={form.$('autoLaunchOnStart')} />
            <Toggle field={form.$('runInBackground')} />
            <Toggle field={form.$('enableSystemTray')} />
+            <Toggle field={form.$('reloadAfterResume')} />
            {isTrayEnabled && <Toggle field={form.$('startMinimized')} />}
            {process.platform === 'win32' && (
              <Toggle field={form.$('minimizeToSystemTray')} />
diff --git a/src/config.js b/src/config.js
index a16583463..af304232e 100644
--- a/src/config.js
+++ b/src/config.js
@@ -76,6 +76,7 @@ export const iconSizeBias = 20;
 export const DEFAULT_APP_SETTINGS = {
  autoLaunchInBackground: false,
  runInBackground: true,
+  reloadAfterResume: true,
  enableSystemTray: true,
  startMinimized: false,
  minimizeToSystemTray: false,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 6b3f8d3d3..5221b0694 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -48,6 +48,10 @@ const messages = defineMessages({
    id: 'settings.app.form.enableSystemTray',
    defaultMessage: '!!!Always show Ferdi in system tray',
  },
+  reloadAfterResume: {
+    id: 'settings.app.form.reloadAfterResume',
+    defaultMessage: '!!!Reload Ferdi after system resume',
+  },
  minimizeToSystemTray: {
    id: 'settings.app.form.minimizeToSystemTray',
    defaultMessage: '!!!Minimize Ferdi to system tray',
@@ -195,6 +199,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
      data: {
        runInBackground: settingsData.runInBackground,
        enableSystemTray: settingsData.enableSystemTray,
+        reloadAfterResume: settingsData.reloadAfterResume,
        startMinimized: settingsData.startMinimized,
        minimizeToSystemTray: settingsData.minimizeToSystemTray,
        privateNotifications: settingsData.privateNotifications,
@@ -317,6 +322,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
          value: settings.all.app.enableSystemTray,
          default: DEFAULT_APP_SETTINGS.enableSystemTray,
        },
+        reloadAfterResume: {
+          label: intl.formatMessage(messages.reloadAfterResume),
+          value: settings.all.app.reloadAfterResume,
+          default: DEFAULT_APP_SETTINGS.reloadAfterResume,
+        },
        minimizeToSystemTray: {
          label: intl.formatMessage(messages.minimizeToSystemTray),
          value: settings.all.app.minimizeToSystemTray,
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 29b461d17..5d98551f6 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index c82819b9d..8c6926d4f 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Configuració",
  "settings.app.headlineAdvanced": "Avançat",
  "settings.app.headlineAppearance": "Aparença",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index a236d8f6c..52215c715 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Nastavení",
  "settings.app.headlineAdvanced": "Pokročilé",
  "settings.app.headlineAppearance": "Vzhled",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 82de95f8b..d7985a017 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Passwort ungültig",
  "locked.password.label": "Passwort",
  "locked.submit.label": "Entsperren",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Server wechseln",
  "login.customServerQuestion": "Du benutzt ein Franz-Konto zum Anmelden?",
  "login.customServerSuggestion": "Versuche dein Franz-Konto in Ferdi zu importieren",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo-Server",
  "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Einstellungen",
  "settings.app.headlineAdvanced": "Erweitert",
  "settings.app.headlineAppearance": "Darstellung",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 596e09fa1..be0cd008b 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4227,393 +4227,406 @@
        }
      },
      {
-        "defaultMessage": "!!!Minimize Ferdi to system tray",
+        "defaultMessage": "!!!Reload Ferdi after system resume",
        "end": {
          "column": 3,
          "line": 54
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.reloadAfterResume",
+        "start": {
+          "column": 21,
+          "line": 51
+        }
+      },
+      {
+        "defaultMessage": "!!!Minimize Ferdi to system tray",
+        "end": {
+          "column": 3,
+          "line": 58
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.minimizeToSystemTray",
        "start": {
          "column": 24,
-          "line": 51
+          "line": 55
        }
      },
      {
        "defaultMessage": "!!!Don't show message content in notifications",
        "end": {
          "column": 3,
-          "line": 58
+          "line": 62
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.privateNotifications",
        "start": {
          "column": 24,
-          "line": 55
+          "line": 59
        }
      },
      {
        "defaultMessage": "!!!Navigation bar behaviour",
        "end": {
          "column": 3,
-          "line": 62
+          "line": 66
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.navigationBarBehaviour",
        "start": {
          "column": 26,
-          "line": 59
+          "line": 63
        }
      },
      {
        "defaultMessage": "!!!Send telemetry data",
        "end": {
          "column": 3,
-          "line": 66
+          "line": 70
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.sentry",
        "start": {
          "column": 10,
-          "line": 63
+          "line": 67
        }
      },
      {
        "defaultMessage": "!!!Enable service hibernation",
        "end": {
          "column": 3,
-          "line": 70
+          "line": 74
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.hibernate",
        "start": {
          "column": 13,
-          "line": 67
+          "line": 71
        }
      },
      {
        "defaultMessage": "!!!Hibernation strategy",
        "end": {
          "column": 3,
-          "line": 74
+          "line": 78
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.hibernationStrategy",
        "start": {
          "column": 23,
-          "line": 71
+          "line": 75
        }
      },
      {
        "defaultMessage": "!!!Server",
        "end": {
          "column": 3,
-          "line": 78
+          "line": 82
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.server",
        "start": {
          "column": 10,
-          "line": 75
+          "line": 79
        }
      },
      {
        "defaultMessage": "!!!Todo Server",
        "end": {
          "column": 3,
-          "line": 82
+          "line": 86
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.todoServer",
        "start": {
          "column": 14,
-          "line": 79
+          "line": 83
        }
      },
      {
        "defaultMessage": "!!!Enable Password Lock",
        "end": {
          "column": 3,
-          "line": 86
+          "line": 90
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableLock",
        "start": {
          "column": 14,
-          "line": 83
+          "line": 87
        }
      },
      {
        "defaultMessage": "!!!Password",
        "end": {
          "column": 3,
-          "line": 90
+          "line": 94
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.lockPassword",
        "start": {
          "column": 16,
-          "line": 87
+          "line": 91
        }
      },
      {
        "defaultMessage": "!!!Allow using Touch ID to unlock",
        "end": {
          "column": 3,
-          "line": 94
+          "line": 98
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.useTouchIdToUnlock",
        "start": {
          "column": 22,
-          "line": 91
+          "line": 95
        }
      },
      {
        "defaultMessage": "!!!Lock after inactivity",
        "end": {
          "column": 3,
-          "line": 98
+          "line": 102
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.inactivityLock",
        "start": {
          "column": 18,
-          "line": 95
+          "line": 99
        }
      },
      {
        "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
        "end": {
          "column": 3,
-          "line": 102
+          "line": 106
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.scheduledDNDEnabled",
        "start": {
          "column": 23,
-          "line": 99
+          "line": 103
        }
      },
      {
        "defaultMessage": "!!!From",
        "end": {
          "column": 3,
-          "line": 106
+          "line": 110
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.scheduledDNDStart",
        "start": {
          "column": 21,
-          "line": 103
+          "line": 107
        }
      },
      {
        "defaultMessage": "!!!To",
        "end": {
          "column": 3,
-          "line": 110
+          "line": 114
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.scheduledDNDEnd",
        "start": {
          "column": 19,
-          "line": 107
+          "line": 111
        }
      },
      {
        "defaultMessage": "!!!Language",
        "end": {
          "column": 3,
-          "line": 114
+          "line": 118
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.language",
        "start": {
          "column": 12,
-          "line": 111
+          "line": 115
        }
      },
      {
        "defaultMessage": "!!!Dark Mode",
        "end": {
          "column": 3,
-          "line": 118
+          "line": 122
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.darkMode",
        "start": {
          "column": 12,
-          "line": 115
+          "line": 119
        }
      },
      {
        "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting",
        "end": {
          "column": 3,
-          "line": 122
+          "line": 126
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.adaptableDarkMode",
        "start": {
          "column": 21,
-          "line": 119
+          "line": 123
        }
      },
      {
        "defaultMessage": "!!!Enable universal Dark Mode",
        "end": {
          "column": 3,
-          "line": 126
+          "line": 130
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.universalDarkMode",
        "start": {
          "column": 21,
-          "line": 123
+          "line": 127
        }
      },
      {
        "defaultMessage": "!!!Sidebar width",
        "end": {
          "column": 3,
-          "line": 130
+          "line": 134
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.serviceRibbonWidth",
        "start": {
          "column": 22,
-          "line": 127
+          "line": 131
        }
      },
      {
        "defaultMessage": "!!!Service icon size",
        "end": {
          "column": 3,
-          "line": 134
+          "line": 138
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.iconSize",
        "start": {
          "column": 12,
-          "line": 131
+          "line": 135
        }
      },
      {
        "defaultMessage": "!!!Accent color",
        "end": {
          "column": 3,
-          "line": 138
+          "line": 142
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.accentColor",
        "start": {
          "column": 15,
-          "line": 135
+          "line": 139
        }
      },
      {
        "defaultMessage": "!!!Display disabled services tabs",
        "end": {
          "column": 3,
-          "line": 142
+          "line": 146
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.showDisabledServices",
        "start": {
          "column": 24,
-          "line": 139
+          "line": 143
        }
      },
      {
        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
        "end": {
          "column": 3,
-          "line": 146
+          "line": 150
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.showMessagesBadgesWhenMuted",
        "start": {
          "column": 29,
-          "line": 143
+          "line": 147
        }
      },
      {
        "defaultMessage": "!!!Enable spell checking",
        "end": {
          "column": 3,
-          "line": 150
+          "line": 154
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableSpellchecking",
        "start": {
          "column": 23,
-          "line": 147
+          "line": 151
        }
      },
      {
        "defaultMessage": "!!!Enable GPU Acceleration",
        "end": {
          "column": 3,
-          "line": 154
+          "line": 158
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableGPUAcceleration",
        "start": {
          "column": 25,
-          "line": 151
+          "line": 155
        }
      },
      {
        "defaultMessage": "!!!Include beta versions",
        "end": {
          "column": 3,
-          "line": 158
+          "line": 162
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.beta",
        "start": {
          "column": 8,
-          "line": 155
+          "line": 159
        }
      },
      {
        "defaultMessage": "!!!Disable updates",
        "end": {
          "column": 3,
-          "line": 162
+          "line": 166
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.noUpdates",
        "start": {
          "column": 13,
-          "line": 159
+          "line": 163
        }
      },
      {
        "defaultMessage": "!!!Enable Franz Todos",
        "end": {
          "column": 3,
-          "line": 166
+          "line": 170
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.enableTodos",
        "start": {
          "column": 15,
-          "line": 163
+          "line": 167
        }
      },
      {
        "defaultMessage": "!!!Keep all workspaces loaded",
        "end": {
          "column": 3,
-          "line": 170
+          "line": 174
        },
        "file": "src/containers/settings/EditSettingsScreen.js",
        "id": "settings.app.form.keepAllWorkspacesLoaded",
        "start": {
          "column": 27,
-          "line": 167
+          "line": 171
        }
      }
    ],
@@ -6486,809 +6499,822 @@
        }
      },
      {
-        "defaultMessage": "!!!Speech",
+        "defaultMessage": "!!!Find in Page",
        "end": {
          "column": 3,
          "line": 57
        },
        "file": "src/lib/Menu.js",
+        "id": "menu.edit.findInPage",
+        "start": {
+          "column": 14,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!Speech",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/lib/Menu.js",
        "id": "menu.edit.speech",
        "start": {
          "column": 10,
-          "line": 54
+          "line": 58
        }
      },
      {
        "defaultMessage": "!!!Start Speaking",
        "end": {
          "column": 3,
-          "line": 61
+          "line": 65
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.startSpeaking",
        "start": {
          "column": 17,
-          "line": 58
+          "line": 62
        }
      },
      {
        "defaultMessage": "!!!Stop Speaking",
        "end": {
          "column": 3,
-          "line": 65
+          "line": 69
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.stopSpeaking",
        "start": {
          "column": 16,
-          "line": 62
+          "line": 66
        }
      },
      {
        "defaultMessage": "!!!Start Dictation",
        "end": {
          "column": 3,
-          "line": 69
+          "line": 73
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.startDictation",
        "start": {
          "column": 18,
-          "line": 66
+          "line": 70
        }
      },
      {
        "defaultMessage": "!!!Emoji & Symbols",
        "end": {
          "column": 3,
-          "line": 73
+          "line": 77
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.emojiSymbols",
        "start": {
          "column": 16,
-          "line": 70
+          "line": 74
        }
      },
      {
        "defaultMessage": "!!!Open Quick Switch",
        "end": {
          "column": 3,
-          "line": 77
+          "line": 81
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.openQuickSwitch",
        "start": {
          "column": 19,
-          "line": 74
+          "line": 78
        }
      },
      {
        "defaultMessage": "!!!Back",
        "end": {
          "column": 3,
-          "line": 81
+          "line": 85
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.back",
        "start": {
          "column": 8,
-          "line": 78
+          "line": 82
        }
      },
      {
        "defaultMessage": "!!!Forward",
        "end": {
          "column": 3,
-          "line": 85
+          "line": 89
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.forward",
        "start": {
          "column": 11,
-          "line": 82
+          "line": 86
        }
      },
      {
        "defaultMessage": "!!!Actual Size",
        "end": {
          "column": 3,
-          "line": 89
+          "line": 93
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.resetZoom",
        "start": {
          "column": 13,
-          "line": 86
+          "line": 90
        }
      },
      {
        "defaultMessage": "!!!Zoom In",
        "end": {
          "column": 3,
-          "line": 93
+          "line": 97
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.zoomIn",
        "start": {
          "column": 10,
-          "line": 90
+          "line": 94
        }
      },
      {
        "defaultMessage": "!!!Zoom Out",
        "end": {
          "column": 3,
-          "line": 97
+          "line": 101
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.zoomOut",
        "start": {
          "column": 11,
-          "line": 94
+          "line": 98
        }
      },
      {
        "defaultMessage": "!!!Enter Full Screen",
        "end": {
          "column": 3,
-          "line": 101
+          "line": 105
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.enterFullScreen",
        "start": {
          "column": 19,
-          "line": 98
+          "line": 102
        }
      },
      {
        "defaultMessage": "!!!Exit Full Screen",
        "end": {
          "column": 3,
-          "line": 105
+          "line": 109
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.exitFullScreen",
        "start": {
          "column": 18,
-          "line": 102
+          "line": 106
        }
      },
      {
        "defaultMessage": "!!!Toggle Full Screen",
        "end": {
          "column": 3,
-          "line": 109
+          "line": 113
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleFullScreen",
        "start": {
          "column": 20,
-          "line": 106
+          "line": 110
        }
      },
      {
        "defaultMessage": "!!!Toggle Developer Tools",
        "end": {
          "column": 3,
-          "line": 113
+          "line": 117
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleDevTools",
        "start": {
          "column": 18,
-          "line": 110
+          "line": 114
        }
      },
      {
        "defaultMessage": "!!!Toggle Todos Developer Tools",
        "end": {
          "column": 3,
-          "line": 117
+          "line": 121
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleTodosDevTools",
        "start": {
          "column": 23,
-          "line": 114
+          "line": 118
        }
      },
      {
        "defaultMessage": "!!!Toggle Service Developer Tools",
        "end": {
          "column": 3,
-          "line": 121
+          "line": 125
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleServiceDevTools",
        "start": {
          "column": 25,
-          "line": 118
+          "line": 122
        }
      },
      {
        "defaultMessage": "!!!Reload Service",
        "end": {
          "column": 3,
-          "line": 125
+          "line": 129
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.reloadService",
        "start": {
          "column": 17,
-          "line": 122
+          "line": 126
        }
      },
      {
        "defaultMessage": "!!!Reload Ferdi",
        "end": {
          "column": 3,
-          "line": 129
+          "line": 133
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.reloadFranz",
        "start": {
          "column": 15,
-          "line": 126
+          "line": 130
        }
      },
      {
        "defaultMessage": "!!!Lock Ferdi",
        "end": {
          "column": 3,
-          "line": 133
+          "line": 137
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.lockFerdi",
        "start": {
          "column": 13,
-          "line": 130
+          "line": 134
        }
      },
      {
        "defaultMessage": "!!!Minimize",
        "end": {
          "column": 3,
-          "line": 137
+          "line": 141
        },
        "file": "src/lib/Menu.js",
        "id": "menu.window.minimize",
        "start": {
          "column": 12,
-          "line": 134
+          "line": 138
        }
      },
      {
        "defaultMessage": "!!!Close",
        "end": {
          "column": 3,
-          "line": 141
+          "line": 145
        },
        "file": "src/lib/Menu.js",
        "id": "menu.window.close",
        "start": {
          "column": 9,
-          "line": 138
+          "line": 142
        }
      },
      {
        "defaultMessage": "!!!Learn More",
        "end": {
          "column": 3,
-          "line": 145
+          "line": 149
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.learnMore",
        "start": {
          "column": 13,
-          "line": 142
+          "line": 146
        }
      },
      {
        "defaultMessage": "!!!Changelog",
        "end": {
          "column": 3,
-          "line": 149
+          "line": 153
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.changelog",
        "start": {
          "column": 13,
-          "line": 146
+          "line": 150
        }
      },
      {
        "defaultMessage": "!!!Support",
        "end": {
          "column": 3,
-          "line": 153
+          "line": 157
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.support",
        "start": {
          "column": 11,
-          "line": 150
+          "line": 154
        }
      },
      {
        "defaultMessage": "!!!Copy Debug Information",
        "end": {
          "column": 3,
-          "line": 157
+          "line": 161
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.debugInfo",
        "start": {
          "column": 13,
-          "line": 154
+          "line": 158
        }
      },
      {
        "defaultMessage": "!!!Publish Debug Information",
        "end": {
          "column": 3,
-          "line": 161
+          "line": 165
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.publishDebugInfo",
        "start": {
          "column": 20,
-          "line": 158
+          "line": 162
        }
      },
      {
        "defaultMessage": "!!!Ferdi Debug Information",
        "end": {
          "column": 3,
-          "line": 165
+          "line": 169
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.debugInfoCopiedHeadline",
        "start": {
          "column": 27,
-          "line": 162
+          "line": 166
        }
      },
      {
        "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
        "end": {
          "column": 3,
-          "line": 169
+          "line": 173
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.debugInfoCopiedBody",
        "start": {
          "column": 23,
-          "line": 166
+          "line": 170
        }
      },
      {
        "defaultMessage": "!!!Unlock with Touch ID",
        "end": {
          "column": 3,
-          "line": 173
+          "line": 177
        },
        "file": "src/lib/Menu.js",
        "id": "locked.touchId",
        "start": {
          "column": 11,
-          "line": 170
+          "line": 174
        }
      },
      {
        "defaultMessage": "!!!unlock via Touch ID",
        "end": {
          "column": 3,
-          "line": 177
+          "line": 181
        },
        "file": "src/lib/Menu.js",
        "id": "locked.touchIdPrompt",
        "start": {
          "column": 17,
-          "line": 174
+          "line": 178
        }
      },
      {
        "defaultMessage": "!!!Terms of Service",
        "end": {
          "column": 3,
-          "line": 181
+          "line": 185
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.tos",
        "start": {
          "column": 7,
-          "line": 178
+          "line": 182
        }
      },
      {
        "defaultMessage": "!!!Privacy Statement",
        "end": {
          "column": 3,
-          "line": 185
+          "line": 189
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.privacy",
        "start": {
          "column": 11,
-          "line": 182
+          "line": 186
        }
      },
      {
        "defaultMessage": "!!!File",
        "end": {
          "column": 3,
-          "line": 189
+          "line": 193
        },
        "file": "src/lib/Menu.js",
        "id": "menu.file",
        "start": {
          "column": 8,
-          "line": 186
+          "line": 190
        }
      },
      {
        "defaultMessage": "!!!View",
        "end": {
          "column": 3,
-          "line": 193
+          "line": 197
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view",
        "start": {
          "column": 8,
-          "line": 190
+          "line": 194
        }
      },
      {
        "defaultMessage": "!!!Services",
        "end": {
          "column": 3,
-          "line": 197
+          "line": 201
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services",
        "start": {
          "column": 12,
-          "line": 194
+          "line": 198
        }
      },
      {
        "defaultMessage": "!!!Window",
        "end": {
          "column": 3,
-          "line": 201
+          "line": 205
        },
        "file": "src/lib/Menu.js",
        "id": "menu.window",
        "start": {
          "column": 10,
-          "line": 198
+          "line": 202
        }
      },
      {
        "defaultMessage": "!!!Help",
        "end": {
          "column": 3,
-          "line": 205
+          "line": 209
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help",
        "start": {
          "column": 8,
-          "line": 202
+          "line": 206
        }
      },
      {
        "defaultMessage": "!!!About Ferdi",
        "end": {
          "column": 3,
-          "line": 209
+          "line": 213
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.about",
        "start": {
          "column": 9,
-          "line": 206
+          "line": 210
        }
      },
      {
        "defaultMessage": "!!!What's new?",
        "end": {
          "column": 3,
-          "line": 213
+          "line": 217
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.announcement",
        "start": {
          "column": 16,
-          "line": 210
+          "line": 214
        }
      },
      {
        "defaultMessage": "!!!Settings",
        "end": {
          "column": 3,
-          "line": 217
+          "line": 221
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.settings",
        "start": {
          "column": 12,
-          "line": 214
+          "line": 218
        }
      },
      {
        "defaultMessage": "!!!Check for updates",
        "end": {
          "column": 3,
-          "line": 221
+          "line": 225
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.checkForUpdates",
        "start": {
          "column": 19,
-          "line": 218
+          "line": 222
        }
      },
      {
        "defaultMessage": "!!!Hide",
        "end": {
          "column": 3,
-          "line": 225
+          "line": 229
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.hide",
        "start": {
          "column": 8,
-          "line": 222
+          "line": 226
        }
      },
      {
        "defaultMessage": "!!!Hide Others",
        "end": {
          "column": 3,
-          "line": 229
+          "line": 233
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.hideOthers",
        "start": {
          "column": 14,
-          "line": 226
+          "line": 230
        }
      },
      {
        "defaultMessage": "!!!Unhide",
        "end": {
          "column": 3,
-          "line": 233
+          "line": 237
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.unhide",
        "start": {
          "column": 10,
-          "line": 230
+          "line": 234
        }
      },
      {
        "defaultMessage": "!!!Auto-hide menu bar",
        "end": {
          "column": 3,
-          "line": 237
+          "line": 241
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.autohideMenuBar",
        "start": {
          "column": 19,
-          "line": 234
+          "line": 238
        }
      },
      {
        "defaultMessage": "!!!Quit",
        "end": {
          "column": 3,
-          "line": 241
+          "line": 245
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.quit",
        "start": {
          "column": 8,
-          "line": 238
+          "line": 242
        }
      },
      {
        "defaultMessage": "!!!Add New Service...",
        "end": {
          "column": 3,
-          "line": 245
+          "line": 249
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.addNewService",
        "start": {
          "column": 17,
-          "line": 242
+          "line": 246
        }
      },
      {
        "defaultMessage": "!!!Add New Workspace...",
        "end": {
          "column": 3,
-          "line": 249
+          "line": 253
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.addNewWorkspace",
        "start": {
          "column": 19,
-          "line": 246
+          "line": 250
        }
      },
      {
        "defaultMessage": "!!!Open workspace drawer",
        "end": {
          "column": 3,
-          "line": 253
+          "line": 257
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.openWorkspaceDrawer",
        "start": {
          "column": 23,
-          "line": 250
+          "line": 254
        }
      },
      {
        "defaultMessage": "!!!Close workspace drawer",
        "end": {
          "column": 3,
-          "line": 257
+          "line": 261
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.closeWorkspaceDrawer",
        "start": {
          "column": 24,
-          "line": 254
+          "line": 258
        }
      },
      {
        "defaultMessage": "!!!Activate next service...",
        "end": {
          "column": 3,
-          "line": 261
+          "line": 265
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.setNextServiceActive",
        "start": {
          "column": 23,
-          "line": 258
+          "line": 262
        }
      },
      {
        "defaultMessage": "!!!Activate previous service...",
        "end": {
          "column": 3,
-          "line": 265
+          "line": 269
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.activatePreviousService",
        "start": {
          "column": 27,
-          "line": 262
+          "line": 266
        }
      },
      {
        "defaultMessage": "!!!Disable notifications & audio",
        "end": {
          "column": 3,
-          "line": 269
+          "line": 273
        },
        "file": "src/lib/Menu.js",
        "id": "sidebar.muteApp",
        "start": {
          "column": 11,
-          "line": 266
+          "line": 270
        }
      },
      {
        "defaultMessage": "!!!Enable notifications & audio",
        "end": {
          "column": 3,
-          "line": 273
+          "line": 277
        },
        "file": "src/lib/Menu.js",
        "id": "sidebar.unmuteApp",
        "start": {
          "column": 13,
-          "line": 270
+          "line": 274
        }
      },
      {
        "defaultMessage": "!!!Workspaces",
        "end": {
          "column": 3,
-          "line": 277
+          "line": 281
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces",
        "start": {
          "column": 14,
-          "line": 274
+          "line": 278
        }
      },
      {
        "defaultMessage": "!!!Default",
        "end": {
          "column": 3,
-          "line": 281
+          "line": 285
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.defaultWorkspace",
        "start": {
          "column": 20,
-          "line": 278
+          "line": 282
        }
      },
      {
        "defaultMessage": "!!!Todos",
        "end": {
          "column": 3,
-          "line": 285
+          "line": 289
        },
        "file": "src/lib/Menu.js",
        "id": "menu.todos",
        "start": {
          "column": 9,
-          "line": 282
+          "line": 286
        }
      },
      {
        "defaultMessage": "!!!Open Todos drawer",
        "end": {
          "column": 3,
-          "line": 289
+          "line": 293
        },
        "file": "src/lib/Menu.js",
        "id": "menu.Todoss.openTodosDrawer",
        "start": {
          "column": 19,
-          "line": 286
+          "line": 290
        }
      },
      {
        "defaultMessage": "!!!Close Todos drawer",
        "end": {
          "column": 3,
-          "line": 293
+          "line": 297
        },
        "file": "src/lib/Menu.js",
        "id": "menu.Todoss.closeTodosDrawer",
        "start": {
          "column": 20,
-          "line": 290
+          "line": 294
        }
      },
      {
        "defaultMessage": "!!!Enable Todos",
        "end": {
          "column": 3,
-          "line": 297
+          "line": 301
        },
        "file": "src/lib/Menu.js",
        "id": "menu.todos.enableTodos",
        "start": {
          "column": 15,
-          "line": 294
+          "line": 298
        }
      },
      {
        "defaultMessage": "!!!Home",
        "end": {
          "column": 3,
-          "line": 301
+          "line": 305
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.goHome",
        "start": {
          "column": 17,
-          "line": 298
+          "line": 302
        }
      }
    ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 091740ca6..b1615ec16 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Ρυθμίσεις",
  "settings.app.headlineAdvanced": "Για προχωρημένους",
  "settings.app.headlineAppearance": "Εμφάνιση",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 499b73f68..4c14c8f90 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -116,6 +116,7 @@
  "menu.edit.cut": "Cut",
  "menu.edit.delete": "Delete",
  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.edit.findInPage": "Find in Page",
  "menu.edit.paste": "Paste",
  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
  "menu.edit.redo": "Redo",
@@ -290,6 +291,7 @@
  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
  "settings.app.form.noUpdates": "Disable updates",
  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
  "settings.app.form.scheduledDNDEnd": "To",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 21d3c8228..c55ba4583 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Contraseña incorrecta",
  "locked.password.label": "Contraseña",
  "locked.submit.label": "Desbloquear",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Cambiar servidor",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Servidor de tareas",
  "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Configuración",
  "settings.app.headlineAdvanced": "Avanzado",
  "settings.app.headlineAppearance": "Apariencia",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 0e767983d..42c3d1a1f 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Mot de passe invalide",
  "locked.password.label": "Mot de passe",
  "locked.submit.label": "Déverrouiller",
+  "locked.touchId": "Déverrouiller avec Touch ID",
+  "locked.touchIdPrompt": "déverrouiller via Touch ID",
+  "locked.unlockWithPassword": "Déverrouiller avec le mot de passe",
  "login.changeServer": "Changer de serveur",
  "login.customServerQuestion": "Utiliser un serveur de Ferdi modifié?",
  "login.customServerSuggestion": "Essayer d'importer votre compte Franz dans Ferdi",
@@ -152,7 +155,7 @@
  "menu.view.resetZoom": "Taille actuelle",
  "menu.view.toggleDevTools": "Activer les outils de développeur",
  "menu.view.toggleFullScreen": "Activer le mode plein écran",
-  "menu.view.toggleServiceDevTools": "Activer les outils de développement WebKit",
+  "menu.view.toggleServiceDevTools": "Activer les outils de développeur du service",
  "menu.view.toggleTodosDevTools": "Activer les outils de développeur Todos",
  "menu.view.zoomIn": "Zoom Avant",
  "menu.view.zoomOut": "Zoom Arrière",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Démarrer en mode réduit",
  "settings.app.form.todoServer": "Serveur Todo",
  "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
+  "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
  "settings.app.headline": "Paramètres",
  "settings.app.headlineAdvanced": "Paramètres avancés",
  "settings.app.headlineAppearance": "Apparence",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 2462110fd..22007bdf1 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Socruithe",
  "settings.app.headlineAdvanced": "Casta",
  "settings.app.headlineAppearance": "Dealramh",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 6b4e22f13..5f8aad160 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Postavke",
  "settings.app.headlineAdvanced": "Napredne alatke",
  "settings.app.headlineAppearance": "Izgled",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index f829e12c0..d9f0e734a 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Beállítások",
  "settings.app.headlineAdvanced": "Haladó",
  "settings.app.headlineAppearance": "Megjelenés",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index bb8f54d10..55754d150 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Pengaturan",
  "settings.app.headlineAdvanced": "Tingkat Lanjut",
  "settings.app.headlineAppearance": "Tampilan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 3929b039c..7a562e29f 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Impostazioni",
  "settings.app.headlineAdvanced": "Avanzate",
  "settings.app.headlineAppearance": "Aspetto",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index bb9c8cbbe..ead6a92a9 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "設定",
  "settings.app.headlineAdvanced": "詳細",
  "settings.app.headlineAppearance": "表示スタイル",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 17eec6540..0f36372fe 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "პარამეტრები",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 7a1e21490..f89d20286 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index c1cbf070d..b52b9a6d4 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Instellingen",
  "settings.app.headlineAdvanced": "Geavanceerd",
  "settings.app.headlineAppearance": "Weergave",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index adf587408..d222f8b0c 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Verkeerd wachtwoord",
  "locked.password.label": "Wachtwoord",
  "locked.submit.label": "Ontgrendelen",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Instellingen",
  "settings.app.headlineAdvanced": "Geavanceerd",
  "settings.app.headlineAppearance": "Weergave",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 70cbb41f9..ee668a5e7 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Ustawienia",
  "settings.app.headlineAdvanced": "Zaawansowane",
  "settings.app.headlineAppearance": "Wygląd",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index a00052a58..3a97077de 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -62,7 +62,7 @@
  "global.spellchecking.autodetect.short": "Automático",
  "global.spellchecking.language": "Linguagem para correção ortográfica",
  "global.upgradeButton.upgradeToPro": "Atualizar para o Ferdi Profissional",
-  "import.headline": "Importa os teus serviços do Ferdi",
+  "import.headline": "Importar os seus serviços do Ferdi",
  "import.notSupportedHeadline": "Estes serviços ainda não são suportados pelo Ferdi 5",
  "import.skip.label": "Eu quero adicionar serviços manualmente",
  "import.submit.label": "Importar serviços",
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Senha inválida",
  "locked.password.label": "Senha",
  "locked.submit.label": "Desbloquear",
+  "locked.touchId": "Desbloquear com Touch ID",
+  "locked.touchIdPrompt": "desbloquear via Touch ID",
+  "locked.unlockWithPassword": "Desbloquear com Senha",
  "login.changeServer": "Alterar servidor",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -97,8 +100,8 @@
  "login.serverLogout": "A sua sessão expirou, inicie sessão novamente.",
  "login.submit.label": "Iniciar Sessão",
  "login.tokenExpired": "A sua sessão expirou, inicie sessão novamente.",
-  "menu.Todoss.closeTodosDrawer": "Fechar a gaveta Todos",
+  "menu.Todoss.closeTodosDrawer": "Fechar Tarefas",
-  "menu.Todoss.openTodosDrawer": "Abrir a gaveta Todos",
+  "menu.Todoss.openTodosDrawer": "Abrir Tarefas",
  "menu.app.about": "Sobre o Ferdi",
  "menu.app.announcement": "O que há de novo?",
  "menu.app.autohideMenuBar": "Auto-ocultar barra de menu",
@@ -106,7 +109,7 @@
  "menu.app.hide": "Ocultar",
  "menu.app.hideOthers": "Ocultar Outros",
  "menu.app.quit": "Sair",
-  "menu.app.settings": "Definições",
+  "menu.app.settings": "Configurações",
  "menu.app.unhide": "Mostrar",
  "menu.edit": "Editar",
  "menu.edit.copy": "Copiar",
@@ -122,7 +125,7 @@
  "menu.edit.startSpeaking": "Comece a falar",
  "menu.edit.stopSpeaking": "Pare de Falar",
  "menu.edit.undo": "Desfazer",
-  "menu.file": "Ficheiro",
+  "menu.file": "Arquivo",
  "menu.help": "Ajuda",
  "menu.help.changelog": "Registo de alterações",
  "menu.help.debugInfo": "Copiar a informação Debug",
@@ -142,8 +145,8 @@
  "menu.todos.enableTodos": "Activar Todos",
  "menu.view": "Ver",
  "menu.view.back": "Anterior",
-  "menu.view.enterFullScreen": "Ativar Modo de Ecrã Completo",
+  "menu.view.enterFullScreen": "Ativar Modo Tela Cheia",
-  "menu.view.exitFullScreen": "Sair do Modo de Ecrã Completo",
+  "menu.view.exitFullScreen": "Sair do Modo Tela Cheia",
  "menu.view.forward": "Próximo",
  "menu.view.lockFerdi": "Bloquear Ferdi",
  "menu.view.openQuickSwitch": "Abrir Troca Rápida",
@@ -151,7 +154,7 @@
  "menu.view.reloadService": "Recarregar serviço",
  "menu.view.resetZoom": "Tamanho Real",
  "menu.view.toggleDevTools": "Ativar/Desativar Ferramentas de Desenvolvimento",
-  "menu.view.toggleFullScreen": "Ativar/Desativar Ecrã Completo",
+  "menu.view.toggleFullScreen": "Ativar/Desativar Tela Cheia",
  "menu.view.toggleServiceDevTools": "Ativar/Desativar Ferramentas de Desenvolvimento de Serviços",
  "menu.view.toggleTodosDevTools": "Ativar Ferramentas de Desenvolvedor das Tarefas",
  "menu.view.zoomIn": "Aumentar",
@@ -159,11 +162,11 @@
  "menu.window": "Janela",
  "menu.window.close": "Fechar",
  "menu.window.minimize": "Minimizar",
-  "menu.workspaces": "Espa��os de trabalho",
+  "menu.workspaces": "��reas de trabalho",
  "menu.workspaces.addNewWorkspace": "Adicionar novo Espaço de trabalho",
-  "menu.workspaces.closeWorkspaceDrawer": "Fechar a janela do Espa��o de trabalho",
+  "menu.workspaces.closeWorkspaceDrawer": "Fechar a janela da ��rea de trabalho",
  "menu.workspaces.defaultWorkspace": "Todos os serviços",
-  "menu.workspaces.openWorkspaceDrawer": "Abrir a janela do Espa��o de trabalho",
+  "menu.workspaces.openWorkspaceDrawer": "Abrir a janela da ��rea de trabalho",
  "password.email.label": "Endereço de e-mail",
  "password.headline": "Repor a minha palavra-passe",
  "password.link.login": "Iniciar sessão",
@@ -186,7 +189,7 @@
  "pricing.features.unlimitedServices": "Instalar serviços ilimitados",
  "pricing.features.upToSixServices": "Adicionar até 6 serviços",
  "pricing.features.upToThreeServices": "Adicionar até 3 serviços",
-  "pricing.features.workspaces": "Espa��os de trabalho",
+  "pricing.features.workspaces": "��reas de trabalho",
  "pricing.plan.free": "Ferdi Gratuito",
  "pricing.plan.legacy": "Ferdi Premium",
  "pricing.plan.personal": "Ferdi Pessoal",
@@ -249,7 +252,7 @@
  "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial",
  "settings.account.headlineUpgradeAccount": "Dê um upgrade na sua conta e tenha uma completa experiência do Ferdi",
  "settings.account.invoiceDownload": "Transferir",
-  "settings.account.manageSubscription.label": "Gerir as minhas subscrições",
+  "settings.account.manageSubscription.label": "Gerenciar minhas inscrições",
  "settings.account.successInfo": "As suas alterações foram efetuadas com sucesso",
  "settings.account.trial": "Free Trial",
  "settings.account.trialEndsIn": "Your free trial ends in {duration}.",
@@ -284,7 +287,7 @@
  "settings.app.form.language": "Idioma",
  "settings.app.form.lockPassword": "Senha",
  "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.navigationBarBehaviour": "Comportamento da barra de navegação",
  "settings.app.form.noUpdates": "Desativar atualizações",
  "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
  "settings.app.form.runInBackground": "Manter o Ferdi em segundo plano ao fechar a janela",
@@ -299,7 +302,8 @@
  "settings.app.form.startMinimized": "Iniciar minimizado na bandeja",
  "settings.app.form.todoServer": "Servidor das Tarefas",
  "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
-  "settings.app.headline": "Definições",
+  "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
+  "settings.app.headline": "Configurações",
  "settings.app.headlineAdvanced": "Avançado",
  "settings.app.headlineAppearance": "Aparência",
  "settings.app.headlineGeneral": "Geral",
@@ -328,16 +332,16 @@
  "settings.navigation.account": "Conta",
  "settings.navigation.availableServices": "Serviços disponíveis",
  "settings.navigation.logout": "Terminar sessão",
-  "settings.navigation.settings": "Definições",
+  "settings.navigation.settings": "Configurações",
  "settings.navigation.supportFerdi": "Apoie o Ferdi",
-  "settings.navigation.team": "Gerir a equipa",
+  "settings.navigation.team": "Gerenciar equipes",
-  "settings.navigation.yourServices": "Os seus serviços",
+  "settings.navigation.yourServices": "Seus serviços",
-  "settings.navigation.yourWorkspaces": "Os teus Espa��os de trabalho",
+  "settings.navigation.yourWorkspaces": "Suas ��reas de trabalho",
  "settings.recipes.all": "Todos os serviços",
  "settings.recipes.custom": "Servicios Personalizados",
  "settings.recipes.customService.headline.communityRecipes": "Serviços da comunidade",
  "settings.recipes.customService.headline.customRecipes": "Serviços personalizados",
-  "settings.recipes.customService.headline.devRecipes": "Seus Serviços em Desenvolvimento",
+  "settings.recipes.customService.headline.devRecipes": "Serviços em Desenvolvimento",
  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie o serviço para:",
  "settings.recipes.customService.openDevDocs": "Documentação do Desenvolvedor",
  "settings.recipes.customService.openFolder": "Abrir pasta",
@@ -390,12 +394,12 @@
  "settings.service.form.tabOnPremise": "Com domínio próprio ⭐️",
  "settings.service.form.team": "Equipa",
  "settings.service.form.useHostedService": "Utilize o serviço oferecido por {name}.",
-  "settings.service.form.yourServices": "Os seus serviços",
+  "settings.service.form.yourServices": "Seus serviços",
  "settings.services.deletedInfo": "O serviço foi apagado",
  "settings.services.discoverServices": "Descobrir serviços",
-  "settings.services.headline": "Os seus serviços",
+  "settings.services.headline": "Seus serviços",
  "settings.services.noServicesAdded": "Ainda não adicionou nenhum serviço.",
-  "settings.services.servicesRequestFailed": "Não foi possível ler os teus serviços",
+  "settings.services.servicesRequestFailed": "Não foi possível ler os seus serviços",
  "settings.services.tooltip.isDisabled": "O serviço está desativado",
  "settings.services.tooltip.isMuted": "Todos os sons estão silenciados",
  "settings.services.tooltip.notificationsDisabled": "As notificações estão desativadas",
@@ -409,7 +413,7 @@
  "settings.team.copy": "\"Ferdi para Equipes\" possui a opção de convidar ajudantes para a sua equipe através de mensagens por e-mail e gerenciar as inscrições deles em suas preferências de conta. Não perca tempo configurando as inscrições para membro da equipe individualmente, esqueça as múltiplas faturas e tempos de pagamento. Uma regra universal para todos os membros da equipe.",
  "settings.team.headline": "Equipa",
  "settings.team.intro": "Você e sua equipe usam Ferdi? Você pode agora administrar as inscrições pagas de todos os seus colegas, amigos e membros da família que você quiser, tudo isso em uma única conta.",
-  "settings.team.manageAction": "Gerir a tua Equipa em getferdi.com",
+  "settings.team.manageAction": "Gerenciar sua Equipe em getferdi.com",
  "settings.team.teamsUnavailable": "A funcionalidade de Equipes está indisponível",
  "settings.team.teamsUnavailableInfo": "Atualmente a funcionalidade de Equipes está disponível apenas utilizando o servidor Franz após adquirir um plano Franz Profissional. Por favor altere o seridor par https://api.franzinfra.com para utilizar esta funcionalidade.",
  "settings.team.upgradeAction": "Atualizar sua conta",
@@ -423,30 +427,30 @@
  "settings.user.form.lastname": "Último Nome",
  "settings.user.form.newPassword": "Nova palavra-passe",
  "settings.workspace.add.form.name": "Nome",
-  "settings.workspace.add.form.submitButton": "Criar um Espa��o de trabalho",
+  "settings.workspace.add.form.submitButton": "Nova ��rea de Trabalho",
-  "settings.workspace.form.buttonDelete": "Apagar um Espa��o de trabalho",
+  "settings.workspace.form.buttonDelete": "Excluir ��rea de trabalho",
-  "settings.workspace.form.buttonSave": "Gravar um Espa��o de trabalho",
+  "settings.workspace.form.buttonSave": "Salvar ��rea de Trabalho",
  "settings.workspace.form.keepLoaded": "Maner todas a áreas de trabalhos carregadas*",
  "settings.workspace.form.keepLoadedInfo": "*Esta opção será substituída pela configuração global \"Manter todas a áreas de trabalho carregada\".",
  "settings.workspace.form.name": "Nome",
  "settings.workspace.form.servicesInWorkspaceHeadline": "Serviços neste Workspace",
-  "settings.workspace.form.yourWorkspaces": "Os teus Espa��os de trabalho",
+  "settings.workspace.form.yourWorkspaces": "Suas ��reas de trabalho",
  "settings.workspaces.deletedInfo": "O Espaço de trabalho foi apagado",
-  "settings.workspaces.headline": "Os teus Espa��os de trabalho",
+  "settings.workspaces.headline": "Suas ��reas de trabalho",
  "settings.workspaces.noWorkspacesAdded": "Ainda não adicionou nenhum Espaço de trabalho",
  "settings.workspaces.tryReloadWorkspaces": "Tentar novamente",
  "settings.workspaces.updatedInfo": "As suas alterações foram efetuadas com sucesso",
-  "settings.workspaces.workspaceFeatureHeadline": "Menos é Mais: Introduzindo os Espa��o de trabalho Ferdi",
+  "settings.workspaces.workspaceFeatureHeadline": "Menos é Mais: Introduzindo as ��reas de trabalho Ferdi",
  "settings.workspaces.workspaceFeatureInfo": "As áreas de trabalho do Ferdi permite você focar no que realmente é importante agora. Configure diferentes conjuntos de serviços e alterne entre eles facilmente em qualquer momento. Você decide quais serviços você precisa e onde deseja colocá-los, então nós podemos te ajudar a aumentar a produtividade de suas tarefas. Ou facilmente deletar os aplicativos que você nunca irá precisar.",
  "settings.workspaces.workspacesRequestFailed": "Não foi possível carregar suas áreas de trabalho",
  "sidebar.addNewService": "Adicionar um novo serviço",
  "sidebar.closeTodosDrawer": "Fechar as Tarefas",
-  "sidebar.closeWorkspaceDrawer": "Fechar a janela do Espa��o de trabalho",
+  "sidebar.closeWorkspaceDrawer": "Fechar a janela da ��rea de trabalho",
  "sidebar.lockFerdi": "Bloquear Ferdi",
  "sidebar.muteApp": "Desativar notificações e áudio",
  "sidebar.openTodosDrawer": "Abrir as Tarefas",
-  "sidebar.openWorkspaceDrawer": "Abrir a janela do Espa��o de trabalho",
+  "sidebar.openWorkspaceDrawer": "Abrir a janela da ��rea de trabalho",
-  "sidebar.settings": "Definições",
+  "sidebar.settings": "Configurações",
  "sidebar.unmuteApp": "Ativar notificações e áudio",
  "signup.email.label": "Endereço de e-mail",
  "signup.emailDuplicate": "Já existe uma conta associada a este endereço de email",
@@ -495,7 +499,7 @@
  "welcome.signupButton": "Criar uma conta gratuita",
  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar uma nova área de trabalho",
  "workspaceDrawer.allServices": "Todos os serviços",
-  "workspaceDrawer.headline": "Espa��os de trabalho",
+  "workspaceDrawer.headline": "��reas de trabalho",
  "workspaceDrawer.item.contextMenuEdit": "editar",
  "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço foi adicionado",
  "workspaceDrawer.premiumCtaButtonLabel": "Crie sua primeira área de trabalho",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index b6e4fbe83..5210b9cdd 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Senha inválida",
  "locked.password.label": "Senha",
  "locked.submit.label": "Desbloquear",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Alterar servidor",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Tarefa do Servidor",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Configurações",
  "settings.app.headlineAdvanced": "Avançado",
  "settings.app.headlineAppearance": "Aparência",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 58228c1ab..d7b928f7e 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Неверный пароль",
  "locked.password.label": "Пароль",
  "locked.submit.label": "Разблокировать",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Изменить сервер",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Настройки",
  "settings.app.headlineAdvanced": "Дополнительно",
  "settings.app.headlineAppearance": "Внешний вид",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 177ead66a..c336999bc 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Nastavenia",
  "settings.app.headlineAdvanced": "Pokročilé",
  "settings.app.headlineAppearance": "Vzhľad",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 25432a219..4e419c039 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Postavke",
  "settings.app.headlineAdvanced": "Napredne alatke",
  "settings.app.headlineAppearance": "Izgled",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 446753135..6d130d84e 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Geçersiz şifre",
  "locked.password.label": "Şifre",
  "locked.submit.label": "Kilidi aç",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Sunucuyu değiştir",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Ayarlar",
  "settings.app.headlineAdvanced": "Gelişmiş",
  "settings.app.headlineAppearance": "Görünüm",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index b2bbf598f..522fcf24c 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Налаштування",
  "settings.app.headlineAdvanced": "Додаткові налаштування",
  "settings.app.headlineAppearance": "Вигляд",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 44d91848b..b34cb6b07 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "密碼無效",
  "locked.password.label": "密碼",
  "locked.submit.label": "解除封鎖",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "切換服務器",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "開始時最小化到系統匣",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "設置",
  "settings.app.headlineAdvanced": "高級設置",
  "settings.app.headlineAppearance": "外觀",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index ec5bd1a04..ff81d6b9f 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -85,6 +85,9 @@
  "locked.invalidCredentials": "Password invalid",
  "locked.password.label": "Password",
  "locked.submit.label": "Unlock",
+  "locked.touchId": "Unlock with Touch ID",
+  "locked.touchIdPrompt": "unlock via Touch ID",
+  "locked.unlockWithPassword": "Unlock with Password",
  "login.changeServer": "Change server",
  "login.customServerQuestion": "Using a custom Ferdi server?",
  "login.customServerSuggestion": "Try importing your Franz account",
@@ -299,6 +302,7 @@
  "settings.app.form.startMinimized": "Start minimized in tray",
  "settings.app.form.todoServer": "Todo Server",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.headline": "Settings",
  "settings.app.headlineAdvanced": "Advanced",
  "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 60d080918..0d3265c51 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -65,15 +65,28 @@
    }
  },
  {
+    "id": "settings.app.form.reloadAfterResume",
+    "defaultMessage": "!!!Reload Ferdi after system resume",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 51,
+      "column": 21
+    },
+    "end": {
+      "line": 54,
+      "column": 3
+    }
+  },
+  {
    "id": "settings.app.form.minimizeToSystemTray",
    "defaultMessage": "!!!Minimize Ferdi to system tray",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 51,
+      "line": 55,
      "column": 24
    },
    "end": {
-      "line": 54,
+      "line": 58,
      "column": 3
    }
  },
@@ -82,11 +95,11 @@
    "defaultMessage": "!!!Don't show message content in notifications",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 55,
+      "line": 59,
      "column": 24
    },
    "end": {
-      "line": 58,
+      "line": 62,
      "column": 3
    }
  },
@@ -95,11 +108,11 @@
    "defaultMessage": "!!!Navigation bar behaviour",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 59,
+      "line": 63,
      "column": 26
    },
    "end": {
-      "line": 62,
+      "line": 66,
      "column": 3
    }
  },
@@ -108,11 +121,11 @@
    "defaultMessage": "!!!Send telemetry data",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 63,
+      "line": 67,
      "column": 10
    },
    "end": {
-      "line": 66,
+      "line": 70,
      "column": 3
    }
  },
@@ -121,11 +134,11 @@
    "defaultMessage": "!!!Enable service hibernation",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 67,
+      "line": 71,
      "column": 13
    },
    "end": {
-      "line": 70,
+      "line": 74,
      "column": 3
    }
  },
@@ -134,11 +147,11 @@
    "defaultMessage": "!!!Hibernation strategy",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 71,
+      "line": 75,
      "column": 23
    },
    "end": {
-      "line": 74,
+      "line": 78,
      "column": 3
    }
  },
@@ -147,11 +160,11 @@
    "defaultMessage": "!!!Server",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 75,
+      "line": 79,
      "column": 10
    },
    "end": {
-      "line": 78,
+      "line": 82,
      "column": 3
    }
  },
@@ -160,11 +173,11 @@
    "defaultMessage": "!!!Todo Server",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 79,
+      "line": 83,
      "column": 14
    },
    "end": {
-      "line": 82,
+      "line": 86,
      "column": 3
    }
  },
@@ -173,11 +186,11 @@
    "defaultMessage": "!!!Enable Password Lock",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 83,
+      "line": 87,
      "column": 14
    },
    "end": {
-      "line": 86,
+      "line": 90,
      "column": 3
    }
  },
@@ -186,11 +199,11 @@
    "defaultMessage": "!!!Password",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 87,
+      "line": 91,
      "column": 16
    },
    "end": {
-      "line": 90,
+      "line": 94,
      "column": 3
    }
  },
@@ -199,11 +212,11 @@
    "defaultMessage": "!!!Allow using Touch ID to unlock",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 91,
+      "line": 95,
      "column": 22
    },
    "end": {
-      "line": 94,
+      "line": 98,
      "column": 3
    }
  },
@@ -212,11 +225,11 @@
    "defaultMessage": "!!!Lock after inactivity",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 95,
+      "line": 99,
      "column": 18
    },
    "end": {
-      "line": 98,
+      "line": 102,
      "column": 3
    }
  },
@@ -225,11 +238,11 @@
    "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 99,
+      "line": 103,
      "column": 23
    },
    "end": {
-      "line": 102,
+      "line": 106,
      "column": 3
    }
  },
@@ -238,11 +251,11 @@
    "defaultMessage": "!!!From",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 103,
+      "line": 107,
      "column": 21
    },
    "end": {
-      "line": 106,
+      "line": 110,
      "column": 3
    }
  },
@@ -251,11 +264,11 @@
    "defaultMessage": "!!!To",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 107,
+      "line": 111,
      "column": 19
    },
    "end": {
-      "line": 110,
+      "line": 114,
      "column": 3
    }
  },
@@ -264,11 +277,11 @@
    "defaultMessage": "!!!Language",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 111,
+      "line": 115,
      "column": 12
    },
    "end": {
-      "line": 114,
+      "line": 118,
      "column": 3
    }
  },
@@ -277,11 +290,11 @@
    "defaultMessage": "!!!Dark Mode",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 115,
+      "line": 119,
      "column": 12
    },
    "end": {
-      "line": 118,
+      "line": 122,
      "column": 3
    }
  },
@@ -290,11 +303,11 @@
    "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 119,
+      "line": 123,
      "column": 21
    },
    "end": {
-      "line": 122,
+      "line": 126,
      "column": 3
    }
  },
@@ -303,11 +316,11 @@
    "defaultMessage": "!!!Enable universal Dark Mode",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 123,
+      "line": 127,
      "column": 21
    },
    "end": {
-      "line": 126,
+      "line": 130,
      "column": 3
    }
  },
@@ -316,11 +329,11 @@
    "defaultMessage": "!!!Sidebar width",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 127,
+      "line": 131,
      "column": 22
    },
    "end": {
-      "line": 130,
+      "line": 134,
      "column": 3
    }
  },
@@ -329,11 +342,11 @@
    "defaultMessage": "!!!Service icon size",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 131,
+      "line": 135,
      "column": 12
    },
    "end": {
-      "line": 134,
+      "line": 138,
      "column": 3
    }
  },
@@ -342,11 +355,11 @@
    "defaultMessage": "!!!Accent color",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 135,
+      "line": 139,
      "column": 15
    },
    "end": {
-      "line": 138,
+      "line": 142,
      "column": 3
    }
  },
@@ -355,11 +368,11 @@
    "defaultMessage": "!!!Display disabled services tabs",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 139,
+      "line": 143,
      "column": 24
    },
    "end": {
-      "line": 142,
+      "line": 146,
      "column": 3
    }
  },
@@ -368,11 +381,11 @@
    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 143,
+      "line": 147,
      "column": 29
    },
    "end": {
-      "line": 146,
+      "line": 150,
      "column": 3
    }
  },
@@ -381,11 +394,11 @@
    "defaultMessage": "!!!Enable spell checking",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 147,
+      "line": 151,
      "column": 23
    },
    "end": {
-      "line": 150,
+      "line": 154,
      "column": 3
    }
  },
@@ -394,11 +407,11 @@
    "defaultMessage": "!!!Enable GPU Acceleration",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 151,
+      "line": 155,
      "column": 25
    },
    "end": {
-      "line": 154,
+      "line": 158,
      "column": 3
    }
  },
@@ -407,11 +420,11 @@
    "defaultMessage": "!!!Include beta versions",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 155,
+      "line": 159,
      "column": 8
    },
    "end": {
-      "line": 158,
+      "line": 162,
      "column": 3
    }
  },
@@ -420,11 +433,11 @@
    "defaultMessage": "!!!Disable updates",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 159,
+      "line": 163,
      "column": 13
    },
    "end": {
-      "line": 162,
+      "line": 166,
      "column": 3
    }
  },
@@ -433,11 +446,11 @@
    "defaultMessage": "!!!Enable Franz Todos",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 163,
+      "line": 167,
      "column": 15
    },
    "end": {
-      "line": 166,
+      "line": 170,
      "column": 3
    }
  },
@@ -446,11 +459,11 @@
    "defaultMessage": "!!!Keep all workspaces loaded",
    "file": "src/containers/settings/EditSettingsScreen.js",
    "start": {
-      "line": 167,
+      "line": 171,
      "column": 27
    },
    "end": {
-      "line": 170,
+      "line": 174,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 58618a427..15f5ff75f 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -117,15 +117,28 @@
    }
  },
  {
+    "id": "menu.edit.findInPage",
+    "defaultMessage": "!!!Find in Page",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 54,
+      "column": 14
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
    "id": "menu.edit.speech",
    "defaultMessage": "!!!Speech",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 54,
+      "line": 58,
      "column": 10
    },
    "end": {
-      "line": 57,
+      "line": 61,
      "column": 3
    }
  },
@@ -134,11 +147,11 @@
    "defaultMessage": "!!!Start Speaking",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 58,
+      "line": 62,
      "column": 17
    },
    "end": {
-      "line": 61,
+      "line": 65,
      "column": 3
    }
  },
@@ -147,11 +160,11 @@
    "defaultMessage": "!!!Stop Speaking",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 62,
+      "line": 66,
      "column": 16
    },
    "end": {
-      "line": 65,
+      "line": 69,
      "column": 3
    }
  },
@@ -160,11 +173,11 @@
    "defaultMessage": "!!!Start Dictation",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 66,
+      "line": 70,
      "column": 18
    },
    "end": {
-      "line": 69,
+      "line": 73,
      "column": 3
    }
  },
@@ -173,11 +186,11 @@
    "defaultMessage": "!!!Emoji & Symbols",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 70,
+      "line": 74,
      "column": 16
    },
    "end": {
-      "line": 73,
+      "line": 77,
      "column": 3
    }
  },
@@ -186,11 +199,11 @@
    "defaultMessage": "!!!Open Quick Switch",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 74,
+      "line": 78,
      "column": 19
    },
    "end": {
-      "line": 77,
+      "line": 81,
      "column": 3
    }
  },
@@ -199,11 +212,11 @@
    "defaultMessage": "!!!Back",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 78,
+      "line": 82,
      "column": 8
    },
    "end": {
-      "line": 81,
+      "line": 85,
      "column": 3
    }
  },
@@ -212,11 +225,11 @@
    "defaultMessage": "!!!Forward",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 82,
+      "line": 86,
      "column": 11
    },
    "end": {
-      "line": 85,
+      "line": 89,
      "column": 3
    }
  },
@@ -225,11 +238,11 @@
    "defaultMessage": "!!!Actual Size",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 86,
+      "line": 90,
      "column": 13
    },
    "end": {
-      "line": 89,
+      "line": 93,
      "column": 3
    }
  },
@@ -238,11 +251,11 @@
    "defaultMessage": "!!!Zoom In",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 90,
+      "line": 94,
      "column": 10
    },
    "end": {
-      "line": 93,
+      "line": 97,
      "column": 3
    }
  },
@@ -251,11 +264,11 @@
    "defaultMessage": "!!!Zoom Out",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 94,
+      "line": 98,
      "column": 11
    },
    "end": {
-      "line": 97,
+      "line": 101,
      "column": 3
    }
  },
@@ -264,11 +277,11 @@
    "defaultMessage": "!!!Enter Full Screen",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 98,
+      "line": 102,
      "column": 19
    },
    "end": {
-      "line": 101,
+      "line": 105,
      "column": 3
    }
  },
@@ -277,11 +290,11 @@
    "defaultMessage": "!!!Exit Full Screen",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 102,
+      "line": 106,
      "column": 18
    },
    "end": {
-      "line": 105,
+      "line": 109,
      "column": 3
    }
  },
@@ -290,11 +303,11 @@
    "defaultMessage": "!!!Toggle Full Screen",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 106,
+      "line": 110,
      "column": 20
    },
    "end": {
-      "line": 109,
+      "line": 113,
      "column": 3
    }
  },
@@ -303,11 +316,11 @@
    "defaultMessage": "!!!Toggle Developer Tools",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 110,
+      "line": 114,
      "column": 18
    },
    "end": {
-      "line": 113,
+      "line": 117,
      "column": 3
    }
  },
@@ -316,11 +329,11 @@
    "defaultMessage": "!!!Toggle Todos Developer Tools",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 114,
+      "line": 118,
      "column": 23
    },
    "end": {
-      "line": 117,
+      "line": 121,
      "column": 3
    }
  },
@@ -329,11 +342,11 @@
    "defaultMessage": "!!!Toggle Service Developer Tools",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 118,
+      "line": 122,
      "column": 25
    },
    "end": {
-      "line": 121,
+      "line": 125,
      "column": 3
    }
  },
@@ -342,11 +355,11 @@
    "defaultMessage": "!!!Reload Service",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 122,
+      "line": 126,
      "column": 17
    },
    "end": {
-      "line": 125,
+      "line": 129,
      "column": 3
    }
  },
@@ -355,11 +368,11 @@
    "defaultMessage": "!!!Reload Ferdi",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 126,
+      "line": 130,
      "column": 15
    },
    "end": {
-      "line": 129,
+      "line": 133,
      "column": 3
    }
  },
@@ -368,11 +381,11 @@
    "defaultMessage": "!!!Lock Ferdi",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 130,
+      "line": 134,
      "column": 13
    },
    "end": {
-      "line": 133,
+      "line": 137,
      "column": 3
    }
  },
@@ -381,11 +394,11 @@
    "defaultMessage": "!!!Minimize",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 134,
+      "line": 138,
      "column": 12
    },
    "end": {
-      "line": 137,
+      "line": 141,
      "column": 3
    }
  },
@@ -394,11 +407,11 @@
    "defaultMessage": "!!!Close",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 138,
+      "line": 142,
      "column": 9
    },
    "end": {
-      "line": 141,
+      "line": 145,
      "column": 3
    }
  },
@@ -407,11 +420,11 @@
    "defaultMessage": "!!!Learn More",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 142,
+      "line": 146,
      "column": 13
    },
    "end": {
-      "line": 145,
+      "line": 149,
      "column": 3
    }
  },
@@ -420,11 +433,11 @@
    "defaultMessage": "!!!Changelog",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 146,
+      "line": 150,
      "column": 13
    },
    "end": {
-      "line": 149,
+      "line": 153,
      "column": 3
    }
  },
@@ -433,11 +446,11 @@
    "defaultMessage": "!!!Support",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 150,
+      "line": 154,
      "column": 11
    },
    "end": {
-      "line": 153,
+      "line": 157,
      "column": 3
    }
  },
@@ -446,11 +459,11 @@
    "defaultMessage": "!!!Copy Debug Information",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 154,
+      "line": 158,
      "column": 13
    },
    "end": {
-      "line": 157,
+      "line": 161,
      "column": 3
    }
  },
@@ -459,11 +472,11 @@
    "defaultMessage": "!!!Publish Debug Information",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 158,
+      "line": 162,
      "column": 20
    },
    "end": {
-      "line": 161,
+      "line": 165,
      "column": 3
    }
  },
@@ -472,11 +485,11 @@
    "defaultMessage": "!!!Ferdi Debug Information",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 162,
+      "line": 166,
      "column": 27
    },
    "end": {
-      "line": 165,
+      "line": 169,
      "column": 3
    }
  },
@@ -485,11 +498,11 @@
    "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 166,
+      "line": 170,
      "column": 23
    },
    "end": {
-      "line": 169,
+      "line": 173,
      "column": 3
    }
  },
@@ -498,11 +511,11 @@
    "defaultMessage": "!!!Unlock with Touch ID",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 170,
+      "line": 174,
      "column": 11
    },
    "end": {
-      "line": 173,
+      "line": 177,
      "column": 3
    }
  },
@@ -511,11 +524,11 @@
    "defaultMessage": "!!!unlock via Touch ID",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 174,
+      "line": 178,
      "column": 17
    },
    "end": {
-      "line": 177,
+      "line": 181,
      "column": 3
    }
  },
@@ -524,11 +537,11 @@
    "defaultMessage": "!!!Terms of Service",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 178,
+      "line": 182,
      "column": 7
    },
    "end": {
-      "line": 181,
+      "line": 185,
      "column": 3
    }
  },
@@ -537,11 +550,11 @@
    "defaultMessage": "!!!Privacy Statement",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 182,
+      "line": 186,
      "column": 11
    },
    "end": {
-      "line": 185,
+      "line": 189,
      "column": 3
    }
  },
@@ -550,11 +563,11 @@
    "defaultMessage": "!!!File",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 186,
+      "line": 190,
      "column": 8
    },
    "end": {
-      "line": 189,
+      "line": 193,
      "column": 3
    }
  },
@@ -563,11 +576,11 @@
    "defaultMessage": "!!!View",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 190,
+      "line": 194,
      "column": 8
    },
    "end": {
-      "line": 193,
+      "line": 197,
      "column": 3
    }
  },
@@ -576,11 +589,11 @@
    "defaultMessage": "!!!Services",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 194,
+      "line": 198,
      "column": 12
    },
    "end": {
-      "line": 197,
+      "line": 201,
      "column": 3
    }
  },
@@ -589,11 +602,11 @@
    "defaultMessage": "!!!Window",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 198,
+      "line": 202,
      "column": 10
    },
    "end": {
-      "line": 201,
+      "line": 205,
      "column": 3
    }
  },
@@ -602,11 +615,11 @@
    "defaultMessage": "!!!Help",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 202,
+      "line": 206,
      "column": 8
    },
    "end": {
-      "line": 205,
+      "line": 209,
      "column": 3
    }
  },
@@ -615,11 +628,11 @@
    "defaultMessage": "!!!About Ferdi",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 206,
+      "line": 210,
      "column": 9
    },
    "end": {
-      "line": 209,
+      "line": 213,
      "column": 3
    }
  },
@@ -628,11 +641,11 @@
    "defaultMessage": "!!!What's new?",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 210,
+      "line": 214,
      "column": 16
    },
    "end": {
-      "line": 213,
+      "line": 217,
      "column": 3
    }
  },
@@ -641,11 +654,11 @@
    "defaultMessage": "!!!Settings",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 214,
+      "line": 218,
      "column": 12
    },
    "end": {
-      "line": 217,
+      "line": 221,
      "column": 3
    }
  },
@@ -654,11 +667,11 @@
    "defaultMessage": "!!!Check for updates",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 218,
+      "line": 222,
      "column": 19
    },
    "end": {
-      "line": 221,
+      "line": 225,
      "column": 3
    }
  },
@@ -667,11 +680,11 @@
    "defaultMessage": "!!!Hide",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 222,
+      "line": 226,
      "column": 8
    },
    "end": {
-      "line": 225,
+      "line": 229,
      "column": 3
    }
  },
@@ -680,11 +693,11 @@
    "defaultMessage": "!!!Hide Others",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 226,
+      "line": 230,
      "column": 14
    },
    "end": {
-      "line": 229,
+      "line": 233,
      "column": 3
    }
  },
@@ -693,11 +706,11 @@
    "defaultMessage": "!!!Unhide",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 230,
+      "line": 234,
      "column": 10
    },
    "end": {
-      "line": 233,
+      "line": 237,
      "column": 3
    }
  },
@@ -706,11 +719,11 @@
    "defaultMessage": "!!!Auto-hide menu bar",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 234,
+      "line": 238,
      "column": 19
    },
    "end": {
-      "line": 237,
+      "line": 241,
      "column": 3
    }
  },
@@ -719,11 +732,11 @@
    "defaultMessage": "!!!Quit",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 238,
+      "line": 242,
      "column": 8
    },
    "end": {
-      "line": 241,
+      "line": 245,
      "column": 3
    }
  },
@@ -732,11 +745,11 @@
    "defaultMessage": "!!!Add New Service...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 242,
+      "line": 246,
      "column": 17
    },
    "end": {
-      "line": 245,
+      "line": 249,
      "column": 3
    }
  },
@@ -745,11 +758,11 @@
    "defaultMessage": "!!!Add New Workspace...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 246,
+      "line": 250,
      "column": 19
    },
    "end": {
-      "line": 249,
+      "line": 253,
      "column": 3
    }
  },
@@ -758,11 +771,11 @@
    "defaultMessage": "!!!Open workspace drawer",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 250,
+      "line": 254,
      "column": 23
    },
    "end": {
-      "line": 253,
+      "line": 257,
      "column": 3
    }
  },
@@ -771,11 +784,11 @@
    "defaultMessage": "!!!Close workspace drawer",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 254,
+      "line": 258,
      "column": 24
    },
    "end": {
-      "line": 257,
+      "line": 261,
      "column": 3
    }
  },
@@ -784,11 +797,11 @@
    "defaultMessage": "!!!Activate next service...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 258,
+      "line": 262,
      "column": 23
    },
    "end": {
-      "line": 261,
+      "line": 265,
      "column": 3
    }
  },
@@ -797,11 +810,11 @@
    "defaultMessage": "!!!Activate previous service...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 262,
+      "line": 266,
      "column": 27
    },
    "end": {
-      "line": 265,
+      "line": 269,
      "column": 3
    }
  },
@@ -810,11 +823,11 @@
    "defaultMessage": "!!!Disable notifications & audio",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 266,
+      "line": 270,
      "column": 11
    },
    "end": {
-      "line": 269,
+      "line": 273,
      "column": 3
    }
  },
@@ -823,11 +836,11 @@
    "defaultMessage": "!!!Enable notifications & audio",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 270,
+      "line": 274,
      "column": 13
    },
    "end": {
-      "line": 273,
+      "line": 277,
      "column": 3
    }
  },
@@ -836,11 +849,11 @@
    "defaultMessage": "!!!Workspaces",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 274,
+      "line": 278,
      "column": 14
    },
    "end": {
-      "line": 277,
+      "line": 281,
      "column": 3
    }
  },
@@ -849,11 +862,11 @@
    "defaultMessage": "!!!Default",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 278,
+      "line": 282,
      "column": 20
    },
    "end": {
-      "line": 281,
+      "line": 285,
      "column": 3
    }
  },
@@ -862,11 +875,11 @@
    "defaultMessage": "!!!Todos",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 282,
+      "line": 286,
      "column": 9
    },
    "end": {
-      "line": 285,
+      "line": 289,
      "column": 3
    }
  },
@@ -875,11 +888,11 @@
    "defaultMessage": "!!!Open Todos drawer",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 286,
+      "line": 290,
      "column": 19
    },
    "end": {
-      "line": 289,
+      "line": 293,
      "column": 3
    }
  },
@@ -888,11 +901,11 @@
    "defaultMessage": "!!!Close Todos drawer",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 290,
+      "line": 294,
      "column": 20
    },
    "end": {
-      "line": 293,
+      "line": 297,
      "column": 3
    }
  },
@@ -901,11 +914,11 @@
    "defaultMessage": "!!!Enable Todos",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 294,
+      "line": 298,
      "column": 15
    },
    "end": {
-      "line": 297,
+      "line": 301,
      "column": 3
    }
  },
@@ -914,11 +927,11 @@
    "defaultMessage": "!!!Home",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 298,
+      "line": 302,
      "column": 17
    },
    "end": {
-      "line": 301,
+      "line": 305,
      "column": 3
    }
  }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 957621f94..4547e84f9 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -51,6 +51,10 @@ const menuItems = defineMessages({
    id: 'menu.edit.selectAll',
    defaultMessage: '!!!Select All',
  },
+  findInPage: {
+    id: 'menu.edit.findInPage',
+    defaultMessage: '!!!Find in Page',
+  },
  speech: {
    id: 'menu.edit.speech',
    defaultMessage: '!!!Speech',
@@ -376,6 +380,27 @@ const _templateFactory = (intl, locked) => [
        type: 'separator',
      },
      {
+        label: intl.formatMessage(menuItems.findInPage),
+        accelerator: 'CmdOrCtrl+F',
+        click() {
+          // Check if there is a service active
+          if (!window.ferdi.stores.services.active) return;
+          // Focus webview so find in page popup gets focused
+          window.ferdi.stores.services.active.webview.focus();
+          const currentService = window.ferdi.stores.services.active.id;
+          window.ferdi.actions.service.sendIPCMessage({
+            serviceId: currentService,
+            channel: 'find-in-page',
+            args: {},
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
        label: intl.formatMessage(menuItems.back),
        accelerator: 'CmdOrCtrl+Left',
        click() {
@@ -584,6 +609,27 @@ const _titleBarTemplateFactory = (intl, locked) => [
        type: 'separator',
      },
      {
+        label: intl.formatMessage(menuItems.findInPage),
+        accelerator: 'CmdOrCtrl+F',
+        click() {
+          // Check if there is a service active
+          if (!window.ferdi.stores.services.active) return;
+          // Focus webview so find in page popup gets focused
+          window.ferdi.stores.services.active.webview.focus();
+          const currentService = window.ferdi.stores.services.active.id;
+          window.ferdi.actions.service.sendIPCMessage({
+            serviceId: currentService,
+            channel: 'find-in-page',
+            args: {},
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
        label: intl.formatMessage(menuItems.back),
        accelerator: 'CmdOrCtrl+Left',
        click() {
@@ -861,7 +907,7 @@ export default class FranzMenu {
        },
      }, {
        type: 'separator',
-        visible: touchIdEnabled
+        visible: touchIdEnabled,
      });
    }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 36e6efd4f..593bf341e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -202,7 +202,7 @@ export default class AppStore extends Store {
    powerMonitor.on('resume', () => {
      debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
-      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
+      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment()) && this.stores.settings.app.get('reloadAfterResume')) {
        debug('Reloading services, user info and features');
        setTimeout(() => {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index ae6ba11c5..985887d2d 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -766,7 +766,7 @@ export default class ServicesStore extends Store {
      const isMuted = isAppMuted || service.isMuted;
      if (isAttached) {
-        service.webview.audioMuted = isMuted;
+        service.webview.setAudioMuted(isMuted);
      }
    });
  }
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 74d05fc2d..4fac21c55 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -19,6 +19,8 @@ class RecipeWebview {
  loopFunc = () => null;
+  darkModeHandler = false;
  /**
   * Initialize the loop
   *
@@ -67,17 +69,28 @@ class RecipeWebview {
   *                          be an absolute path to the file
   */
  injectCSS(...files) {
-    files.forEach((file) => {
+    files.forEach(async (file) => {
-      const data = fs.readFileSync(file);
+      if (await fs.exists(file)) {
-      const styles = document.createElement('style');
+        const data = await fs.readFile(file);
-      styles.innerHTML = data.toString();
+        const styles = document.createElement('style');
+        styles.innerHTML = data.toString();
-      document.querySelector('head').appendChild(styles);
+        document.querySelector('head').appendChild(styles);
-      debug('Append styles', styles);
+        debug('Append styles', styles);
+      }
    });
  }
+  /**
+   * Set a custom handler for turning on and off dark mode
+   *
+   * @param {function} handler
+   */
+  handleDarkMode(handler) {
+    this.darkModeHandler = handler;
+  }
  onNotify(fn) {
    if (typeof fn === 'function') {
      window.Notification.prototype.onNotify = fn;
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 07d29f477..bad5a93b2 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,10 +1,11 @@
 /* eslint-disable import/first */
-import { ipcRenderer } from 'electron';
+import { ipcRenderer, remote } from 'electron';
 import path from 'path';
 import { autorun, computed, observable } from 'mobx';
 import fs from 'fs-extra';
 import { loadModule } from 'cld3-asm';
 import { debounce } from 'lodash';
+import { FindInPage } from 'electron-find';
 // For some services darkreader tries to use the chrome extension message API
 // This will cause the service to fail loading
@@ -47,10 +48,15 @@ class RecipeController {
    'settings-update': 'updateAppSettings',
    'service-settings-update': 'updateServiceSettings',
    'get-service-id': 'serviceIdEcho',
+    'find-in-page': 'openFindInPage',
  };
  universalDarkModeInjected = false;
+  recipe = null;
+  hasUpdatedBeforeRecipeLoaded = false;
  constructor() {
    this.initialize();
  }
@@ -61,6 +67,8 @@ class RecipeController {
  cldIdentifier = null;
+  findInPage = null;
  async initialize() {
    Object.keys(this.ipcEvents).forEach((channel) => {
      ipcRenderer.on(channel, (...args) => {
@@ -73,6 +81,13 @@ class RecipeController {
    setTimeout(() => ipcRenderer.sendToHost('hello'), 100);
    await spellchecker();
    autorun(() => this.update());
+    document.addEventListener('DOMContentLoaded', () => {
+      this.findInPage = new FindInPage(remote.getCurrentWebContents(), {
+        inputFocusColor: '#CE9FFC',
+        textColor: '#212121',
+      });
+    });
  }
  loadRecipeModule(event, config, recipe) {
@@ -82,11 +97,15 @@ class RecipeController {
    // Delete module from cache
    delete require.cache[require.resolve(modulePath)];
    try {
+      this.recipe = new RecipeWebview();
      // eslint-disable-next-line
-      require(modulePath)(new RecipeWebview(), {...config, recipe,});
+      require(modulePath)(this.recipe, {...config, recipe,});
      debug('Initialize Recipe', config, recipe);
      this.settings.service = Object.assign(config, { recipe });
+      // Make sure to update the WebView, otherwise the custom darkmode handler may not be used
+      this.update();
    } catch (err) {
      console.error('Recipe initialization failed', err);
    }
@@ -125,6 +144,10 @@ class RecipeController {
    }
  }
+  openFindInPage() {
+    this.findInPage.openFindWindow();
+  }
  update() {
    debug('enableSpellchecking', this.settings.app.enableSpellchecking);
    debug('isDarkModeEnabled', this.settings.service.isDarkModeEnabled);
@@ -151,12 +174,25 @@ class RecipeController {
      }
    }
+    if (!this.recipe) {
+      this.hasUpdatedBeforeRecipeLoaded = true;
+    }
    console.log(
      'Darkmode enabled?',
      this.settings.service.isDarkModeEnabled,
      'Dark theme active?',
      this.settings.app.isDarkThemeActive,
    );
+    const handlerConfig = {
+      removeDarkModeStyle,
+      disableDarkMode,
+      enableDarkMode,
+      injectDarkModeStyle: () => injectDarkModeStyle(this.settings.service.recipe.path),
+      isDarkModeStyleInjected,
+    };
    if (this.settings.service.isDarkModeEnabled && this.settings.app.isDarkThemeActive !== false) {
      debug('Enable dark mode');
@@ -166,7 +202,19 @@ class RecipeController {
      console.log('darkmode.css exists? ', darkModeExists ? 'Yes' : 'No');
-      if (darkModeExists) {
+      // Check if recipe has a custom dark mode handler
+      if (this.recipe && this.recipe.darkModeHandler) {
+        console.log('Using custom dark mode handler');
+        // Remove other dark mode styles if they were already loaded
+        if (this.hasUpdatedBeforeRecipeLoaded) {
+          this.hasUpdatedBeforeRecipeLoaded = false;
+          removeDarkModeStyle();
+          disableDarkMode();
+        }
+        this.recipe.darkModeHandler(true, handlerConfig);
+      } else if (darkModeExists) {
        console.log('Injecting darkmode.css');
        injectDarkModeStyle(this.settings.service.recipe.path);
@@ -186,7 +234,16 @@ class RecipeController {
      debug('Remove dark mode');
      console.log('DarkMode disabled - removing remaining styles');
-      if (isDarkModeStyleInjected()) {
+      if (this.recipe && this.recipe.darkModeHandler) {
+        // Remove other dark mode styles if they were already loaded
+        if (this.hasUpdatedBeforeRecipeLoaded) {
+          this.hasUpdatedBeforeRecipeLoaded = false;
+          removeDarkModeStyle();
+          disableDarkMode();
+        }
+        this.recipe.darkModeHandler(false, handlerConfig);
+      } else if (isDarkModeStyleInjected()) {
        console.log('Removing injected darkmode.css');
        removeDarkModeStyle();
      } else {