diff --git a/docs/FAQ.md b/docs/FAQ.md
index 4b5df3ace0..b4c4970ff8 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,6 +1,7 @@
 ---
 id: FAQ
 title: FAQ
+description: All FAQ related to Backstage
 ---
 
 ## Product FAQ
diff --git a/docs/api/backend.md b/docs/api/backend.md
index bc44b8350c..0990343a01 100644
--- a/docs/api/backend.md
+++ b/docs/api/backend.md
@@ -1,6 +1,7 @@
 ---
 id: backend
 title: Backend
+description: About Backend
 ---
 
 ## TODO
diff --git a/docs/api/utility-apis.md b/docs/api/utility-apis.md
index 37cde87262..d192cbd6ee 100644
--- a/docs/api/utility-apis.md
+++ b/docs/api/utility-apis.md
@@ -1,6 +1,7 @@
 ---
 id: utility-apis
 title: Utility APIs
+description: Backstage Utility APIs
 ---
 
 ## Introduction
diff --git a/docs/architecture-decisions/adr001-add-adr-log.md b/docs/architecture-decisions/adr001-add-adr-log.md
index 8a484fa264..453905ab7a 100644
--- a/docs/architecture-decisions/adr001-add-adr-log.md
+++ b/docs/architecture-decisions/adr001-add-adr-log.md
@@ -2,6 +2,7 @@
 id: adrs-adr001
 title: ADR001: Architecture Decision Record (ADR) log
 sidebar_label: ADR001
+description: Architecture Decision Record (ADR) logs as a reference point for the team
 ---
 
 | Created    | Status |
diff --git a/docs/architecture-decisions/adr002-default-catalog-file-format.md b/docs/architecture-decisions/adr002-default-catalog-file-format.md
index af22d33020..da98aafaed 100644
--- a/docs/architecture-decisions/adr002-default-catalog-file-format.md
+++ b/docs/architecture-decisions/adr002-default-catalog-file-format.md
@@ -2,6 +2,7 @@
 id: adrs-adr002
 title: ADR002: Default Software Catalog File Format
 sidebar_label: ADR002
+description: Architecture Decision Record (ADR) log on Default Software Catalog File Format
 ---
 
 | Created    | Status |
diff --git a/docs/architecture-decisions/adr003-avoid-default-exports.md b/docs/architecture-decisions/adr003-avoid-default-exports.md
index 7a8df28f49..9d1f9c83a4 100644
--- a/docs/architecture-decisions/adr003-avoid-default-exports.md
+++ b/docs/architecture-decisions/adr003-avoid-default-exports.md
@@ -2,6 +2,7 @@
 id: adrs-adr003
 title: ADR003: Avoid Default Exports and Prefer Named Exports
 sidebar_label: ADR003
+description: Architecture Decision Record (ADR) log on Avoid Default Exports and Prefer Named Exports
 ---
 
 | Created    | Status |
diff --git a/docs/architecture-decisions/adr004-module-export-structure.md b/docs/architecture-decisions/adr004-module-export-structure.md
index 077f8c35d1..3dbda3f8b9 100644
--- a/docs/architecture-decisions/adr004-module-export-structure.md
+++ b/docs/architecture-decisions/adr004-module-export-structure.md
@@ -2,6 +2,7 @@
 id: adrs-adr004
 title: ADR004: Module Export Structure
 sidebar_label: ADR004
+description: Architecture Decision Record (ADR) log on Module Export Structure
 ---
 
 | Created    | Status |
diff --git a/docs/architecture-decisions/adr005-catalog-core-entities.md b/docs/architecture-decisions/adr005-catalog-core-entities.md
index 8f39acd1cf..ae615f647d 100644
--- a/docs/architecture-decisions/adr005-catalog-core-entities.md
+++ b/docs/architecture-decisions/adr005-catalog-core-entities.md
@@ -2,6 +2,7 @@
 id: adrs-adr005
 title: ADR005: Catalog Core Entities
 sidebar_label: ADR005
+description: Architecture Decision Record (ADR) log on Catalog Core Entities
 ---
 
 | Created    | Status |
diff --git a/docs/architecture-decisions/adr006-avoid-react-fc.md b/docs/architecture-decisions/adr006-avoid-react-fc.md
index e48fceb562..696cdcf537 100644
--- a/docs/architecture-decisions/adr006-avoid-react-fc.md
+++ b/docs/architecture-decisions/adr006-avoid-react-fc.md
@@ -2,6 +2,7 @@
 id: adrs-adr006
 title: ADR006: Avoid React.FC and React.SFC
 sidebar_label: ADR006
+description: Architecture Decision Record (ADR) log on Avoid React.FC and React.SFC
 ---
 
 ## Context
diff --git a/docs/architecture-decisions/adr007-use-msw-to-mock-service-requests.md b/docs/architecture-decisions/adr007-use-msw-to-mock-service-requests.md
index 773f08be30..d91af19068 100644
--- a/docs/architecture-decisions/adr007-use-msw-to-mock-service-requests.md
+++ b/docs/architecture-decisions/adr007-use-msw-to-mock-service-requests.md
@@ -2,6 +2,7 @@
 id: adrs-adr007
 title: ADR007: Use MSW to mock http requests
 sidebar_label: ADR007
+description: Architecture Decision Record (ADR) log on Use MSW to mock http requests
 ---
 
 ## Context
diff --git a/docs/architecture-decisions/adr008-default-catalog-file-name.md b/docs/architecture-decisions/adr008-default-catalog-file-name.md
index 979ea4de33..01afefd690 100644
--- a/docs/architecture-decisions/adr008-default-catalog-file-name.md
+++ b/docs/architecture-decisions/adr008-default-catalog-file-name.md
@@ -2,6 +2,7 @@
 id: adrs-adr008
 title: ADR008: Default Catalog File Name
 sidebar_label: ADR008
+description: Architecture Decision Record (ADR) log on Default Catalog File Name
 ---
 
 ## Background
diff --git a/docs/architecture-decisions/index.md b/docs/architecture-decisions/index.md
index 0e9ff21812..ddf2805e75 100644
--- a/docs/architecture-decisions/index.md
+++ b/docs/architecture-decisions/index.md
@@ -2,6 +2,7 @@
 id: adrs-overview
 title: Architecture Decision Records (ADR)
 sidebar_label: Overview
+description: Overview of Architecture Decision Records (ADR)
 ---
 
 The substantial architecture decisions made in the Backstage project live here.
