diff --git a/AGENTS.md b/AGENTS.md
index 131bc421..dc8687b2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,6 +4,10 @@
 
 The portal uses Astro with the Starlight theme. Application source sits in `src/`, with `pages/` for route entry points, `content/` for MDX docs, `components/` for reusable UI (React, Astro, and Circuit UI), and `utils/`/`lib/` for shared logic. Assets live in `src/assets` and `public/`. Build outputs go to `dist/`. Configuration resides in `astro.config.ts`, `ec.config.mjs`, and `wrangler.jsonc`; adjust them when adding new content types or deployment targets. API documentation is based on `openapi.yaml`, this file is synchronized from outside this repository, do not edit it.
 
+## Content
+
+Content (`content/`) of the developer portal uses United States English spelling and grammar. The articles shall be clear and concise and refer to external documentation for established standards and RFCs. We don't use emojis.
+
 ## Build, Test, and Development Commands
 
 - `npm run dev` — watch mode with Hot Module Reloading; use when authoring docs or components.
diff --git a/public/_redirects b/public/_redirects
index a3f09804..3cdd4ec3 100644
--- a/public/_redirects
+++ b/public/_redirects
@@ -1,229 +1,137 @@
-# SDKs redirects
-/tools/sdks/ios-sdk/                                                         /terminal-payments/sdks/ios-sdk
-/tools/sdks/android-ttp/                                                     /terminal-payments/sdks/android-ttp
-/tools/sdks/android-sdk/                                                     /terminal-payments/sdks/android-sdk
-
-# Terminal Payments redirects
-/terminal-payments/tools/cloud-api/                                          /terminal-payments/cloud-api
-/terminal-payments/introduction/                                             /terminal-payments
-/terminal-payments/introduction/getting-started/                             /terminal-payments
-/terminal-payments/industry/                                                 /terminal-payments
-/docs/terminal-sdk/                                                          /terminal-payments/sdks
-/docs/terminal-overview/                                                     /terminal-payments
-/docs/terminal-getting-started/                                              /terminal-payments
-/docs/terminal-api/                                                          /terminal-payments/cloud-api
-/docs/integration-transport/                                                 /terminal-payments
-/docs/integration-retail/                                                    /terminal-payments
-/docs/integration-hospitality/                                               /terminal-payments
-/docs/integration-enterprise/                                                /terminal-payments
-/docs/integration-bookings/                                                  /terminal-payments
-
-# Online Payments - Tools & SDKs
-/tools/sdks/                                                                 /online-payments/sdks
-/docs/tools/sdks/                                                            /online-payments/sdks
-/tools/sdks/nodejs/                                                          /online-payments/sdks/nodejs
-/tools/sdks/go/                                                              /online-payments/sdks/go
-/tools/sdks/python/                                                          /online-payments/sdks/python
-/tools/sdks/java/                                                            /online-payments/sdks/java
-/tools/sdks/php/                                                             /online-payments/sdks/php
-/tools/sdks/php-sdk/                                                         /online-payments/sdks/php
-/tools/sdks/dotnet/                                                          /online-payments/sdks/dotnet
-/tools/sdks/rust/                                                            /online-payments/sdks/rust
-/online-payments/sdks/react-native-sdk/                                      /online-payments/sdks/react-native
-/docs/online-payments/sdks/react-native-sdk/                                 /online-payments/sdks/react-native
-/online-payments/sdks/swift-checkout/                                        /online-payments/checkouts/swift-checkout
-/docs/online-payments/sdks/swift-checkout/                                   /online-payments/checkouts/swift-checkout
-/online-payments/checkouts/react-native-sdk/                                 /online-payments/sdks/react-native
-/docs/online-payments/checkouts/react-native-sdk/                            /online-payments/sdks/react-native
-/online-payments/checkouts/sdks/react-native-sdk/                            /online-payments/sdks/react-native
-/docs/online-payments/checkouts/sdks/react-native-sdk/                       /online-payments/sdks/react-native
-/online-payments/checkouts/sdks/swift-checkout/                              /online-payments/checkouts/swift-checkout
-/docs/online-payments/checkouts/sdks/swift-checkout/                         /online-payments/checkouts/swift-checkout
-/online-payments/tools/react-native-sdk/                                     /online-payments/sdks/react-native
-/online-payments/tools/hosted-checkout/                                      /online-payments/checkouts/hosted-checkout
-/docs/online-payments/tools/swift-checkout/                                  /online-payments/checkouts/swift-checkout
-/docs/online-payments/tools/php-sdk/                                         /online-payments/sdks/php
-/docs/online-payments/tools/card-widget/                                     /online-payments/checkouts/card-widget
-/docs/php-sdk/                                                               /online-payments/sdks/php
-/online-payments/sdks/php-sdk/                                               /online-payments/sdks/php
-/docs/online-payments/sdks/php-sdk/                                          /online-payments/sdks/php
-
-# Online Payments - Plugins
-/docs/sumup-woocommerce-plugin/                                              /online-payments/plugins/woocommerce
-/docs/sumup-prestashop-plugin/                                               /online-payments/plugins/prestashop
-/docs/online-payments/plugins/woocommerce/                                   /online-payments/plugins/woocommerce
-/docs/online-payments/plugins/wix/                                           /online-payments/plugins/wix
-/docs/online-payments/plugins/prestashop/                                    /online-payments/plugins/prestashop
-
-# Online Payments - General
-/online-payments/introduction/webhooks/                                      /online-payments/webhooks
-/online-payments/introduction/response-handling/                             /online-payments/guides/response-handling
-/online-payments/introduction/register-app/                                  /tools/authorization/register-app
-/online-payments/introduction/get-started/                                   /online-payments
-/online-payments/introduction/authorization/                                 /tools/authorization/authorization
-/online-payments/introduction/3ds/                                           /online-payments/3ds
-/online-payments/apm/introduction/                                           /online-payments/apm
-/docs/online-payments/introduction/getting-started/                          /online-payments
-/docs/getting-started/                                                       /online-payments
-/docs/online-payments/features/3ds/                                          /online-payments/3ds
-
-# Online Payments - Guides
-/docs/single-payment/                                                        /online-payments/guides/single-payment
-/docs/refund/                                                                /online-payments/guides/refund
-/docs/recurring-payments/                                                    /online-payments/guides/recurring-payments
-/docs/online-payments/guides/single-payment/                                 /online-payments/guides/single-payment
-
-# Online Payments - APM
-/docs/online-payments/google-pay-integration/                                /online-payments/apm/google-pay
-/docs/online-payments/apple-pay-integration/                                 /online-payments/apm/apple-pay
-/docs/online-payments/apm-integration/                                       /online-payments/apm
-/docs/online-payments/alternative-payment-methods/                           /online-payments/apm
-/docs/online-payments/alternative-payment-methods/google-pay-integration/    /online-payments/apm/google-pay
-/docs/online-payments/alternative-payment-methods/apple-pay-integration/     /online-payments/apm/apple-pay
-/docs/online-payments/alternative-payment-methods/apm-integration/           /online-payments/apm/integration-guide
-/docs/apm/                                                                   /online-payments/apm
-
-# Category redirects
-/docs/category/plugins/                                                      /online-payments/plugins
-/docs/category/guides/                                                       /online-payments/guides
-/docs/category/alternative-payment-methods/                                  /online-payments/apm
-/docs/category/tools-1/                                                      /terminal-payments/sdks
-/docs/category/tools/                                                        /online-payments/sdks
-/docs/category/introduction-1/                                               /terminal-payments
-/docs/category/features/                                                     /online-payments
-
-# Authorization & Tools
-/apps/                                                                       /tools/authorization
-/api-keys/                                                                   /tools/authorization
-/affiliate-keys/                                                             /tools/authorization/affiliate-keys
-/docs/authorization/                                                         /tools/authorization
-/docs/register-app/                                                          /tools/authorization/register-app
-/tools/models/merchant/                                                      /tools/glossary/merchant
-
-# Resources
-/extdev/                                                                     /getting-started
-/rest-api/                                                                   /api
-/docs/online-payments/features/open-banking/                                 /resources/open-banking
-
-# Webhooks
-/webhooks/create/                                                            /tools/webhooks
-
-# API - Subaccounts
-/docs/api/update-sub-account/                                                /api/subaccounts/update-sub-account
-/docs/api/update-a-subaccount/                                               /api/subaccounts/update-sub-account
-/docs/api/subaccounts/                                                       /api/subaccounts
-/docs/api/retrieve-an-account/                                               /api/subaccounts
-/docs/api/list-subaccounts/                                                  /api/subaccounts/list-sub-accounts
-/docs/api/list-sub-accounts/                                                 /api/subaccounts/list-sub-accounts
-/docs/api/get-account/                                                       /api/subaccounts
-/docs/api/deactivate-sub-account/                                            /api/subaccounts/deactivate-sub-account
-/docs/api/deactivate-a-subaccount/                                           /api/subaccounts/deactivate-sub-account
-/docs/api/create-sub-account/                                                /api/subaccounts/create-sub-account
-/docs/api/create-a-subaccount/                                               /api/subaccounts/create-sub-account
-
-# API - Customers
-/docs/api/update-customer/                                                   /api/customers/update
-/docs/api/update-a-customer/                                                 /api/customers/update
-/docs/api/retrieve-a-customer/                                               /api/customers/get
-/docs/api/list-payment-instruments/                                          /api/customers/list-payment-instruments
-/docs/api/get-customer/                                                      /api/customers/get
-/docs/api/deactivate-payment-instrument/                                     /api/customers/deactivate-payment-instrument
-/docs/api/deactivate-a-payment-instrument/                                   /api/customers/deactivate-payment-instrument
-/docs/api/customers/                                                         /api/customers
-/docs/api/create-customer/                                                   /api/customers/create
-/docs/api/create-a-customer/                                                 /api/customers/create
-
-# API - Transactions
-/docs/api/transactions/                                                      /api/transactions
-/docs/api/retrieve-a-transaction/                                            /api/transactions/get
-/docs/api/refund-transaction/                                                /api/transactions/refund
-/docs/api/refund-a-transaction/                                              /api/transactions/refund
-/docs/api/list-transactions/                                                 /api/transactions/list
-/docs/api/list-financial-transactions/                                       /api/transactions/list
-/docs/api/get-transaction/                                                   /api/transactions/get
-
-# API - Checkouts
-/docs/api/retrieve-a-checkout/                                               /api/checkouts/get
-/docs/api/process-checkout/                                                  /api/checkouts/process
-/docs/api/process-a-checkout/                                                /api/checkouts/process
-/docs/api/list-checkouts/                                                    /api/checkouts/list
-/docs/api/get-checkout/                                                      /api/checkouts/get
-/docs/api/get-payment-methods/                                               /api/checkouts/list-available-payment-methods
-/docs/api/get-available-payment-methods/                                     /api/checkouts/list-available-payment-methods
-/docs/api/deactivate-checkout/                                               /api/checkouts/deactivate
-/docs/api/deactivate-a-checkout/                                             /api/checkouts/deactivate
-/docs/api/checkouts/                                                         /api/checkouts
-/docs/api/create-checkout/                                                   /api/checkouts/create
-/docs/api/create-a-checkout/                                                 /api/checkouts/create
-
-# API - Merchant
-/docs/api/retrieve-dba/                                                      /api/merchant/get-doing-business-as
-/docs/api/retrieve-a-personal-profile/                                       /api/merchant/get-personal-profile
-/docs/api/retrieve-a-merchant-profile/                                       /api/merchant/get-merchant-profile
-/docs/api/merchant/                                                          /api/merchant
-/docs/api/list-settings/                                                     /api/merchant/get-settings
-/docs/api/list-bank-accounts/                                                /api/merchant/list-bank-accounts
-/docs/api/get-settings/                                                      /api/merchant/get-settings
-/docs/api/get-personal-profile/                                              /api/merchant/get-personal-profile
-/docs/api/get-merchant-profile/                                              /api/merchant/get
-/docs/api/get-doing-business-as/                                             /api/merchant/get-doing-business-as
-/api/get-doing-business-as/                                                  /api/merchant/get-doing-business-as
-
-# API - Receipts
-/docs/api/retrieve-receipt-details/                                          /api/receipts/get
-/docs/api/receipts/                                                          /api/receipts
-/docs/api/get-receipt/                                                       /api/receipts/get
-
-# API - Payouts
-/docs/api/payouts/                                                           /api/payouts
-/docs/api/list-payouts/                                                      /api/payouts/list
-
-# API - Authorization (deprecated endpoints)
-/docs/api/request-authorization-from-users/                                  /tools/authorization
-/docs/api/generate-a-token/                                                  /tools/authorization
-/docs/api/create-token/                                                      /tools/authorization
-/docs/api/authorize/                                                         /tools/authorization
-/docs/api/authorization/                                                     /tools/authorization
-/tools/api/authorization/                                                    /tools/authorization
-
-# API - General
-/docs/api/sum-up-rest-api/                                                   /api
-
-# Problem
-/problem/504-gateway-timeout/                                                /problem/gateway-timeout
-/problem/500-internal-server-error/                                          /problem/internal-server-error
-/problem/422-unprocessable-entity/                                           /problem/unprocessable-entity
-/problem/409-session-expired/                                                /problem/session-expired
-/problem/409-session-cant-be-deactivated/                                    /problem/session-cant-be-deactivated
-/problem/409-session-already-processed/                                      /problem/session-already-processed
-/problem/404-not-found/                                                      /problem/not-found
-/problem/404-checkout-not-found/                                             /problem/checkout-not-found
-/problem/403-forbidden/                                                      /problem/forbidden
-/problem/401-not-authorised-token/                                           /problem/not-authorised-token
-/problem/401-missing-token/                                                  /problem/missing-token
-/problem/401-invalid-token/                                                  /problem/invalid-token
-/problem/400-validation-failed/                                              /problem/validation-failed
-/problem/400-unknown-payment-method/                                         /problem/unknown-payment-method
-/problem/400-payment-method-not-allowed/                                     /problem/payment-method-not-allowed
-/problem/400-multiple-invalid-parameters/                                    /problem/multiple-invalid-parameters
-/problem/400-invalid-parameter/                                              /problem/invalid-parameter
-/docs/problem/problem/504-gateway-timeout                                    /problem/gateway-timeout
-/docs/problem/problem/500-internal-server-error                              /problem/internal-server-error
-/docs/problem/problem/422-unprocessable-entity                               /problem/unprocessable-entity
-/docs/problem/problem/409-session-expired                                    /problem/session-expired
-/docs/problem/problem/409-session-cant-be-deactivated                        /problem/session-cant-be-deactivated
-/docs/problem/problem/409-session-already-processed                          /problem/session-already-processed
-/docs/problem/problem/404-not-found                                          /problem/not-found
-/docs/problem/problem/404-checkout-not-found                                 /problem/checkout-not-found
-/docs/problem/problem/403-forbidden                                          /problem/forbidden
-/docs/problem/problem/401-not-authorised-token                               /problem/not-authorised-token
-/docs/problem/problem/401-missing-token                                      /problem/missing-token
-/docs/problem/problem/401-invalid-token                                      /problem/invalid-token
-/docs/problem/problem/400-validation-failed                                  /problem/validation-failed
-/docs/problem/problem/400-unknown-payment-method                             /problem/unknown-payment-method
-/docs/problem/problem/400-payment-method-not-allowed                         /problem/payment-method-not-allowed
-/docs/problem/problem/400-multiple-invalid-parameters                        /problem/multiple-invalid-parameters
-/docs/problem/problem/400-invalid-parameter                                  /problem/invalid-parameter
-
-# Catch-all for old docs structure
-/docs/*                                                                      /:splat
+/tools/sdks/ios-sdk                                                         /terminal-payments/sdks/ios-sdk/
+/tools/sdks/android-ttp                                                     /terminal-payments/sdks/android-ttp/
+/tools/sdks/android-sdk                                                     /terminal-payments/sdks/android-sdk/
+/terminal-payments/tools/cloud-api                                          /terminal-payments/cloud-api/
+/terminal-payments/introduction                                             /terminal-payments/
+/terminal-payments/introduction/getting-started                             /terminal-payments/
+/terminal-payments/industry                                                 /terminal-payments/
+/rest-api                                                                   /api
+/online-payments/tools/react-native-sdk                                     /online-payments/sdks/react-native-sdk/
+/online-payments/tools/hosted-checkout                                      /online-payments/checkouts/hosted-checkout/
+/online-payments/introduction/webhooks                                      /online-payments/webhooks/
+/online-payments/introduction/response-handling                             /online-payments/guides/response-handling/
+/online-payments/introduction/register-app                                  /tools/authorization/oauth/
+/online-payments/introduction/get-started                                   /online-payments/
+/online-payments/introduction/authorization                                 /tools/authorization/
+/online-payments/introduction/3ds                                           /online-payments/3ds/
+/online-payments/apm/introduction                                           /online-payments/apm
+/extdev                                                                     /quickstart
+/docs/terminal-sdk                                                          /terminal-payments/sdks
+/docs/terminal-overview                                                     /terminal-payments/
+/docs/terminal-getting-started                                              /terminal-payments/
+/docs/terminal-api                                                          /terminal-payments/cloud-api
+/docs/sumup-woocommerce-plugin                                              /online-payments/plugins/woocommerce
+/docs/sumup-prestashop-plugin                                               /online-payments/plugins/prestashop
+/docs/single-payment                                                        /online-payments/guides/single-payment
+/docs/register-app                                                          /tools/authorization/oauth/
+/docs/refund                                                                /online-payments/guides/refund
+/docs/recurring-payments                                                    /online-payments/guides/recurring-payments
+/docs/php-sdk                                                               /online-payments/sdks/php-sdk
+/docs/online-payments/tools/swift-checkout                                  /online-payments/checkouts/swift-checkout
+/docs/online-payments/tools/php-sdk                                         /online-payments/sdks/php-sdk
+/docs/online-payments/tools/card-widget                                     /online-payments/checkouts/card-widget
+/docs/online-payments/plugins/woocommerce                                   /online-payments/plugins/woocommerce
+/docs/online-payments/plugins/wix                                           /online-payments/plugins/wix
+/docs/online-payments/plugins/prestashop                                    /online-payments/plugins/prestashop
+/docs/online-payments/introduction/getting-started                          /online-payments/
+/docs/online-payments/guides/single-payment                                 /online-payments/guides/single-payment
+/docs/online-payments/google-pay-integration                                /online-payments/apm/google-pay
+/docs/online-payments/features/open-banking                                 /tools/open-banking
+/docs/online-payments/features/3ds                                          /online-payments/3ds
+/docs/online-payments/apple-pay-integration                                 /online-payments/apm/apple-pay
+/docs/online-payments/apm-integration                                       /online-payments/apm
+/docs/online-payments/alternative-payment-methods                           /online-payments/apm
+/docs/online-payments/alternative-payment-methods/google-pay-integration    /online-payments/apm/google-pay
+/docs/online-payments/alternative-payment-methods/apple-pay-integration     /online-payments/apm/apple-pay
+/docs/online-payments/alternative-payment-methods/apm-integration           /online-payments/apm/integration-guide
+/docs/integration-transport                                                 /terminal-payments/industry/transport
+/docs/integration-retail                                                    /terminal-payments/industry/retail
+/docs/integration-hospitality                                               /terminal-payments/industry/hospitality
+/docs/integration-enterprise                                                /terminal-payments/industry/enterprise
+/docs/integration-bookings                                                  /terminal-payments/industry/bookings
+/docs/getting-started                                                       /online-payments/
+/docs/category/tools-1                                                      /terminal-payments/tools
+/docs/category/tools                                                        /online-payments/tools
+/docs/category/plugins                                                      /online-payments/plugins
+/docs/category/introduction-1                                               /terminal-payments/introduction
+/docs/category/guides                                                       /online-payments/guides
+/docs/category/features                                                     /online-payments/features
+/docs/category/alternative-payment-methods                                  /online-payments/apm
+/docs/authorization                                                         /tools/api/authorization/
+/docs/apm                                                                   /online-payments/apm
+/docs/api/update-sub-account                                                /api/subaccounts/update
+/docs/api/update-customer                                                   /api/customers/update
+/docs/api/update-api-key                                                    /api/api-keys/update-api-key
+/docs/api/update-a-subaccount                                               /api/subaccounts/update
+/docs/api/update-a-customer                                                 /api/customers/update
+/docs/api/transactions                                                      /api/transactions
+/docs/api/sum-up-rest-api                                                   /api
+/docs/api/subaccounts                                                       /api/subaccounts
+/docs/api/revoke-api-key                                                    /api/api-keys/revoke-api-key
+/docs/api/retrieve-receipt-details                                          /api/receipts/get
+/docs/api/retrieve-dba                                                      /api/merchant/get-doing-business-as
+/docs/api/retrieve-an-account                                               /api/subaccounts
+/docs/api/retrieve-a-transaction                                            /api/transactions/get
+/docs/api/retrieve-a-personal-profile                                       /api/merchant/get-personal-profile
+/docs/api/retrieve-a-merchant-profile                                       /api/merchant/get-merchant-profile
+/docs/api/retrieve-a-customer                                               /api/customers/get
+/docs/api/retrieve-a-checkout                                               /api/get-checkout
+/docs/api/request-authorization-from-users                                  /api/authorization/authorize
+/docs/api/refund-transaction                                                /api/transactions/refund
+/docs/api/refund-a-transaction                                              /api/transactions/refund
+/docs/api/receipts                                                          /api/receipts
+/docs/api/process-checkout                                                  /api/checkouts/process
+/docs/api/process-a-checkout                                                /api/checkouts/process
+/docs/api/payouts                                                           /api/payouts
+/docs/api/merchant                                                          /api/merchant
+/docs/api/list-transactions                                                 /api/transactions/list-detailed
+/docs/api/list-subaccounts                                                  /api/subaccounts/list
+/docs/api/list-sub-accounts                                                 /api/subaccounts/list
+/docs/api/list-settings                                                     /api/merchant/get-settings
+/docs/api/list-payouts                                                      /api/payouts/list
+/docs/api/list-payment-instruments                                          /api/customers/list-payment-instruments
+/docs/api/list-financial-transactions                                       /api/transactions/list
+/docs/api/list-checkouts                                                    /api/checkouts/list
+/docs/api/list-bank-accounts                                                /api/merchant/list-bank-accounts
+/docs/api/list-api-keys                                                     /api/api-keys/list-api-keys
+/docs/api/get-transaction                                                   /api/transactions/get
+/docs/api/get-settings                                                      /api/merchant/get-settings
+/docs/api/get-receipt                                                       /api/receipts/get
+/docs/api/get-personal-profile                                              /api/merchant/get-personal-profile
+/docs/api/get-payment-methods                                               /api/checkouts/list-available-payment-methods
+/docs/api/get-merchant-profile                                              /api/merchant/get
+/docs/api/get-doing-business-as                                             /api/merchant/get-doing-business-as
+/docs/api/get-customer                                                      /api/customers/get
+/docs/api/get-checkout                                                      /api/checkouts/get
+/docs/api/get-available-payment-methods                                     /api/checkouts/list-available-payment-methods
+/docs/api/get-api-key                                                       /api/api-keys/get-api-key
+/docs/api/get-account                                                       /api/subaccounts
+/docs/api/generate-a-token                                                  /api/authorization/create-token
+/docs/api/deactivate-sub-account                                            /api/subaccounts/deactivate
+/docs/api/deactivate-payment-instrument                                     /api/customers/deactivate-payment-instrument
+/docs/api/deactivate-checkout                                               /api/checkouts/deactivate
+/docs/api/deactivate-a-subaccount                                           /api/subaccounts/deactivate
+/docs/api/deactivate-a-payment-instrument                                   /api/customers/deactivate-payment-instrument
+/docs/api/deactivate-a-checkout                                             /api/deactivate-checkout
+/docs/api/customers                                                         /api/customers
+/docs/api/create-token                                                      /api/authorization/create-token
+/docs/api/create-sub-account                                                /api/subaccounts/create-sub-account
+/docs/api/create-customer                                                   /api/customers/create
+/docs/api/create-checkout                                                   /api/checkouts/create
+/docs/api/create-api-key                                                    /api/api-keys/create-api-key
+/docs/api/create-a-subaccount                                               /api/subaccounts/create-sub-account
+/docs/api/create-a-payment-instrument                                       /api/customers/create-payment-instrument
+/docs/api/create-a-customer                                                 /api/customers/create
+/docs/api/create-a-checkout                                                 /api/checkouts/create
+/docs/api/checkouts                                                         /api/checkouts
+/docs/api/authorize                                                         /api/authorization/create-token
+/docs/api/authorization                                                     /api/authorization
+/docs/api/api-keys                                                          /api/api-keys
+/apps                                                                       /tools/api/authorization/
+/api-keys                                                                   /tools/api/authorization/
+/api/get-doing-business-as                                                  /api/merchant/retrieve-dba
+/affiliate-keys                                                             /tools/api/affiliate-keys/
+/webhooks/create                                                            /webhooks/
+/webhook-docs/introduction/*                                                /webhooks/:splat
+/webhook-docs/*                                                             /webhooks/:splat
+/docs/*                                                                     /:splat
diff --git a/src/content/docs/online-payments/checkouts/card-widget.mdx b/src/content/docs/online-payments/checkouts/card-widget.mdx
index 0c7656a4..2e2ee881 100644
--- a/src/content/docs/online-payments/checkouts/card-widget.mdx
+++ b/src/content/docs/online-payments/checkouts/card-widget.mdx
@@ -15,7 +15,7 @@ A secure HTTPS connection is used to submit the payment information. We recommen
 
 ## Prerequisites
 
-Payment Widget requires only the ability to create online checkouts via [SumUp checkout API](/api/checkouts/create), authorized by API key or access token (see the [Authorization Guide](/tools/authorization/authorization/) for details).​
+Payment Widget requires only the ability to create online checkouts via [SumUp checkout API](/api/checkouts/create), authorized by API key or access token (see the [Authorization Guide](/tools/authorization/) for details).​
 
 ## Compliance
 
diff --git a/src/content/docs/online-payments/checkouts/hosted-checkout.mdx b/src/content/docs/online-payments/checkouts/hosted-checkout.mdx
index ddfaa2b7..fb277d52 100644
--- a/src/content/docs/online-payments/checkouts/hosted-checkout.mdx
+++ b/src/content/docs/online-payments/checkouts/hosted-checkout.mdx
@@ -20,7 +20,7 @@ Hosted Checkouts is available to all SumUp merchants and getting started with it
 
 ## Prerequisites
 
-Hosted Checkout requires only the ability to create online checkouts via [SumUp checkout API](/api/checkouts/create), authorized by API key or access token (see the [Authorization Guide](/tools/authorization/authorization/) for details).​
+Hosted Checkout requires only the ability to create online checkouts via [SumUp checkout API](/api/checkouts/create), authorized by API key or access token (see the [Authorization Guide](/tools/authorization/) for details).​
 
 ## Accessing Hosted Checkout
 
diff --git a/src/content/docs/online-payments/guides/refund.mdx b/src/content/docs/online-payments/guides/refund.mdx
index 9dade295..befa8189 100644
--- a/src/content/docs/online-payments/guides/refund.mdx
+++ b/src/content/docs/online-payments/guides/refund.mdx
@@ -25,14 +25,14 @@ Here are the things that you need in order to complete the steps in this guide:
 
 - [SumUp merchant account](https://me.sumup.com/login) with completed [account details](https://me.sumup.com/account).
   - You can also use a [test account](/online-payments/#getting-a-test-account).
-- [Registered client application](/tools/authorization/register-app/) with SumUp.
-- Valid access token obtained with the [Authorization code flow](/tools/authorization/authorization/#authorization-code-flow).
+- [Registered client application](/tools/authorization/oauth/#register-oauth-application) with SumUp.
+- Valid access token obtained with the [Authorization code flow](/tools/authorization/oauth/#authorization-code-flow).
 - You have processed a checkout and you have the checkout ID.
 
 
 <Aside type="note">
 
-Transactions are associated with active merchant user accounts. As a result, you _cannot_ use an access token obtained via the [Client credentials flow](/tools/authorization/authorization/#client-credentials-flow) to complete the steps in this guide.
+Transactions are associated with active merchant user accounts. As a result, you _cannot_ use an access token obtained via the [Client credentials flow](/tools/authorization/oauth/#client-credentials-flow) to complete the steps in this guide.
 
 </Aside>
 
diff --git a/src/content/docs/online-payments/guides/single-payment.mdx b/src/content/docs/online-payments/guides/single-payment.mdx
index 211a39ee..b20ef50c 100644
--- a/src/content/docs/online-payments/guides/single-payment.mdx
+++ b/src/content/docs/online-payments/guides/single-payment.mdx
@@ -22,8 +22,8 @@ When you complete these steps, you will have processed a payment with a payment
 
 - [SumUp merchant account](https://me.sumup.com/login) with completed [account details](https://me.sumup.com/account).
   - You can also use a [test account](/online-payments/#getting-a-test-account).
-- [Registered client application](/tools/authorization/register-app/) with SumUp.
-- Valid access token obtained either with the [Authorization code flow](/tools/authorization/authorization/#authorization-code-flow) or [Client credentials flow](/tools/authorization/authorization/#client-credentials-flow).
+- [Registered client application](/tools/authorization/oauth/#register-oauth-application) with SumUp.
+- Valid access token obtained either with the [Authorization code flow](/tools/authorization/oauth/#authorization-code-flow) or [Client credentials flow](/tools/authorization/oauth/#client-credentials-flow).
 
 ## Steps
 
diff --git a/src/content/docs/online-payments/guides/tokenization-with-payment-sdk.mdx b/src/content/docs/online-payments/guides/tokenization-with-payment-sdk.mdx
index 6a34ec54..7a8733f9 100644
--- a/src/content/docs/online-payments/guides/tokenization-with-payment-sdk.mdx
+++ b/src/content/docs/online-payments/guides/tokenization-with-payment-sdk.mdx
@@ -25,7 +25,7 @@ You will go through the following steps:
 
 - You have a merchant account with [SumUp](https://me.sumup.com/login) and have already filled in your [account details](https://me.sumup.com/account).
   - You can also create a [test account](/online-payments/#getting-a-test-account). Please note that setting up 3DS verification in a test account requires contact with our team at integrations@sumup.com.
-- You have an API Key. For more details see the [Authorization Guide](/tools/authorization/authorization/#api-keys).
+- You have an API Key. For more details see the [Authorization Guide](/tools/authorization/api-keys/).
 - You have control over the backend server to retrieve data securely.
 
 
diff --git a/src/content/docs/online-payments/index.mdx b/src/content/docs/online-payments/index.mdx
index c459ac8a..a1c8fa08 100644
--- a/src/content/docs/online-payments/index.mdx
+++ b/src/content/docs/online-payments/index.mdx
@@ -39,7 +39,7 @@ When finished experimenting with the test account, switch back to a regular acco
 
 ## Authorization
 
-All online payment products use SumUp APIs, which require authorization via an API key or access token. See the [Authorization Guide](/tools/authorization/authorization/) for details on available options.​
+All online payment products use SumUp APIs, which require authorization via an API key or access token. See the [Authorization Guide](/tools/authorization/) for details on available options.​
 
 ## Checkout Products
 
@@ -91,12 +91,12 @@ The API handles requests and responses primarily in JSON format, except when req
 
 ### Receiving Payments
 
-To receive payments, [create a checkout](/online-payments/guides/single-payment/#1-create-a-checkout). Use merchant-direct payments or initiate on a merchant's behalf based on your [authorization type](/tools/authorization/authorization/). Checkouts are created via server-to-server communication to keep access tokens and credentials secret and prevent changes to sensitive details like transaction amount or recipient.
+To receive payments, [create a checkout](/online-payments/guides/single-payment/#1-create-a-checkout). Use merchant-direct payments or initiate on a merchant's behalf based on your [authorization type](/tools/authorization/). Checkouts are created via server-to-server communication to keep access tokens and credentials secret and prevent changes to sensitive details like transaction amount or recipient.
 
 [Completing checkouts](/online-payments/guides/single-payment/#2-complete-a-checkout) via web browser or mobile app to avoid handling sensitive data like card details on your servers, eliminating PCI DSS compliance needs.
 
 <Aside type="tip">
-A checkout can be completed in a browser only from a domain that is present as an authorized JavaScript origin when [creating your client credentials](/tools/authorization/register-app/#3-create-oauth-client-credentials).
+A checkout can be completed in a browser only from a domain that is present as an authorized JavaScript origin when [creating your client credentials](/tools/authorization/oauth/#3-create-oauth-client-credentials).
 </Aside>
 
 SumUp offers the following checkout completion options:
diff --git a/src/content/docs/online-payments/plugins/prestashop.mdx b/src/content/docs/online-payments/plugins/prestashop.mdx
index 43bb2232..e0bf0bd3 100644
--- a/src/content/docs/online-payments/plugins/prestashop.mdx
+++ b/src/content/docs/online-payments/plugins/prestashop.mdx
@@ -25,8 +25,8 @@ Currently, Alternative Payment Methods (APMs) are not available in SumUp plugins
 
 ## Installation
 
-1. Follow [the register application guide](/tools/authorization/register-app) to obtain the client credentials for your app.
-2. Download the client credentials JSON as described in the [access client credentials section](/tools/authorization/register-app/#4-access-the-client-credentials).
+1. Follow [the register application guide](/tools/authorization/oauth/#register-oauth-application) to obtain the client credentials for your app.
+2. Download the client credentials JSON as described in the [access client credentials section](/tools/authorization/oauth/#4-access-the-client-credentials).
 3. Upload the JSON to the **Module Configuration** page in PrestaShop Backoffice.
 4. After SumUp account verification, [contact us](/contact) to enable online payments scope for your PrestaShop online store.
 
diff --git a/src/content/docs/online-payments/plugins/wix.mdx b/src/content/docs/online-payments/plugins/wix.mdx
index 9fd86e39..ff90c380 100644
--- a/src/content/docs/online-payments/plugins/wix.mdx
+++ b/src/content/docs/online-payments/plugins/wix.mdx
@@ -19,7 +19,7 @@ WIX integration supports the following Alternative Payment Methods (APMs): iDeal
 
 ## Installation
 
-1. First, create your secret API Key. [See this article](/tools/authorization/authorization/#integration-via-api-keys) for details. Copy your key before proceeding.
+1. First, create your secret API Key. [See this article](/tools/authorization/api-keys/#create-an-api-key) for details. Copy your key before proceeding.
 2. In WIX dashboard, go to **Settings** > **Accept payments**.
 3. Select **SumUp**, paste your secret API Key in **Account Information**, and **Save**.
 
diff --git a/src/content/docs/online-payments/plugins/woocommerce.mdx b/src/content/docs/online-payments/plugins/woocommerce.mdx
index 490c7a2f..b0e77d19 100644
--- a/src/content/docs/online-payments/plugins/woocommerce.mdx
+++ b/src/content/docs/online-payments/plugins/woocommerce.mdx
@@ -70,7 +70,7 @@ Available for plugin versions above `2.5`.
 ### Advanced Integration
 
 1. Once the plugin is activated, click **Advanced version**.
-2. [Create your API Key](/tools/authorization/authorization/#create-api-key).
+2. [Create your API Key](/tools/authorization/api-keys/#create-an-api-key).
 3. Enter SumUp credentials (API Key, email, and merchant code) and settings.
 
 ## Additional Configuration
@@ -111,7 +111,7 @@ To create client credentials you must have an active [SumUp account](https://me.
   Monday through Friday.
 </Aside>
 
-Once you ensure you've met the above requirements, you can proceed with our [Register application guide](/tools/authorization/register-app/) to set up your client credentials.
+Once you ensure you've met the above requirements, you can proceed with our [Register application guide](/tools/authorization/oauth/#register-oauth-application) to set up your client credentials.
 
 ## Plugin Configuration
 
diff --git a/src/content/docs/online-payments/sdks/react-native.mdx b/src/content/docs/online-payments/sdks/react-native.mdx
index ca2b44cf..bfe1a0d4 100644
--- a/src/content/docs/online-payments/sdks/react-native.mdx
+++ b/src/content/docs/online-payments/sdks/react-native.mdx
@@ -22,8 +22,8 @@ SumUp's React Native Payment SDK provides a payment sheet that is displayed on t
 Here are the things that you need in order to complete the steps in this guide:
 - You have a merchant account with [SumUp](https://me.sumup.com/login) and have already filled in your [account details](https://me.sumup.com/account).
   - For a **test account** reach out to our support team through this [contact form](/contact).
-- You have [registered your client application](/tools/authorization/register-app/) with SumUp.
-- You have a valid access token obtained via the [Authorization code flow](/tools/authorization/authorization/#authorization-code-flow).
+- You have [registered your client application](/tools/authorization/oauth/#register-oauth-application) with SumUp.
+- You have a valid access token obtained via the [Authorization code flow](/tools/authorization/oauth/#authorization-code-flow).
 - The restricted `payment_instruments` scope is enabled for your client application. If it isn't enabled, [contact us](/contact) and request it.
 - Review how to create a single payment [here](https://developer.sumup.com/online-payments/guides/single-payment/#before-you-begin).
 
diff --git a/src/content/docs/terminal-payments/cloud-api.mdx b/src/content/docs/terminal-payments/cloud-api.mdx
index b8deed79..0a2e529c 100644
--- a/src/content/docs/terminal-payments/cloud-api.mdx
+++ b/src/content/docs/terminal-payments/cloud-api.mdx
@@ -29,7 +29,7 @@ The { cloudapiname } integration supports:
 
 ## Prerequisites
 
-* Your device must be authorized to use the { cloudapiname }. [Refer to the authorization guide](/tools/authorization/authorization/) and implement the method that best fits your use case. An API key should be sufficient if you don’t plan to delegate access to third parties.
+* Your device must be authorized to use the { cloudapiname }. [Refer to the authorization guide](/tools/authorization/) and implement the method that best fits your use case. An API key should be sufficient if you don’t plan to delegate access to third parties.
 * You must [create an Affiliate Key](/tools/authorization/affiliate-keys/) for your app, as SumUp { cloudapiname } requires this key in checkout requests.
 * We strongly recommend keeping the Solo terminal plugged in when using the { cloudapiname }.
 * If you want to use mobile data, ensure you are not connected to Wi-Fi. Disconnect from Wi-Fi if necessary—when both mobile data and Wi-Fi are available, the Solo reader will always use Wi-Fi.
diff --git a/src/content/docs/terminal-payments/index.mdx b/src/content/docs/terminal-payments/index.mdx
index 86233c04..38704d54 100644
--- a/src/content/docs/terminal-payments/index.mdx
+++ b/src/content/docs/terminal-payments/index.mdx
@@ -16,7 +16,7 @@ You can accept card payments using SumUp’s platform accompanied by our proprie
 
 * Before integrating either the [Native SDK](/terminal-payments/sdks/) or the [Payment API Switch](/terminal-payments/payment-switch), create a SumUp account in the [SumUp Dashboard](https://me.sumup.com). The dashboard offers [a test account](#getting-a-test-account), allowing for integration tests without involving real money.
 
-* Once you have an account, [create an Affiliate Key](/tools/authorization/affiliate-keys/) for your app and [provide authorization](/tools/authorization/authorization/).
+* Once you have an account, [create an Affiliate Key](/tools/authorization/affiliate-keys/) for your app and [provide authorization](/tools/authorization/).
 
 <Aside type="caution">
 
diff --git a/src/content/docs/terminal-payments/payment-switch.mdx b/src/content/docs/terminal-payments/payment-switch.mdx
index bc71b21c..7435e3c0 100644
--- a/src/content/docs/terminal-payments/payment-switch.mdx
+++ b/src/content/docs/terminal-payments/payment-switch.mdx
@@ -11,7 +11,7 @@ Your app initiates a request to charge a card, opens the SumUp app on the mercha
 
 The API integration also allows the possibility to pre-fill the checkout amount and cardholder information, and send a receipt via SMS or email. You can use the cash option, not available in our SDK, for better reporting and management of your funds in the SumUp dashboard.
 
-Activate the [mandatory authorization scopes](/tools/authorization/authorization/#authorization-scopes) for a smooth performance. They require an access token for your client application for authentication and authorization with the SumUp REST API.
+Activate the [mandatory authorization scopes](/tools/authorization/oauth/#authorization-scopes) for a smooth performance. They require an access token for your client application for authentication and authorization with the SumUp REST API.
 
 ## Integration Documentation
 
diff --git a/src/content/docs/terminal-payments/sdks/android-sdk.mdx b/src/content/docs/terminal-payments/sdks/android-sdk.mdx
index fe839579..ef26e174 100644
--- a/src/content/docs/terminal-payments/sdks/android-sdk.mdx
+++ b/src/content/docs/terminal-payments/sdks/android-sdk.mdx
@@ -282,7 +282,7 @@ SumUpLogin sumupLogin = SumUpLogin.builder(mAffiliateKey).accessToken("MY_ACCESS
 SumUpAPI.openLoginActivity(MainActivity.this, sumupLogin, 1);
 ```
 
-For information about how to obtain a token, please see the [Authorization Documentation](/tools/authorization/authorization).
+For information about how to obtain a token, please see the [Authorization Documentation](/tools/authorization/).
 
 If the token is invalid, `SumUpAPI.Response.ResultCode.ERROR_INVALID_TOKEN` is returned.
 
diff --git a/src/content/docs/terminal-payments/sdks/android-ttp.mdx b/src/content/docs/terminal-payments/sdks/android-ttp.mdx
index 4d4e492e..4f386abc 100644
--- a/src/content/docs/terminal-payments/sdks/android-ttp.mdx
+++ b/src/content/docs/terminal-payments/sdks/android-ttp.mdx
@@ -91,11 +91,11 @@ interface AuthTokenProvider {
 
 There are several ways for a consumer app to provide the access token to the SDK.
 
-1. Using the OAuth 2.0 [flow](https://developer.sumup.com/tools/authorization/authorization#integration-via-oauth-20):
+1. Using the OAuth 2.0 [flow](https://developer.sumup.com/tools/authorization/oauth/#integration-via-oauth-20):
    The consumer app can implement the OAuth 2.0 flow to get the access token and provide it to the SDK. The SDK provides the `AuthTokenProvider` interface that should be implemented by the consumer app. The implementation of the `getAccessToken` method should return the access token. This way is preferable and recommended because it provides a more secure way to authenticate the user.
 
 2. Using API Key:
-   You can use an API Key as an auth token. Generate the key in the [SumUp Dashboard](https://developer.sumup.com/tools/authorization/authorization#create-api-key) and provide it to the SDK through `AuthTokenProvider.getAccessToken()` method.
+   You can use an API Key as an auth token. Generate the key in the [SumUp Dashboard](https://developer.sumup.com/tools/authorization/#create-api-key) and provide it to the SDK through `AuthTokenProvider.getAccessToken()` method.
 
 > ⚠️ **Important:**
 > The API keys should be stored securely and should not be hardcoded in the app. Instead, they should be stored in the secure storage and provided to the SDK when needed. Do not share your secret API keys in publicly accessible places such as GitHub repositories, client-side code, etc.
diff --git a/src/content/docs/terminal-payments/sdks/ios-sdk.mdx b/src/content/docs/terminal-payments/sdks/ios-sdk.mdx
index 4763ecb3..d2a570bc 100644
--- a/src/content/docs/terminal-payments/sdks/ios-sdk.mdx
+++ b/src/content/docs/terminal-payments/sdks/ios-sdk.mdx
@@ -343,7 +343,7 @@ SumUp { iossdkname } supports either the OAuth 2.0 Authorization Code Flow login
 
 ### Implementing Authentication with OAuth 2.0
 
-SumUp can issue Access Tokens in accordance with the OAuth 2.0 Authorization Code Flow, which is our recommended authorization approach (Client Credentials Flow is not supported by this SDK). See the [Authorization Documentation](/tools/authorization/authorization#integration-via-oauth-20) for more details.
+SumUp can issue Access Tokens in accordance with the OAuth 2.0 Authorization Code Flow, which is our recommended authorization approach (Client Credentials Flow is not supported by this SDK). See the [Authorization Documentation](/tools/authorization/oauth/#integration-via-oauth-20) for more details.
 
 ### Implementing Authentication with View Controller
 
diff --git a/src/content/docs/tools/authorization/affiliate-keys.mdx b/src/content/docs/tools/authorization/affiliate-keys.mdx
index a8609f26..ff733ddb 100644
--- a/src/content/docs/tools/authorization/affiliate-keys.mdx
+++ b/src/content/docs/tools/authorization/affiliate-keys.mdx
@@ -10,40 +10,40 @@ import { Steps } from '@astrojs/starlight/components';
 
 ## About Affiliate Keys
 
-SumUp uses Affiliate Keys to track critical metrics like Total Processing Volume for partner integrations. The key links all associated merchant accounts to the partner, enabling enforcement of terms such as fast onboarding, revenue share, and transaction fees. For that reason, **Affiliate Keys are mandatory for card-present integrations**, such as:
+SumUp uses Affiliate Keys to identify critical metrics such as Total Processing Volume coming through a Partner's integration. The key associates all merchant account users of the Affiliate Key with the partner,
+allowing SumUp to enforce agreed terms such as fast onboarding, revenue share, and transaction
+fees. For that reason, **Affiliate Keys are mandatory for card-present integrations**, such as:
 
 * Mobile SDKs including Android SDK and [iOS SDK](/terminal-payments/sdks/ios-sdk/)
 * [API Payment Switch](/terminal-payments/payment-switch/)
 * [Solo API (Cloud API)](/terminal-payments/cloud-api/)
 
-Affiliate Keys are not part of authorization. SumUp uses them in card-present integrations to attribute payments to specific integrations.
-
-See [Authorization Guide](/tools/authorization/authorization/) for details on authorization.
+Affiliate keys are not an authorization mechanism. Use them together with either [API keys](/tools/authorization/api-keys/) or [OAuth 2.0](/tools/authorization/oauth/) depending on how your integration calls SumUp APIs.
 
 ## Create Affiliate Key
 
 <Steps>
 
-1. Log in to [your SumUp account](https://me.sumup.com).
+1. Log in to [https://me.sumup.com](https://me.sumup.com).
 2. Expand your profile and open **Settings**.
 3. Go to **For Developers** > **Toolkit**.
 4. Select **Affiliate Keys**.
    
-   The page shows the **Application identifier** field if no key exists, or lists existing keys.
+   If you didn't create a key before, this page is empty, and shows the **Application identifier** field.
+   If you did, your existing Affiliate Key can be found here.
 
-5. Enter the **Application identifier** matching the App ID/Bundle ID from your development project (such as `com.example.app`).
-6. Select **Add**. The key is generated, and the App ID is assigned to it. You can add more App IDs to the key if you need to integrate more apps, but **the key itself is immutable**.
+5. Enter the **Application identifier** - this is the App ID/Bundle ID as defined in your development project (such as `com.example.app`).
+6. Select **Add**. The key is generated automatically and the App ID is assigned to it. You can add more App IDs to the key if you need to integrate more apps, but **the key itself is immutable**.
 
 </Steps>
 
 ## Example Usage
 
-Solo Terminal API uses the Affiliate Key in the [Reader Checkout Request](https://developer.sumup.com/api/readers/create-checkout).
-
-The Solo Terminal API includes the Affiliate Key in the [Reader Checkout Request](https://developer.sumup.com/api/readers/create-checkout) under the affiliate section:
+Solo Terminal API uses the Affiliate Key in the [Reader Checkout Request](https://developer.sumup.com/api/readers/create-checkout). This request contains a separate section of
+Affiliates that contains two fields:
 
-* `app_id`: This is the aforementioned application ID.
-* `key`: This is the Affiliate key unique to each account and mandatory for every merchant
+* `app_id`: This is the application ID that has been discussed in the earlier section.
+* `key`: This is the Affiliate key unique to each account and mandatory to be used by every merchant
 in their checkout requests.
 
 ```json
@@ -64,9 +64,9 @@ in their checkout requests.
 
 Check the following resources to build your integration:
 
-* [OAuth 2.0 App Registration Guide](/tools/authorization/register-app/)
+* [OAuth 2.0 App Registration Guide](/tools/authorization/oauth/#register-oauth-application)
 * [iOS SDK Guide](/terminal-payments/sdks/ios-sdk/)
-* [Android SDK Guide](/terminal-payments/sdks/android-sdk/)
-* [PHP SDK Guide](/tools/sdks/php-sdk/)
+* [Android SDK Guide](https://github.com/sumup/sumup-android-sdk)
+* [PHP SDK Guide](/online-payments/sdks/php-sdk/)
 * [React Native SDK](/terminal-payments/sdks/react-native-sdk/)
-* [Cloud API for the Solo Card Reader](/terminal-payments/cloud-api/)
+* [Cloud API for the Solo Card Reader](/tools/api/sdks/cloud-api/)
diff --git a/src/content/docs/tools/authorization/api-keys.mdx b/src/content/docs/tools/authorization/api-keys.mdx
new file mode 100644
index 00000000..7a56f018
--- /dev/null
+++ b/src/content/docs/tools/authorization/api-keys.mdx
@@ -0,0 +1,58 @@
+---
+title: API Keys
+description: Learn how to use and protect SumUp API keys for direct integrations.
+sidebar:
+  order: 2
+---
+
+import { Aside, Steps } from '@astrojs/starlight/components';
+
+## Overview
+
+API keys are static credentials that let your application act on behalf of the merchant account that created the key.
+Use them when you control the merchant account and need direct access to SumUp APIs with the full set of permissions.
+
+## Authorize requests with an API key
+
+Include the API key in the `Authorization` header using the `Bearer` scheme when calling SumUp APIs.
+
+```bash
+curl https://api.sumup.com/v0.1/me -H "Authorization: Bearer $SUMUP_API_KEY"
+```
+
+<Aside type="caution">
+
+Do not expose secret API keys in publicly accessible places such as client-side code or repositories.
+API keys grant broad access to the merchant account, so treat them as sensitive credentials.
+
+</Aside>
+
+## Create an API key
+
+<Steps>
+
+1. Log in to [https://me.sumup.com](https://me.sumup.com).
+2. Expand your profile and open **Settings**.
+3. Go to **For Developers** > **Toolkit**.
+4. Select **API Keys**.
+
+   If this is your first key, the page only shows the SumUp Public Key.
+   Existing API keys are also listed here.
+
+   Do not use the public key in your integration.
+
+5. Select **Create** and name the key so you can identify it later.
+6. When prompted, copy or download the key. SumUp does not store the key, so you are responsible for keeping it secure.
+
+</Steps>
+
+## Handle API keys securely
+
+- Keep the key in a secure secret store and rotate it regularly.
+- Avoid sharing the key with third parties. If sharing is unavoidable, make sure they meet your security expectations.
+- Monitor how the key is used and revoke it promptly if you suspect misuse.
+
+## When to choose another method
+
+Use [OAuth 2.0](/tools/authorization/oauth/) when you build an integration that other merchants or their staff will authorize.
+For card-present scenarios, combine your chosen authorization method with an [Affiliate Key](/tools/authorization/affiliate-keys/).
diff --git a/src/content/docs/tools/authorization/authorization.mdx b/src/content/docs/tools/authorization/authorization.mdx
deleted file mode 100644
index 878caca2..00000000
--- a/src/content/docs/tools/authorization/authorization.mdx
+++ /dev/null
@@ -1,183 +0,0 @@
----
-title: Authorization
-description: Learn how to authenticate and authorize calls to SumUp APIs.
-sidebar:
-  order: 2
----
-
-import { Aside, Steps } from '@astrojs/starlight/components';
-import { iossdkname } from '@lib/productnames.ts';
-import { androidreadersdkname } from '@lib/productnames.ts';
-
-## Overview
-
-All requests to the SumUp API must use [HTTPS](https://en.wikipedia.org/wiki/HTTPS) and include authorization.
-
-SumUp supports two authorization methods. [API keys](#api-keys) allow an app to authenticate and authorize on behalf of a merchant with full permissions. This simplest approach suits most use cases.
-
-[OAuth 2.0](#integration-via-oauth-20) enables apps to request access on behalf of third parties, ideal for multi-merchant integrations.
-
-## Integration via API Keys
-
-SumUp uses API keys to authenticate and authorize API requests. API Keys are short static tokens passed in the `Authorization` header.
-
-```bash
-curl https://api.sumup.com/v0.1/me -H "Authorization: Bearer $SUMUP_API_KEY"
-```
-
-The intended purpose of API keys is to authorize on behalf of a single merchant to whom the API key belongs.
-
-<Aside type="caution">
-
-Do not share your secret API keys publicly, for example in GitHub repositories or client-side code.
-Your API keys carry full permissions to the entire SumUp API, so make sure to keep them secure.
-Should you decide to integrate third-parties with the API key, you are responsible for the security of such integration.
-
-</Aside>
-
-### Create API Key
-
-<Steps>
-
-1. Log in to [https://me.sumup.com](https://me.sumup.com).
-2. Expand your profile and open **Settings**.
-3. Go to **For Developers** > **Toolkit**.
-4. Select **API Keys**.
-   
-   If you didn't create a key before, this page only shows the SumUp Public Key.
-   If you did, your existing API Keys can be found here.
-
-   Do not use the public key in your integration.
-
-5. Select **Create** and give the key a meaningful name. Your key is now created and granted permissions to access SumUp APIs.
-6. When prompted, copy the key (you can also download it). SumUp does not store the key for security reasons.
-   Integrators are responsible for handling the key securely in accordance with best industry practices.
-
-   * Ideally, do not share the key with third parties. If you do, ensure they handle it securely.
-   * Do not add the key to source-controlled repository or client-side code.
-   * Monitor key usage.
-   * Rotate the key on regular basis.
-
-</Steps>
-
-## Affiliate Keys
-
-Affiliate Keys are required for card-present integrations but are not part of core authorization as such. See the [Affiliate Keys documentation for details](/tools/authorization/affiliate-keys/).
-
-## Integration via OAuth 2.0
-
-OAuth 2.0 is the recommended approach for building advanced integrations involving multiple merchants or their employees.
-SumUp conforms to the [OAuth 2.0 protocol](https://oauth.net/2/), providing an authorization server and exposing the following endpoints as defined by the industry:
-
-- `https://api.sumup.com/authorize`
-- `https://api.sumup.com/token`
-
-
-[OAuth 2.0](https://oauth.net/2/) is an industry-standard authorization protocol that allows for control over an application’s scope, and authorization flows across multiple devices.
-OAuth 2.0 allows the app to request API access on behalf of other users after they grant you the permission.
-
-SumUp supports the following OAuth 2.0 authorization flows:
-
-- [Authorization Code flow](#authorization-code-flow) to request permissions from other users.
-- [Client Credentials flow](#client-credentials-flow) to authenticate as yourself.
-
-<Aside type="caution">
-
-For security reasons, SumUp manually verifies the following scope grants:
-
-* `payments` - required to process payments.
-* `payment_instruments` - required to store customer data and tokenize cards.
-
-[Contact us](/contact) to request those scopes to be granted to your app.
-
-SumUp does not recommend direct OAuth 2.0 integration and does not expose detailed authorization endpoint documentation for that reason.
-Please use a library that handles OAuth 2.0 protocol. We highly recommend that you use one of the [existing reputable implementations](https://openid.net/developers/certified-openid-connect-implementations/).
-
-</Aside>
-
-### Authorization Code Flow
-
-This flow works [as specified by the RFC 6749 Authorization Code Grant](https://datatracker.ietf.org/doc/html/rfc6749#section-4.1), enabling applications to request permission from a SumUp merchant to act on their behalf. The [requested scopes](#authorization-scopes) define what your application is allowed to do.
-
-<Steps>
-
-1. To initiate the flow, your application redirects a user to the SumUp authorization server with the `https://api.sumup.com/authorize` endpoint.
-
-2. The request triggers an authorization prompt describing which application is requesting authorization from the user.
-
-    <Aside type="caution">
-    If the user denies and clicks the **Cancel** button on the request, the authorization server will not generate an authorization code and will instead return an `error` parameter with an `access_denied` value instead.
-    </Aside>
-
-3. Once the user accepts your authorization request, the authorization server redirects the user back to your application by using the registered URI you specified in the `redirect_uri` at the initial GET request. 
-  The response will return the `code` parameter, which is mandatory for retrieving an access token.
-
-4. To retrieve the access token, the app makes a request to the `https://api.sumup.com/token` endpoint with a `Content-Type: application/x-www-form-urlencoded` header.
-
-    The app receives the standard response, containing `access_token`, `refresh_token`, `token_type`, and `expires_in`.
-
-    ```json
-    {
-      "access_token": "565e2d19cef68203170ddadb952141326d14e03f4ccbd46daa079c26c910a864",
-      "refresh_token": "d180031bfe9bac36c336e5746637810272546865e9c9586012f462a56f3fe9af",
-      "token_type": "Bearer",
-      "expires_in": 3600
-    }
-    ```
-
-</Steps>
-
-The `access_token` can now be used in the `Authorization` header with the `Bearer` scheme to authorize calls to SumUp services.
-The app can use the `refresh_token` to get a new `access_token` when it expires without the user’s interaction (see [Refresh token flow](#refresh-token-flow) below).
-
-### Refresh Token Flow
-
-To refresh the access token, send a request to the `https://api.sumup.com/token` endpoint with the refresh token you've received when completing the [Authorization Code flow](#authorization-code-flow). Access tokens can expire for many reasons, such as the user changing their password or revoking app permissions.
-
-In the response, the app receives a new `access_token` that is valid for `expires_in` seconds and a new `refresh_token`. Make sure to store the new `refresh_token` for successive refreshes.
-
-<Aside type="caution">
-
-By default, refresh tokens are valid for a period of 6 months. After your `refresh_token` expires, the app must follow the [Authorization code flow](#authorization-code-flow) again to obtain a valid access token and a new refresh token. A new refresh token will also be issued when a valid refresh token is used within 30 days prior to its expiration. The new refresh token will be valid for another 6 months. The old refresh token remains valid until its expiration date, giving you a grace period to propagate the new token across your integration.
-
-Note that refresh tokens can be invalidated due to factors other than expiration, such as password change, scope changes, etc. Failed attempt to refresh a token should be handled gracefully by triggering a new login and obtaining a fresh access and refresh token.
-
-</Aside>
-
-### Authorization Scopes
-
-Authorization scopes define what an application is allowed to do on a merchant's behalf. A required set of scopes may be passed as a space-separated list in the authorization request. When scopes are omitted, the default ones are granted. If additional scopes are required, a new `access_token` has to be collected via the [Authorization code flow](#authorization-code-flow).
-
-| Scope name                       | Default | Access Level | Description                                                                                                                                                                                                                                                             |
-| -------------------------------- | ------- | ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| transactions.history             | yes     | merchant     | Allows to view the transactions and transaction history for a specific merchant user's account.                                                                                                                                                                     |
-| user.app-settings                | yes     | merchant     | Allows to view and modify the SumUp mobile application settings for a specific merchant user's account.                                                                                                                                                             |
-| user.profile_readonly            | yes     | merchant     | Allows to view the profile details for a specific merchant user's account.                                                                                                                                                                                          |
-| user.profile                     | no      | merchant     | Allows to modify the profile details of a specific merchant user's account.                                                                                                                                                                                         |
-| user.subaccounts                 | no      | merchant     | Allows to view and modify the profile details of a sub-account created for a specific merchant user's account. Sub-accounts are user accounts for employees of a merchant and can be granted different permissions by the holder of the main merchant user's account. |
-| user.payout-settings             | no      | merchant     | Allows to view and modify the payout settings for a specific merchant user's account.                                                                                                                                                                               |
-| products                         | no      | merchant     | Allows to view and modify the product store for a specific merchant user's account. This includes the products, shelves, prices, and VAT rates available in the merchant's product store.                                                                           |
-| `restricted` payments            | no      | feature      | Allows to make payments by creating and processing payment checkouts. Requires verification by SumUp before it can be granted.                                                                                                                                                                                               |
-| `restricted` payment_instruments | no      | feature      | Allows to save customers and tokenize their payment cards for a specific merchant user's account. Requires verification by SumUp before it can be granted.                                                                                                                                                         |
-
-Restricted scopes must be enabled by SumUp for your application. To do that, [contact us](/contact).
-
-### Client Credentials Flow
-
-This flow follows [the RFC 6749 Client Credentials Grant](https://datatracker.ietf.org/doc/html/rfc6749#section-4.4)
-
-In the Client Credentials flow, your application requests an access token without requesting authorization from the merchant. As a result, when you use this flow, your application is not authorized to access any data  associated with 
-the merchant user's account, such as transactions, saved customers, or tokenized payment cards. In other words, you can only process payments for merchant accounts with an access token obtained via this grant flow.
-
-To request an access token, the app needs to make a request to the `https://api.sumup.com/token` endpoint as defined in the OAuth 2.0 Client Credentials protocol. This flow does not grant a Refresh Token.
-
-## What's Next?
-
-Check the following resources to build your integration:
-
-* [OAuth 2.0 App Registration Guide](/tools/authorization/register-app/)
-* [{ iossdkname } Guide](/terminal-payments/sdks/ios-sdk/)
-* [{ androidreadersdkname } Guide](https://github.com/sumup/sumup-android-sdk)
-* [PHP SDK Guide](/tools/sdks/php-sdk/)
-* [React Native SDK](/terminal-payments/sdks/react-native-sdk/)
-* [Cloud API for the Solo Card Reader](/terminal-payments/cloud-api/)
diff --git a/src/content/docs/tools/authorization/index.mdx b/src/content/docs/tools/authorization/index.mdx
index 93da1c27..06d01e33 100644
--- a/src/content/docs/tools/authorization/index.mdx
+++ b/src/content/docs/tools/authorization/index.mdx
@@ -1,18 +1,23 @@
 ---
 title: Authorization
-description: Select the appropriate authorization method for your integration.
 sidebar:
   label: Overview
   order: 1
 ---
 
-SumUp provides a REST API to manage checkouts, retrieve transactions, and perform other operations programmatically. Authorize your application before making requests. For card-present integrations, you also need to provide an [Affiliate Key](/tools/authorization/affiliate-keys/).​
+SumUp exposes REST APIs for managing checkouts, retrieving transactions, and more.
+Every integration needs a way to authorize API requests, and card-present solutions also need to identify the integration itself.
 
-Key topics in this section:
+## Choose the right option
 
-- **[Authorization](/tools/authorization/authorization/)** – explains how to use API Keys or OAuth 2.0 access tokens.
-- **[Affiliate Keys](/tools/authorization/affiliate-keys/)** – learn why affiliate
-  keys are required and how to generate one.
+- **[API keys](/tools/authorization/api-keys/)** – Static credentials owned by a single merchant.
+  Use them for direct server-to-server integrations when you control the merchant account and need full API access.
+- **[OAuth 2.0](/tools/authorization/oauth/)** – Standards-based authorization for multi-merchant solutions.
+  Use it when other merchants or their employees connect to your application and must explicitly grant access.
+- **[Affiliate Keys](/tools/authorization/affiliate-keys/)** – Required for card-present scenarios to attribute transactions to your integration.
+  Combine them with API keys or OAuth depending on how you authorize API calls.
 
-Once you are familiar with these concepts, you can explore the detailed
-[API reference](/api/).
+## Next steps
+
+- Review the [API reference](/api/) once you have your credentials.
+- Follow product-specific guides such as [terminal integrations](/terminal-payments/) or [online payments](/online-payments/) with the appropriate authorization method in place.
diff --git a/src/content/docs/tools/authorization/oauth.mdx b/src/content/docs/tools/authorization/oauth.mdx
new file mode 100644
index 00000000..f5fb6c0f
--- /dev/null
+++ b/src/content/docs/tools/authorization/oauth.mdx
@@ -0,0 +1,220 @@
+---
+title: OAuth 2.0
+description: Learn how to request SumUp API access on behalf of other merchants.
+sidebar:
+  order: 3
+---
+
+import { Aside, Steps } from '@astrojs/starlight/components';
+import Image from '@components/content/Image.astro';
+
+## Integration via OAuth 2.0
+
+OAuth 2.0 lets your application request permission to act on behalf of other SumUp merchants or their employees.
+It follows the industry-standard [OAuth 2.0 protocol](https://oauth.net/2/) and is the right choice for multi-merchant integrations or when you cannot rely on a single merchant-owned API key.
+
+SumUp exposes two OAuth 2.0 endpoints:
+
+- `https://api.sumup.com/authorize`
+- `https://api.sumup.com/token`
+
+SumUp supports two OAuth 2.0 flows:
+
+- The [authorization code flow](#authorization-code-flow) when an end user grants your application access.
+- The [client credentials flow](#client-credentials-flow) when your application authenticates as itself.
+
+## Authorization flows
+
+Choose the flow that matches how your application obtains access while keeping scope verification requirements in mind.
+
+<Aside type="caution">
+
+SumUp manually verifies requests for the following scopes:
+
+* `payments` – required to create and process payments.
+* `payment_instruments` – required to store customer data and tokenize cards.
+
+[Contact us](/contact) to request those scopes for your application.
+
+Use a reputable OAuth 2.0 client implementation instead of handling the protocol manually.
+
+</Aside>
+
+## Authorization Code Flow
+
+This flow implements the [RFC 6749 Authorization Code Grant](https://datatracker.ietf.org/doc/html/rfc6749#section-4.1). It lets a SumUp merchant review the permissions you request and authorize your application accordingly. The [requested scopes](#authorization-scopes) determine the allowed actions.
+
+<Steps>
+
+1. Redirect the user to `https://api.sumup.com/authorize` with the required parameters.
+2. SumUp shows an authorization prompt describing your application and the scopes requested.
+
+   <Aside type="caution">
+   If the user denies the request, SumUp sends an error response to your redirect URI and does not issue an authorization code.
+   </Aside>
+
+3. After the user approves, SumUp redirects to your **Redirect URI** with an authorization code and the original `state`.
+4. Your application exchanges the authorization code for tokens by calling the token endpoint described below.
+5. Use the `access_token` in the `Authorization: Bearer` header when calling SumUp APIs.
+
+</Steps>
+
+### Exchange the authorization code
+
+Send the following request to `https://api.sumup.com/token`:
+
+```bash
+curl https://api.sumup.com/token \
+  -X POST \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -d "grant_type=authorization_code&code={AUTHORIZATION_CODE}&redirect_uri={REDIRECT_URI}" \
+  -u "{CLIENT_ID}:{CLIENT_SECRET}"
+```
+
+The response contains an access token, refresh token, and metadata such as token lifetime and granted scopes.
+
+```json
+{
+  "access_token": "{ACCESS_TOKEN}",
+  "token_type": "Bearer",
+  "expires_in": 3599,
+  "refresh_token": "{REFRESH_TOKEN}",
+  "scope": "payments customers payment_instruments"
+}
+```
+
+### Refresh the access token
+
+Access tokens expire, for example when a user changes their password or revokes access.
+Use the refresh token to request a new access token from `https://api.sumup.com/token` as defined by OAuth 2.0.
+
+Refresh tokens are valid for six months. If you use a refresh token within 30 days of its expiration, SumUp issues a new token that remains valid for another six months. The previous token keeps working until it expires, giving you time to rotate it across your systems.
+
+## Authorization Scopes
+
+Scopes restrict what your application may do on behalf of the merchant. Request only the scopes you need. When you omit scopes, SumUp grants the defaults listed below. To obtain additional scopes later, repeat the authorization code flow.
+
+| Scope name                       | Default | Access Level | Description |
+| -------------------------------- | ------- | ------------ | ----------- |
+| transactions.history             | yes     | merchant     | View transactions and transaction history for the merchant user. |
+| user.app-settings                | yes     | merchant     | View and modify SumUp mobile app settings for the merchant user. |
+| user.profile_readonly            | yes     | merchant     | View profile details of the merchant user. |
+| user.profile                     | no      | merchant     | Modify profile details of the merchant user. |
+| user.subaccounts                 | no      | merchant     | View and modify sub-account profiles for the merchant user. |
+| user.payout-settings             | no      | merchant     | View and modify payout settings for the merchant user. |
+| products                         | no      | merchant     | View and modify products, shelves, prices, and VAT rates in the merchant's product store. |
+| `restricted` payments            | no      | feature      | Create and process payment checkouts. Requires manual verification by SumUp. |
+| `restricted` payment_instruments | no      | feature      | Save customers and tokenize their payment cards. Requires manual verification by SumUp. |
+
+Restricted scopes must be enabled by SumUp for your application. [Contact us](/contact) to request them.
+
+## Client Credentials Flow
+
+The client credentials flow follows [RFC 6749 Client Credentials Grant](https://datatracker.ietf.org/doc/html/rfc6749#section-4.4). It issues an access token without involving a merchant user. Because no user is associated with the token, the flow does not allow access to merchant-specific data such as transactions or stored customers. You can still process payments for merchants linked to your application.
+
+Request an access token from `https://api.sumup.com/token` using the client credentials grant parameters. This flow does not return a refresh token.
+
+## Register an OAuth application
+
+To integrate an external application with SumUp, register an OAuth application and generate client credentials.
+These credentials let you complete the OAuth flows in this guide and obtain access tokens for protected SumUp resources.
+
+### Steps
+
+This section walks through the registration process:
+
+1. [Log in to your account](#1-log-in-to-your-account)
+2. [Create an OAuth application](#2-create-an-oauth-application)
+3. [Generate the client credentials](#3-generate-the-client-credentials)
+4. [Access the client credentials](#4-access-the-client-credentials)
+
+### Before you begin
+
+Have the following ready before you register the application:
+
+- A SumUp merchant account with completed [account details](https://me.sumup.com/account). Reach out through the [contact form](/contact) if you need a test account.
+- Your application name.
+- One or more redirect URIs. SumUp redirects users to these URIs after authentication and sends the authorization codes you exchange for tokens in the [authorization code flow](#authorization-code-flow).
+
+### 1. Log in to your account
+
+Log in to [your SumUp account](/auth/login). Once logged in, **Account** appears in place of the **Log in** button at the top right.
+
+### 2. Create an OAuth application
+
+Navigate to the [OAuth Apps](/apps/) page to create or manage OAuth applications.
+
+Select **Create application** at the bottom right to define your application.
+
+<Image alt="Create OAuth App screen" src="/img/guides/create-oauth-apps.png" width="80%" />
+
+Describe your application, provide its homepage, and select **Register application** to continue.
+
+You can edit the registered application by selecting it. The edit page lets you update details and add optional information such as a logo, terms and conditions, and privacy policy URLs.
+
+You can also select the scopes your application requires. Each scope includes a short description of the access it grants.
+
+### 3. Generate the client credentials
+
+On the [OAuth Apps](/apps) page, open your application and choose **Create client secret**.
+
+<Image alt="Create new OAuth App credentials form" src="/img/guides/client-credentials-form.png" width="80%" />
+
+Provide the following details:
+
+| Name | Required | Description |
+| -----| -------- | ----------  |
+| Client name | Yes | A descriptive name for your client application. |
+| Application type | Yes | The type of your client application. Options: Web, Android, iOS, Other. |
+| Authorized redirect URL | Yes | Redirect URL to register for your client application. Specify multiple URLs by separating them with commas. |
+| Authorized JavaScript Origin | No | Origin URI for browser-based web applications. SumUp enables CORS for registered origins. |
+
+Select **Save** to generate the credentials. The **Client secrets** section lists each credential with its name, application type, and client ID.
+
+<Aside type="note">
+
+You can register as many client credentials as you need. Repeat this step to create additional ones.
+
+</Aside>
+
+### 4. Access the client credentials
+
+After creation, credentials appear in the **Client credentials** section of your OAuth application (see screenshot).
+
+<Image alt="OAuth client credentials section" src="/img/guides/client-credentials-list.png" width="80%" />
+
+<Aside type="note">
+For security reasons, the client secrets are not displayed.
+</Aside>
+
+Use the download button to receive a JSON file with the full credential details, for example:
+
+```json
+{
+  "id": "CCCFAXYD",
+  "name": "SA web client",
+  "client_id": "fOcmczrYtYMJ7Li5GjMLLcUeC9dN",
+  "client_secret": "717bd571b54297494cd7a79b491e8f2c1da6189c4cc2d3481380e8366eef539c",
+  "application_type": "web",
+  "redirect_uris": ["https://sample-app.example.com/callback"]
+}
+```
+
+<Aside type="note">
+
+Store client secrets securely and never expose them publicly. If you suspect a secret was compromised, [contact us](/contact) immediately.
+
+</Aside>
+
+### Result
+
+You have registered at least one OAuth application and have downloaded its client credentials. Proceed with the [OAuth 2.0 flows](#authorization-flows) to obtain access tokens. Use them to accept payments with a [customer-entered card](/online-payments/guides/single-payment/) or with stored payment data in recurring scenarios.
+
+## What's Next?
+
+- [Review your OAuth application scopes](#authorization-scopes)
+- [iOS SDK Guide](/terminal-payments/sdks/ios-sdk/)
+- [Android SDK Guide](https://github.com/sumup/sumup-android-sdk)
+- [PHP SDK Guide](/online-payments/sdks/php-sdk/)
+- [React Native SDK](/terminal-payments/sdks/react-native-sdk/)
+- [Cloud API for the Solo Card Reader](/terminal-payments/cloud-api/)
diff --git a/src/content/docs/tools/authorization/register-app.mdx b/src/content/docs/tools/authorization/register-app.mdx
deleted file mode 100644
index b3c8becf..00000000
--- a/src/content/docs/tools/authorization/register-app.mdx
+++ /dev/null
@@ -1,121 +0,0 @@
----
-title: Register OAuth 2.0 Application
-sidebar:
-  order: 3
----
-
-import { Aside } from '@astrojs/starlight/components';
-import Image from '@components/content/Image.astro';
-
-Register an OAuth application to integrate with SumUp and generate client credentials for OAuth-authenticated requests. See [OAuth2 authorization flows](/tools/authorization/authorization/) for details on obtaining access tokens for protected API resources.
-
-This guide covers registering a client application and obtaining credentials through these steps:
-
-1.  [Log in to your account](#1-log-in-to-your-account)
-2.  [Create an OAuth application](#2-create-an-o-auth-application)
-3.  [Generate client credentials](#3-generate-client-credentials)
-4.  [Access client credentials](#4-access-client-credentials)
-
-## Prerequisites
-
-- A [SumUp merchant account](https://me.sumup.com/login) with completed [account details](https://me.sumup.com/account) (or a [test account](/online-payments/#getting-a-test-account))
-- Your application name
-- One or more redirect URIs, used to redirect users after authentication and send authorization codes via [OAuth2 Authorization Code Flow](/tools/authorization/authorization/#authorization-code-flow).
-
-### 1. Log in to Your Account
-
-Log in to [your SumUp account](/auth/login). Log in to your SumUp account. **Account name** (First name + last name) replaces the **Log in** button in the top-right corner.
-
-### 2. Create an OAuth Application
-
-1. Navigate to **Account** > **Settings** > **For Developers** > **OAuth2 Apps**. This page allows you to create and edit OAuth applications.
-
-2. Click on **Create application** to define your application.
-
-    <Image alt="Create OAuth App screen" src="/img/guides/create-oauth-apps.png" width="80%" />
-
-    Describe your application and provide its homepage. Click **Register application** to complete.
-
-    Edit details by clicking the application. Update initial data and add optional items like logo, Terms & Conditions, and Privacy Policy URLs.
-
-3. Under **Scopes**, specify the authorization scopes for your app. Scopes represent the access rights of the app once consent is granted by the user.
-
-    <Aside type="caution">
-
-    For security reasons, SumUp manually verifies the following scope grants:
-
-    * `payments` - required to process payments.
-    * `payment_instruments` - required to store customer data and tokenize cards.
-
-    [Contact us](/contact) to request those scopes to be granted to your app.
-
-    SumUp does not recommend direct OAuth 2.0 integration and does not expose detailed authorization endpoint documentation for that reason.
-    Please use a library that handles OAuth 2.0 protocol. We highly recommend that you use one of the [existing reputable implementations](https://openid.net/developers/certified-openid-connect-implementations/).
-
-    </Aside>
-
-    <Image alt="Edit OAuth App screen" src="/img/guides/edit-oauth-apps.png" width="80%" />
-
-    The app requests user consent to access their data in line with the scopes granted here. For detailed information, see [OAuth2 Authorization Code Flow](/tools/authorization/authorization/).
-
-### 3. Generate Client Credentials
-
-On the OAuth2 Apps page, click on a registered application. Go to the **Client credentials** tab.
-
-Click on **Create client secret** to open the following form:
-
-<Image alt="Create new OAuth App credentials form" src="/img/guides/client-credentials-form.png" width="80%" />
-
-Provide the following details:
-
-| Name | Required | Description |
-| -----| -------- | ----------  |
-| Client name | Yes | A descriptive name for your client application. |
-| Application type | Yes | Type: Web, Android, iOS, or Other. |
-| Authorized redirect URL | Yes | Redirect URL for post-authentication. When merchant users authenticate with SumUp and authorize your client app to access their account data, they are redirected to this path in your application. You can add multiple URLs; separate with a comma. |
-| Authorized JavaScript Origin | No | The origin URI of your client application. SumUp allows Cross-Origin Resource Sharing (CORS) across various domains from the browser and is available for type web applications only. The value allows your client application to request resources from SumUp servers. |
-
-Click **Save** to generate the client credentials. In the **Client secrets** section, you will see an entry with the name, application type, and client ID of each generated credential.
-
-<Aside type="note">
-
-You can register as many client applications as needed. To register another credential, repeat this step.
-
-</Aside>
-
-### 4. Access Client Credentials
-
-Once created, credentials appear in the **Client credentials** section of your OAuth application's settings (see screenshot).
-
-<Image alt="OAuth client credentials section" src="/img/guides/client-credentials-list.png" width="80%" />
-
-<Aside type="note">
-For security reasons, the client secrets are not displayed.
-</Aside>
-
-Use the download button to access a JSON file with the full client credential details for the current application.
-Below you can see an example:
-
-```json
-{
-  "id": "CCCFAXYD",
-  "name": "SA web client",
-  "client_id": "fOcmczrYtYMJ7Li5GjMLLcUeC9dN",
-  "client_secret": "717bd571b54297494cd7a79b491e8f2c1da6189c4cc2d3481380e8366eef539c",
-  "application_type": "web",
-  "redirect_uris": ["https://sample-app.example.com/callback"]
-}
-```
-
-<Aside type="note">
-
-Store your client secret keys securely and never reveal them publicly. If you suspect that the secret key for an application has been compromised, [contact us](/contact) immediately.
-
-</Aside>
-
-## Result
-
-You have registered a client application and downloaded OAuth client credentials.
-
-You can now use one of the [OAuth2 authorization flows](/tools/authorization/authorization/#authorization-flows) to obtain an access token and start making payments with either a [payment card entered by a customer](/online-payments/guides/single-payment/) or with a token for a [recurring payment](/online-payments/guides/tokenization-with-payment-sdk).
-
diff --git a/src/content/help/oauth-credentials.mdx b/src/content/help/oauth-credentials.mdx
index 0d274a4e..e39de237 100644
--- a/src/content/help/oauth-credentials.mdx
+++ b/src/content/help/oauth-credentials.mdx
@@ -2,4 +2,4 @@
 title: How do I set up OAuth credentials?
 ---
 
-You can create credentials by logging in on the [SumUp Developer](https://me.sumup.com/developers) page and navigating to the "Create Client Credentials" section. Detailed information on how to authenticate further can be found in our [step-by-step guide](/tools/authorization/register-app/#steps) or in this [video](https://www.youtube.com/watch?v=0ALwF_tm8wII).
+You can create credentials by logging in on the [SumUp Developer](https://me.sumup.com/developers) page and navigating to the "Create Client Credentials" section. Detailed information on how to authenticate further can be found in our [step-by-step guide](/tools/authorization/oauth/#steps) or in this [video](https://www.youtube.com/watch?v=0ALwF_tm8wII).