diff --git a/docs/frontend/frontend-intro/jamstack-cms.md b/docs/frontend/frontend-intro/jamstack-cms.md
index 4a714d3e31a..fbecfeacea6 100755
--- a/docs/frontend/frontend-intro/jamstack-cms.md
+++ b/docs/frontend/frontend-intro/jamstack-cms.md
@@ -129,6 +129,8 @@ The following CMSs have high popularity among Gatsby users and support key funct
 
 https://github.com/outline/outline
 
+[Decap CMS | Open-Source Content Management System](https://decapcms.org/)
+
 [KeystoneJS: The superpowered Node.js Headless CMS for developers - Keystone 6](https://keystonejs.com/)
 
 ## sites.google.com - Great UI and functionalities
diff --git a/docs/frontend/frontend-intro/pwa.md b/docs/frontend/frontend-intro/pwa.md
index f36a6f9e571..7a470d7feee 100644
--- a/docs/frontend/frontend-intro/pwa.md
+++ b/docs/frontend/frontend-intro/pwa.md
@@ -18,3 +18,5 @@
 [PWABuilder Suite Documentation](https://docs.pwabuilder.com/#/builder/app-store)
 
 [PWAs in app stores  |  Articles  |  web.dev](https://web.dev/articles/pwas-in-app-stores)
+
+[Workbox  |  Chrome for Developers](https://developer.chrome.com/docs/workbox/)
diff --git a/docs/frontend/others/docusaurus.md b/docs/frontend/others/docusaurus.md
index 6788c6c1b73..e0e52a2d009 100755
--- a/docs/frontend/others/docusaurus.md
+++ b/docs/frontend/others/docusaurus.md
@@ -56,6 +56,8 @@ swizzling permits to **swap a theme component with your own implementation**, a
 - [📦 plugin-google-gtag | Docusaurus](https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-google-gtag)
 - [📦 plugin-content-docs | Docusaurus](https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-content-docs)
 - [Serving Optimized Docusaurus Images with Rehype, Markdown and Cloudinary - DevJams Episode #21 - YouTube](https://www.youtube.com/watch?v=9oBWMDK0Av4)
+- [Docusaurus](https://docusaurus.io/docs/api/themes/@docusaurus/theme-live-codeblock)
+- [GitHub - Arsero/docusaurus-graph: The Docusaurus GraphView Plugin is an open source plugin designed to generate a graph view from your Docusaurus documentation files.](https://github.com/Arsero/docusaurus-graph)
 
 ### Upgrading from v2 to v3
 
@@ -80,7 +82,7 @@ npm i @docusaurus/core@latest @docusaurus/plugin-google-gtag@latest @docusaurus/
 
 [Search | Docusaurus](https://docusaurus.io/docs/search)
 
-### Local Search
+### Local Search (not compatible with v3)
 
 ```json
 themes: [
@@ -95,6 +97,8 @@ themes: [
 ],
 ```
 
+[Releases · cmfcmf/docusaurus-search-local](https://github.com/cmfcmf/docusaurus-search-local/releases)
+
 ### Algolia
 
 [Run your own | DocSearch by Algolia](https://docsearch.algolia.com/docs/legacy/run-your-own/)
@@ -133,6 +137,16 @@ algolia: {
 
 [Crawler Admin Console](https://crawler.algolia.com/)
 
+## CMS
+
+- [I was looking for a Docusaurus-friendly CMS : r/Docusaurus](https://www.reddit.com/r/Docusaurus/comments/1geqz1q/i_was_looking_for_a_docusaurusfriendly_cms/)
+- [A minimal CMS for Docusaurus | Spinal](https://spinalcms.com/cms-for-docusaurus/)
+- [Docusaurus | Decap CMS | Open-Source Content Management System](https://decapcms.org/docs/docusaurus/)
+- [Gitten - Your Git Assistant](https://www.insightest.app/apps/gitten/#/)
+- [Docusaurus](https://docusaurus.io/feature-requests/p/make-content-editing-easier)
+
 ## Links
 
 - [Docusaurus](https://docusaurus.io/docs/blog)
+- [GitHub - webbertakken/awesome-docusaurus: A curated list of awesome Docusaurus resources.](https://github.com/webbertakken/awesome-docusaurus)
+- [Docusaurus](https://docusaurus.io/docs/seo)
diff --git a/docs/frontend/seo/seo-tools.md b/docs/frontend/seo/seo-tools.md
index cc38de93442..be5adf90798 100644
--- a/docs/frontend/seo/seo-tools.md
+++ b/docs/frontend/seo/seo-tools.md
@@ -8,6 +8,13 @@
 ## Google Tools
 
 - https://search.google.com/test/rich-results
+	- AMP
+	- Breadcrumbs
+	- FAQs
+	- Profile page
+	- Q&A
+	- Review Snippets
+	- Videos
 - https://search.google.com/test/amp
 - https://pagespeed.web.dev/
 
diff --git a/docusaurus.config.js b/docusaurus.config.js
index f03b4a5fdcd..aea964f6b66 100755
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -170,11 +170,12 @@ const config = {
       [
         '@docusaurus/plugin-pwa',
         {
-          debug: true,
+          debug: false,
           offlineModeActivationStrategies: [
             'appInstalled',
             'standalone',
             'queryString',
+            'always',
           ],
           pwaHead: [
             {
diff --git a/static/manifest.json b/static/manifest.json
index e196b583d48..60c55494e9a 100755
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -15,10 +15,10 @@
   ],
   "id": "/?source=pwa",
   "start_url": "/?source=pwa",
+  "theme_color": "#2f8555",
   "background_color": "#2f8555",
   "display": "standalone",
   "scope": "/",
-  "theme_color": "#2f8555",
   "description": "Deep Notes | Deepak's Personal Wiki",
   "screenshots": [
     {