diff --git a/docs/auth/oauth-popup-flow.svg b/docs/assets/auth/oauth-popup-flow.svg
similarity index 98%
rename from docs/auth/oauth-popup-flow.svg
rename to docs/assets/auth/oauth-popup-flow.svg
index 4d9e79787a..2132903783 100644
--- a/docs/auth/oauth-popup-flow.svg
+++ b/docs/assets/auth/oauth-popup-flow.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1145px" preserveAspectRatio="none" style="width:1214px;height:1145px;background:#FEFEFE;" version="1.1" viewBox="0 0 1214 1145" width="1214px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="287" x="461.5" y="27.4023">OAuth Consent and Refresh Flow</text><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="120" x2="120" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="419.5" x2="419.5" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="839" x2="839" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="985" x2="985" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1107" x2="1107" y1="86.6875" y2="1088.041"/><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="69" x="86" y="55.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="55" x="93" y="75.7344">Browser</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="69" x="86" y="1087.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="55" x="93" y="1107.5762">Browser</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="116" x="361.5" y="55.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="102" x="368.5" y="75.7344">Popup Window</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="116" x="361.5" y="1087.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="102" x="368.5" y="1107.5762">Popup Window</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="159" x="760" y="55.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="145" x="767" y="75.7344">auth-backend plugin</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="159" x="760" y="1087.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="145" x="767" y="1107.5762">auth-backend plugin</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="107" x="929" y="83.7344">Consent Screen</text><ellipse cx="985.5" cy="54.1992" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><polygon fill="#383838" points="981.5,42.1992,987.5,37.1992,985.5,42.1992,987.5,47.1992,981.5,42.1992" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="107" x="929" y="1100.5762">Consent Screen</text><ellipse cx="985.5" cy="1119.5293" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><polygon fill="#383838" points="981.5,1107.5293,987.5,1102.5293,985.5,1107.5293,987.5,1112.5293,981.5,1107.5293" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="1052" y="83.7344">OAuth Provider</text><ellipse cx="1107.5" cy="54.1992" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><line style="stroke: #383838; stroke-width: 2.0;" x1="1095.5" x2="1119.5" y1="68.1992" y2="68.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="1052" y="1100.5762">OAuth Provider</text><ellipse cx="1107.5" cy="1119.5293" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><line style="stroke: #383838; stroke-width: 2.0;" x1="1095.5" x2="1119.5" y1="1133.5293" y2="1133.5293"/><path d="M8,101.6875 L8,156.6875 L233,156.6875 L233,111.6875 L223,101.6875 L8,101.6875 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M223,101.6875 L223,111.6875 L233,111.6875 L223,101.6875 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="201" x="14" y="119.2559">Components on page ask for an</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="161" x="14" y="134.5664">access token with greater</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="204" x="14" y="149.877">scope than the existing session.</text><polygon fill="#383838" points="407.5,179.9297,417.5,183.9297,407.5,187.9297,411.5,183.9297" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="120.5" x2="413.5" y1="183.9297" y2="183.9297"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="77" x="127.5" y="179.1875">Open popup</text><polygon fill="#383838" points="827.5,209.2402,837.5,213.2402,827.5,217.2402,831.5,213.2402" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="833.5" y1="213.2402" y2="213.2402"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="333" x="426.5" y="208.498">GET /auth/&lt;provider&gt;/start?scope=some%20scopes</text><polygon fill="#383838" points="430.5,269.1719,420.5,273.1719,430.5,277.1719,426.5,273.1719" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="424.5" x2="838.5" y1="273.1719" y2="273.1719"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="198" x="436.5" y="237.8086">Redirect to consent screen with</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="212" x="436.5" y="253.1191">random nonce in OAuth state and</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="255" x="436.5" y="268.4297">short-lived cookie with the same nonce.</text><polygon fill="#383838" points="973.5,313.793,983.5,317.793,973.5,321.793,977.5,317.793" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="979.5" y1="317.793" y2="317.793"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="369" x="426.5" y="297.7402">GET /consent_url?redirect_uri=&lt;redirect_uri&gt;?nonce=&lt;n&gt;</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="422" x="426.5" y="313.0508">where redirect_uri=&lt;app-origin&gt;/auth/&lt;provider&gt;/handler/frame</text><path d="M905,330.793 L905,370.793 L1066,370.793 L1066,340.793 L1056,330.793 L905,330.793 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M1056,330.793 L1056,340.793 L1066,340.793 L1056,330.793 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="106" x="911" y="348.3613">User consents to</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="911" y="363.6719">access the new scope.</text><polygon fill="#383838" points="430.5,393.7246,420.5,397.7246,430.5,401.7246,426.5,397.7246" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="424.5" x2="984.5" y1="397.7246" y2="397.7246"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="343" x="436.5" y="392.9824">Redirect to given redirect URL, with authorization code</text><polygon fill="#383838" points="827.5,438.3457,837.5,442.3457,827.5,446.3457,831.5,442.3457" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="833.5" y1="442.3457" y2="442.3457"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="396" x="426.5" y="422.293">GET /auth/&lt;provider&gt;/handler/frame?code=&lt;c&gt;&amp;nonce=&lt;n&gt;</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="304" x="426.5" y="437.6035">Request includes the previously set none cookie</text><path d="M710,455.3457 L710,495.3457 L969,495.3457 L969,465.3457 L959,455.3457 L710,455.3457 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M959,455.3457 L959,465.3457 L969,465.3457 L959,455.3457 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="217" x="716" y="472.9141">Verify that the nonce in the cookie</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="238" x="716" y="488.2246">matches the nonce in the OAuth state</text><polygon fill="#383838" points="1095.5,548.8984,1105.5,552.8984,1095.5,556.8984,1099.5,552.8984" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="839.5" x2="1101.5" y1="552.8984" y2="552.8984"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="846.5" y="517.5352">Authorization Code</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="846.5" y="532.8457">Client ID</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="79" x="846.5" y="548.1563">Client Secret</text><path d="M1013,565.8984 L1013,590.8984 L1202,590.8984 L1202,575.8984 L1192,565.8984 L1013,565.8984 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M1192,565.8984 L1192,575.8984 L1202,575.8984 L1192,565.8984 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="168" x="1019" y="583.4668">Verify and generate tokens</text><polygon fill="#383838" points="850.5,674.7617,840.5,678.7617,850.5,682.7617,846.5,678.7617" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="844.5" x2="1106.5" y1="678.7617" y2="678.7617"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="87" x="856.5" y="612.7773">Access Token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="856.5" y="628.0879">(ID Token)</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="856.5" y="643.3984">(Refresh Token)</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="856.5" y="658.709">Scope</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="74" x="856.5" y="674.0195">Expire Time</text><polygon fill="#383838" points="430.5,719.3828,420.5,723.3828,430.5,727.3828,426.5,723.3828" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="424.5" x2="838.5" y1="723.3828" y2="723.3828"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="300" x="436.5" y="703.3301">Small HTML page with inlined response payload</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="260" x="436.5" y="718.6406">Store Refresh Token in HTTP-only cookie</text><polygon fill="#383838" points="131.5,748.6934,121.5,752.6934,131.5,756.6934,127.5,752.6934" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="125.5" x2="418.5" y1="752.6934" y2="752.6934"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="275" x="137.5" y="747.9512">postMessage() with tokens and info or error</text><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="461.5" y1="782.0039" y2="782.0039"/><line style="stroke: #383838; stroke-width: 1.0;" x1="461.5" x2="461.5" y1="782.0039" y2="795.0039"/><line style="stroke: #383838; stroke-width: 1.0;" x1="420.5" x2="461.5" y1="795.0039" y2="795.0039"/><polygon fill="#383838" points="430.5,791.0039,420.5,795.0039,430.5,799.0039,426.5,795.0039" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="426.5" y="777.2617">Close self</text><path d="M9,808.0039 L9,863.0039 L232,863.0039 L232,818.0039 L222,808.0039 L9,808.0039 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M222,808.0039 L222,818.0039 L232,818.0039 L222,808.0039 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="174" x="15" y="825.5723">A later point when a refresh</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="176" x="19" y="840.8828">is needed. Either because of</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="198" x="19" y="856.1934">a reload or an expiring session.</text><polygon fill="#383838" points="827.5,901.5566,837.5,905.5566,827.5,909.5566,831.5,905.5566" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="120.5" x2="833.5" y1="905.5566" y2="905.5566"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="127.5" y="885.5039">GET /auth/&lt;provider&gt;/token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="194" x="127.5" y="900.8145">Refresh Token cookie included</text><polygon fill="#383838" points="1095.5,961.4883,1105.5,965.4883,1095.5,969.4883,1099.5,965.4883" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="839.5" x2="1101.5" y1="965.4883" y2="965.4883"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="846.5" y="930.125">Refresh Token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="846.5" y="945.4355">Client ID</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="79" x="846.5" y="960.7461">Client Secret</text><polygon fill="#383838" points="850.5,1036.7305,840.5,1040.7305,850.5,1044.7305,846.5,1040.7305" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="844.5" x2="1106.5" y1="1040.7305" y2="1040.7305"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="87" x="856.5" y="990.0566">Access Token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="856.5" y="1005.3672">(ID Token)</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="856.5" y="1020.6777">Scope</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="74" x="856.5" y="1035.9883">Expire Time</text><polygon fill="#383838" points="131.5,1066.041,121.5,1070.041,131.5,1074.041,127.5,1070.041" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="125.5" x2="838.5" y1="1070.041" y2="1070.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="102" x="137.5" y="1065.2988">Tokens and info</text><!--MD5=[5195d92647a89e68689dac1adbbd164a]
-@startuml oauth-popup-flow
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1145px" preserveAspectRatio="none" style="width:1214px;height:1145px;background:#FEFEFE;" version="1.1" viewBox="0 0 1214 1145" width="1214px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="287" x="461.5" y="27.4023">OAuth Consent and Refresh Flow</text><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="120" x2="120" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="419.5" x2="419.5" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="839" x2="839" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="985" x2="985" y1="86.6875" y2="1088.041"/><line style="stroke: #383838; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1107" x2="1107" y1="86.6875" y2="1088.041"/><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="69" x="86" y="55.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="55" x="93" y="75.7344">Browser</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="69" x="86" y="1087.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="55" x="93" y="1107.5762">Browser</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="116" x="361.5" y="55.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="102" x="368.5" y="75.7344">Popup Window</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="116" x="361.5" y="1087.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="102" x="368.5" y="1107.5762">Popup Window</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="159" x="760" y="55.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="145" x="767" y="75.7344">auth-backend plugin</text><rect fill="#F8F8F8" height="30.4883" style="stroke: #383838; stroke-width: 1.5;" width="159" x="760" y="1087.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="145" x="767" y="1107.5762">auth-backend plugin</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="107" x="929" y="83.7344">Consent Screen</text><ellipse cx="985.5" cy="54.1992" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><polygon fill="#383838" points="981.5,42.1992,987.5,37.1992,985.5,42.1992,987.5,47.1992,981.5,42.1992" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="107" x="929" y="1100.5762">Consent Screen</text><ellipse cx="985.5" cy="1119.5293" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><polygon fill="#383838" points="981.5,1107.5293,987.5,1102.5293,985.5,1107.5293,987.5,1112.5293,981.5,1107.5293" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="1052" y="83.7344">OAuth Provider</text><ellipse cx="1107.5" cy="54.1992" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><line style="stroke: #383838; stroke-width: 2.0;" x1="1095.5" x2="1119.5" y1="68.1992" y2="68.1992"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="1052" y="1100.5762">OAuth Provider</text><ellipse cx="1107.5" cy="1119.5293" fill="#F8F8F8" rx="12" ry="12" style="stroke: #383838; stroke-width: 2.0;"/><line style="stroke: #383838; stroke-width: 2.0;" x1="1095.5" x2="1119.5" y1="1133.5293" y2="1133.5293"/><path d="M8,101.6875 L8,156.6875 L233,156.6875 L233,111.6875 L223,101.6875 L8,101.6875 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M223,101.6875 L223,111.6875 L233,111.6875 L223,101.6875 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="201" x="14" y="119.2559">Components on page ask for an</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="161" x="14" y="134.5664">access token with greater</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="204" x="14" y="149.877">scope than the existing session.</text><polygon fill="#383838" points="407.5,179.9297,417.5,183.9297,407.5,187.9297,411.5,183.9297" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="120.5" x2="413.5" y1="183.9297" y2="183.9297"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="77" x="127.5" y="179.1875">Open popup</text><polygon fill="#383838" points="827.5,209.2402,837.5,213.2402,827.5,217.2402,831.5,213.2402" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="833.5" y1="213.2402" y2="213.2402"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="333" x="426.5" y="208.498">GET /auth/&lt;provider&gt;/start?scope=some%20scopes</text><polygon fill="#383838" points="430.5,269.1719,420.5,273.1719,430.5,277.1719,426.5,273.1719" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="424.5" x2="838.5" y1="273.1719" y2="273.1719"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="198" x="436.5" y="237.8086">Redirect to consent screen with</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="212" x="436.5" y="253.1191">random nonce in OAuth state and</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="255" x="436.5" y="268.4297">short-lived cookie with the same nonce.</text><polygon fill="#383838" points="973.5,313.793,983.5,317.793,973.5,321.793,977.5,317.793" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="979.5" y1="317.793" y2="317.793"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="369" x="426.5" y="297.7402">GET /consent_url?redirect_uri=&lt;redirect_uri&gt;?nonce=&lt;n&gt;</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="422" x="426.5" y="313.0508">where redirect_uri=&lt;app-origin&gt;/auth/&lt;provider&gt;/handler/frame</text><path d="M905,330.793 L905,370.793 L1066,370.793 L1066,340.793 L1056,330.793 L905,330.793 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M1056,330.793 L1056,340.793 L1066,340.793 L1056,330.793 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="106" x="911" y="348.3613">User consents to</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="911" y="363.6719">access the new scope.</text><polygon fill="#383838" points="430.5,393.7246,420.5,397.7246,430.5,401.7246,426.5,397.7246" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="424.5" x2="984.5" y1="397.7246" y2="397.7246"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="343" x="436.5" y="392.9824">Redirect to given redirect URL, with authorization code</text><polygon fill="#383838" points="827.5,438.3457,837.5,442.3457,827.5,446.3457,831.5,442.3457" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="833.5" y1="442.3457" y2="442.3457"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="396" x="426.5" y="422.293">GET /auth/&lt;provider&gt;/handler/frame?code=&lt;c&gt;&amp;nonce=&lt;n&gt;</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="304" x="426.5" y="437.6035">Request includes the previously set none cookie</text><path d="M710,455.3457 L710,495.3457 L969,495.3457 L969,465.3457 L959,455.3457 L710,455.3457 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M959,455.3457 L959,465.3457 L969,465.3457 L959,455.3457 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="217" x="716" y="472.9141">Verify that the nonce in the cookie</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="238" x="716" y="488.2246">matches the nonce in the OAuth state</text><polygon fill="#383838" points="1095.5,548.8984,1105.5,552.8984,1095.5,556.8984,1099.5,552.8984" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="839.5" x2="1101.5" y1="552.8984" y2="552.8984"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="846.5" y="517.5352">Authorization Code</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="846.5" y="532.8457">Client ID</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="79" x="846.5" y="548.1563">Client Secret</text><path d="M1013,565.8984 L1013,590.8984 L1202,590.8984 L1202,575.8984 L1192,565.8984 L1013,565.8984 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M1192,565.8984 L1192,575.8984 L1202,575.8984 L1192,565.8984 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="168" x="1019" y="583.4668">Verify and generate tokens</text><polygon fill="#383838" points="850.5,674.7617,840.5,678.7617,850.5,682.7617,846.5,678.7617" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="844.5" x2="1106.5" y1="678.7617" y2="678.7617"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="87" x="856.5" y="612.7773">Access Token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="856.5" y="628.0879">(ID Token)</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="856.5" y="643.3984">(Refresh Token)</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="856.5" y="658.709">Scope</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="74" x="856.5" y="674.0195">Expire Time</text><polygon fill="#383838" points="430.5,719.3828,420.5,723.3828,430.5,727.3828,426.5,723.3828" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="424.5" x2="838.5" y1="723.3828" y2="723.3828"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="300" x="436.5" y="703.3301">Small HTML page with inlined response payload</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="260" x="436.5" y="718.6406">Store Refresh Token in HTTP-only cookie</text><polygon fill="#383838" points="131.5,748.6934,121.5,752.6934,131.5,756.6934,127.5,752.6934" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="125.5" x2="418.5" y1="752.6934" y2="752.6934"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="275" x="137.5" y="747.9512">postMessage() with tokens and info or error</text><line style="stroke: #383838; stroke-width: 1.0;" x1="419.5" x2="461.5" y1="782.0039" y2="782.0039"/><line style="stroke: #383838; stroke-width: 1.0;" x1="461.5" x2="461.5" y1="782.0039" y2="795.0039"/><line style="stroke: #383838; stroke-width: 1.0;" x1="420.5" x2="461.5" y1="795.0039" y2="795.0039"/><polygon fill="#383838" points="430.5,791.0039,420.5,795.0039,430.5,799.0039,426.5,795.0039" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="426.5" y="777.2617">Close self</text><path d="M9,808.0039 L9,863.0039 L232,863.0039 L232,818.0039 L222,808.0039 L9,808.0039 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><path d="M222,808.0039 L222,818.0039 L232,818.0039 L222,808.0039 " fill="#ECECEC" style="stroke: #383838; stroke-width: 1.0;"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="174" x="15" y="825.5723">A later point when a refresh</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="176" x="19" y="840.8828">is needed. Either because of</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="198" x="19" y="856.1934">a reload or an expiring session.</text><polygon fill="#383838" points="827.5,901.5566,837.5,905.5566,827.5,909.5566,831.5,905.5566" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="120.5" x2="833.5" y1="905.5566" y2="905.5566"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="127.5" y="885.5039">GET /auth/&lt;provider&gt;/token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="194" x="127.5" y="900.8145">Refresh Token cookie included</text><polygon fill="#383838" points="1095.5,961.4883,1105.5,965.4883,1095.5,969.4883,1099.5,965.4883" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="839.5" x2="1101.5" y1="965.4883" y2="965.4883"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="846.5" y="930.125">Refresh Token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="846.5" y="945.4355">Client ID</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="79" x="846.5" y="960.7461">Client Secret</text><polygon fill="#383838" points="850.5,1036.7305,840.5,1040.7305,850.5,1044.7305,846.5,1040.7305" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="844.5" x2="1106.5" y1="1040.7305" y2="1040.7305"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="87" x="856.5" y="990.0566">Access Token</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="856.5" y="1005.3672">(ID Token)</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="856.5" y="1020.6777">Scope</text><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="74" x="856.5" y="1035.9883">Expire Time</text><polygon fill="#383838" points="131.5,1066.041,121.5,1070.041,131.5,1074.041,127.5,1070.041" style="stroke: #383838; stroke-width: 1.0;"/><line style="stroke: #383838; stroke-width: 1.0;" x1="125.5" x2="838.5" y1="1070.041" y2="1070.041"/><text fill="#000000" font-family="Segoe UI, Helvetica, Arial, sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="102" x="137.5" y="1065.2988">Tokens and info</text><!--MD5=[c025fb26ac34956dc15457f201ee7a22]
+@startuml /../assets/auth/oauth-popup-flow
 
 skinparam monochrome true
 skinparam shadowing false
