diff --git a/en/asgardeo/docs/guides/branding/localization-in-asgardeo.md b/en/asgardeo/docs/guides/branding/localization.md
similarity index 100%
rename from en/asgardeo/docs/guides/branding/localization-in-asgardeo.md
rename to en/asgardeo/docs/guides/branding/localization.md
diff --git a/en/asgardeo/mkdocs.yml b/en/asgardeo/mkdocs.yml
index 94e552aa5c..ad8c472d36 100644
--- a/en/asgardeo/mkdocs.yml
+++ b/en/asgardeo/mkdocs.yml
@@ -127,6 +127,7 @@ plugins:
         'references/application-logs.md' : 'guides/asgardeo-logs.md'
         'apis/oauth-dcr.md' : 'apis/dynamic-client-registration-rest-api.md'
         '/guides/authorization/impersonation/user-impersonation/' : '/guides/authorization/user-impersonation/'
+        'guides/branding/localization-in-asgardeo.md': 'guides/branding/localization.md'
 
 exclude_docs: |
   /get-started/hello-world.md
@@ -349,7 +350,7 @@ nav:
             - Branding AI: guides/branding/ai-branding.md
             - Configure custom domains: guides/branding/configure-custom-domains.md
             - Customize email templates: guides/branding/customize-email-templates.md
-            - Localization in Asgardeo: guides/branding/localization-in-asgardeo.md
+            - Localization in Asgardeo: guides/branding/localization.md
         - Extend with actions:
             - Understanding actions: guides/customize/actions/understanding-actions.md
             - Setting up actions: guides/customize/actions/setting-up-actions.md
@@ -425,8 +426,8 @@ nav:
         - Session extension API: apis/extend-sessions.md
       - User store management API: apis/user-store.md
       - Validation API: apis/validation.md
-    - Orgnization APIs:
-      - Orgnization APIs: apis/organization-apis/index.md
+    - Organization APIs:
+      - Organization APIs: apis/organization-apis/index.md
       - Get access for organization APIs: apis/organization-apis/authentication.md
       - Application management API: apis/organization-apis/org-application-management.md
       - Authenticators API: apis/organization-apis/org-authenticators.md
diff --git a/en/identity-server/7.0.0/docs/guides/branding/add-custom-layouts.md b/en/identity-server/7.0.0/docs/guides/branding/add-custom-layouts.md
new file mode 100644
index 0000000000..8554c1e5c6
--- /dev/null
+++ b/en/identity-server/7.0.0/docs/guides/branding/add-custom-layouts.md
@@ -0,0 +1 @@
+{% include "../../../../../includes/guides/branding/add-custom-layouts.md" %}
\ No newline at end of file
diff --git a/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-app-name.png b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-app-name.png
new file mode 100644
index 0000000000..8d405387df
Binary files /dev/null and b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-app-name.png differ
diff --git a/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-auth-config.png b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-auth-config.png
new file mode 100644
index 0000000000..6696b3af88
Binary files /dev/null and b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-auth-config.png differ
diff --git a/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-configure-connector.png b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-configure-connector.png
new file mode 100644
index 0000000000..e45aa4ab12
Binary files /dev/null and b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-configure-connector.png differ
diff --git a/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-custom-connector.png b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-custom-connector.png
new file mode 100644
index 0000000000..9975168a6a
Binary files /dev/null and b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-custom-connector.png differ
diff --git a/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-key-token.png b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-key-token.png
new file mode 100644
index 0000000000..aba827b0b9
Binary files /dev/null and b/en/identity-server/next/docs/assets/img/guides/idp/x-idp/x-key-token.png differ
diff --git a/en/identity-server/next/docs/guides/authentication/app-native-authentication/index.md b/en/identity-server/next/docs/guides/authentication/app-native-authentication/index.md
new file mode 100644
index 0000000000..4247bbc9a4
--- /dev/null
+++ b/en/identity-server/next/docs/guides/authentication/app-native-authentication/index.md
@@ -0,0 +1 @@
+{% include "../../../../../../includes/guides/authentication/app-native-authentication/index.md" %}
\ No newline at end of file
diff --git a/en/includes/guides/authentication/federated-login/index.md b/en/includes/guides/authentication/federated-login/index.md
index 73b5f0dced..4e8e845013 100644
--- a/en/includes/guides/authentication/federated-login/index.md
+++ b/en/includes/guides/authentication/federated-login/index.md
@@ -30,6 +30,7 @@ You can register an external IdP in {{product_name}} by creating a connection. {
       <img src="{{base_path}}/assets/img/logo/microsoft-logo.svg" alt="Microsoft" />
       <span>Microsoft</span>
     </a>
+    {% if product_name == "WSO2 Identity Server" %}
     <a href="{{base_path}}/guides/authentication/enterprise-login/add-microsoft-365-login" class="card square">
       <img src="{{base_path}}/assets/img/logo/microsoft-logo.svg" alt="Microsoft 365" />
       <span>Microsoft 365</span>
@@ -38,7 +39,6 @@ You can register an external IdP in {{product_name}} by creating a connection. {
       <img src="{{base_path}}/assets/img/logo/microsoft-logo.svg" alt="Microsoft IWA" /></br>
       <span>IWA</span>
     </a>
-    {% if product_name == "WSO2 Identity Server" %}
     <a href="{{base_path}}/guides/authentication/social-login/add-x-login/" class="card square">
       <img src="{{base_path}}/assets/img/logo/x-logo.svg#only-light" alt="X" /></br>
       <img src="{{base_path}}/assets/img/logo/x-logo-dark.svg#only-dark" alt="X" /></br>
@@ -53,10 +53,12 @@ You can register an external IdP in {{product_name}} by creating a connection. {
       <img src="{{base_path}}/assets/img/logo/saml-logo.svg" alt="SAML" />
       <span>SAML</span>
     </a>
+    {% if product_name == "WSO2 Identity Server" %}
     <a href="{{base_path}}/guides/authentication/standard-based-login/add-ws-federation" class="card square">
       <img src="{{base_path}}/assets/img/logo/ws-fed.svg" alt="WS-Fed" /></br></br></br>
       <span>WS-Federation</span>
     </a>
+    {% endif %}
     {% if product_name == "Asgardeo" %}
     <a href="{{base_path}}/guides/authentication/decentralized-login/sign-in-with-ethereum" class="card square">
       <img src="{{base_path}}/assets/img/logo/ethereum.svg" alt="Ethereum" /></br>