@@ -46,7 +46,7 @@ Browser <- Backend: Tokens and info
 
 @enduml
 
-PlantUML version 1.2020.11(Sat May 30 12:13:43 CEST 2020)
+PlantUML version 1.2020.16(Mon Aug 24 01:50:43 IST 2020)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/docs/auth/add-auth-provider.md b/docs/auth/add-auth-provider.md
index 7e4f5c8e2f..c5f7645a49 100644
--- a/docs/auth/add-auth-provider.md
+++ b/docs/auth/add-auth-provider.md
@@ -1,6 +1,7 @@
 ---
 id: add-auth-provider
 title: Adding authentication providers
+description: Documentation on Adding authentication providers
 ---
 
 ## Passport
diff --git a/docs/auth/auth-backend-classes.md b/docs/auth/auth-backend-classes.md
index 0147c66dd9..4ccee8ede9 100644
--- a/docs/auth/auth-backend-classes.md
+++ b/docs/auth/auth-backend-classes.md
@@ -1,6 +1,7 @@
 ---
 id: auth-backend-classes
 title: Auth backend classes
+description: Documentation on Auth backend classes
 ---
 
 ## How Does Authentication Work?
diff --git a/docs/auth/auth-backend.md b/docs/auth/auth-backend.md
index 579d2e2cda..6d8b95ac9f 100644
--- a/docs/auth/auth-backend.md
+++ b/docs/auth/auth-backend.md
@@ -1,6 +1,7 @@
 ---
 id: auth-backend
 title: Auth backend
+description: Documentation on Auth backend
 ---
 
 ## TODO
diff --git a/docs/auth/glossary.md b/docs/auth/glossary.md
index 607326b3a5..ad7ae78d19 100644
--- a/docs/auth/glossary.md
+++ b/docs/auth/glossary.md
@@ -1,6 +1,7 @@
 ---
 id: glossary
 title: Glossary
+description: All Glossaries related to auth
 ---
 
 - **Popup** - A separate browser window opened on top of the previous one.
diff --git a/docs/auth/index.md b/docs/auth/index.md
index b885db0820..0fa8de3280 100644
--- a/docs/auth/index.md
+++ b/docs/auth/index.md
@@ -1,6 +1,7 @@
 ---
 id: index
 title: User Authentication and Authorization in Backstage
+description: Documentation on User Authentication and Authorization in Backstage
 ---
 
 ## Summary
diff --git a/docs/auth/oauth.md b/docs/auth/oauth.md
index b7013a310d..e90b7b665a 100644
--- a/docs/auth/oauth.md
+++ b/docs/auth/oauth.md
@@ -1,6 +1,9 @@
 ---
 id: oauth
 title: OAuth and OpenID Connect
+description: This section describes how Backstage allows plugins to request
+OAuth Access Tokens and OpenID Connect ID Tokens on behalf of the user, to be
+used for auth to various third party APIs
 ---
 
 This section describes how Backstage allows plugins to request OAuth Access
@@ -104,10 +107,10 @@ request an access token.
 
 The following diagram visualizes the flow described in the previous section.
 
-![](oauth-popup-flow.svg)
+![Sequence Diagram](../assets/auth/oauth-popup-flow.svg)
 
 <!--
-@startuml oauth-popup-flow
+@startuml /../assets/auth/oauth-popup-flow
 
 skinparam monochrome true
 skinparam shadowing false
diff --git a/docs/conf/defining.md b/docs/conf/defining.md
index b28d6b8362..bea03e4e44 100644
--- a/docs/conf/defining.md
+++ b/docs/conf/defining.md
@@ -1,6 +1,7 @@
 ---
 id: defining
 title: Defining Configuration for your Plugin
+description: Documentation on Defining Configuration for your Plugin
 ---
 
 There is currently no tooling support or helpers for defining plugin
diff --git a/docs/conf/index.md b/docs/conf/index.md
index bc1d7e8e1f..83eff50a7d 100644
--- a/docs/conf/index.md
+++ b/docs/conf/index.md
@@ -1,6 +1,7 @@
 ---
 id: index
 title: Static Configuration in Backstage
+description: Documentation on Static Configuration in Backstage
 ---
 
 ## Summary
diff --git a/docs/conf/reading.md b/docs/conf/reading.md
index 76d1f7f6ea..a43ec8c026 100644
--- a/docs/conf/reading.md
+++ b/docs/conf/reading.md
@@ -1,6 +1,7 @@
 ---
 id: reading
 title: Reading Backstage Configuration
+description: Documentation on Reading Backstage Configuration
 ---
 
 ## Config API
diff --git a/docs/conf/writing.md b/docs/conf/writing.md
index da2a10a86d..6d338e586d 100644
--- a/docs/conf/writing.md
+++ b/docs/conf/writing.md
@@ -1,6 +1,7 @@
 ---
 id: writing
 title: Writing Backstage Configuration Files
+description: Documentation on Writing Backstage Configuration Files
 ---
 
 ## File Format
diff --git a/docs/dls/contributing-to-storybook.md b/docs/dls/contributing-to-storybook.md
index f0c2201a98..058f4a23a7 100644
--- a/docs/dls/contributing-to-storybook.md
+++ b/docs/dls/contributing-to-storybook.md
@@ -1,6 +1,7 @@
 ---
 id: contributing-to-storybook
 title: Contributing to Storybook
+description: Documentation on How to Contribute to Storybook
 ---
 
 You find our storybook at
diff --git a/docs/dls/design.md b/docs/dls/design.md
index b434fc8791..fa3a0c159e 100644
--- a/docs/dls/design.md
+++ b/docs/dls/design.md
@@ -1,6 +1,7 @@
 ---
 id: design
 title: Design
+description: Documentation on Design
 ---
 
 ![header](../assets/dls/designheader-updated.png)
diff --git a/docs/dls/figma.md b/docs/dls/figma.md
index 14de2f5980..c5a33d15c2 100644
--- a/docs/dls/figma.md
+++ b/docs/dls/figma.md
@@ -1,6 +1,8 @@
 ---
 id: figma
 title: Figma
+description: Documentation on using Figma to build your own plugins for
+Backstage
 ---
 
 We have a [Figma component library](https://www.figma.com/@backstage) that you
diff --git a/docs/features/software-catalog/api.md b/docs/features/software-catalog/api.md
index 332c1e505b..f7c7b19112 100644
--- a/docs/features/software-catalog/api.md
+++ b/docs/features/software-catalog/api.md
@@ -1,6 +1,7 @@
 ---
 id: software-catalog-api
 title: API
+description: Documentation on Software Catalog API
 ---
 
 ## TODO
diff --git a/docs/features/software-catalog/configuration.md b/docs/features/software-catalog/configuration.md
index be6314e494..0bcfaabe0a 100644
--- a/docs/features/software-catalog/configuration.md
+++ b/docs/features/software-catalog/configuration.md
@@ -1,6 +1,7 @@
 ---
 id: software-catalog-configuration
 title: Catalog Configuration
+description: Documentation on Software Catalog Configuration
 ---
 
 ## Static Location Configuration
diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index bf01f1972c..bbc68b2e27 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -2,6 +2,8 @@
 id: descriptor-format
 title: Descriptor Format of Catalog Entities
 sidebar_label: YAML File Format
+description: Documentation on Descriptor Format of Catalog Entities which
+describes the default data shape and semantics of catalog entities
 ---
 
 This section describes the default data shape and semantics of catalog entities.
diff --git a/docs/features/software-catalog/extending-the-model.md b/docs/features/software-catalog/extending-the-model.md
index 8b621f2e44..4e8a357ea7 100644
--- a/docs/features/software-catalog/extending-the-model.md
+++ b/docs/features/software-catalog/extending-the-model.md
@@ -1,6 +1,7 @@
 ---
 id: extending-the-model
 title: Extending the model
+description: Documentation on Extending the model
 ---
 
 Backstage natively supports tracking of the following component
diff --git a/docs/features/software-catalog/external-integrations.md b/docs/features/software-catalog/external-integrations.md
index 7ca869cdae..00a9d95fc2 100644
--- a/docs/features/software-catalog/external-integrations.md
+++ b/docs/features/software-catalog/external-integrations.md
@@ -1,6 +1,8 @@
 ---
 id: external-integrations
 title: External integrations
+description: Documentation on External integrations to integrate systems
+with Backstage
 ---
 
 Backstage natively supports storing software components in
diff --git a/docs/features/software-catalog/index.md b/docs/features/software-catalog/index.md
index 9b5de16472..49a490d78b 100644
--- a/docs/features/software-catalog/index.md
+++ b/docs/features/software-catalog/index.md
@@ -2,6 +2,8 @@
 id: software-catalog-overview
 title: Backstage Service Catalog (alpha)
 sidebar_label: Overview
+description: The Backstage Service Catalog — actually, a software catalog, since
+it includes more than just services
 ---
 
 ## What is a Service Catalog?
diff --git a/docs/features/software-catalog/installation.md b/docs/features/software-catalog/installation.md
index 85598a2025..a825020eb6 100644
--- a/docs/features/software-catalog/installation.md
+++ b/docs/features/software-catalog/installation.md
@@ -1,6 +1,7 @@
 ---
 id: installation
 title: Installing in your Backstage App
+description: Documentation on How to install Backstage Plugin
 ---
 
 The catalog plugin comes in two packages, `@backstage/plugin-catalog` and
diff --git a/docs/features/software-catalog/system-model.md b/docs/features/software-catalog/system-model.md
index 4436f60fc2..44dac13d65 100644
--- a/docs/features/software-catalog/system-model.md
+++ b/docs/features/software-catalog/system-model.md
@@ -1,6 +1,7 @@
 ---
 id: system-model
 title: System Model
+description: Documentation on System Model
 ---
 
 We believe that a strong shared understanding and terminology around software
diff --git a/docs/features/software-catalog/well-known-annotations.md b/docs/features/software-catalog/well-known-annotations.md
index d6e81e639f..ba5b491e07 100644
--- a/docs/features/software-catalog/well-known-annotations.md
+++ b/docs/features/software-catalog/well-known-annotations.md
@@ -2,6 +2,9 @@
 id: well-known-annotations
 title: Well-known Annotations on Catalog Entities
 sidebar_label: Well-known Annotations
+description: Documentation on lists a number of well known Annotations, that
+have defined semantics. They can be attached to catalog entities and consumed
+by plugins as needed
 ---
 
 This section lists a number of well known
diff --git a/docs/features/software-templates/adding-templates.md b/docs/features/software-templates/adding-templates.md
index 1472986c2a..fad5c68e41 100644
--- a/docs/features/software-templates/adding-templates.md
+++ b/docs/features/software-templates/adding-templates.md
@@ -1,6 +1,7 @@
 ---
 id: adding-templates
 title: Adding your own Templates
+description: Documentation on Adding your own Templates
 ---
 
 Templates are stored in the **Service Catalog** under a kind `Template`. The
diff --git a/docs/features/software-templates/extending/create-your-own-preparer.md b/docs/features/software-templates/extending/create-your-own-preparer.md
index 0b3fb31323..14c75b0ffb 100644
--- a/docs/features/software-templates/extending/create-your-own-preparer.md
+++ b/docs/features/software-templates/extending/create-your-own-preparer.md
@@ -1,6 +1,7 @@
 ---
 id: extending-preparer
 title: Create your own Preparer
+description: Documentation on Creating your own Preparer
 ---
 
 Preparers are responsible for reading the location of the definition of a
diff --git a/docs/features/software-templates/extending/create-your-own-publisher.md b/docs/features/software-templates/extending/create-your-own-publisher.md
index 111125b49f..25d7bcf676 100644
--- a/docs/features/software-templates/extending/create-your-own-publisher.md
+++ b/docs/features/software-templates/extending/create-your-own-publisher.md
@@ -1,6 +1,7 @@
 ---
 id: extending-publisher
 title: Create your own Publisher
+description: Documentation on Creating your own Publisher
 ---
 
 Publishers are responsible for pushing and storing the templated skeleton after
diff --git a/docs/features/software-templates/extending/create-your-own-templater.md b/docs/features/software-templates/extending/create-your-own-templater.md
index 9dee66af06..36c362b9c3 100644
--- a/docs/features/software-templates/extending/create-your-own-templater.md
+++ b/docs/features/software-templates/extending/create-your-own-templater.md
@@ -1,6 +1,7 @@
 ---
 id: extending-templater
 title: Creating your own Templater
+description: Documentation on Creating your own Templater
 ---
 
 Templaters are responsible for taking the directory path for the skeleton
diff --git a/docs/features/software-templates/index.md b/docs/features/software-templates/index.md
index 645b498926..7a8a3bc3dc 100644
--- a/docs/features/software-templates/index.md
+++ b/docs/features/software-templates/index.md
@@ -2,6 +2,8 @@
 id: software-templates-index
 title: Backstage Software Templates
 sidebar_label: Overview
+description: The Software Templates part of Backstage is a tool that can help
+you create Components inside Backstage
 ---
 
 The Software Templates part of Backstage is a tool that can help you create
diff --git a/docs/features/software-templates/installation.md b/docs/features/software-templates/installation.md
index ef0afb76f7..e4736c49db 100644
--- a/docs/features/software-templates/installation.md
+++ b/docs/features/software-templates/installation.md
@@ -1,6 +1,7 @@
 ---
 id: installation
 title: Installing in your Backstage App
+description: Documentation on How to install Backstage App
 ---
 
 The scaffolder plugin comes in two packages, `@backstage/plugin-scaffolder` and
diff --git a/docs/features/techdocs/FAQ.md b/docs/features/techdocs/FAQ.md
index cae0288889..5d6c9136d9 100644
--- a/docs/features/techdocs/FAQ.md
+++ b/docs/features/techdocs/FAQ.md
@@ -2,6 +2,7 @@
 id: faqs
 title: TechDocs FAQ
 sidebar_label: FAQ
+description: This page answers frequently asked questions about TechDocs
 ---
 
 This page answers frequently asked questions about [TechDocs](README.md).
diff --git a/docs/features/techdocs/README.md b/docs/features/techdocs/README.md
index 03f3d452f4..aa97506edb 100644
--- a/docs/features/techdocs/README.md
+++ b/docs/features/techdocs/README.md
@@ -2,6 +2,8 @@
 id: techdocs-overview
 title: TechDocs Documentation
 sidebar_label: Overview
+description: TechDocs is Spotify’s homegrown docs-like-code solution built
+directly into Backstage
 ---
 
 ## What is it?
diff --git a/docs/features/techdocs/architecture.md b/docs/features/techdocs/architecture.md
index 4e063a8559..926ec238e1 100644
--- a/docs/features/techdocs/architecture.md
+++ b/docs/features/techdocs/architecture.md
@@ -1,6 +1,7 @@
 ---
 id: architecture
 title: Architecture
+description: Documentation on Architecture
 ---
 
 ![TechDocs Big Picture](../../assets/techdocs/techdocs_big_picture.png)
diff --git a/docs/features/techdocs/concepts.md b/docs/features/techdocs/concepts.md
index 8f5558c0f8..f13f9933f5 100644
--- a/docs/features/techdocs/concepts.md
+++ b/docs/features/techdocs/concepts.md
@@ -1,6 +1,8 @@
 ---
 id: concepts
 title: Concepts
+description: Documentation on concepts that are introduced with
+Spotify's docs-like-code solution in Backstage
 ---
 
 This page describes concepts that are introduced with Spotify's docs-like-code
diff --git a/docs/features/techdocs/creating-and-publishing.md b/docs/features/techdocs/creating-and-publishing.md
index 9d93eda9bc..e1adedf25e 100644
--- a/docs/features/techdocs/creating-and-publishing.md
+++ b/docs/features/techdocs/creating-and-publishing.md
@@ -2,6 +2,7 @@
 id: creating-and-publishing
 title: Creating and publishing your docs
 sidebar_label: Creating and Publishing Documentation
+description: Guidance on how to create and publish documentation
 ---
 
 This section will guide you through:
diff --git a/docs/features/techdocs/getting-started.md b/docs/features/techdocs/getting-started.md
index 174894b020..d8c836c970 100644
--- a/docs/features/techdocs/getting-started.md
+++ b/docs/features/techdocs/getting-started.md
@@ -1,6 +1,7 @@
 ---
 id: getting-started
 title: Getting Started
+description: Getting Started Guidelines
 ---
 
 TechDocs functions as a plugin to Backstage, so you will need to use Backstage
diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md
index e555c6b52d..97876c2ba1 100644
--- a/docs/getting-started/app-custom-theme.md
+++ b/docs/getting-started/app-custom-theme.md
@@ -1,6 +1,7 @@
 ---
 id: app-custom-theme
 title: Customize the look-and-feel of your App
+description: Documentation on Customizing look and feel of the App
 ---
 
 Backstage ships with a default theme with a light and dark mode variant. The
diff --git a/docs/getting-started/configure-app-with-plugins.md b/docs/getting-started/configure-app-with-plugins.md
index 515b52afa7..1d02f147c1 100644
--- a/docs/getting-started/configure-app-with-plugins.md
+++ b/docs/getting-started/configure-app-with-plugins.md
@@ -1,6 +1,7 @@
 ---
 id: configure-app-with-plugins
 title: Configuring App with plugins
+description: Documentation on How Configuring App with plugins
 ---
 
 ## Adding existing plugins to your app
diff --git a/docs/getting-started/create-an-app.md b/docs/getting-started/create-an-app.md
index cebf3f5de2..452e90add5 100644
--- a/docs/getting-started/create-an-app.md
+++ b/docs/getting-started/create-an-app.md
@@ -1,6 +1,7 @@
 ---
 id: create-an-app
 title: Create an App
+description: Documentation on Creating an App
 ---
 
 To get set up quickly with your own Backstage project you can create a Backstage
diff --git a/docs/getting-started/deployment-k8s.md b/docs/getting-started/deployment-k8s.md
index 2a184779e2..ddcbd290c6 100644
--- a/docs/getting-started/deployment-k8s.md
+++ b/docs/getting-started/deployment-k8s.md
@@ -1,6 +1,7 @@
 ---
 id: deployment-k8s
 title: Kubernetes
+description: Documentation on Kubernetes and K8s Deployment
 ---
 
 Coming soon!
diff --git a/docs/getting-started/deployment-other.md b/docs/getting-started/deployment-other.md
index d3fb9d932b..2cd9708e2a 100644
--- a/docs/getting-started/deployment-other.md
+++ b/docs/getting-started/deployment-other.md
@@ -1,6 +1,7 @@
 ---
 id: deployment-other
 title: Other
+description: Documentation on different ways of Deployment
 ---
 
 ## Deploying Locally
diff --git a/docs/getting-started/development-environment.md b/docs/getting-started/development-environment.md
index 9c75c8eabf..154a959f85 100644
--- a/docs/getting-started/development-environment.md
+++ b/docs/getting-started/development-environment.md
@@ -1,6 +1,8 @@
 ---
 id: development-environment
 title: Development Environment
+description: Documentation on how to get set up for doing development on
+the Backstage repository
 ---
 
 This section describes how to get set up for doing development on the Backstage
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
index c528ad34ad..a9ac770f90 100644
--- a/docs/getting-started/index.md
+++ b/docs/getting-started/index.md
@@ -1,6 +1,7 @@
 ---
 id: index
 title: Getting Started
+description: Documentation on How to get started with Backstage
 ---
 
 There are two different ways to get started with Backstage, either by creating a
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index a4f91b6e95..3b11d2b8e1 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -1,6 +1,7 @@
 ---
 id: installation
 title: Installation
+description: Documentation on Installation
 ---
 
 Coming soon!
diff --git a/docs/getting-started/running-backstage-locally.md b/docs/getting-started/running-backstage-locally.md
index 249727e9d4..a0cf10998e 100644
--- a/docs/getting-started/running-backstage-locally.md
+++ b/docs/getting-started/running-backstage-locally.md
@@ -1,6 +1,7 @@
 ---
 id: running-backstage-locally
 title: Running Backstage Locally
+description: Documentation on How to run Backstage Locally
 ---
 
 ## Prerequisites
diff --git a/docs/overview/adopting.md b/docs/overview/adopting.md
index 893eac6398..422adfb288 100644
--- a/docs/overview/adopting.md
+++ b/docs/overview/adopting.md
@@ -1,6 +1,8 @@
 ---
 id: adopting
 title: Strategies for adopting
+description: Documentation on some general best practices that have been key
+to Backstage's success inside Spotify
 ---
 
 This document outlines some general best practices that have been key to
diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md
index 55a1aeec04..f2c6dad61f 100644
--- a/docs/overview/architecture-overview.md
+++ b/docs/overview/architecture-overview.md
@@ -1,6 +1,7 @@
 ---
 id: architecture-overview
 title: Architecture overview
+description: Documentation on Architecture overview
 ---
 
 ## Overview
diff --git a/docs/overview/architecture-terminology.md b/docs/overview/architecture-terminology.md
index aee581f927..092ca7fb01 100644
--- a/docs/overview/architecture-terminology.md
+++ b/docs/overview/architecture-terminology.md
@@ -1,6 +1,7 @@
 ---
 id: architecture-terminology
 title: Architecture terminology
+description: Documentation on Architecture terminology
 ---
 
 Backstage is constructed out of three parts. We separate Backstage in this way
diff --git a/docs/overview/background.md b/docs/overview/background.md
index ef226653fb..486260bac3 100644
--- a/docs/overview/background.md
+++ b/docs/overview/background.md
@@ -1,6 +1,7 @@
 ---
 id: background
 title: The Spotify Story
+description: Documentation on Background and Story behind making of Backstage
 ---
 
 Backstage was born out of necessity at Spotify. We found that as we grew, our
diff --git a/docs/overview/logos.md b/docs/overview/logos.md
index 39071ed793..2a684420bc 100644
--- a/docs/overview/logos.md
+++ b/docs/overview/logos.md
@@ -2,6 +2,7 @@
 id: logos
 title: Logos
 sidebar_label: Logo assets
+description: Guidelines for how to use the Backstage logos and icons
 ---
 
 Guidelines for how to use the Backstage logo and icon can be found
diff --git a/docs/overview/roadmap.md b/docs/overview/roadmap.md
index 5a06f4544f..d6c1d2d641 100644
--- a/docs/overview/roadmap.md
+++ b/docs/overview/roadmap.md
@@ -1,6 +1,7 @@
 ---
 id: roadmap
 title: Project roadmap
+description: Roadmap of Backstage Project
 ---
 
 ## Current status
diff --git a/docs/overview/support.md b/docs/overview/support.md
index 9e4e9eca15..6e00c17fab 100644
--- a/docs/overview/support.md
+++ b/docs/overview/support.md
@@ -1,6 +1,7 @@
 ---
 id: support
 title: Support and community
+description: Support and Community Details and Links
 ---
 
 - [Discord chatroom](https://discord.gg/MUpMjP2) - Get support or discuss the
diff --git a/docs/overview/vision.md b/docs/overview/vision.md
index 2ab7cdc6f4..df75a4f0a6 100644
--- a/docs/overview/vision.md
+++ b/docs/overview/vision.md
@@ -1,6 +1,8 @@
 ---
 id: vision
 title: Vision
+description: Goal is to provide engineers with the best developer experience in
+the world
 ---
 
 Our goal is to provide engineers with the best developer experience in the
diff --git a/docs/overview/what-is-backstage.md b/docs/overview/what-is-backstage.md
index 96e89618a8..0d16943c9b 100644
--- a/docs/overview/what-is-backstage.md
+++ b/docs/overview/what-is-backstage.md
@@ -1,6 +1,8 @@
 ---
 id: what-is-backstage
 title: What is Backstage?
+description: Backsatge is an open platform for building developer portals.
+Powered by a centralized service catalog, Backstage restores order to your microservices and infrastructure
 ---
 
 ![service-catalog](https://backstage.io/blog/assets/6/header.png)
diff --git a/docs/plugins/add-to-marketplace.md b/docs/plugins/add-to-marketplace.md
index d85807a226..59cca07bff 100644
--- a/docs/plugins/add-to-marketplace.md
+++ b/docs/plugins/add-to-marketplace.md
@@ -1,6 +1,7 @@
 ---
 id: add-to-marketplace
 title: Add to Marketplace
+description: Documentation on Adding Plugin to Marketplace
 ---
 
 ## Adding a Plugin to the Marketplace
diff --git a/docs/plugins/backend-plugin.md b/docs/plugins/backend-plugin.md
index 986af66c20..516ba4b111 100644
--- a/docs/plugins/backend-plugin.md
+++ b/docs/plugins/backend-plugin.md
@@ -1,6 +1,7 @@
 ---
 id: backend-plugin
 title: Backend plugin
+description: Documentation on Backend plugin
 ---
 
 ## TODO
diff --git a/docs/plugins/call-existing-api.md b/docs/plugins/call-existing-api.md
index 9658176224..14ea4c1f5a 100644
--- a/docs/plugins/call-existing-api.md
+++ b/docs/plugins/call-existing-api.md
@@ -1,6 +1,8 @@
 ---
 id: call-existing-api
 title: Call Existing API
+description: Describes the various options that Backstage frontend plugins have,
+in communicating with service APIs that already exist
 ---
 
 This article describes the various options that Backstage frontend plugins have,
diff --git a/docs/plugins/create-a-plugin.md b/docs/plugins/create-a-plugin.md
index 4bcc4da387..bcb86024fd 100644
--- a/docs/plugins/create-a-plugin.md
+++ b/docs/plugins/create-a-plugin.md
@@ -1,6 +1,7 @@
 ---
 id: create-a-plugin
 title: Create a Backstage Plugin
+description: Documentation on How to Create a Backstage Plugin
 ---
 
 A Backstage Plugin adds functionality to Backstage.
diff --git a/docs/plugins/existing-plugins.md b/docs/plugins/existing-plugins.md
index 8598ae02c4..c1fbda379a 100644
--- a/docs/plugins/existing-plugins.md
+++ b/docs/plugins/existing-plugins.md
@@ -1,6 +1,7 @@
 ---
 id: existing-plugins
 title: Existing plugins
+description: Lists of existing open source plugins
 ---
 
 ## Open source plugins
diff --git a/docs/plugins/index.md b/docs/plugins/index.md
index 5aaf8acadf..8a61aeee80 100644
--- a/docs/plugins/index.md
+++ b/docs/plugins/index.md
@@ -1,6 +1,7 @@
 ---
 id: index
 title: Intro to plugins
+description: Documentation on Introduction to Plugins
 ---
 
 Backstage is a single-page application composed of a set of plugins.
diff --git a/docs/plugins/integrating-plugin-into-service-catalog.md b/docs/plugins/integrating-plugin-into-service-catalog.md
index 4408c27ccc..51d2331140 100644
--- a/docs/plugins/integrating-plugin-into-service-catalog.md
+++ b/docs/plugins/integrating-plugin-into-service-catalog.md
@@ -1,6 +1,7 @@
 ---
 id: integrating-plugin-into-service-catalog
 title: Integrate into the Service Catalog
+description: Documentation on How to integrate plugin into service catalog
 ---
 
 > This is an advanced use case and currently is an experimental feature. Expect
diff --git a/docs/plugins/plugin-development.md b/docs/plugins/plugin-development.md
index faf3c6ddbd..c5d9763f7d 100644
--- a/docs/plugins/plugin-development.md
+++ b/docs/plugins/plugin-development.md
@@ -1,6 +1,7 @@
 ---
 id: plugin-development
 title: Plugin Development
+description: Documentation on Plugin Development
 ---
 
 Backstage plugins provide features to a Backstage App.
diff --git a/docs/plugins/proxying.md b/docs/plugins/proxying.md
index 1951f41763..2f809ffd10 100644
--- a/docs/plugins/proxying.md
+++ b/docs/plugins/proxying.md
@@ -1,6 +1,7 @@
 ---
 id: proxying
 title: Proxying
+description: Documentation on Proxying
 ---
 
 ## Overview
diff --git a/docs/plugins/publish-private.md b/docs/plugins/publish-private.md
index 6361f70854..d04449d465 100644
--- a/docs/plugins/publish-private.md
+++ b/docs/plugins/publish-private.md
@@ -1,6 +1,7 @@
 ---
 id: publish-private
 title: Publish private
+description: Documentation on How to Publish private
 ---
 
 ## TODO
diff --git a/docs/plugins/publishing.md b/docs/plugins/publishing.md
index 6fee4f9b1d..0ed85e8cdc 100644
--- a/docs/plugins/publishing.md
+++ b/docs/plugins/publishing.md
@@ -1,6 +1,7 @@
 ---
 id: publishing
 title: Publishing
+description: Documentation on Publishing NPM packages
 ---
 
 ## NPM
diff --git a/docs/plugins/structure-of-a-plugin.md b/docs/plugins/structure-of-a-plugin.md
index 20e72c539d..f061d2f4a8 100644
--- a/docs/plugins/structure-of-a-plugin.md
+++ b/docs/plugins/structure-of-a-plugin.md
@@ -1,6 +1,7 @@
 ---
 id: structure-of-a-plugin
 title: Structure of a Plugin
+description: Details about structure of a plugin
 ---
 
 Nice, you have a new plugin! We'll soon see how we can develop it into doing
diff --git a/docs/plugins/testing.md b/docs/plugins/testing.md
index 110bc97515..696f8b1368 100644
--- a/docs/plugins/testing.md
+++ b/docs/plugins/testing.md
@@ -1,6 +1,7 @@
 ---
 id: testing
 title: Testing with Jest
+description: Documentation on How to do unit testing with Jest
 ---
 
 Backstage uses [Jest](https://facebook.github.io/jest/) for all our unit testing
diff --git a/docs/reference/createPlugin-feature-flags.md b/docs/reference/createPlugin-feature-flags.md
index bc38656939..ebb8a6b503 100644
--- a/docs/reference/createPlugin-feature-flags.md
+++ b/docs/reference/createPlugin-feature-flags.md
@@ -1,6 +1,7 @@
 ---
 id: createPlugin-feature-flags
 title: createPlugin - feature flags
+description: Documentation on createPlugin - feature flags
 ---
 
 The `featureFlags` object passed to the `register` function makes it possible
diff --git a/docs/reference/createPlugin-router.md b/docs/reference/createPlugin-router.md
index 361b485df9..89ee44e558 100644
--- a/docs/reference/createPlugin-router.md
+++ b/docs/reference/createPlugin-router.md
@@ -1,6 +1,7 @@
 ---
 id: createPlugin-router
 title: createPlugin - router
+description: Documentation on createPlugin - router
 ---
 
 The router that is passed to the `register` function makes it possible for
diff --git a/docs/reference/createPlugin.md b/docs/reference/createPlugin.md
index 0cabe63b39..45e3303124 100644
--- a/docs/reference/createPlugin.md
+++ b/docs/reference/createPlugin.md
@@ -1,6 +1,7 @@
 ---
 id: createPlugin
 title: createPlugin
+description: Documentation on createPlugin
 ---
 
 Taking a plugin config as argument and returns a new plugin.
diff --git a/docs/tutorials/journey.md b/docs/tutorials/journey.md
index 3c399c53ba..24765e8531 100644
--- a/docs/tutorials/journey.md
+++ b/docs/tutorials/journey.md
@@ -1,6 +1,7 @@
 ---
 id: journey
 title: Future developer journey
+description: This document describes a possible journey of a future Backstage
 ---
 
 > This document describes a possible journey of a **_future_** Backstage plugin
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index b6f927bc61..dd758eaef0 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -38,7 +38,7 @@
     "helmet": "^4.0.0",
     "jsonschema": "^1.2.6",
     "morgan": "^1.10.0",
-    "nodegit": "0.26.5",
+    "nodegit": "0.27.0",
     "uuid": "^8.2.0",
     "winston": "^3.2.1",
     "yaml": "^1.10.0"
diff --git a/yarn.lock b/yarn.lock
index 3da4f288c5..e60ed587a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5796,7 +5796,7 @@ arrify@^1.0.1:
   resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@^2.0.0, asap@~2.0.3, asap@~2.0.6:
+asap@^2.0.0, asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -15045,30 +15045,7 @@ node-request-interceptor@^0.3.5:
     debug "^4.1.1"
     headers-utils "^1.2.0"
 
-nodegit-promise@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz#5722b184f2df7327161064a791d2e842c9167b34"
-  integrity sha1-VyKxhPLfcycWEGSnkdLoQskWezQ=
-  dependencies:
-    asap "~2.0.3"
-
-nodegit@0.26.5:
-  version "0.26.5"
-  resolved "https://registry.npmjs.org/nodegit/-/nodegit-0.26.5.tgz#1534d8aaa52de7acfbbe18de28df2075de86f7d2"
-  integrity sha512-l9l2zhcJ0V7FYzPdXIsuJcXN8UnLuhQgM+377HJfCYE/eupL/OWtMVvUOq42F9dRsgC3bAYH9j2Xbwr0lpYVZQ==
-  dependencies:
-    fs-extra "^7.0.0"
-    json5 "^2.1.0"
-    lodash "^4.17.14"
-    nan "^2.14.0"
-    node-gyp "^4.0.0"
-    node-pre-gyp "^0.13.0"
-    promisify-node "~0.3.0"
-    ramda "^0.25.0"
-    request-promise-native "^1.0.5"
-    tar-fs "^1.16.3"
-
-nodegit@^0.27.0:
+nodegit@0.27.0, nodegit@^0.27.0:
   version "0.27.0"
   resolved "https://registry.npmjs.org/nodegit/-/nodegit-0.27.0.tgz#4e8cc236f60e1c97324a5acff99056fe116a6ebe"
   integrity sha512-E9K4gPjWiA0b3Tx5lfWCzG7Cvodi2idl3V5UD2fZrOrHikIfrN7Fc2kWLtMUqqomyoToYJLeIC8IV7xb1CYRLA==
@@ -16995,13 +16972,6 @@ promise@^8.0.3:
   dependencies:
     asap "~2.0.6"
 
-promisify-node@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/promisify-node/-/promisify-node-0.3.0.tgz#b4b55acf90faa7d2b8b90ca396899086c03060cf"
-  integrity sha1-tLVaz5D6p9K4uQyjlomQhsAwYM8=
-  dependencies:
-    nodegit-promise "~4.0.0"
-
 prompts@^2.0.1:
   version "2.3.2"
   resolved "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"