diff --git a/.gitignore b/.gitignore
index 032d1f01b..bcd741b02 100755
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@ tmp-openapi-gen/**/*.json
 .mcp.json
 node_modules
 .claude
+.blume/
diff --git a/docs/changelog.mdx b/docs/changelog.mdx
deleted file mode 100644
index e16c3246f..000000000
--- a/docs/changelog.mdx
+++ /dev/null
@@ -1,580 +0,0 @@
----
-title: Version History
-sidebarTitle: Changelog
-description: All notable changes to the Sonr blockchain
-icon: "hourglass"
----
-
-
-<Update label="2025-09-04" description="v0.13.3" tags={["DevOps", "Infrastructure", "Docker"]}>
-  Consolidate deployment infrastructure with Docker Compose and enhance build targets (#248)
-  - Unified backend services configuration (Highway, Redis, Caddy, IPFS, snrd)
-  - Implemented multi-stage Dockerfile build targets
-  - Enhanced Makefile with Docker management targets
-  - Introduced health check and readiness probe system
-</Update>
-
-<Update label="2025-09-04" description="v0.13.2" tags={["Authentication", "WebAuthn", "OIDC"]}>
-  Implement OpenID Connect provider with WebAuthn in bridge handlers (#244)
-  - Full WebAuthn passwordless authentication integration
-  - Implemented Self-Issued OpenID Provider (SIOP) v2
-  - Blockchain-based WebAuthn credential broadcasting
-  - Supports Authorization Code Flow with PKCE
-</Update>
-
-<Update label="2025-09-03" description="v0.13.0" tags={["Cryptography", "Security", "Testing"]}>
-  Fix cryptographic implementations and enable disabled tests (#243)
-  - Fixed and re-enabled previously disabled cryptographic tests
-  - Enhanced security validation for cryptographic modules
-  - Improved test coverage for core security components
-</Update>
-
----
-
-<Update label="2025-09-03" description="v0.12.11" tags={["WebAuthn", "Authentication"]}>
-  WebAuthn attestation and verification improvements (#242)
-  - Enhanced attestation verification logic
-  - Improved security checks for authentication ceremonies
-  - Refined credential validation mechanisms
-</Update>
-
-<Update label="2025-09-03" description="v0.12.10" tags={["Services", "Module", "Configuration"]}>
-  Implement Service module capability system and parameters (#241)
-  - Introduced comprehensive capability management for services
-  - Added robust parameter validation for service configurations
-  - Enhanced service module flexibility and security
-</Update>
-
-<Update label="2025-09-03" description="v0.12.9" tags={["DID", "WebAuthn"]}>
-  Complete DID module WebAuthn and parameter implementation (#240)
-  - Full W3C WebAuthn Level 2 compliance with passwordless authentication
-  - Implemented CBOR-based attestation parsing
-  - Multi-algorithm signature verification (ES256, RS256, EdDSA)
-  - Added 9 new DID module parameters with validation
-</Update>
-
-<Update label="2025-09-03" description="v0.12.8" tags={["DWN", "Security", "IPFS"]}>
-  Introduce key rotation events and IPFS status endpoint (#238)
-  - Vault key rotation with Motor plugin integration
-  - Consensus-based encryption using validator set
-  - HMAC-SHA256 validation for data integrity
-  - IPFS status query endpoint with health metrics
-</Update>
-
-<Update label="2025-09-02" description="v0.12.7" tags={["Module Configuration"]}>
-  Implement module parameter validation and defaults (#237)
-  - Comprehensive parameter validation for DID and SVC modules
-  - Default parameters with FIDO2-compliant WebAuthn settings
-  - Enhanced parameter validation for service limits and timeouts
-</Update>
-
-<Update label="2025-08-30" description="v0.12.6" tags={["Events", "Modules"]}>
-  Complete remaining event emissions for DID and DWN modules (#235)
-  - Implemented typed Protobuf events for all state-changing operations
-  - Added detailed event types with enhanced observability
-  - Updated event emission patterns to follow Cosmos SDK v0.50.14 best practices
-</Update>
-
-<Update label="2025-08-27" description="v0.12.5" tags={["Events", "Protobuf"]}>
-  Implement typed Protobuf events for x/did, x/dwn, and x/svc modules (#233)
-  - Typed events following Cosmos SDK's ADR-032 pattern
-  - Event-driven application support with CometBFT websockets
-  - Backward compatibility maintained with legacy events
-</Update>
-
-<Update label="2025-08-24" description="v0.12.4" tags={["IBC", "DEX"]}>
-  Integrate Interchain Accounts for cross-chain DEX functionality
-  - Enhanced cross-chain interoperability for trading
-  - IBC integration for decentralized exchange operations
-</Update>
-
-<Update label="2025-08-24" description="v0.12.3" tags={["ICA", "DEX"]}>
-  Implement ICA Controller system in x/dex module for cross-chain DEX operations (#221)
-  - Full Interchain Account Controller implementation
-  - Cross-chain DEX trading capability
-  - Enhanced IBC protocol support
-</Update>
-
-<Update label="2025-08-20" description="v0.12.1" tags={["Testing", "Starship"]}>
-  Replace InterchainTest with Starship-based E2E testing framework (#217)
-  - Modern testing infrastructure with Starship
-  - Improved E2E test reliability and speed
-  - Better multi-chain testing support
-</Update>
-
-<Update label="2025-08-18" description="v0.12.0" tags={["Cryptography", "JWK"]}>
-  Add support for additional elliptic curves and JWK verification (#216)
-  - Extended elliptic curve support beyond secp256k1
-  - JSON Web Key (JWK) verification implementation
-  - Enhanced cryptographic flexibility
-</Update>
-
----
-
-<Update label="2025-08-18" description="v0.11.4" tags={["WebAuthn", "FIDO2"]}>
-  Complete WebAuthn/FIDO2 implementation for passwordless authentication (#215)
-  - Full FIDO2 compliance with passwordless authentication
-  - Hardware security key support
-  - Biometric authentication integration
-</Update>
-
-<Update label="2025-08-17" description="v0.11.3" tags={["DID", "W3C"]}>
-  Complete DID keeper implementation with W3C compliance and WebAuthn authentication (#214)
-  - Full W3C DID specification compliance
-  - WebAuthn integration for DID authentication
-  - Enhanced identity management capabilities
-</Update>
-
-<Update label="2025-08-16" description="v0.11.2" tags={["UI", "Monorepo"]}>
-  Transform UI package to shadcn monorepo architecture for uniform styling (#213)
-  - Migrated to shadcn component architecture
-  - Consistent design system across applications
-  - Improved component reusability
-</Update>
-
-<Update label="2025-08-15" description="v0.11.1" tags={["Security", "Memory"]}>
-  Improve secure memory handling for enhanced security (#201)
-  - Zero-memory clearing for sensitive data
-  - Protected memory allocation for cryptographic operations
-  - Enhanced key material security
-</Update>
-
-<Update label="2025-08-15" description="v0.11.0" tags={["Cryptography", "Security"]}>
-  Implement comprehensive cryptographic security enhancements (#200)
-  - Major cryptographic subsystem overhaul
-  - Enhanced encryption algorithms
-  - Improved key management system
-</Update>
-
----
-
-<Update label="2025-08-15" description="v0.10.34" tags={["CLI", "Wallet"]}>
-  Implement CLI commands for wallet module (#198)
-  - Comprehensive wallet management via CLI
-  - Transaction signing and broadcasting commands
-  - Key management operations
-</Update>
-
-<Update label="2025-08-14" description="v0.10.33" tags={["UCAN", "Wallet"]}>
-  Implement UCAN permission validation for wallet transactions (#197)
-  - User-Controlled Authorization Networks integration
-  - Permission-based transaction validation
-  - Enhanced wallet security model
-</Update>
-
-<Update label="2025-08-14" description="v0.10.32" tags={["SDK", "Go"]}>
-  Implement Go client SDK with transaction signing and broadcasting (#196)
-  - Complete Go SDK for chain interaction
-  - Transaction building and signing utilities
-  - gRPC and REST endpoint support
-</Update>
-
-<Update label="2025-08-13" description="v0.10.31" tags={["Docker", "Testnet"]}>
-  Enable Docker-based testnet execution
-  - Simplified testnet deployment via Docker
-  - Containerized node operation
-  - Quick local testing environment
-</Update>
-
-<Update label="2025-08-13" description="v0.10.28" tags={["Monorepo", "pnpm"]}>
-  Implement monorepo structure with pnpm workspaces and changesets (#189)
-  - Modern monorepo architecture
-  - pnpm workspace management
-  - Automated versioning with changesets
-</Update>
-
-<Update label="2025-08-12" description="v0.10.27" tags={["WebAuthn", "Gasless"]}>
-  Implement WebAuthn gasless transactions with comprehensive protocol integration (#186)
-  - Gasless onboarding for new users
-  - WebAuthn-based transaction signing
-  - Eliminated token requirement for registration
-</Update>
-
-<Update label="2025-08-11" description="v0.10.25" tags={["WebAuthn", "Security"]}>
-  Implement gasless WebAuthn registration with comprehensive security audit (#182)
-  - Security-audited gasless registration flow
-  - Anti-abuse mechanisms
-  - Credential uniqueness enforcement
-</Update>
-
-<Update label="2025-08-09" description="v0.10.24" tags={["DWN", "Encryption"]}>
-  Implement consensus-based encryption for DWN module (#181)
-  - Validator-based encryption keys
-  - Consensus-driven key management
-  - Enhanced data privacy
-</Update>
-
-<Update label="2025-08-09" description="v0.10.23" tags={["VRF", "Context"]}>
-  Enhance init command with VRF keypair generation and SonrContext system (#180)
-  - Verifiable Random Function integration
-  - SonrContext for session management
-  - Enhanced initialization process
-</Update>
-
-<Update label="2025-08-09" description="v0.10.22" tags={["Testing", "Refactor"]}>
-  Move interchain tests to dedicated location (#178)
-  - Improved test organization
-  - Separated integration tests
-  - Better test maintainability
-</Update>
-
-<Update label="2025-08-08" description="v0.10.20" tags={["Motor", "WASM", "MPC"]}>
-  Refactor Motor WASM plugin as MPC-based UCAN source (#177)
-  - Multi-party computation integration
-  - WASM-based secure execution
-  - UCAN capability management
-</Update>
-
-<Update label="2025-08-08" description="v0.10.19" tags={["Documentation", "UCAN"]}>
-  Migrate documentation to Mintlify structure (#172) and migrate x/ucan module to internal library (#174)
-  - Documentation platform migration
-  - UCAN module refactoring
-  - Improved code organization
-</Update>
-
-<Update label="2025-08-06" description="v0.10.17" tags={["WebAuthn", "CLI"]}>
-  Implement WebAuthn CLI registration with gasless transactions (#168)
-  - CLI-based WebAuthn registration
-  - Browser integration for credential creation
-  - Gasless onboarding flow
-</Update>
-
-<Update label="2025-08-06" description="v0.10.16" tags={["DWN", "Security"]}>
-  Implement auto-create DWN vault with comprehensive security improvements (#161)
-  - Automatic vault provisioning
-  - Enhanced security measures
-  - Improved user onboarding
-</Update>
-
-<Update label="2025-08-05" description="v0.10.15" tags={["Highway", "WebSocket"]}>
-  Migrate Highway service to Echo framework with WebSocket/SSE and JWT auth (#159)
-  - Echo framework migration
-  - Real-time WebSocket support
-  - JWT authentication system
-</Update>
-
-<Update label="2025-08-05" description="v0.10.14" tags={["Highway", "Asynq"]}>
-  Complete Highway proxy server implementation with asynq and proto.Actor (#157)
-  - Asynq task queue integration
-  - Actor-based concurrency model
-  - Improved task processing
-</Update>
-
-<Update label="2025-08-05" description="v0.10.13" tags={["DWN", "Gasless"]}>
-  Refactor x/dwn vaults and introduce gasless transactions (#154)
-  - Vault system refactoring
-  - Gasless transaction support
-  - Enhanced user experience
-</Update>
-
-<Update label="2025-08-03" description="v0.10.12" tags={["Monorepo", "CI/CD"]}>
-  Monorepo restructure with internal packages and enhanced CI/CD (#151)
-  - Internal package architecture
-  - CI/CD pipeline improvements
-  - Better code organization
-</Update>
-
-<Update label="2025-08-02" description="v0.10.9" tags={["Testnet", "Infrastructure"]}>
-  Enhance testnet configuration with faucet and explorer settings (#145)
-  - Testnet faucet integration
-  - Block explorer configuration
-  - Improved developer experience
-</Update>
-
-<Update label="2025-08-01" description="v0.10.8" tags={["Deployment", "Infrastructure"]}>
-  Optimize deployment workflows and update infrastructure configuration (#141)
-  - Streamlined deployment process
-  - Infrastructure updates
-  - Performance optimizations
-</Update>
-
-<Update label="2025-08-01" description="v0.10.6" tags={["Starship", "Network"]}>
-  Introduce Starship network configurations for devnet and testnet (#139)
-  - Starship integration for local development
-  - Multi-network configuration support
-  - Simplified network management
-</Update>
-
-<Update label="2025-07-31" description="v0.10.3" tags={["Docker", "Build"]}>
-  Streamline Docker build for enhanced efficiency (#136)
-  - Optimized Docker build process
-  - Reduced image sizes
-  - Faster build times
-</Update>
-
-<Update label="2025-07-31" description="v0.10.2" tags={["Starship", "Development"]}>
-  Streamline starship configuration and local development (#135)
-  - Simplified Starship setup
-  - Enhanced local development workflow
-  - Better developer experience
-</Update>
-
-<Update label="2025-07-31" description="v0.10.1" tags={["CI/CD", "Wallet", "EVM"]}>
-  Major infrastructure and wallet improvements (#134, #131, #128, #127)
-  - Optimized CI/CD workflows with smart testing
-  - Fee grant integration with BasicAllowance
-  - EVM transaction support in wallet module
-  - External wallet linking as DID assertion methods
-</Update>
-
-<Update label="2025-07-21" description="v0.10.0" tags={["Security", "WASM"]}>
-  Implement secure key management with WASM enclaves (#126)
-  - WASM-based secure enclaves
-  - Hardware-level key protection
-  - Enhanced cryptographic isolation
-</Update>
-
----
-
-<Update label="2025-07-21" description="v0.9.22" tags={["Vault", "IPFS"]}>
-  Implement vault export/import with IPFS encryption (#125)
-  - IPFS-based vault backup
-  - Encrypted vault exports
-  - Decentralized storage integration
-</Update>
-
-<Update label="2025-07-20" description="v0.9.20" tags={["Transactions", "Release"]}>
-  Add transaction building framework and streamline release process (#123)
-  - Comprehensive transaction builder
-  - Automated release pipeline
-  - Improved developer tools
-</Update>
-
-<Update label="2025-07-20" description="v0.9.19" tags={["Testing", "CI"]}>
-  Add cross-module keeper integration tests and optimize CI performance (#122)
-  - Cross-module testing framework
-  - CI pipeline optimization
-  - Better test coverage
-</Update>
-
-<Update label="2025-07-20" description="v0.9.18" tags={["Service", "UCAN"]}>
-  Improve service validation and UCAN integration (#121)
-  - Enhanced service validation logic
-  - UCAN capability improvements
-  - Better error handling
-</Update>
-
-<Update label="2025-07-20" description="v0.9.17" tags={["DWN", "Service"]}>
-  Implement ServiceKeeper interface for x/dwn module (#120)
-  - Service abstraction layer
-  - Improved module interactions
-  - Enhanced modularity
-</Update>
-
-<Update label="2025-07-20" description="v0.9.16" tags={["DWN", "UCAN"]}>
-  Implement UCANKeeper interface for x/dwn module (#119)
-  - UCAN integration for DWN
-  - Capability-based permissions
-  - Enhanced authorization
-</Update>
-
-<Update label="2025-07-18" description="v0.9.15" tags={["Service", "UCAN"]}>
-  Implement UCANKeeper interface for x/svc module (#117)
-  - Service module UCAN support
-  - Permission management
-  - Improved security model
-</Update>
-
-<Update label="2025-07-18" description="v0.9.14" tags={["Service", "DID"]}>
-  Implement DIDKeeper interface for x/svc module (#116)
-  - DID integration for services
-  - Identity-based service management
-  - Enhanced authentication
-</Update>
-
-<Update label="2025-07-18" description="v0.9.11" tags={["Service", "Keeper"]}>
-  Implement ServiceKeeper interface methods in x/svc keeper (#113)
-  - Complete service keeper implementation
-  - Core service functionality
-  - Module integration
-</Update>
-
-<Update label="2025-07-18" description="v0.9.10" tags={["UCAN", "Error Handling"]}>
-  Implement UCANKeeper interface methods and centralize error handling (#112)
-  - UCAN keeper implementation
-  - Centralized error management
-  - Improved code maintainability
-</Update>
-
-<Update label="2025-07-18" description="v0.9.9" tags={["DID", "Signatures"]}>
-  Implement VerifyDIDDocumentSignature method with multi-algorithm support (#111)
-  - Multi-algorithm signature verification
-  - Ed25519, ECDSA, RSA support
-  - Enhanced DID security
-</Update>
-
-<Update label="2025-07-18" description="v0.9.8" tags={["Wallet", "Architecture"]}>
-  Implement wallet derivation and keeper interface architecture (#110)
-  - HD wallet derivation
-  - Keeper interface design
-  - Improved wallet architecture
-</Update>
-
-<Update label="2025-07-16" description="v0.9.6" tags={["Vault", "Interface"]}>
-  Introduce VaultKeeper interface for enhanced modularity (#99)
-  - Vault abstraction layer
-  - Improved code organization
-  - Better testability
-</Update>
-
-<Update label="2025-07-15" description="v0.9.5" tags={["DWN", "Vault"]}>
-  Enable DWN vault spawning via query API and add comprehensive tests (#98)
-  - Query-based vault creation
-  - Comprehensive test suite
-  - API improvements
-</Update>
-
-<Update label="2025-07-14" description="v0.9.4" tags={["Testnet", "DAO"]}>
-  Update testnet configuration for DAO governance (#84)
-  - DAO governance integration
-  - Testnet parameter updates
-  - Governance readiness
-</Update>
-
-<Update label="2025-07-09" description="v0.9.3" tags={["Vault", "Actor"]}>
-  Centralize vault actor system and optimize plugin management (#83)
-  - Actor system centralization
-  - Plugin optimization
-  - Performance improvements
-</Update>
-
-<Update label="2025-07-06" description="v0.9.0" tags={["DWN", "WASM"]}>
-  Refactor x/dwn module structure and integrate WebAssembly motor client (#81)
-  - Major DWN module refactoring
-  - WASM motor client integration
-  - Enhanced documentation
-</Update>
-
----
-
-<Update label="2025-07-05" description="v0.8.12" tags={["Analytics", "Documentation"]}>
-  Implement Rybbit analytics and update documentation site styling (#80)
-  - Analytics integration
-  - Documentation improvements
-  - Better user insights
-</Update>
-
-<Update label="2025-07-04" description="v0.8.11" tags={["UI", "Migration"]}>
-  Complete shadcn/TemplUI migration from NebulaUI (#79)
-  - UI library migration
-  - Modern component system
-  - Improved styling
-</Update>
-
-<Update label="2025-07-02" description="v0.8.2" tags={["Documentation", "Branding"]}>
-  Enhanced documentation landing page with custom branding (#69)
-  - Custom branding implementation
-  - Improved documentation UI
-  - Better user experience
-</Update>
-
-<Update label="2025-07-02" description="v0.8.0" tags={["Quality", "Linting"]}>
-  Integrate Trunk.io for code quality and linting (#65)
-  - Trunk.io integration
-  - Automated code quality checks
-  - Enhanced linting rules
-</Update>
-
----
-
-<Update label="2025-07-01" description="v0.7.0" tags={["DWN", "DIF"]}>
-  Implement DWN module with enclave signing and DIF specification (#64)
-  - Decentralized Web Node implementation
-  - DIF specification compliance
-  - Enclave-based signing
-</Update>
-
----
-
-<Update label="2025-07-01" description="v0.6.1" tags={["Protobuf", "Client"]}>
-  ES-client protobuf generation (#63)
-  - JavaScript client protobuf support
-  - Improved client SDK
-  - Better developer tools
-</Update>
-
-<Update label="2025-07-01" description="v0.6.0" tags={["API", "Documentation"]}>
-  Automated API Reference Generation for Cosmos Modules and Highway REST Service (#62)
-  - Automated API documentation
-  - REST service documentation
-  - Improved developer resources
-</Update>
-
----
-
-<Update label="2025-06-30" description="v0.5.1" tags={["TUI", "Dashboard"]}>
-  Enhance TUI Dashboard with real-time data visualization and testnet support (#59)
-  - Real-time data visualization
-  - Testnet dashboard support
-  - Enhanced monitoring
-</Update>
-
-<Update label="2025-06-30" description="v0.5.0" tags={["UCAN", "Handlers"]}>
-  Implement x/ucan msgServer handlers with capability templates (#55)
-  - UCAN message handlers
-  - Capability templates
-  - Authorization framework
-</Update>
-
----
-
-<Update label="2025-06-30" description="v0.4.1" tags={["UI", "Components"]}>
-  Integrate Nebula UI Component Library (#54)
-  - UI component library integration
-  - Reusable components
-  - Design consistency
-</Update>
-
-<Update label="2025-06-29" description="v0.4.0" tags={["DID", "WebAuthn", "Testing"]}>
-  W3C DID Controller with WebAuthn support and comprehensive testing improvements (#52)
-  - W3C DID controller implementation
-  - WebAuthn authentication
-  - Enhanced test coverage
-</Update>
-
----
-
-<Update label="2025-06-29" description="v0.3.0" tags={["UCAN", "Migration"]}>
-  Migrate UCAN capability definitions to x/ucan module (#49)
-  - UCAN module creation
-  - Capability migration
-  - Improved architecture
-</Update>
-
----
-
-<Update label="2025-06-28" description="v0.2.0" tags={["DNS", "UCAN"]}>
-  Implement DNS record verification with UCAN delegation for x/svc (#41)
-  - DNS verification system
-  - UCAN-based delegation
-  - Service authentication
-</Update>
-
----
-
-<Update label="2025-06-28" description="v0.1.0" tags={["Highway", "API"]}>
-  Implement Highway Service API Handlers (#39)
-  - Highway service implementation
-  - API handler creation
-  - Core service functionality
-</Update>
-
-<Update label="2025-06-26" description="v0.0.23" tags={["IPFS", "CI/CD", "Documentation"]}>
-  Major infrastructure and documentation improvements (#38, #37, #36)
-  - IPFS private network support
-  - Enhanced CI/CD workflows
-  - Comprehensive tokenomics documentation
-  - Client integration guide
-  - Research section with whitepapers
-</Update>
-
-<Update label="2025-06-22" description="v0.0.1" tags={["Initial", "Core"]}>
-  Initial release with core blockchain features
-  - Automated version bumping and changelog generation
-  - Highway service for enhanced authentication
-  - Database migration using goose
-  - CosmWasm VM for smart contracts
-  - IPFS Kubo v0.35.0 integration
-  - Decentralized web node runtime with WASM enclave
-  - Complete database schema for core entities
-</Update>
diff --git a/docs/docs.json b/docs/docs.json
deleted file mode 100644
index 06337b5a8..000000000
--- a/docs/docs.json
+++ /dev/null
@@ -1,366 +0,0 @@
-{
-  "$schema": "https://mintlify.com/docs.json",
-  "theme": "maple",
-  "name": "Sonr Docs",
-  "logo": {
-    "light": "https://cdn.sonr.io/logos/docs/logo.svg",
-    "dark": "https://cdn.sonr.io/logos/docs/logo-dark.svg"
-  },
-  "favicon": "https://cdn.sonr.io/favicon.ico",
-  "colors": {
-    "primary": "#17c2FF",
-    "light": "#17c2FF",
-    "dark": "#279cff"
-  },
-  "icons": {
-    "library": "lucide"
-  },
-  "navigation": {
-    "dropdowns": [
-      {
-        "dropdown": "Documentation",
-        "description": "Sonr Fundamentals",
-        "icon": "lightbulb",
-        "pages": [
-          {
-            "group": "Getting Started",
-            "icon": "rocket",
-            "pages": [
-              "index",
-              "reference/install",
-              "changelog",
-              "faq"
-            ]
-          },
-          {
-            "group": "Learn Concepts",
-            "icon": "lightbulb",
-            "pages": [
-              {
-                "group": "Sonr Blockchain",
-                "icon": "combine",
-                "pages": ["concepts/sonr", "modules/did/index", "modules/dwn/index", "modules/svc/index", "modules/dex/index"]
-              },
-              {
-                "group": "Gateway Services",
-                "icon": "radio-tower",
-                "pages": [
-                  "concepts/hway",
-                  "concepts/gasless-onboarding",
-                  "concepts/webauthn-integration"
-                ]
-              },
-              {
-                "group": "Light Clients",
-                "icon": "plug",
-                "pages": [
-                  "concepts/motr",
-                  "concepts/decentralized-auth",
-                  "concepts/identity-generation",
-                  "concepts/dwn-architecture"
-                ]
-              },
-              {
-                "group": "Token Economics",
-                "icon": "coins",
-                "pages": [
-                  "concepts/token",
-                  "economics/values",
-                  "economics/utility",
-                  "economics/staking",
-                  "economics/rewards",
-                  "economics/governance",
-                  "economics/distribution"
-                ]
-              }
-            ]
-          },
-          {
-            "group": "Build Apps",
-            "icon": "hammer",
-            "pages": [
-              {
-                "group": "Client SDKs",
-                "icon": "code",
-                "pages": [
-                  "quickstart/react",
-                  "quickstart/browser",
-                  "quickstart/golang"
-                ]
-              },
-              {
-                "group": "Service Management",
-                "icon": "globe",
-                "pages": [
-                  "guides/register-records",
-                  "guides/authorize-clients",
-                  "guides/broadcast-transactions",
-                  "guides/issue-payments",
-                  "guides/establish-connection"
-                ]
-              }
-            ]
-          },
-          {
-            "group": "Validator Guides",
-            "icon": "shield-check",
-            "pages": [
-              "guides/onboarding",
-              "guides/development",
-              "guides/deployment",
-              {
-                "group": "Security Report",
-                "icon": "shield",
-                "pages": [
-                  "reference/security/audit-report",
-                  "reference/security/compliance",
-                  "reference/security/cryptography",
-                  "reference/security/vulnerabilities"
-                ]
-              }
-            ]
-          },
-          {
-            "group": "Next Steps",
-            "icon": "play",
-            "pages": []
-          }
-        ]
-      },
-      {
-        "dropdown": "Reference",
-        "description": "API Reference",
-        "icon": "code",
-        "pages": [
-          {
-            "group": "CLI Commands",
-            "icon": "terminal",
-            "root": "cli-commands",
-            "pages": [
-              "reference/commands/snrd",
-              "reference/commands/snrd_auth",
-              "reference/commands/snrd_auth_register",
-              "reference/commands/snrd_genesis",
-              "reference/commands/snrd_genesis_add-genesis-account",
-              "reference/commands/snrd_genesis_collect-gentxs",
-              "reference/commands/snrd_genesis_export",
-              "reference/commands/snrd_genesis_gentx",
-              "reference/commands/snrd_genesis_init",
-              "reference/commands/snrd_genesis_migrate",
-              "reference/commands/snrd_genesis_validate",
-              "reference/commands/snrd_help",
-              "reference/commands/snrd_init",
-              "reference/commands/snrd_keys",
-              "reference/commands/snrd_keys_add",
-              "reference/commands/snrd_keys_delete",
-              "reference/commands/snrd_keys_export",
-              "reference/commands/snrd_keys_import",
-              "reference/commands/snrd_keys_list",
-              "reference/commands/snrd_keys_migrate",
-              "reference/commands/snrd_keys_parse",
-              "reference/commands/snrd_keys_show",
-              "reference/commands/snrd_migrate",
-              "reference/commands/snrd_node",
-              "reference/commands/snrd_prune",
-              "reference/commands/snrd_query",
-              "reference/commands/snrd_query_account",
-              "reference/commands/snrd_query_accounts",
-              "reference/commands/snrd_query_auth",
-              "reference/commands/snrd_query_bank",
-              "reference/commands/snrd_query_consensus",
-              "reference/commands/snrd_query_delegation",
-              "reference/commands/snrd_query_did",
-              "reference/commands/snrd_query_distribution",
-              "reference/commands/snrd_query_dwn",
-              "reference/commands/snrd_query_feegrant",
-              "reference/commands/snrd_query_gov",
-              "reference/commands/snrd_query_slashing",
-              "reference/commands/snrd_query_staking",
-              "reference/commands/snrd_query_svc",
-              "reference/commands/snrd_query_tendermint",
-              "reference/commands/snrd_query_tx",
-              "reference/commands/snrd_rollback",
-              "reference/commands/snrd_status",
-              "reference/commands/snrd_tendermint",
-              "reference/commands/snrd_tx",
-              "reference/commands/snrd_tx_bank",
-              "reference/commands/snrd_tx_consensus",
-              "reference/commands/snrd_tx_crisis",
-              "reference/commands/snrd_tx_did",
-              "reference/commands/snrd_tx_distribution",
-              "reference/commands/snrd_tx_dwn",
-              "reference/commands/snrd_tx_feegrant",
-              "reference/commands/snrd_tx_gov",
-              "reference/commands/snrd_tx_slashing",
-              "reference/commands/snrd_tx_staking",
-              "reference/commands/snrd_tx_svc",
-              "reference/commands/snrd_version"
-            ]
-          },
-          {
-            "group": "Decentralized Exchange",
-            "icon": "arrow-right-left",
-            "tag": "x/dex",
-            "pages": [
-              {
-                "group": "HTTP Endpoints",
-                "tag": "Query",
-                "icon": "rss",
-                "pages": [
-                  "api-reference/dex/get-dex-account",
-                  "api-reference/dex/get-module-parameters",
-                  "api-reference/dex/get-pool-information",
-                  "api-reference/dex/get-remote-chain-balance",
-                  "api-reference/dex/get-transaction-history",
-                  "api-reference/dex/list-all-dex-accounts",
-                  "api-reference/dex/list-orders"
-                ]
-              },
-              {
-                "group": "GRPC Methods",
-                "tag": "TxMsg",
-                "icon": "plug",
-                "pages": [
-                  "api-reference/dex/add-liquidity",
-                  "api-reference/dex/cancel-order",
-                  "api-reference/dex/create-dex-account",
-                  "api-reference/dex/create-limit-order",
-                  "api-reference/dex/execute-token-swap",
-                  "api-reference/dex/remove-liquidity"
-                ]
-              }
-            ]
-          },
-          {
-            "group": "Decentralized Identifiers",
-            "icon": "contact-round",
-            "tag": "x/did",
-            "pages": [
-              {
-                "group": "HTTP Endpoints",
-                "tag": "Query",
-                "icon": "rss",
-                "pages": [
-                  "api-reference/did/get-all-credentials-by-did",
-                  "api-reference/did/get-did-document",
-                  "api-reference/did/get-dids-by-controller",
-                  "api-reference/did/get-module-parameters",
-                  "api-reference/did/get-service-endpoint",
-                  "api-reference/did/get-verifiable-credential",
-                  "api-reference/did/get-verification-method",
-                  "api-reference/did/list-all-did-documents",
-                  "api-reference/did/list-verifiable-credentials",
-                  "api-reference/did/resolve-did"
-                ]
-              },
-              {
-                "group": "GRPC Methods",
-                "tag": "TxMsg",
-                "icon": "plug",
-                "pages": [
-                  "api-reference/did/add-service-endpoint",
-                  "api-reference/did/add-verification-method",
-                  "api-reference/did/create-did-document",
-                  "api-reference/did/deactivate-did",
-                  "api-reference/did/issue-verifiable-credential",
-                  "api-reference/did/link-external-wallet",
-                  "api-reference/did/register-webauthn-credential-gasless",
-                  "api-reference/did/remove-service-endpoint",
-                  "api-reference/did/remove-verification-method",
-                  "api-reference/did/revoke-verifiable-credential",
-                  "api-reference/did/update-did-document",
-                  "api-reference/did/update-module-parameters"
-                ]
-              }
-            ]
-          },
-          {
-            "group": "Decentralized Web Nodes",
-            "icon": "wallet",
-            "tag": "x/dwn",
-            "pages": [
-              {
-                "group": "HTTP Endpoints",
-                "tag": "Query",
-                "icon": "rss",
-                "pages": [
-                  "api-reference/dwn/query-dwn-permissions",
-                  "api-reference/dwn/query-dwn-protocols",
-                  "api-reference/dwn/query-dwn-records",
-                  "api-reference/dwn/query-encrypted-record-with-decryption",
-                  "api-reference/dwn/query-encryption-system-status",
-                  "api-reference/dwn/query-ipfs-node-status",
-                  "api-reference/dwn/query-module-parameters",
-                  "api-reference/dwn/query-specific-dwn-record",
-                  "api-reference/dwn/query-specific-dwn-protocol",
-                  "api-reference/dwn/query-specific-vault",
-                  "api-reference/dwn/query-vaults-by-owner",
-                  "api-reference/dwn/query-vrf-consensus-contributions",
-                  "api-reference/dwn/retrieve-ipfs-content-by-cid"
-                ]
-              },
-              {
-                "group": "GRPC Methods",
-                "tag": "TxMsg",
-                "icon": "plug",
-                "pages": [
-                  "api-reference/dwn/configure-dwn-protocol",
-                  "api-reference/dwn/delete-record-from-dwn",
-                  "api-reference/dwn/grant-dwn-permission",
-                  "api-reference/dwn/revoke-dwn-permission",
-                  "api-reference/dwn/rotate-vault-encryption-keys",
-                  "api-reference/dwn/update-dwn-module-parameters",
-                  "api-reference/dwn/write-record-to-dwn"
-                ]
-              }
-            ]
-          },
-          {
-            "group": "Service Registry",
-            "icon": "shield-check",
-            "tag": "x/svc",
-            "pages": [
-              {
-                "group": "HTTP Endpoints",
-                "tag": "Query",
-                "icon": "rss",
-                "pages": [
-                  "api-reference/svc/query-domain-verification-status",
-                  "api-reference/svc/query-module-parameters",
-                  "api-reference/svc/query-service-by-id",
-                  "api-reference/svc/query-services-by-domain",
-                  "api-reference/svc/query-services-by-owner"
-                ]
-              },
-              {
-                "group": "GRPC Methods",
-                "tag": "TxMsg",
-                "icon": "plug",
-                "pages": [
-                  "api-reference/svc/complete-domain-verification",
-                  "api-reference/svc/initiate-domain-verification",
-                  "api-reference/svc/register-service-with-verified-domain",
-                  "api-reference/svc/update-module-parameters"
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "footer": {
-    "socials": {
-      "discord": "https://sonr.io/discord",
-      "github": "https://github.com/sonr-io",
-      "twitter": "https://twitter.com/sonr_io",
-      "youtube": "https://youtube.com/@sonrhq",
-      "website": "https://sonr.io"
-    }
-  },
-  "integrations": {
-    "ga4": {
-      "measurementId": "G-FY0WZBSGH8"
-    }
-  }
-}
diff --git a/docs/faq.mdx b/docs/faq.mdx
index 234ec211f..ef220aa51 100644
--- a/docs/faq.mdx
+++ b/docs/faq.mdx
@@ -1,10 +1,12 @@
 ---
 title: "Frequently Asked Questions"
-sidebarTitle: "FAQ"
 description: "A Collection of commonly asked questions about Sonr"
 icon: "life-buoy"
+sidebar:
+  label: "FAQ"
 ---
 
+
 <iframe
   width="750"
   height="422"
@@ -18,17 +20,17 @@ icon: "life-buoy"
 
 ## General
 
-<AccordionGroup>
-    <Accordion title="What Components make up the Sonr stack?">
+<Accordion>
+    <AccordionItem title="What Components make up the Sonr stack?">
         **Network** -- We've built a global decentralized network that leverages our breakthrough identity module allowing for device based authentication, realtime content delivery, and true digital asset ownership. Users are provided the promised utility of Web3 without any lagging experience.
 
         **Motor** -- The Sonr Motor node is an end to end client suite which provides all the features of our Network in an easily approachable SDK. Motor offers the easiest consumer onboarding experience in Web3 by stripping away seed phrases, and introducing multi-party computation for Quantum computing resistant encryption.
 
         **Blockchain** -- The Blockchain is the perfect marriage for Sonr's global decentralized network. With Cosmos, we can quickly and easily connect to other blockchains, providing our users with the ability to build interoperable experiences. IBC is the perfect specification for cross-chain communication, and GravityBridge provides us with the perfect way to bridge to Ethereum. Sonr’s blockchain also provides developer with the peace of mind of knowing that user data is securely distributed across IPFS with a native bridge to Filecoin.
 
-        </Accordion>
+        </AccordionItem>
 
-        <Accordion title="What’s preventing Web3 Mobile Apps from going mainstream?">
+        <AccordionItem title="What’s preventing Web3 Mobile Apps from going mainstream?">
         There are several factors that may prevent the widespread adoption of web3 mobile apps. Some of the main challenges and barriers to the adoption of web3 mobile apps include:
             - Limited awareness and understanding of web3 and decentralized technologies among the general public
             - Limited adoption of decentralized technologies and infrastructure by developers and businesses
@@ -37,46 +39,46 @@ icon: "life-buoy"
             - Regulatory uncertainty and potential legal challenges
 
         Overall, the adoption of web3 mobile apps is currently limited by a range of technical, market, and regulatory challenges. These challenges will need to be addressed in order for web3 mobile apps to become more widely used and adopted.
-        </Accordion>
+        </AccordionItem>
 
-        <Accordion title="Will DIDs replace traditional authentication in the future?">
+        <AccordionItem title="Will DIDs replace traditional authentication in the future?">
         It is possible that DIDs (decentralized IDs) could eventually replace traditional forms of authentication, such as username and password combinations, in the future. DIDs are a key component of the decentralized identity (DID) ecosystem, which is being developed to provide individuals and organizations with control over their own digital identities and data. DIDs are designed to be secure, decentralized, and interoperable, and can be used to represent a wide range of identity-related information in a secure and decentralized way.
 
         The use of DIDs for authentication has several potential benefits over traditional forms of authentication. For example, DIDs can provide a more secure and decentralized way to authenticate users, as they are stored on a decentralized ledger (such as a blockchain) and can be accessed and verified by anyone with the appropriate permissions. This can help to improve the security and privacy of online authentication, and can reduce the risk of identity theft and other security threats. DIDs can also be more user-friendly and convenient for users, as they can be easily accessed and managed using a variety of different devices and applications.
 
         Overall, it is possible that DIDs could eventually replace traditional forms of authentication, but this will depend on the continued development and adoption of decentralized identity technologies and infrastructure.
 
-        </Accordion>
+        </AccordionItem>
 
-        <Accordion title="How large is the Cosmos Ecosystem?">
+        <AccordionItem title="How large is the Cosmos Ecosystem?">
         The exact size of the Cosmos ecosystem is difficult to determine, as it includes a wide range of projects, applications, and stakeholders. However, the Cosmos ecosystem is generally considered to be one of the largest and most active communities in the decentralized technology space, and it continues to grow and evolve over time.
 
         The Cosmos ecosystem is focused on building an open, interoperable, and scalable ecosystem of decentralized networks and applications. This ecosystem is based on the Cosmos SDK, a framework for building blockchain applications, and the Inter-Blockchain Communication (IBC) protocol, which allows different blockchain networks to interoperate with each other. The Cosmos ecosystem also includes a range of tools, services, and resources that are designed to support the development and adoption of decentralized technologies and applications.
 
-        </Accordion>
+        </AccordionItem>
 
-        <Accordion title="What was Tim Berners Lee’s Original Vision for the Internet?">
+        <AccordionItem title="What was Tim Berners Lee’s Original Vision for the Internet?">
 
         Tim Berners-Lee, the inventor of the World Wide Web, has expressed a vision for the future of the internet that emphasizes decentralization, interoperability, and user control. In this vision, the internet would be a more open, transparent, and democratic platform, where users have more control over their own data and online experiences.
 
         Berners-Lee has referred to this vision as the "POD" (Personal Online Data) model, and has described it as a way to "take back the web" from the large technology companies that currently dominate the internet landscape. In the POD model, users would be able to store their own data on personal servers or other decentralized storage systems,
         and would be able to control who has access to that data. This would enable users to have more control over their own data and online experiences, and would help to reduce the concentration of power and control in the hands of a few large technology companies.
 
-        </Accordion>
-    </AccordionGroup>
+        </AccordionItem>
+    </Accordion>
 
 ## Developers
 
-<AccordionGroup>
-    <Accordion title="Why build on Sonr?">
+<Accordion>
+    <AccordionItem title="Why build on Sonr?">
 
     Sonr's decentralized, realtime network provides Web3 developers with a tool-set that to quickly deploy scalable Web3 applications, with verifiable data that can be reused and shared across all Sonr powered applications.
 
     - **Developer Experience** -- We believe application development should be as straight forward as possible. Sonr's SDK's is an all-in-one solution for developing applications for the Sonr network. We believe in consistency and openness, as our libraries are built on open standards.
     - **Composable by Design** -- Our protocols are flexible and are capable of wrapping custom protocols. These protocols are extendable and support merging, which allows for reusability and composability.
 
-    </Accordion>
-    <Accordion title="Does Sonr have Wallet to Wallet Messaging?">
+    </AccordionItem>
+    <AccordionItem title="Does Sonr have Wallet to Wallet Messaging?">
         We utilize libp2p, DID documents, and MPC to have decentralized wallet-to-wallet messaging, you can follow these steps:
 
         1. Use the libp2p library to establish a peer-to-peer network between the two wallets. This will allow the wallets to communicate directly with each other, without going through a central server.
@@ -88,34 +90,34 @@ icon: "life-buoy"
         4. Use the libp2p library to send messages between the wallets, using the keys that were generated with MPC. These messages can be encrypted to ensure privacy, and can be signed to ensure authenticity.
 
         By following these steps, it is possible to utilize libp2p, DID documents, and MPC to create decentralized wallet-to-wallet messaging. This approach allows users to securely and privately communicate with each other, while also maintaining control over their own data and assets.
-    </Accordion>
-</AccordionGroup>
+    </AccordionItem>
+</Accordion>
 
 
 ## Token
 
-<AccordionGroup>
-    <Accordion title="What is the Total Supply of Tokens?">
+<Accordion>
+    <AccordionItem title="What is the Total Supply of Tokens?">
 
     500M, See our Distribution [here](https://www.notion.so/Token-Supply-0578a472c3364718a8634efa8c290e4b).
 
-    </Accordion>
+    </AccordionItem>
 
-    <Accordion title="When is the Sonr Team anticipating on going to MainNet?">
+    <AccordionItem title="When is the Sonr Team anticipating on going to MainNet?">
 
     We’re gearing for a Summer 2023 Launch
 
-    </Accordion>
+    </AccordionItem>
 
-    <Accordion title="Do Developers receive Airdrops?">
+    <AccordionItem title="Do Developers receive Airdrops?">
 
     Yes! Developers can receive AirDrops for submitting proposals or participating in Sonr sponsored events.
 
-    </Accordion>
+    </AccordionItem>
 
-    <Accordion title="Whats the price of $SNR?">
+    <AccordionItem title="Whats the price of $SNR?">
 
     The Sonr team cannot provide an anticipated price for $SNR due to the [SEC’s rules](https://cryptolawinsider.com/security-token/) on Securities.
 
-    </Accordion>
-</AccordionGroup>
+    </AccordionItem>
+</Accordion>
diff --git a/docs/features.mdx b/docs/features.mdx
index 889affeb9..1f6edde3c 100644
--- a/docs/features.mdx
+++ b/docs/features.mdx
@@ -2,25 +2,25 @@
 title: Features
 description: The peer-to-peer identity and asset management system that makes Web3 as easy as Web2 through DID documents, WebAuthn, and IPFS—providing users with secure, portable decentralized identity
 icon: "puzzle"
+sidebar:
+  label: "Features"
 ---
 
-# Introduction to Sonr
+:::note[Scope]
+This document introduces Sonr's blockchain architecture, core components, and
+integration patterns. It covers identity management, authentication, data
+sovereignty, and cross-chain operations. This document does not cover
+implementation details or code examples—see the Quick Start Guide for hands-on
+tutorials.
+:::
 
-<Note title="Scope">
-  This document introduces Sonr's blockchain architecture, core components, and
-  integration patterns. It covers identity management, authentication, data
-  sovereignty, and cross-chain operations. This document does not cover
-  implementation details or code examples—see the Quick Start Guide for hands-on
-  tutorials.
-</Note>
-
-<Note title="Audience">
-  **Developers** building Web3 applications who want simple integration
-  patterns. **Validators** interested in securing a next-generation blockchain
-  network. **Users** seeking sovereign digital identity solutions.
-  Prerequisites: Basic understanding of web development (HTML/JavaScript) for
-  developers; blockchain consensus for validators.
-</Note>
+:::note[Audience]
+**Developers** building Web3 applications who want simple integration
+patterns. **Validators** interested in securing a next-generation blockchain
+network. **Users** seeking sovereign digital identity solutions.
+Prerequisites: Basic understanding of web development (HTML/JavaScript) for
+developers; blockchain consensus for validators.
+:::
 
 ## Summary
 
@@ -63,16 +63,16 @@ Sonr provides:
 ## Core Architecture
 
 <CardGroup>
-  <Card title="Decentralized Identity (DID)" href="/blockchain/modules/did/">
+  <Card title="Decentralized Identity (DID)" href="/reference/modules/did">
     W3C-compliant identity system using WebAuthn for passwordless authentication
   </Card>
-  <Card title="Decentralized Web Nodes (DWN)" href="/blockchain/modules/dwn/">
+  <Card title="Decentralized Web Nodes (DWN)" href="/reference/concepts/sonrmodules/dwn/">
     Personal Vaults acting as user-controlled agents for blockchain interactions
   </Card>
-  <Card title="UCAN Authorization" href="/blockchain/modules/svc/ucan">
+  <Card title="UCAN Authorization" href="/reference/modules/svc">
     Capability-based permissions replacing dangerous unlimited approve patterns
   </Card>
-  <Card title="Service Registry" href="/blockchain/modules/svc/">
+  <Card title="Service Registry" href="/reference/modules/svc">
     Stake-based trust system for service discovery and DNS verification
   </Card>
 </CardGroup>
@@ -109,7 +109,7 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
 ### Developer Resources
 
 <CardGroup>
-  <Card title="Browser Integration" href="/quickstart/browser">
+  <Card title="Browser Integration" href="/onboardingbrowser">
     Browser integration patterns and WebAuthn examples
   </Card>
   <Card title="Wallet Architecture" href="/highway/">
@@ -118,7 +118,7 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
   <Card title="Payment Systems" href="/highway/wallets/sending-payments">
     Payment integration and transaction management
   </Card>
-  <Card title="Service Registry" href="/blockchain/modules/svc/">
+  <Card title="Service Registry" href="/reference/modules/svc">
     DNS verification and stake-based trust
   </Card>
 </CardGroup>
@@ -130,16 +130,16 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
 Validators secure four critical systems:
 
 <CardGroup>
-  <Card title="Blockchain Core" href="/blockchain/">
+  <Card title="Blockchain Core" href="/reference/concepts/sonr">
     Cosmos SDK with IBC for cross-chain operations
   </Card>
-  <Card title="Network Architecture" href="/blockchain/network">
+  <Card title="Network Architecture" href="/reference/concepts/sonrnetwork">
     Network topology and consensus mechanisms
   </Card>
   <Card title="Highway Proxy" href="/highway/">
     HTTP bridge supporting WebAuthn authentication
   </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
+  <Card title="Token Economics" href="/reference/concepts/sonrtoken/">
     Tokenomics and staking mechanisms
   </Card>
 </CardGroup>
@@ -166,10 +166,10 @@ Validators perform five key functions:
 ### Identity Management
 
 <CardGroup>
-  <Card title="Identity System" href="/blockchain/modules/did/">
+  <Card title="Identity System" href="/reference/modules/did">
     W3C DIDs with WebAuthn for digital sovereignty
   </Card>
-  <Card title="DID Module" href="/blockchain/modules/did/">
+  <Card title="DID Module" href="/reference/modules/did">
     Blockchain implementation of identity management
   </Card>
 </CardGroup>
@@ -177,10 +177,10 @@ Validators perform five key functions:
 ### Data Sovereignty
 
 <CardGroup>
-  <Card title="DWN Module" href="/blockchain/modules/dwn/">
+  <Card title="DWN Module" href="/reference/concepts/sonrmodules/dwn/">
     Personal Vaults for user-controlled data and agents
   </Card>
-  <Card title="Network Architecture" href="/blockchain/network">
+  <Card title="Network Architecture" href="/reference/concepts/sonrnetwork">
     Network architecture and cross-chain features
   </Card>
 </CardGroup>
@@ -188,10 +188,10 @@ Validators perform five key functions:
 ### Authorization System
 
 <CardGroup>
-  <Card title="UCAN Module" href="/blockchain/modules/svc/ucan">
+  <Card title="UCAN Module" href="/reference/modules/svc">
     Capability-based permissions for secure delegation
   </Card>
-  <Card title="Service Module" href="/blockchain/modules/svc/">
+  <Card title="Service Module" href="/reference/modules/svc">
     Registration, verification, and trust management
   </Card>
 </CardGroup>
@@ -199,7 +199,7 @@ Validators perform five key functions:
 ### Cross-Chain Features
 
 <CardGroup>
-  <Card title="Network Protocol" href="/blockchain/network">
+  <Card title="Network Protocol" href="/reference/concepts/sonrnetwork">
     Bridgeless transactions via InterchainAccounts
   </Card>
   <Card title="Payment Handler" href="/highway/wallets/sending-payments">
@@ -214,13 +214,13 @@ Validators perform five key functions:
 Build Web3 applications without blockchain complexity:
 
 <CardGroup>
-  <Card title="Quick Start" href="/quickstart/">
+  <Card title="Quick Start" href="/onboarding">
     Create your first Sonr application in 10 minutes
   </Card>
-  <Card title="Browser Integration" href="/quickstart/browser">
+  <Card title="Browser Integration" href="/onboardingbrowser">
     Real-world browser integration examples
   </Card>
-  <Card title="CLI Tools" href="/quickstart/cli">
+  <Card title="CLI Tools" href="/onboardingcli">
     Command line tools and utilities
   </Card>
 </CardGroup>
@@ -230,10 +230,10 @@ Build Web3 applications without blockchain complexity:
 Secure the future of digital sovereignty:
 
 <CardGroup>
-  <Card title="Node Setup" href="/quickstart/validators">
+  <Card title="Node Setup" href="/deployment">
     Complete validator installation guide
   </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
+  <Card title="Token Economics" href="/reference/concepts/sonrtoken/">
     Token distribution, staking, and governance
   </Card>
   <Card title="Security" href="/reference/security/">
@@ -246,10 +246,10 @@ Secure the future of digital sovereignty:
 Experience true digital ownership:
 
 <CardGroup>
-  <Card title="Create Identity" href="/blockchain/modules/did/onboarding">
+  <Card title="Create Identity" href="/onboarding">
     30-second setup with biometric authentication
   </Card>
-  <Card title="Use Your Vault" href="/blockchain/modules/dwn/">
+  <Card title="Use Your Vault" href="/reference/concepts/sonrmodules/dwn/">
     Master your personal Web3 agent
   </Card>
   <Card title="Security Guide" href="/reference/security/">
@@ -259,13 +259,13 @@ Experience true digital ownership:
 
 ## Next Steps
 
-<Note title="Ready to Build?" type="success">
-**Developers**: Start with the [Quick Start Guide](/quickstart/) to build your first Sonr application.
+:::note[Ready to Build?]
+**Developers**: Start with the [Quick Start Guide](/onboarding) to build your first Sonr application.
 
-**Validators**: Follow the [Node Setup Guide](/quickstart/validators) to join the network.
+**Validators**: Follow the [Node Setup Guide](/deployment) to join the network.
 
-**Users**: [Create your identity](/blockchain/modules/did/onboarding) in under 30 seconds.
+**Users**: [Create your identity](/onboarding) in under 30 seconds.
 
-</Note>
+:::
 
 Explore the concepts above or dive into specific topics using the navigation menu. Join us in building the sovereign internet where identity belongs to individuals, not platforms.
diff --git a/docs/guides/architecture/delegated-proof-of-stake.mdx b/docs/guides/architecture/delegated-proof-of-stake.mdx
deleted file mode 100644
index bfbe7d5b8..000000000
--- a/docs/guides/architecture/delegated-proof-of-stake.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Delegated Proof of Stake (DPoS)
-description: A decentralized, secure, and efficient consensus mechanism.
----
-
-Sonr leverages a Delegated Proof of Stake (DPoS) mechanism to optimize network security and user participation. DPoS imposes an opportunity cost for malicious behavior through slashing, but it also presents challenges that must be addressed for a sustainable design.
-
-## Challenges in Staking Mechanisms
-
-- **Token Value**: The token must have intrinsic value to incentivize staking.
-- **Wealth Concentration**: Staking can give an outsized advantage to wealthy users.
-- **Coordination Problems**: Staking mechanisms can be gamed by coordinated actors.
-
-## Sonr's Approach to DPoS
-
-We have designed our staking mechanism to address these challenges and create a sustainable and equitable system:
-
-<CardGroup>
-  <Card title="Low Barrier to Entry">
-    The upfront capital required to stake is designed to not significantly
-    discourage participation.
-  </Card>
-  <Card title="Slashing for Malice">
-    If a stakeholder group makes decisions that materially harm the network,
-    their stake is slashed.
-  </Card>
-  <Card title="Incentivizing Positive Growth">
-    Stakeholders can make decisions that positively impact the future network
-    health and token price, promoting long-term growth.
-  </Card>
-</CardGroup>
diff --git a/docs/guides/architecture/inter-blockchain-communication.mdx b/docs/guides/architecture/inter-blockchain-communication.mdx
deleted file mode 100644
index 2a5e7adce..000000000
--- a/docs/guides/architecture/inter-blockchain-communication.mdx
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: Network Architecture
-description: A detailed look at Sonr's three-tier system design.
----
-
-Our incorporation of embedded light nodes signifies a strategic move towards enhancing network robustness and efficiency. These nodes operate with a reduced resource footprint, ensuring a widespread and seamless network distribution. They form the bedrock of the infrastructure, interfacing directly with a series of validators. These validators are pivotal in maintaining the integrity and trustworthiness of the network, each playing an instrumental role in processing transactions and securing the network's protocol.
-
-## Blockchain Services
-
-Blockchain Services are instrumental in ensuring seamless interoperability and data exchange across the network.
-
-<CardGroup>
-  <Card title="IBC Relayer">
-    The IBC Relayer stands at the forefront of inter-blockchain communication,
-    enabling different blockchain protocols to transfer and share information
-    effectively.
-  </Card>
-  <Card title="IPFS/Libp2p Routing">
-    IPFS/Libp2p Routing underpins the decentralized routing of information,
-    ensuring resilient and scalable data distribution across the network.
-  </Card>
-</CardGroup>
-
-## Interoperability Protocols
-
-The overarching network architecture is designed with interoperability at its core, integrating protocols such as Matrix and Pinecone to facilitate communication and data exchange across disparate systems.
-
-- **Matrix Protocol**: A new paradigm in secure, decentralized communication.
-- **Pinecone Routing**: A novel approach to establishing network pathways, enhancing the efficiency and reliability of data transmission.
diff --git a/docs/guides/architecture/multi-party-computation.mdx b/docs/guides/architecture/multi-party-computation.mdx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/guides/architecture/passkey-web-authentication.mdx b/docs/guides/architecture/passkey-web-authentication.mdx
deleted file mode 100644
index 13874a453..000000000
--- a/docs/guides/architecture/passkey-web-authentication.mdx
+++ /dev/null
@@ -1,238 +0,0 @@
----
-title: "WebAuthn Integration"
-description: "Comprehensive guide to Sonr's WebAuthn/FIDO2 implementation for passwordless authentication"
-icon: "key"
-sidebarTitle: "WebAuthn Integration"
----
-
-<Note>
-  This documentation covers the WebAuthn implementation in the Sonr blockchain,
-  providing a secure, passwordless authentication mechanism through
-  W3C-compliant WebAuthn protocols.
-</Note>
-
-## Overview
-
-Sonr's WebAuthn implementation enables gasless onboarding and secure transaction authorization without requiring users to hold tokens initially. This document provides a comprehensive guide to understanding and using our WebAuthn client.
-
-## Architecture
-
-<Frame>
-  <img
-    src="https://cdn.sonr.io/diagrams/passkey-jwt.png"
-    alt="WebAuthn Architecture Diagram"
-  />
-</Frame>
-
-The WebAuthn implementation is structured across three primary layers:
-
-1. **Client Layer** (`client/auth/webauthn.go`)
-
-   - WebAuthnClient interface
-   - Registration and Authentication flows
-   - DID integration
-
-2. **Internal WebAuthn Package** (`internal/webauthn/`)
-
-   - COSE key parsing
-   - CBOR encoding/decoding
-   - Attestation verification
-   - Signature verification (ES256/RS256)
-
-3. **DID Module Layer** (`x/did/keeper/`)
-   - WebAuthn controller verifier
-   - Credential storage in DID documents
-   - Challenge generation and validation
-
-## API Reference
-
-### WebAuthnClient Interface
-
-<CodeGroup>
-```go
-type WebAuthnClient interface {
-    // Registration Operations
-    BeginRegistration(ctx context.Context, opts *RegistrationOptions) (*RegistrationChallenge, error)
-    CompleteRegistration(ctx context.Context, challenge *RegistrationChallenge, response *AuthenticatorAttestationResponse) (*WebAuthnCredential, error)
-    
-    // Authentication Operations
-    BeginAuthentication(ctx context.Context, opts *AuthenticationOptions) (*AuthenticationChallenge, error)
-    CompleteAuthentication(ctx context.Context, challenge *AuthenticationChallenge, response *AuthenticatorAssertionResponse, credentialID string) (*AuthenticationResult, error)
-    
-    // Credential Management Methods...
-}
-```
-</CodeGroup>
-
-## Usage Examples
-
-### Registration Flow
-
-<CodeGroup>
-```go Registration Example
-func registerWebAuthn() error {
-    client := auth.NewWebAuthnClient()
-    ctx := context.Background()
-    
-    // Begin registration
-    regOpts := &auth.RegistrationOptions{
-        UserID:      "user123",
-        Username:    "alice@example.com",
-        DisplayName: "Alice Smith",
-        UserVerification: "preferred",
-    }
-    
-    challenge, err := client.BeginRegistration(ctx, regOpts)
-    if err != nil {
-        return err
-    }
-    
-    // Complete registration
-    response := &auth.AuthenticatorAttestationResponse{
-        ClientDataJSON:    clientDataJSON,
-        AttestationObject: attestationObject,
-    }
-    
-    credential, err := client.CompleteRegistration(ctx, challenge, response)
-    return err
-}
-```
-</CodeGroup>
-
-### Authentication Flow
-
-<CodeGroup>
-```go Authentication Example
-func authenticateWebAuthn(credentialID string) error {
-    client := auth.NewWebAuthnClient()
-    ctx := context.Background()
-    
-    // Begin authentication
-    authOpts := &auth.AuthenticationOptions{
-        UserVerification: "required",
-        AllowedCredentials: []*auth.CredentialDescriptor{
-            {
-                Type: "public-key",
-                ID:   []byte(credentialID),
-            },
-        },
-    }
-    
-    challenge, err := client.BeginAuthentication(ctx, authOpts)
-    if err != nil {
-        return err
-    }
-    
-    // Complete authentication
-    response := &auth.AuthenticatorAssertionResponse{
-        ClientDataJSON:    clientDataJSON,
-        AuthenticatorData: authenticatorData,
-        Signature:         signature,
-        UserHandle:        userHandle,
-    }
-    
-    result, err := client.CompleteAuthentication(ctx, challenge, response, credentialID)
-    return err
-}
-```
-</CodeGroup>
-
-## Security Considerations
-
-### Supported Algorithms
-
-<Tabs>
-  <Tab title="ES256">ECDSA with P-256 curve and SHA-256</Tab>
-  <Tab title="RS256">RSASSA-PKCS1-v1_5 with SHA-256</Tab>
-</Tabs>
-
-### Attestation Formats
-
-<Callout type="info">
-  1. **none**: No attestation (development/testing) 2. **packed**:
-  Self-attestation or certificate chain 3. **fido-u2f**: Legacy U2F
-  authenticators 4. **android-safetynet**: Android device attestation
-</Callout>
-
-### Security Features
-
-- **Challenge uniqueness**: Each challenge is unique and time-bound
-- **Origin validation**: Ensures requests come from trusted origins
-- **User verification**: Requires biometric or PIN when configured
-- **Counter tracking**: Detects cloned credentials
-- **Credential isolation**: Each DID has separate credential namespace
-
-## Configuration
-
-### Chain Parameters
-
-<CodeGroup>
-```json Configuration Example
-{
-  "webauthn": {
-    "rp_id": "sonr.io",
-    "rp_name": "Sonr Network",
-    "timeout": 60000,
-    "user_verification": "preferred",
-    "attestation": "none",
-    "allowed_origins": [
-      "https://sonr.io",
-      "https://app.sonr.io"
-    ]
-  }
-}
-```
-</CodeGroup>
-
-## Troubleshooting
-
-<Accordion title="Common WebAuthn Issues">
-  - **"Invalid attestation format"**: Ensure authenticator supports the
-  configured format - **"Challenge mismatch"**: Verify challenge hasn't expired
-  - **"Origin validation failed"**: Check allowed origins list - **"User
-  verification required"**: Ensure authenticator supports verification
-</Accordion>
-
-## Contributing
-
-### Development Setup
-
-<CodeGroup>
-```bash Setup Commands
-# Clone repository
-git clone https://github.com/sonr-io/sonr.git
-
-# Install dependencies
-
-make install
-
-# Run WebAuthn tests
-
-make test-webauthn
-
-```
-</CodeGroup>
-
-## References
-
-<Card
-  title="WebAuthn Specifications"
-  icon="link"
-  href="https://www.w3.org/TR/webauthn/"
->
-  Official W3C WebAuthn Specification
-</Card>
-
-<Card
-  title="FIDO2 CTAP"
-  icon="lock"
-  href="https://fidoalliance.org/specs/fido-v2.0/"
->
-  FIDO2 Client to Authenticator Protocol
-</Card>
-
-## License
-
-Copyright 2024 Sonr Inc. Licensed under the Apache License, Version 2.0.
-```
-
diff --git a/docs/guides/architecture/user-controller-authorization-network.mdx b/docs/guides/architecture/user-controller-authorization-network.mdx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/guides/authorize-clients.mdx b/docs/guides/authorize-clients.mdx
deleted file mode 100644
index 9fe085617..000000000
--- a/docs/guides/authorize-clients.mdx
+++ /dev/null
@@ -1,221 +0,0 @@
----
-title: "Authorization with UCAN"
-description: "Comprehensive guide to creating, validating, and managing User-Controlled Authorization Network (UCAN) tokens"
-sidebarTitle: Client Authorization
-icon: "badge-check"
----
-
-# UCAN Token Operations
-
-User-Controlled Authorization Networks (UCAN) provide a decentralized authorization mechanism that enables flexible, portable, and secure token-based access control.
-
-## Overview
-
-UCAN tokens are JWT-based authorization tokens that allow:
-
-- Decentralized identity verification
-- Granular access control
-- Delegatable permissions
-- Cryptographic proof of authorization
-
-## Token Structure
-
-A UCAN token consists of:
-
-- Issuer DID
-- Audience DID
-- Capabilities (Attenuations)
-- Proofs (Optional parent tokens)
-- Time-based constraints
-
-## Creating Origin Tokens
-
-An origin token is the first token in a delegation chain:
-
-```go
-type NewOriginTokenRequest struct {
-    AudienceDID  string                   // Target DID
-    Attenuations []map[string]any // Token restrictions
-    Facts        []string                 // Additional claims
-    NotBefore    int64                    // Token activation time
-    ExpiresAt    int64                    // Token expiration time
-}
-
-// Example origin token creation
-originToken := NewOriginTokenRequest{
-    AudienceDID: "did:sonr:example-recipient",
-    Attenuations: []{
-        {
-            "capability": "read",
-            "resource": "/storage/documents"
-        }
-    },
-    Facts: ["authenticated_user"],
-    NotBefore: time.Now().Unix(),
-    ExpiresAt: time.Now().Add(24 * time.Hour).Unix()
-}
-```
-
-## Creating Attenuated Tokens
-
-Attenuated tokens derive from existing tokens, further restricting capabilities:
-
-```go
-type NewAttenuatedTokenRequest struct {
-    ParentToken  string                   // Previous token
-    AudienceDID  string                   // New token recipient
-    Attenuations []map[string]any // Further restrictions
-    Facts        []string                 // Additional claims
-    NotBefore    int64                    // Token activation time
-    ExpiresAt    int64                    // Token expiration time
-}
-
-// Example attenuated token
-attenuatedToken := NewAttenuatedTokenRequest{
-    ParentToken: originTokenString,
-    AudienceDID: "did:sonr:delegated-user",
-    Attenuations: []{
-        {
-            "capability": "read",
-            "resource": "/storage/documents/public"
-        }
-    }
-}
-```
-
-## Token Validation Workflow
-
-```go
-func ValidateUCANToken(token string) (bool, error) {
-    // 1. Parse the token
-    parsedToken, err := jwt.Parse(token, keyFunc)
-    if err != nil {
-        return false, err
-    }
-
-    // 2. Verify issuer DID
-    issuerDID := parsedToken.Claims["iss"]
-    if !isDIDValid(issuerDID) {
-        return false, errors.New("invalid issuer DID")
-    }
-
-    // 3. Check audience
-    audienceDID := parsedToken.Claims["aud"]
-    if !isCurrentUserAudience(audienceDID) {
-        return false, errors.New("token not intended for this audience")
-    }
-
-    // 4. Validate time constraints
-    if isTokenExpired(parsedToken) {
-        return false, errors.New("token has expired")
-    }
-
-    // 5. Check capabilities
-    capabilities := parsedToken.Claims["att"]
-    if !validateCapabilities(capabilities) {
-        return false, errors.New("insufficient capabilities")
-    }
-
-    // 6. Verify proofs (if present)
-    proofs := parsedToken.Claims["prf"]
-    if !validateProofChain(proofs) {
-        return false, errors.New("invalid proof chain")
-    }
-
-    return true, nil
-}
-```
-
-## Capability Patterns
-
-### Read Capabilities
-
-```json
-{
-  "capability": "read",
-  "resource": "/storage/documents",
-  "conditions": {
-    "max_size": "10MB",
-    "allowed_types": ["pdf", "txt"]
-  }
-}
-```
-
-### Write Capabilities
-
-```json
-{
-  "capability": "write",
-  "resource": "/storage/documents",
-  "conditions": {
-    "max_files": 5,
-    "max_file_size": "50MB"
-  }
-}
-```
-
-## Practical Examples
-
-### Decentralized File Sharing
-
-```go
-// Create an origin token for file access
-originToken := NewOriginTokenRequest{
-    AudienceDID: "did:sonr:collaborator",
-    Attenuations: []{
-        {
-            "capability": "read",
-            "resource": "/project/design-docs"
-        },
-        {
-            "capability": "write",
-            "resource": "/project/design-docs/comments"
-        }
-    },
-    ExpiresAt: time.Now().Add(30 * 24 * time.Hour).Unix()
-}
-
-// Later, create a more restricted token
-limitedToken := NewAttenuatedTokenRequest{
-    ParentToken: originTokenString,
-    AudienceDID: "did:sonr:junior-designer",
-    Attenuations: []{
-        {
-            "capability": "read",
-            "resource": "/project/design-docs/public"
-        }
-    }
-}
-```
-
-## Security Considerations
-
-- Use the shortest possible token lifetime
-- Implement granular capabilities
-- Validate all tokens before use
-- Rotate keys regularly
-- Log and monitor token usage
-
-## Performance Optimization
-
-- Cache validated tokens
-- Use efficient JWT parsing
-- Implement token revocation lists
-
-## Advanced Topics
-
-- [DID Module](/blockchain/modules/did/)
-- [DWN Architecture](/blockchain/modules/dwn/architecture)
-- [Service Registry](/blockchain/modules/svc/)
-
-## Error Handling
-
-```go
-type UCANError struct {
-    Code    string
-    Message string
-    Details map[string]any
-}
-```
-
-By leveraging UCAN tokens, you can create a flexible, secure, and decentralized authorization system that puts users in control of their access.
diff --git a/docs/guides/broadcast-transactions.mdx b/docs/guides/broadcast-transactions.mdx
deleted file mode 100644
index 19e595057..000000000
--- a/docs/guides/broadcast-transactions.mdx
+++ /dev/null
@@ -1,411 +0,0 @@
----
-title: Transactions
-description: Transaction types, fee structures, and token mechanics for SNR within the Sonr network
-sidebarTitle: Broadcast Transactions
-icon: "send"
----
-
-## Overview
-
-SNR token transactions power the revolutionary Sonr ecosystem, enabling gasless onboarding, stake-based service registration, and UCAN-authorized operations. The unique architecture allows for both traditional fee-based transactions and innovative gasless user experiences.
-
-<Note>
-  Sonr features both traditional fee-based transactions and revolutionary
-  gasless operations like vault claiming, enabling zero-barrier user onboarding
-  while maintaining network security through economic incentives.
-</Note>
-
-## Transaction Types
-
-### Basic Transfers
-
-The foundation of the SNR economy consists of peer-to-peer token transfers:
-
-<CardGroup>
-  <Card title="Simple Transfers">
-    Direct SNR transfers between addresses with minimal gas fees
-  </Card>
-  <Card title="Multi-send">
-    Batch transfers to multiple recipients in a single transaction
-  </Card>
-  <Card title="Scheduled Transfers">
-    Time-locked transfers with vesting or release conditions
-  </Card>
-</CardGroup>
-
-### Module-Specific Transactions
-
-Each Sonr core module enables specialized transaction types with specific SNR token requirements:
-
-#### Service Module (x/svc) Transactions
-
-- **MsgRegisterService**: Register a new service with TLD domain verification and capability requests
-- **MsgUpdateService**: Update service metadata or request additional permissions
-- **DNS Verification**: Simple DNS TXT record verification for domain ownership
-- **Stake Requirements**: Services must stake SNR tokens based on requested capabilities
-
-#### DWN Module (x/dwn) Transactions
-
-- **MsgClaimVault**: **Gasless** transaction for claiming user vaults during onboarding
-- **Vault Configuration Updates**: Paid transactions for advanced vault settings and WASM runtime upgrades
-- **Cross-Chain Operations**: SNR fees for multi-chain vault management and bridging
-- **MPC Operations**: Transaction fees for multi-party computation within secure enclaves
-
-#### UCAN Module (x/ucan) Transactions
-
-- **MsgIssueRootCapability**: Request MPC threshold signing for root capability tokens
-- **MsgSubmitThresholdShare**: Validators submit MPC shares for capability creation
-- **MsgRevokeCapability**: Revoke previously issued capability tokens on-chain
-- **Delegation Chain Processing**: Computational fees for validating complex authorization chains
-
-#### DID Module (x/did) Transactions
-
-- **DID Registration**: Fees for creating new decentralized identifiers
-- **MsgLinkAuthentication**: Add WebAuthn credentials or other authentication methods
-- **MsgLinkAssertion**: Link identity claims and verifications to DIDs
-- **MsgExecuteTx**: Execute UCAN-authorized transactions on behalf of DIDs
-
-## Fee Structure
-
-### Dual Fee Model
-
-Sonr implements a revolutionary dual fee model supporting both traditional gas fees and gasless operations:
-
-```math
-\text{Fee} = \begin{cases}
-0 & \text{for gasless operations (vault claiming)} \\
-\text{Base Cost} + (\text{Gas Used} \times \text{Gas Price}) & \text{for standard transactions}
-\end{cases}
-```
-
-<Warning>
-  While basic vault claiming is gasless, advanced operations like service
-  registration, MPC signing, and cross-chain transactions require SNR tokens for
-  network security and spam prevention.
-</Warning>
-
-### Fee Components
-
-<CardGroup>
-  <Card title="MPC Computation">
-    Multi-party computation costs for threshold signing and capability issuance
-  </Card>
-  <Card title="Stake-Based Security">
-    Service registration fees that are burned or sent to community pool
-  </Card>
-  <Card title="Cross-Chain Operations">
-    IBC and InterchainAccount transaction costs for bridgeless operations
-  </Card>
-  <Card title="Identity Operations">
-    DID registration, authentication linking, and credential management
-  </Card>
-</CardGroup>
-
-### Economic Mechanisms
-
-The network implements sophisticated economic mechanisms:
-
-1. **Gasless Subsidies**: Network subsidizes vault claiming for zero-barrier onboarding
-2. **Stake-Based Pricing**: Service registration costs scale with capability requests
-3. **MPC Rewards**: Validators earn additional fees for threshold signing participation
-4. **Deflationary Pressure**: Service registration fees are burned, reducing total supply
-
-## Transaction Lifecycle
-
-### Gasless Vault Claiming Flow
-
-```mermaid
-graph LR
-    A[WebAuthn Creation] --> B[Client-Side Vault Config]
-    B --> C[Submit MsgClaimVault]
-    C --> D[Network Subsidy Check]
-    D --> E[Gasless Execution]
-    E --> F[Vault Active]
-```
-
-### Service Registration Flow
-
-```mermaid
-graph LR
-    A[DNS Verification] --> B[Stake Calculation]
-    B --> C[MsgRegisterService]
-    C --> D[Capability Request]
-    D --> E[MPC Signing]
-    E --> F[Root UCAN Issued]
-```
-
-### UCAN Authorization Flow
-
-```mermaid
-graph LR
-    A[Service Request] --> B[Capability Check]
-    B --> C[User Approval]
-    C --> D[UCAN Creation]
-    D --> E[Delegation Chain]
-    E --> F[Authorized Execution]
-```
-
-### Standard Transaction Processing
-
-1. **UCAN Validation**: Check authorization tokens and delegation chains
-2. **Module Routing**: Route to appropriate module (svc, dwn, ucan, did)
-3. **MPC Coordination**: Multi-party computation for sensitive operations
-4. **State Updates**: Update module-specific state and emit events
-5. **Fee Distribution**: Distribute fees to validators, burn pool, and treasury
-
-## Advanced Features
-
-### UCAN-Powered Automation
-
-Enable sophisticated authorization patterns:
-
-<CardGroup>
-  <Card title="Capability Delegation">
-    Services receive granular, time-limited permissions from users
-  </Card>
-  <Card title="Agent Execution">
-    Motr Vaults execute pre-authorized actions without user intervention
-  </Card>
-  <Card title="Subscription Automation">
-    Recurring payments and service interactions through UCAN tokens
-  </Card>
-</CardGroup>
-
-### Multi-Party Computation Integration
-
-Leverage MPC for secure operations:
-
-- **Threshold Signing**: Validators collaborate to issue root capabilities
-- **Key Sharding**: No single point of failure for vault key management
-- **Secure Enclaves**: WASM-based computation with hardware security
-- **Privacy Preservation**: Zero-knowledge proofs for sensitive operations
-
-### Cross-Module Interactions
-
-Transactions can interact with multiple Sonr modules in powerful combinations:
-
-```typescript
-// Example: Complete user onboarding with service registration
-const tx = {
-  messages: [
-    // DID Module: Create decentralized identity
-    {
-      type: "did/MsgCreateDID",
-      creator: "sonr1abc...",
-      document: didDocument,
-      webauthnCredential: credential,
-    },
-    // DWN Module: Claim gasless vault
-    {
-      type: "dwn/MsgClaimVault",
-      creator: "did:sonr:alice123",
-      vaultConfig: vaultCID,
-      mpcThreshold: 3,
-    },
-    // Service Module: Register domain service
-    {
-      type: "svc/MsgRegisterService",
-      creator: "did:sonr:alice123",
-      domain: "alice-app.com",
-      capabilities: ["dwn:read", "dwn:write"],
-      stakeAmount: "5000usnr",
-    },
-    // UCAN Module: Request root capability
-    {
-      type: "ucan/MsgIssueRootCapability",
-      issuer: "did:sonr:alice123",
-      audience: "alice-app.com",
-      capabilities: ["service:register"],
-    },
-  ],
-  fee: {
-    amount: [{ denom: "usnr", amount: "5000" }], // Only service registration fee
-    gasLimit: "500000",
-  },
-  memo: "Complete onboarding: Identity + Vault + Service + Capabilities",
-};
-
-// Example: Cross-chain payment automation
-const paymentTx = {
-  messages: [
-    // UCAN: Validate payment authority
-    {
-      type: "ucan/MsgValidateCapability",
-      token: ucanPaymentToken,
-      requestedAction: "payment:send",
-    },
-    // DID: Execute authorized transaction
-    {
-      type: "did/MsgExecuteTx",
-      signer: "did:sonr:alice123",
-      targetChain: "osmosis-1",
-      transaction: swapTransaction,
-      authorization: ucanToken,
-    },
-  ],
-};
-```
-
-## Performance Optimization
-
-### Module-Specific Batching
-
-Optimize transactions by batching within module boundaries:
-
-1. **DWN Operations**: Batch vault updates and data operations
-2. **Service Operations**: Group domain verifications and capability requests
-3. **UCAN Processing**: Batch capability validations and delegation chains
-4. **Cross-Chain Coordination**: Bundle InterchainAccount operations
-
-### Gasless Operation Prioritization
-
-Sonr prioritizes gasless operations to enhance user experience:
-
-<Check>
-  Gasless vault claiming is prioritized by validators to enable zero-friction
-  onboarding. Service registration and MPC operations use dynamic pricing based
-  on network demand and stake requirements.
-</Check>
-
-### MPC Coordination Efficiency
-
-Multi-party computation operations are optimized for performance:
-
-```typescript
-// MPC threshold signing optimization
-interface MPCOptimization {
-  parallelShares: boolean; // Generate shares in parallel
-  precomputedCommitments: boolean; // Cache commitments
-  batchSigning: boolean; // Sign multiple capabilities together
-  networkSharding: boolean; // Distribute computation load
-}
-```
-
-## Security Considerations
-
-### Module-Specific Security
-
-- **DID Security**: WebAuthn hardware-backed authentication prevents identity theft
-- **UCAN Validation**: Cryptographic proof chains ensure capability authenticity
-- **Vault Isolation**: MPC key sharding prevents single points of failure
-- **Service Reputation**: Stake-based trust system deters malicious actors
-
-### Zero-Knowledge Privacy
-
-Sonr implements privacy-preserving transaction patterns:
-
-```typescript
-// Privacy-preserving operations
-interface PrivacyFeatures {
-  zkProofs: {
-    ageVerification: boolean; // Prove age without revealing birthdate
-    balanceProofs: boolean; // Prove sufficient funds without amounts
-    reputationProofs: boolean; // Prove service quality without data
-  };
-  selectiveDisclosure: {
-    didDocuments: boolean; // Share only necessary identity claims
-    vaultData: boolean; // Controlled data access permissions
-    paymentHistory: boolean; // Private transaction records
-  };
-}
-```
-
-### Best Practices for Sonr Transactions
-
-1. **UCAN Validation**: Always verify capability tokens before execution
-2. **MPC Coordination**: Ensure threshold requirements are met
-3. **Gasless Limits**: Monitor gasless operation quotas and fallbacks
-4. **Cross-Chain Safety**: Validate IBC channel security and timeouts
-
-## Fee Distribution
-
-SNR transaction fees are distributed to align network incentives:
-
-<CardGroup>
-  <Card title="Validators (35%)">
-    Block proposers and MPC threshold signers receive primary rewards
-  </Card>
-  <Card title="Burn Pool (25%)">
-    Service registration fees burned for deflationary pressure
-  </Card>
-  <Card title="Community Treasury (25%)">
-    Development and ecosystem growth funds
-  </Card>
-  <Card title="Gasless Subsidy (10%)">
-    Funds vault claiming and onboarding operations
-  </Card>
-  <Card title="IBC Relayers (5%)">
-    Cross-chain message delivery and InterchainAccount operations
-  </Card>
-</CardGroup>
-
-### Module-Specific Fee Sources
-
-```typescript
-// Fee sources by module
-interface ModuleFees {
-  svc: {
-    domainRegistration: "25% to burn, 75% to validators";
-    capabilityRequests: "Deposit-based, refundable on completion";
-    stakeSlashing: "100% to community treasury";
-  };
-
-  dwn: {
-    vaultClaiming: "Gasless (subsidized by treasury)";
-    storageOperations: "Standard gas fees";
-    mpcOperations: "Premium fees for computation";
-  };
-
-  ucan: {
-    rootCapabilityIssuance: "MPC coordination fees";
-    delegationValidation: "Minimal computational costs";
-    revocations: "Standard gas fees";
-  };
-
-  did: {
-    didRegistration: "One-time identity creation fee";
-    credentialLinking: "WebAuthn integration costs";
-    crossChainExecution: "IBC and InterchainAccount fees";
-  };
-}
-```
-
-## Future Enhancements
-
-### Revolutionary Capabilities in Development
-
-- **AI-Powered Automation**: Natural language transaction commands through Motr Vault agents
-- **Predictive Authorization**: Pre-approve expected transactions based on user patterns
-- **W3C Payment Handler**: Native browser integration for seamless Web2/Web3 payments
-- **Subscription Automation**: Recurring payments through UCAN capability delegation
-- **Privacy-First Operations**: Full zero-knowledge transaction processing
-- **Hardware Enclave Integration**: Dedicated Sonr hardware for enhanced security
-- **Cross-Chain DeFi**: Seamless DeFi operations across all supported chains
-- **Social Recovery Networks**: Trustless account recovery through guardian systems
-
-### Standards-Based Interoperability
-
-Building on open standards for maximum compatibility:
-
-```typescript
-// Future standards integration
-interface FutureStandards {
-  w3cCompliance: {
-    paymentHandlerAPI: "Native browser payment integration";
-    webauthnLevel3: "Enhanced biometric authentication";
-    didCore2: "Next-generation identity standards";
-  };
-
-  crossChainStandards: {
-    ibcV2: "Enhanced cross-chain capabilities";
-    cosmwasmCompatibility: "Universal smart contract execution";
-    evmIntegration: "Ethereum Virtual Machine support";
-  };
-
-  privacyStandards: {
-    zkStarks: "Scalable zero-knowledge proofs";
-    selectiveDisclosure: "W3C verifiable credentials";
-    confidentialComputing: "Hardware-backed privacy";
-  };
-}
-```
\ No newline at end of file
diff --git a/docs/guides/configure-local-node.mdx b/docs/guides/configure-local-node.mdx
deleted file mode 100644
index b4a3ac6dd..000000000
--- a/docs/guides/configure-local-node.mdx
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "Configuring a Validator Node"
-sidebarTitle: "Command Line"
-description: "Setup a validator node on the Sonar Network in your local environment"
-icon: "terminal"
----
-
-**1. Initialize a blockchain node**
-
-```sh
-sonrd init localnet
-```
-
-**2. Generate account keys**
-
-```sh
-sonrd keys add test-validator
-```
-
-**3. Add the account to the genesis file**
-
-```sh
-sonrd add-genesis-account $(sonrd keys show test-validator -a) 1000000000000000000000000000stake,1000000000000000000000000000snr
-```
-
-**4. Generate a genesis transaction**
-
-```sh
-sonrd gentx test-validator 1000000000000000000000000000stake --chain-id localnet
-```
-
-**5. Collect genesis transactions**
-
-```sh
-sonrd collect-gentxs
-```
-
-**6. Validate the genesis file**
-
-```sh
-sonrd validate-genesis
-```
-
-**7. Start the blockchain node**
-
-```sh
-sonrd start
-```
diff --git a/docs/guides/deployment.mdx b/docs/guides/deployment.mdx
deleted file mode 100644
index b3058cba7..000000000
--- a/docs/guides/deployment.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Production Network Deployment
-description: Complete guide for becoming a Sonr blockchain validator - from setup to operations
-icon: "ship"
-sidebarTitle: Deploy Network & Services
----
-
-
diff --git a/docs/guides/development.mdx b/docs/guides/development.mdx
deleted file mode 100644
index 0bb94d543..000000000
--- a/docs/guides/development.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Local Development Setup
-description: Complete guide for becoming a Sonr blockchain validator - from setup to operations
-icon: "code"
-sidebarTitle: Setup Your Environment
----
-
-
diff --git a/docs/guides/economics/distribution.mdx b/docs/guides/economics/distribution.mdx
deleted file mode 100644
index 63cb4fb38..000000000
--- a/docs/guides/economics/distribution.mdx
+++ /dev/null
@@ -1,305 +0,0 @@
----
-title: Distribution
-description: SNR token distribution model, allocation strategy, and economic distribution mechanisms
-sidebarTitle: "Supply & Distribution"
-icon: "chart-pie"
----
-
-## Overview
-
-The SNR token distribution is designed to balance immediate network needs with long-term sustainability, ensuring fair allocation across stakeholders while maintaining sufficient reserves for ecosystem growth.
-
-**Total Supply: 1,000,000,000 SNR**
-
-<Note>
-  Token distribution follows a carefully planned vesting schedule to prevent
-  market manipulation and ensure aligned incentives across all participants.
-</Note>
-
-## Supply Dynamics
-
-### Circulating Supply Factors
-
-The circulating token supply depends on several key factors:
-
-<CardGroup>
-  <Card title="Initial Circulation">
-    200M SNR at genesis (20% of total supply)
-  </Card>
-  <Card title="Minted Tokens">
-    New tokens created through inflation for rewards and subsidies
-  </Card>
-  <Card title="Vesting Releases">
-    Scheduled releases from locked allocations over time
-  </Card>
-  <Card title="Staked Tokens">
-    Tokens locked in staking reducing effective circulation
-  </Card>
-</CardGroup>
-
-### Token Velocity
-
-Token velocity measures how frequently tokens change hands and directly impacts token value:
-
-```math
-\text{Token Value} = \frac{\text{Economic Activity}}{\text{Circulating Supply} \times \text{Velocity}}
-```
-
-## Allocation Strategy
-
-### Core Allocations
-
-The token distribution prioritizes long-term network health through strategic allocations:
-
-1. **Community & Ecosystem** (35% - 350M SNR)
-   - Airdrop Program: 100M SNR (10%)
-   - Testnet Incentives: 50M SNR (5%)
-   - Staking Rewards Pool: 100M SNR (10%)
-   - Ecosystem Grants: 100M SNR (10%)
-
-2. **Team & Advisors** (20% - 200M SNR)
-   - Team Allocation: 150M SNR (15%)
-   - Advisors: 50M SNR (5%)
-
-3. **Investors** (25% - 250M SNR)
-   - Seed Round: 75M SNR (7.5%)
-   - Series A: 100M SNR (10%)
-   - Strategic Round: 75M SNR (7.5%)
-
-4. **Foundation Treasury** (15% - 150M SNR)
-   - Operations: 75M SNR (7.5%)
-   - Reserve Fund: 75M SNR (7.5%)
-
-5. **Validator Incentives** (5% - 50M SNR)
-   - Genesis Validators: 30M SNR (3%)
-   - Delegation Program: 20M SNR (2%)
-
-### Vesting Schedules
-
-<Warning>
-  All non-circulating allocations follow strict vesting schedules to ensure
-  gradual market entry and prevent supply shocks.
-</Warning>
-
-#### Team Vesting
-
-- **Team**: 12-month cliff, 48-month linear vest
-- **Advisors**: 6-month cliff, 24-month linear vest
-- No transfers until cliff periods expire
-
-#### Investor Vesting
-
-- **Seed Round**: 6-month cliff, 36-month linear vest
-- **Series A**: 3-month cliff, 24-month linear vest
-- **Strategic Round**: 25% immediate, remainder over 18 months
-
-#### Community Vesting
-
-- **Airdrop**: 25% immediate, 75% over 12 months
-- **Testnet**: Distribution over 6-month testnet period
-- **Ecosystem Grants**: Project milestone-based releases
-
-#### Foundation Vesting
-
-- **Operations**: 10% at genesis, 90% over 5 years
-- **Reserve Fund**: Minimum 3 years lockup, governance approval required
-
-## Inflation Mechanism
-
-### Reward Distribution
-
-The network implements controlled inflation to incentivize participation:
-
-<CardGroup>
-  <Card title="Validator Rewards">
-    Block rewards for consensus participation distributed pro-rata to stake
-  </Card>
-  <Card title="Highway Services">
-    Compensation for off-chain computation, storage, and routing services
-  </Card>
-  <Card title="Governance Rewards">
-    Incentives for proposal creation and voting participation
-  </Card>
-</CardGroup>
-
-### Inflation Schedule
-
-**Year 1**: 15% inflation (aggressive growth)
-- Focus on network bootstrapping
-- High rewards for early adopters
-
-**Year 2**: 12% inflation (continued expansion)
-- Stabilization period begins
-- Balanced growth incentives
-
-**Year 3**: 9% inflation (stabilization)
-- Network maturation
-- Sustainable reward levels
-
-**Year 4+**: 7% inflation (long-term sustainability)
-- Minimal dilution
-- Self-sustaining economics
-
-## Economic Safeguards
-
-### Anti-Manipulation Measures
-
-1. **Vesting Cliffs**: Prevent immediate dumps from large holders
-2. **Staking Lockups**: Reduce liquid supply through validator requirements
-3. **Governance Delays**: Time-locked treasury withdrawals
-4. **Slashing Penalties**: Discourage malicious validator behavior
-
-### Supply Controls
-
-The network implements several mechanisms to manage token supply:
-
-- **Fee Burning**: 50% of transaction fees burned (deflationary)
-- **Treasury Management**: Governance-controlled minting caps
-- **Dynamic Rewards**: Adjustment based on network participation
-- **Lock Incentives**: Higher rewards for longer staking periods
-
-### Centralization Risks
-
-- No single entity controls >20% at genesis
-- Team tokens have longest vesting (4 years)
-- Foundation treasury requires governance approval
-- Validator set caps prevent concentration
-
-### Market Stability
-
-- Staggered vesting prevents supply shocks
-- Fee burning provides deflationary pressure
-- Utility demand from identity services
-- Cross-chain value capture mechanisms
-
-## Token Utility & Value Accrual
-
-### Primary Utilities
-
-<CardGroup>
-  <Card title="Network Security">
-    Staking for validation and delegation
-  </Card>
-  <Card title="Governance">
-    Voting on protocol upgrades and parameters
-  </Card>
-  <Card title="Transaction Fees">
-    Gas payments for network operations
-  </Card>
-  <Card title="Identity Services">
-    Premium features and API access
-  </Card>
-</CardGroup>
-
-### Value Accrual Mechanisms
-
-1. **Fee Burning**: 50% of transaction fees burned (deflationary)
-2. **Staking Yield**: 7-15% APR depending on network participation
-3. **Identity Revenue**: Enterprise licensing fees distributed to stakers
-4. **Cross-chain Value**: IBC transfer fees and bridge operations
-
-### Staking Targets
-
-- **Target staking ratio**: 65%
-- **Validator set**: 50-100 active validators
-- **Minimum stake**: 1M SNR (0.1% of supply)
-- **Delegation minimum**: 1 SNR (accessible to all)
-
-### Vesting Schedule Overview
-
-| Category | Immediate | 6 Months | 12 Months | 24 Months | 36 Months | 48 Months |
-|----------|-----------|----------|-----------|-----------|-----------|-----------|
-| Airdrop | 25% | 50% | 75% | 100% | - | - |
-| Team | 0% | 0% | 12.5% | 37.5% | 62.5% | 100% |
-| Seed Investors | 0% | 0% | 16.7% | 50% | 83.3% | 100% |
-| Series A | 0% | 25% | 50% | 100% | - | - |
-| Foundation | 10% | 28% | 46% | 64% | 82% | 100% |
-
-<Check>
-  The distribution model prioritizes network security, ecosystem growth, and
-  fair participant rewards while maintaining economic sustainability.
-</Check>
-
-## Distribution Timeline
-
-### Pre-Launch (Months -6 to 0)
-
-- Team allocation locked
-- Investor funds raised
-- Testnet incentives distributed
-- Airdrop snapshot taken
-
-### Genesis (Month 0)
-
-- 200M SNR circulating supply
-- Genesis validators receive allocation
-- Foundation treasury initialized
-- Staking rewards begin
-
-### Year 1 (Months 1-12)
-
-- Airdrop vesting releases 75M SNR
-- Team cliff expires, vesting begins
-- Series A completes vesting
-- Ecosystem grants distributed
-
-### Year 2-3 (Months 13-36)
-
-- Seed round completes vesting
-- Team reaches 62.5% vested
-- Foundation operations fully unlocked
-- Validator program matured
-
-## Economic Incentives
-
-### Genesis Validator Program
-
-- **Genesis Validators**: 30M SNR (3%)
-- 50 validators × 600,000 SNR each
-- 24 months minimum staking lockup
-- 99%+ uptime and governance participation required
-
-### Delegation Program
-
-- **Foundation Delegations**: 20M SNR (2%)
-- 6-month renewable terms
-- Performance-based allocation
-- Support for high-performing validators
-
-### Maturity Phase (Year 3+)
-
-- Stabilized inflation rate
-- Self-sustaining economics
-- Community-driven allocation
-
-## Success Metrics
-
-### Year 1 Targets
-
-- 50% of supply staked
-- 50+ active validators
-- 100k+ active addresses
-- $10M+ in identity service revenue
-
-### Year 3 Targets
-
-- 65% of supply staked
-- 75+ active validators
-- 1M+ active addresses
-- $100M+ total value locked
-
-### Long-term Vision (5+ years)
-
-- Self-sustaining network economics
-- Deflationary token model
-- Industry-standard identity infrastructure
-- Billion-dollar ecosystem value
-
-## Transparency Commitments
-
-All token distributions are:
-
-- Publicly verifiable on-chain
-- Subject to regular audits
-- Reported in quarterly updates
-- Governed by smart contracts
\ No newline at end of file
diff --git a/docs/guides/economics/governance.mdx b/docs/guides/economics/governance.mdx
deleted file mode 100644
index 2d725338f..000000000
--- a/docs/guides/economics/governance.mdx
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: "Governance"
-sidebarTitle: "Protocol Governance"
-description: "Governance is the process of making decisions on behalf of a group of people or organization"
-icon: "landmark"
----
-
-The Demand is rooted from participation in the governance process, determining upgrades to the protocol or allocation of resources, and supply is the result of the tokens eligible to participate in the governance process.
-On Sonr we will be leveraging a **delegate stake** mechanism in order to **optimize buy-in** for users in the network. It imposes an **excess opportunity cost** if **slashing** is implemented.
-
-**Seven elements of economic design for governance**
-
-1. Scope of Decisions
-2. Stakeholders
-3. Policy Research & Development
-4. Proposal Process
-5. Information Distribution Systems
-6. Decision Making Procedures
-7. Implementation & Property Rights
-
-## Yearly Governance Cycle
-
-- Two General Elections for proposals yearly
-- Proposals need at least 20% of all validator approval to move into general election
-- 51% of General Vote required for proposal to pass
-- Emergency Voting sessions can be called if requested by 51% of Governance Participants
-
-### ☀️ Summer Cycle
-
-|                               | Start Date | End Date |
-| ----------------------------- | ---------- | -------- |
-| Validator Vetting             | 5/17       | 5/31     |
-| Proposals Posted              | 6/1        |          |
-| General Election of Proposals | 6/2        | 6/15     |
-| Results Posted                | 6/16       |          |
-
-### ❄️ Winter Cycle
-
-|                               | Start Date | End Date |
-| ----------------------------- | ---------- | -------- |
-| Validator Vetting             | 11/17      | 11/31    |
-| Proposals Posted              | 12/1       |          |
-| General Election of Proposals | 12/2       | 12/15    |
-| Results Posted                | 12/16      |          |
-
-## First Rollout Phase
-
-These are the measures the core Sonr team will be undertaking prior and during test-net deployment.
-
-### Establish Community
-
-Build a loyal community of token holders that represent our platforms stakeholder groups.
-
-- All of our existing token holders (this includes our founder and early investors) will be staking their Sonr Token in order to be incentivized to hold tokens and participate in voting
-- We will be actively networking with DeFi projects, blockchain service providers, and etc. in order to participate
-
-### Build Dashboards
-
-We are under the process of creating a [dashboard](https://sonrscan.io) in order to provide key metrics to our stakeholders
-
-- **Technology**: Pricing, total fees paid, total storage used, uptime
-- **Governance**: Identities, proposal outcomes, community participation
-
-### Polling System
-
-Our initial polling system will be token weighted and not enforceable, in order to build engagement.
-
-- Users will submit qualitative updates to the system and have them up/downvoted
-- The core team will then assess the submissions and select viable community suggestions into upgrades
-  - Along side this, our team will locate and commission the development of a proposal for any technical upgrades without enforceable code proposals
-  - We will be able to provide clarity, external security, and in applicable cases the economic evaluation from the impacts of proposals to the community.
-
-## Second Rollout Phase
-
-Phase 2 will be underway in the months prior to main-net deployment, along with an extensive security audit.
-
-### On-Chain Execution
-
-We will be introducing an on-chain, executable code-based governance system in stages with majority rule voting.
-
-**Stage 1:** Grants Program
-
-- Incorporate community voting for grant recipient selection
-- Allow users to submit proposals for grant allocation
-
-**Stage 2:** Subsidies and Rewards
-
-- Proposals to update subsidies and rewards can be submitted by Core Sonr Team or third parties
-- Core Team will be responsible for considering funding security, and economic audits for proposals
-
-**Stage 3:** Technical Upgrades
-
-- These include pricing, security, and bug fixes
-- Proposals will be spearheaded by the Sonr Team and/or its delegates
-
-### Maintenance
-
-When on-chain governance has come to fruition, the core Sonr team will be also maintaining the polling-based system with subsidized development to minimize barrier to entry. This will be incorporating governance within the Motor Nebula Widget itself.
diff --git a/docs/guides/economics/rewards.mdx b/docs/guides/economics/rewards.mdx
deleted file mode 100644
index f05b74262..000000000
--- a/docs/guides/economics/rewards.mdx
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: "Rewards"
-sidebarTitle: "Network Rewards"
-description: "Incentivizing the Sonr Ecosystem"
-icon: "gem"
----
-
-In order to maximize buy-in and network availability for the Sonr ecosystem, we will be implementing an empirical Token Rewards mechanism. Rewards are a way to create inflation in order to dilute the token value, resulting in an affordable onboarding and operational experience for the end user. The goal behind Sonr Token rewards is to subsidize Highway based computation, in order to promote value creation and platform growth.
-
-### Governance Participation
-
-At the time of Main-net launch, phase one of the Sonr governance rollout will be implemented and will result in a set of rewards for participants.
-
-**Submission of Proposals**
-
-Users will be incentivized to submit blockchain improvement or grant proposals to be reviewed by voting participants. In order to prevent game from low quality and out of scope proposals, a clear-cut submission and evaluation process will be put into place on a public facing FAQ website.
-
-- Proposers are required to stake before submission — _“Application Fee”_
-
-**Proposal Voting**
-
-In order to prevent innovation from halting on the Sonr ecosystem, we incentivize all staked users to participate in the polling process for community submitted proposals. Users are then rewarded for good-faith participation in voting, while also sustaining momentum.
-
-- Existing Stakeholders are rewarded for good-faith participation in voting
diff --git a/docs/guides/economics/staking.mdx b/docs/guides/economics/staking.mdx
deleted file mode 100644
index a3266c507..000000000
--- a/docs/guides/economics/staking.mdx
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: "Staking"
-sidebarTitle: "Staking Functions"
-description: "Understand the staking mechanism on Sonr"
-icon: "vault"
----
-
-The clear path for the underlying application for staking is utilizing a Delegated Proof of Stake (DPoS) validation mechanism. Down the line Sonr will provide IPFS storage nodes, and governance participation in the staking model.
-
-<Tip>
-Demand = Obtain rewards, goods, or services through staking or locking up the token.
-Supply = Tokens staked or locked up.
-
-</Tip>
-
-On Sonr we will be leveraging a **delegate stake** mechanism in order to **optimize buy-in** for users in the network. It imposes an **excess opportunity cost** if **slashing** is implemented.
-
-With this being said, there are some challenges in implementing staking:
-
-- The token must already have value
-- Allocating power or influence via staking gives major edge to wealthy users
-- They are frequently subject to gaming and coordination problems
-
-However there is substantial benefit in incorporating a staking mechanism, with the following criteria met we can create a sustainable design:
-
-1. The upfront capital required to stake should not significantly discourage them to stake
-2. If a stakeholder group is making decisions that materially harm the network, they would be punished via slashing the stake.
-3. Stakeholders can make decisions that positively impact the future network health and token price, therefore holding stake can promote positive Sonr growth
-
-### Validator Nodes for Cosmos ASB
-
-Sonr is a Cosmos powered blockchain which is powered by a TenderMint validation mechanism. The default consensus for TenderMint is DPoS and works with our current ABCI implementation for Transaction Verification. DPoS is a twist on Proof of Stake consensus that relies upon a group of delegates to validate blocks on behalf of all nodes in the network . Witnesses are elected by stakeholders at a rate of one vote per share per witness . Coin age is irrelevant. All coins that are mature will add the same staking weight (usually 1 in the wallet hover display) Results in stable, consistent interest only for active wallets and only with small inputs.
-
-### IPFS Storage Nodes (excluding FileCoin)
-
-When deploying standalone highway nodes, requiring minimum stake would be an additional method to enforce availability requirements. By having a stake we can ensure that the user deploying a node has a base level of buy-in within the ecosystem.
-
-### Governance Participants
-
-We will be incorporating a similar strategy to AlgoRand in our governance rollout. This is covered more extensively in the [Governance](https://www.notion.so/Governance-af1251b1b7aa41fab16c53dd9fe6ef63) section.
diff --git a/docs/guides/economics/utility.mdx b/docs/guides/economics/utility.mdx
deleted file mode 100644
index 89d8a9306..000000000
--- a/docs/guides/economics/utility.mdx
+++ /dev/null
@@ -1,201 +0,0 @@
----
-title: Utility
-description: Use cases and utility functions of the SNR token including staking, governance, and network operations
-sidebarTitle: "Network Utility"
-icon: "cog"
----
-
-## Overview
-
-The SNR token serves as the native utility token of the Sonr network, enabling various functions from transaction processing to governance participation. Its multi-faceted utility design ensures sustained demand and value accrual.
-
-<Note>
-  The SNR token's utility is designed to grow with the network, adding new use
-  cases as the ecosystem expands while maintaining core functions for network
-  security and operations.
-</Note>
-
-## Core Utilities
-
-### 1. Means of Payment
-
-The primary utility of SNR is facilitating transactions across the Sonr blockchain for user account management and application operations.
-
-<CardGroup>
-  <Card title="Transaction Fees">
-    All on-chain operations require SNR for gas fees and computational resources
-  </Card>
-  <Card title="Service Payments">
-    Payment for Highway services, storage, and off-chain computation
-  </Card>
-  <Card title="Application Fees">
-    Developers pay SNR to register and update applications on the network
-  </Card>
-</CardGroup>
-
-### 2. Staking Mechanisms
-
-SNR tokens enable network security and participation through various staking options:
-
-#### Validator Staking
-
-- **Minimum Stake**: Required SNR deposit to run a validator node
-- **Delegated Staking**: Users can delegate SNR to validators for rewards
-- **Slashing Protection**: Validators must maintain good behavior or risk stake loss
-
-#### Service Node Staking
-
-- **Highway Nodes**: Stake required for running Highway service nodes
-- **IPFS Storage**: Minimum stake for operating storage infrastructure
-- **Availability Guarantee**: Staking ensures node uptime and reliability
-
-<Warning>
-  Staking locks tokens for a specified period, reducing circulating supply while
-  earning rewards for network participation.
-</Warning>
-
-### 3. Governance Participation
-
-SNR tokens grant voting power in the decentralized governance system:
-
-<CardGroup>
-  <Card title="Proposal Creation">
-    Stake SNR to submit governance proposals with anti-spam mechanisms
-  </Card>
-  <Card title="Voting Rights">
-    One token equals one vote in governance decisions
-  </Card>
-  <Card title="Participation Rewards">
-    Earn SNR for active governance participation and quality proposals
-  </Card>
-</CardGroup>
-
-## Module-Specific Operations
-
-### Service Module (x/svc)
-
-SNR tokens are required for service operations within the decentralized service marketplace:
-
-- **Service Registration**: Pay SNR registration fees to claim unique TLD domains (e.g., `music.sonr`, `defi.sonr`)
-- **Capability Requests**: SNR deposits for requesting root capabilities via MPC signing
-- **Service Updates**: Fees for modifying service metadata or requesting additional permissions
-- **TLD Management**: Economic safeguards prevent domain squatting through registration fees
-
-<Note>
-  Service registration fees are burned or sent to the community pool based on
-  governance parameters, creating deflationary pressure.
-</Note>
-
-### DWN Module (x/dwn)
-
-The DWN module enables revolutionary gasless onboarding while using SNR for advanced operations:
-
-- **Gasless Vault Claiming**: Initial `MsgClaimVault` transactions require no SNR fees
-- **Vault Configuration**: SNR fees for updating vault settings and WASM runtime upgrades
-- **MPC Operations**: Transaction fees for multi-party computation within secure enclaves
-- **Cross-Chain Operations**: SNR payments for bridging assets and multi-chain vault management
-
-### UCAN Module (x/ucan)
-
-Authorization operations require SNR for security and spam prevention:
-
-- **Root Capability Issuance**: SNR fees for initiating MPC threshold signing requests
-- **Revocation Processing**: Transaction fees for on-chain capability revocations
-- **Delegation Chain Verification**: Computational costs for validating complex authorization chains
-- **MPC Signing Participation**: Validator rewards for participating in multi-party computation
-
-### DID Module (x/did)
-
-Identity operations use SNR for registration and management:
-
-- **DID Registration**: Fees for creating new decentralized identifiers
-- **Authentication Linking**: SNR costs for adding WebAuthn credentials or other auth methods
-- **Assertion Management**: Fees for linking/unlinking identity claims and verifications
-- **Transaction Execution**: SNR payments for UCAN-authorized transactions on behalf of DIDs
-
-## Economic Mechanisms
-
-### Demand Drivers
-
-The token's value is driven by multiple demand sources:
-
-```math
-\text{Demand} = \text{Transaction Volume} + \text{Staking Locked} + \text{Governance Participation}
-```
-
-<CardGroup>
-  <Card title="Network Growth">
-    More users and applications increase transaction demand
-  </Card>
-  <Card title="Staking Returns">
-    Attractive yields encourage long-term token locking
-  </Card>
-  <Card title="Utility Expansion">
-    New features and services create additional use cases
-  </Card>
-</CardGroup>
-
-### Supply Dynamics
-
-Effective supply is reduced through:
-
-- **Staking Lockups**: Validators and delegators lock tokens
-- **Governance Stakes**: Proposal creation requires token deposits
-- **Service Collateral**: Service providers stake SNR for TLD registration
-- **Fee Burns**: Partial fee burning reduces total supply
-
-## Developer Incentives
-
-### Service Development
-
-- **Service Registration Subsidies**: Reduced TLD domain costs for verified developers
-- **Root Capability Grants**: Free MPC signing for approved service capabilities
-- **Revenue Sharing**: Earn portion of service interaction fees through UCAN delegation
-- **Integration Support**: Subsidized vault interaction costs for new services
-
-### Infrastructure Provision
-
-- **Validator Operations**: SNR staking rewards for consensus participation and MPC signing
-- **MPC Node Operations**: Additional rewards for multi-party computation services
-- **IPFS Storage**: Compensation for decentralized vault configuration storage
-- **UCAN Verification**: Fees for running delegation chain validation services
-
-<Check>
-  The SNR token creates a sustainable economic model where users, developers,
-  and infrastructure providers all benefit from network growth.
-</Check>
-
-## Future Utilities
-
-### Enhanced Module Features
-
-- **Advanced UCAN Features**: Zero-knowledge capability proofs and cross-chain validation
-- **Vault Upgrades**: Seamless WASM runtime updates and social recovery mechanisms
-- **Service Marketplace**: Categorized service discovery with reputation systems
-- **Multi-sig Services**: Shared service ownership through DAO governance
-
-### Cross-Chain Integration
-
-- **IBC UCAN Verification**: Cross-chain capability validation fees
-- **Multi-Chain Vault Operations**: Enhanced cross-chain asset management
-- **Bridge Service Registration**: Specialized TLD domains for bridge operators
-- **Interchain DID Resolution**: Cross-chain identity verification services
-
-### Privacy and Security Enhancements
-
-- **Privacy-Preserving MPC**: Enhanced secure multi-party computation features
-- **Conditional Revocations**: Time or event-based capability revocations
-- **Hardware Vault Support**: Integration with dedicated secure hardware
-- **AI-Powered Workflows**: Natural language vault command processing
-
-## Utility Summary
-
-The SNR token's utility encompasses:
-
-1. **Essential Operations**: Core network functions and transactions
-2. **Security Provision**: Staking for network consensus and safety
-3. **Governance Rights**: Democratic participation in protocol decisions
-4. **Economic Incentives**: Rewards for valuable contributions
-5. **Access Control**: Gateway to premium features and services
-
-This comprehensive utility design ensures the SNR token remains central to the Sonr ecosystem's growth and sustainability.
\ No newline at end of file
diff --git a/docs/guides/economics/values.mdx b/docs/guides/economics/values.mdx
deleted file mode 100644
index f00140dcd..000000000
--- a/docs/guides/economics/values.mdx
+++ /dev/null
@@ -1,235 +0,0 @@
----
-title: Values
-description: Value proposition and economic principles underlying the SNR token and its role in the ecosystem
-sidebarTitle: "Core Values"
-icon: "heart"
----
-
-## Overview
-
-The SNR token's value derives from fundamental economic principles, network utility, and carefully designed tokenomics. Understanding these value drivers helps participants make informed decisions about their involvement in the Sonr ecosystem.
-
-<Note>
-  Token value = Fundamental Value + Token-Specific Non-Fundamentals +
-  Market/Industry Non-Fundamentals
-</Note>
-
-## Fundamental Value Drivers
-
-### Economic Activity
-
-The core value proposition stems from actual network usage across Sonr's core modules:
-
-```math
-\text{Fundamental Value} = \frac{\text{Economic Activity}}{\text{Circulating Supply} \times \text{Velocity}}
-```
-
-<CardGroup>
-  <Card title="Service Registration">
-    TLD domain fees and capability requests through the Service module
-  </Card>
-  <Card title="Identity Operations">
-    DID registration, authentication linking, and assertion management
-  </Card>
-  <Card title="Authorization Services">
-    UCAN issuance, revocation processing, and MPC signing operations
-  </Card>
-  <Card title="Vault Operations">
-    DWN configuration updates and cross-chain management beyond gasless claiming
-  </Card>
-</CardGroup>
-
-### Network Effects
-
-Value increases exponentially with network growth:
-
-1. **User Growth**: More vault claims and DID registrations increase identity network value
-2. **Service Adoption**: More TLD registrations create a valuable service namespace
-3. **Developer Integration**: Services leveraging UCAN authorization expand utility
-4. **Validator Participation**: MPC signing nodes improve security and capability issuance
-
-## Property Rights
-
-The SNR token grants specific rights that create intrinsic value:
-
-### Governance Rights
-
-- **Protocol Decisions**: Vote on network upgrades and parameters
-- **Treasury Management**: Control community fund allocation
-- **Economic Policy**: Influence inflation and reward distribution
-
-### Economic Rights
-
-- **Staking Rewards**: Earn returns for securing the network
-- **Fee Sharing**: Participate in protocol revenue distribution
-- **Priority Access**: Enhanced service levels for token holders
-
-### Network Access
-
-- **Service Registration**: Required for claiming TLD domains and registering services
-- **Identity Management**: Essential for DID operations and authentication linking
-- **Capability Authorization**: Needed for UCAN issuance and delegation chain verification
-- **Vault Configuration**: Access to advanced vault features beyond gasless claiming
-
-<Check>
-  The combination of governance, economic, and access rights creates a
-  comprehensive value proposition for SNR holders.
-</Check>
-
-## Value Accrual Mechanisms
-
-### Supply Reduction
-
-Multiple mechanisms reduce effective token supply:
-
-<CardGroup>
-  <Card title="Staking Lockups">
-    Validators and delegators lock tokens for rewards
-  </Card>
-  <Card title="Fee Burning">
-    Portion of transaction fees permanently removed
-  </Card>
-  <Card title="Governance Deposits">Tokens locked for proposal creation</Card>
-  <Card title="Service Registration">
-    TLD domain registration fees create deflationary pressure
-  </Card>
-</CardGroup>
-
-### Demand Growth
-
-Sustainable demand drivers include:
-
-1. **Organic Growth**: Natural increase in users and transactions
-2. **New Use Cases**: Expanding utility through development
-3. **Partnership Integration**: External protocols adopting SNR
-4. **Premium Features**: Advanced services requiring SNR payment
-
-## Economic Sustainability
-
-### Revenue Model
-
-The network generates sustainable revenue through module-specific operations:
-
-- **Service Module**: TLD domain registration fees and capability request deposits
-- **DID Module**: Identity registration, authentication linking, and assertion management fees
-- **UCAN Module**: Root capability issuance and revocation processing fees
-- **DWN Module**: Advanced vault configuration and cross-chain operation fees
-- **Validator Operations**: MPC signing participation and consensus rewards
-
-### Cost Structure
-
-Efficient operations maintain profitability:
-
-- **MPC Infrastructure**: Multi-party computation hardware and coordination costs
-- **Module Development**: Ongoing improvements to Service, DID, UCAN, and DWN modules
-- **Security Audits**: WASM runtime, capability verification, and cryptographic audits
-- **Gasless Subsidies**: Network-funded vault claiming to remove onboarding barriers
-
-## Market Dynamics
-
-### Price Discovery
-
-Token price reflects multiple factors:
-
-<Warning>
-  While fundamental value provides a baseline, market sentiment and external
-  factors significantly influence short-term price movements.
-</Warning>
-
-### Non-Fundamental Factors
-
-#### Token-Specific
-
-- Marketing campaigns and viral growth
-- Exchange listings and liquidity
-- Partnership announcements
-- Technical milestones
-
-#### Market-Wide
-
-- Cryptocurrency market cycles
-- Regulatory developments
-- Macroeconomic conditions
-- Technology trends
-
-## Value Propositions
-
-### For Users
-
-1. **Digital Sovereignty**: Control your DID and vault without intermediaries
-2. **Gasless Onboarding**: Free vault claiming removes barriers to entry
-3. **Seamless Authentication**: WebAuthn integration with hardware-backed security
-4. **UCAN Authorization**: Granular, revocable permissions replace dangerous unlimited approvals
-
-### For Developers
-
-1. **Service Registration**: Claim unique TLD domains for decentralized services
-2. **UCAN Integration**: Built-in authorization system with capability delegation
-3. **Identity Infrastructure**: Native DID support with WebAuthn authentication
-4. **Revenue Models**: Earn through UCAN-mediated service interactions and fee sharing
-
-### For Validators
-
-1. **MPC Signing Rewards**: Additional compensation for multi-party computation participation
-2. **Capability Issuance**: Central role in root UCAN creation through threshold signing
-3. **Network Security**: Staking rewards for consensus participation and vault protection
-4. **Governance Influence**: Vote on protocol parameters and module improvements
-
-### For Investors
-
-1. **Module Expansion**: Growing utility across Service, DID, UCAN, and DWN modules
-2. **Deflationary Pressure**: Service registration fees and transaction burns reduce supply
-3. **Identity Network Effects**: Value compounds as more DIDs and services join the ecosystem
-4. **Technical Innovation**: Cutting-edge MPC, WASM, and WebAuthn integration
-
-## Comparative Advantages
-
-### vs. Traditional Systems
-
-- **No Intermediaries**: Direct value transfer
-- **Global Access**: Permissionless participation
-- **Transparency**: On-chain verification
-- **User Control**: Self-sovereign identity
-
-### vs. Other Blockchains
-
-- **Native Authorization**: Built-in UCAN capability system replaces external auth
-- **Gasless Onboarding**: Free vault claiming removes crypto barriers
-- **MPC Security**: Multi-party computation eliminates single points of failure
-- **WebAuthn Integration**: Hardware-backed authentication without seed phrase management
-
-## Long-Term Value Thesis
-
-### Sustainable Growth
-
-The SNR token's value proposition centers on:
-
-1. **Real Utility**: Actual usage drives demand
-2. **Network Effects**: Growth compounds value
-3. **Economic Alignment**: All participants benefit
-4. **Technical Innovation**: Continuous improvement
-
-### Value Metrics
-
-Key indicators of fundamental value:
-
-<CardGroup>
-  <Card title="Vault Claims">
-    Growing number of gasless vault registrations
-  </Card>
-  <Card title="Service Registrations">
-    TLD domain claims and capability requests
-  </Card>
-  <Card title="UCAN Issuance">
-    Authorization activity and delegation chains
-  </Card>
-  <Card title="MPC Participation">
-    Validator involvement in threshold signing
-  </Card>
-</CardGroup>
-
-<Note>
-  The SNR token represents ownership in a new paradigm of user-controlled
-  internet infrastructure, with value derived from real utility, network
-  effects, and sustainable economics.
-</Note>
\ No newline at end of file
diff --git a/docs/guides/inter-planetary-file-system.mdx b/docs/guides/inter-planetary-file-system.mdx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/guides/issue-payments.mdx b/docs/guides/issue-payments.mdx
deleted file mode 100644
index c4927410f..000000000
--- a/docs/guides/issue-payments.mdx
+++ /dev/null
@@ -1,158 +0,0 @@
----
-title: Sending Payments
-description: A guide for sending payments and transactions on the Sonr blockchain network
-icon: "credit-card"
----
-
-Sending payments on the Sonr network is designed to be simple and secure, whether you are building a user-facing application or a backend service. This guide covers the different ways to initiate and manage payments.
-
-## The Sonr Payment Model
-
-Sonr payments are built on a capability-based system using UCANs. This means that instead of signing every transaction, users delegate permission to their Vault to execute payments within predefined limits.
-
-<CardGroup>
-  <Card title="Programmable Payments" href="/blockchain/modules/svc/ucan">
-    Automate recurring payments and subscriptions with UCANs.
-  </Card>
-  <Card title="Cross-Chain Transfers" href="/blockchain/network">
-    Send assets to other blockchains seamlessly through IBC.
-  </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
-    Learn about token distribution and transaction fees.
-  </Card>
-</CardGroup>
-
-## Sending a Simple Transfer
-
-This example demonstrates how to send a simple transfer from a user's Vault in a browser application.
-
-<Steps>
-<Step>
-### 1. Authenticate the User
-
-First, ensure the user is authenticated and you have a valid session.
-
-```javascript
-import { Sonr } from "@sonr/sdk";
-
-const sonr = new Sonr({ httpUrl: "http://localhost:1317" });
-const session = await sonr.authenticate();
-```
-
-</Step>
-
-<Step>
-### 2. Request Payment Capability
-
-Before sending a payment, your application must request the necessary permission from the user.
-
-```javascript
-const paymentCapability = await session.vault.requestCapability({
-  action: "bank/send",
-  constraints: {
-    maxAmount: "10000000usnr", // 10 SNR
-    to: "snr1..._recipient_address_...",
-  },
-});
-
-if (!paymentCapability.approved) {
-  throw new Error("Payment not authorized by user");
-}
-```
-
-</Step>
-
-<Step>
-### 3. Execute the Payment
-
-Once you have the capability, you can execute the payment.
-
-```javascript
-const result = await session.vault.send({
-  to: "snr1..._recipient_address_...",
-  amount: "1000000usnr", // 1 SNR
-  ucan: paymentCapability.ucan, // Provide the authorized UCAN
-});
-
-console.log(`Payment successful! TxHash: ${result.txhash}`);
-```
-
-</Step>
-</Steps>
-
-## Backend Payments
-
-For backend services, payments can be initiated using a delegated UCAN.
-
-<Steps>
-<Step>
-### 1. Obtain a Delegated UCAN
-
-Your service must first obtain a delegated UCAN from the user that grants permission to send payments on their behalf.
-
-</Step>
-
-<Step>
-### 2. Use the Go SDK to Send
-
-Your Go backend can use the delegated UCAN to send a payment.
-
-```go
-package main
-
-import (
-    "context"
-    "fmt"
-
-    "github.com/sonr-io/sonr/x/sonr/pkgs/sdk"
-)
-
-func SendPaymentOnBehalfOfUser(userDID, recipientAddress, amount, delegatedUcan string) error {
-    sonr, _ := sdk.NewSonr(rpcEndpoint, "")
-
-    // The SDK will automatically use the UCAN for authorization
-    result, err := sonr.SendFrom(userDID, recipientAddress, amount, delegatedUcan)
-    if err != nil {
-        return err
-    }
-
-    fmt.Printf("Payment sent! TxHash: %s\n", result.TxHash)
-    return nil
-}
-```
-
-</Step>
-</Steps>
-
-## Cross-Chain Payments
-
-Sonr supports cross-chain payments through the Inter-Blockchain Communication (IBC) protocol.
-
-### Sending to another IBC-enabled chain
-
-```javascript
-const result = await session.vault.send({
-  to: "osmo1..._recipient_address_...", // An Osmosis address
-  amount: "1000000usdc", // 1 USDC
-  via: "ibc/transfer/channel-0", // The IBC channel to use
-});
-
-console.log(`Cross-chain payment successful! TxHash: ${result.txhash}`);
-```
-
-## Querying Payment History
-
-You can query a user's payment history from their Vault.
-
-```javascript
-const history = await session.vault.getPaymentHistory({ limit: 10 });
-
-console.log("Payment History:", history.records);
-```
-
-## Next Steps
-
-- [Explore the UCAN authorization model](/blockchain/modules/svc/ucan)
-- [Learn about blockchain modules](/blockchain/)
-- [See the API Reference](/reference/)
-
diff --git a/docs/guides/onboarding.mdx b/docs/guides/onboarding.mdx
deleted file mode 100644
index 2c745063a..000000000
--- a/docs/guides/onboarding.mdx
+++ /dev/null
@@ -1,279 +0,0 @@
----
-title: Validator Node Onboarding
-description: Complete guide for becoming a Sonr blockchain validator from setup to operations
-icon: "boxes"
-sidebarTitle: Become a Validator
----
-
-## Overview
-
-Sonr is a Cosmos SDK-based blockchain focused on decentralized identity and asset management. This guide provides comprehensive information for validators interested in securing the Sonr network and participating in its specialized identity infrastructure ecosystem.
-
-<Note>
-  Sonr is currently in testnet/development phase. While there's no confirmed
-  mainnet launch date, early participation in testnet operations is highly
-  recommended for prospective validators.
-</Note>
-
-## Network Positioning
-
-Sonr differentiates itself within the Cosmos ecosystem through:
-
-- **Decentralized Identity Focus**: Implementing W3C DID standards and WebAuthn integration
-- **Highway Architecture**: Specialized node infrastructure for identity services
-- **Fast Wallet Generation**: 600ms wallet creation with IPFS storage capabilities
-- **Developer Tools**: React SDKs and identity-focused APIs
-
-## Hardware Requirements
-
-Professional validator operations require substantial infrastructure investment to ensure network security and reliability.
-
-### Essential Specifications
-
-  <Card title="CPU">
-    **Minimum**: 4 cores x86 processor **Recommended**: 8+ cores for production
-  </Card>
-  <Card title="RAM">
-    **Minimum**: 16GB with NVMe swap **Recommended**: 32GB+ for optimal
-    performance
-  </Card>
-  <Card title="Storage">
-    **Required**: 1TB+ NVMe SSD **Note**: Regular SSDs often insufficient for
-    I/O demands
-  </Card>
-  <Card title="Network">
-    **Minimum**: 100Mbps dedicated bandwidth **Usage**: Multi-gigabyte daily
-    traffic expected
-  </Card>
-
-### Infrastructure Investment
-
-- **Initial Setup**: Professional-grade hardware required for reliable operations
-- **Monthly Operating**: Tier 3+ datacenter colocation recommended for optimal performance
-- **Redundancy**: Full backup server with identical specifications required
-
-## Quick Setup with NPX
-
-Sonr provides an NPX-based tool to streamline validator deployment:
-
-```bash
-npx @sonr/validator-setup my-validator --chain=sonr-testnet-1
-```
-
-The interactive wizard guides you through:
-
-<Steps>
-  <Step>
-    ### Network Configuration Select testnet or mainnet and configure chain
-    parameters
-  </Step>
-  <Step>
-    ### Hardware Verification Automated check of system requirements and
-    recommendations
-  </Step>
-  <Step>### Key Generation Secure key creation with HSM support options</Step>
-  <Step>
-    ### Sentry Architecture Deploy protective sentry node infrastructure
-  </Step>
-  <Step>
-    ### Monitoring Setup Install Prometheus + Grafana monitoring stack
-  </Step>
-  <Step>
-    ### Security Hardening Configure firewalls and security best practices
-  </Step>
-</Steps>
-
-## Network Parameters
-
-### Validator Network Structure
-
-For a 50-validator network with 1 billion token supply:
-
-#### Early Network Phase (30% staking ratio)
-
-- **Inflation**: 15% (bootstrap incentives)
-- **Validator Participation**: Commission-based earnings structure
-- **Delegator Rewards**: High early participation incentives
-
-#### Bootstrap Phase (50% staking ratio)
-
-- **Inflation**: 12% (balanced growth)
-- **Validator Participation**: Balanced commission structure
-- **Delegator Rewards**: Sustainable growth incentives
-
-#### Mature Network (67% staking ratio)
-
-- **Inflation**: 7% (long-term stability)
-- **Validator Participation**: Stable commission structure
-- **Delegator Rewards**: Long-term participation incentives
-
-### Recommended Parameters
-
-- **Minimum validator stake**: 1,000,000 SNR (0.1% of supply)
-- **Optimal self-bond**: 2,000,000 SNR (0.2% of supply)
-- **Commission range**: 5-15% (5% mandatory minimum)
-- **Inflation range**: 5-18% with 8% target at 65% staking
-- **Unbonding period**: 21 days standard
-
-## Operational Considerations
-
-### Infrastructure Requirements
-
-Validators should ensure adequate infrastructure to support reliable network participation.
-
-### Reward Sources
-
-- **Block Rewards**: Inflation-based token issuance for network security
-- **Transaction Fees**: Gas fees and proposer bonuses from network activity
-- **Additional Rewards**: ICS rewards, cross-chain fees, and ecosystem participation
-
-## Security Architecture
-
-### Sentry Node Design
-
-Implement a multi-layered security approach:
-
-```
-Internet → Sentry Nodes (3-5) → Private Network → Validator Node
-```
-
-### Critical Security Implementations
-
-  <Card title="Key Management">
-    - Hardware Security Modules (HSM) - Tendermint Key Management System (TMKMS)
-    - Remote signing capabilities
-  </Card>
-  <Card title="Network Security">
-    - Geographic distribution across datacenters - Automated double-sign
-    prevention - Comprehensive monitoring and alerting
-  </Card>
-  <Card title="Operational Security">
-    - 99.9%+ uptime requirements - Encrypted backups across locations - Strict
-    access controls and audits
-  </Card>
-
-### Key Types
-
-1. **Consensus Key**: Hot key for block signing (ed25519)
-2. **Operator Key**: Cold storage for validator transactions (secp256k1)
-3. **Node Key**: P2P network identification
-
-## Implementation Roadmap
-
-### Phase 1: Testnet Participation (Months 1-3)
-
-<Note type="warning">
-  Begin with testnet operations to gain experience without operational risk.
-</Note>
-
-- Hardware procurement and datacenter setup
-- Team training on Cosmos SDK operations
-- Security procedure development
-- Community engagement and reputation building
-
-### Phase 2: Infrastructure Preparation (Month 4)
-
-- Deploy production hardware in Tier 3+ datacenters
-- Implement sentry node architecture across regions
-- Configure monitoring and alerting systems
-- Establish 24/7 operational procedures
-
-### Phase 3: Mainnet Genesis (Month 5+)
-
-- Participate in genesis ceremony
-- Self-bond required SNR tokens (1-2M recommended)
-- Configure optimal commission rates (start at 5-7%)
-- Launch validator with foundation delegation support
-
-### Phase 4: Operational Excellence (Ongoing)
-
-- Maintain 99.9%+ uptime through redundant systems
-- Actively participate in governance proposals
-- Provide regular updates to delegators
-- Contribute to ecosystem development
-
-## Foundation Support Programs
-
-### Delegation Program
-
-Sonr implements a foundation delegation program allocating 10-15% of total supply:
-
-- **Coverage**: 30-35 validators (60-70% of active set)
-- **Requirements**: 3-month testnet participation
-- **Terms**: 6-12 month delegation periods
-- **Renewal**: Performance-based criteria
-- **Focus**: Geographic distribution and community contributions
-
-### Testnet Incentives
-
-- **Monthly Rewards**: Testnet participation incentives for active validators
-- **Mainnet Slots**: Top performers receive guaranteed mainnet positions
-- **Foundation Delegations**: 6-month delegations of 2M tokens for top testnet validators
-
-## Monitoring and Operations
-
-### Prometheus Metrics
-
-- System metrics (CPU, RAM, disk, network)
-- Tendermint consensus metrics (height, voting power, peer count)
-- Custom application metrics (missed blocks, proposal statistics)
-
-### Critical Alerts
-
-- Low peer count (less than 5 peers)
-- High block time intervals
-- Resource utilization warnings
-- Disk space projections
-
-### Grafana Dashboards
-
-- Real-time performance monitoring
-- Historical trend analysis
-- Multi-validator comparison views
-
-## Risk Management
-
-### Technical Risks
-
-- **Double-signing prevention**: Proper key management and TMKMS
-- **State corruption recovery**: Automated backup systems
-- **Network partitions**: Geographic distribution strategies
-- **Upgrade failures**: Staging environment testing
-
-### Operational Risks
-
-- **Network participation**: Maintain consistent validator performance
-- **Delegation concentration**: Limits on single delegator exposure
-- **Commission optimization**: Community-competitive rates
-- **Infrastructure management**: Efficient operational procedures
-
-## Future Opportunities
-
-As Sonr matures, validators can explore additional network services:
-
-- **Relayer Operations**: IBC connection services
-- **RPC Endpoints**: Developer infrastructure services
-- **Archive Nodes**: Historical data provision
-- **Identity Services**: Custom solutions leveraging Sonr infrastructure
-- **Interchain Security**: Consumer chain participation
-
-## Getting Started
-
-  <Card title="Join Testnet" href="/guides/validators/testnet">
-    Start with testnet participation to gain operational experience
-  </Card>
-  <Card title="Hardware Setup" href="/guides/validators/setup">
-    Detailed hardware and infrastructure deployment guide
-  </Card>
-  <Card title="Security Guide" href="/guides/validators/security">
-    Comprehensive security implementation and best practices
-  </Card>
-  <Card title="Monitoring" href="/guides/validators/monitoring">
-    Setup monitoring and alerting systems for your validator
-  </Card>
-
-<Note type="success">
-  Sonr presents a compelling opportunity for validators seeking exposure to the
-  decentralized identity market within the Cosmos ecosystem. Early preparation
-  and professional operations are key to success.
-</Note>
\ No newline at end of file
diff --git a/docs/guides/register-records.mdx b/docs/guides/register-records.mdx
deleted file mode 100644
index ba01f30bf..000000000
--- a/docs/guides/register-records.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: "Registering a Domain"
-description: "Comprehensive guide to creating, validating, and managing User-Controlled Authorization Network (UCAN) tokens"
-icon: "key"
----
-
-
diff --git a/docs/guides/security/audit-report.mdx b/docs/guides/security/audit-report.mdx
deleted file mode 100644
index e8fec431a..000000000
--- a/docs/guides/security/audit-report.mdx
+++ /dev/null
@@ -1,447 +0,0 @@
----
-title: "MPC Vault System Security Audit Report"
-sidebarTitle: "Executive Summary"
-description: "Comprehensive security audit findings and recommendations for the MPC vault system"
-icon: "clipboard-check"
----
-
-<Warning>
-  This audit report contains critical security findings that require immediate
-  attention before production deployment.
-</Warning>
-
-**Date:** August 5, 2025  
-**Auditor:** Claude (Senior Security Auditor)  
-**Scope:** Comprehensive security assessment of the MPC vault system for wallet operations  
-**Version:** Sonr v0.10.15
-
-## Executive Summary
-
-This security audit evaluates the Multi-Party Computation (MPC) vault system implemented in Sonr's blockchain platform. The audit covers the current architecture, recent security improvements, wallet operation security, threat analysis, and production readiness assessment.
-
-### Key Findings Overview
-
-- **Critical Issues:** 3 identified
-- **High Risk Issues:** 4 identified
-- **Medium Risk Issues:** 6 identified
-- **Low Risk Issues:** 8 identified
-
-<Info>
-  **Overall Security Posture:** MODERATE RISK - Suitable for testnet deployment
-  with immediate remediation of critical issues required before mainnet
-  deployment with user funds.
-</Info>
-
-## 1. Current Architecture Analysis
-
-### 1.1 System Components
-
-The vault system consists of four primary components:
-
-<AccordionGroup>
-  <Accordion title="Vault Client (internal/vault/vault.go)" icon="code">
-    **Purpose:** High-level interface for vault operations using WebAssembly enclaves
-    
-    **Security Features:**
-    - Input validation framework with regex patterns
-    - Secure error handling with sanitized messages
-    - WASM plugin integrity verification via SHA256 hashing
-    - Restricted host and filesystem access for WASM plugins
-  </Accordion>
-
-<Accordion title="WASM Plugin (cmd/vault/main.go)" icon="cube">
-  **Purpose:** WebAssembly-based secure execution environment for MPC operations
-  **Security Features:** - Sandboxed execution environment - Rate limiting (60
-  operations/minute per vault) - Resource constraints (max 100 vaults per
-  instance) - Ownership-based access control - Configurable IPFS endpoints and
-  timeouts
-</Accordion>
-
-<Accordion
-  title="DWN Keeper Integration (x/dwn/keeper/keeper.go)"
-  icon="database"
->
-  **Purpose:** Blockchain state management and vault lifecycle operations
-  **Security Features:** - Vault state persistence with enclave data separation
-  - Integration with DID-based authentication - Service registration
-  verification
-</Accordion>
-
-  <Accordion title="MPC Enclave (crypto/mpc/enclave.go)" icon="lock">
-    **Purpose:** Multi-party computation cryptographic operations
-    
-    **Security Features:**
-    - AES-GCM encryption for data at rest
-    - ECDSA signing with SHA3-256 hashing
-    - Key derivation and rotation capabilities
-  </Accordion>
-</AccordionGroup>
-
-## 2. Security Fixes Analysis
-
-### 2.1 Recently Implemented Security Improvements
-
-Based on code analysis and git history, the following security enhancements have been implemented:
-
-<CardGroup cols={2}>
-  <Card title="WASM Sandbox Restrictions" icon="check-circle" color="#16a34a">
-    ✅ **EFFECTIVE**
-    
-    - Restricted allowed hosts to local IPFS endpoints only
-    - Limited file system access to `/tmp/vault-wasm` directory
-    - Well-implemented defense against WASM plugin abuse
-  </Card>
-
-<Card title="Input Validation Framework" icon="check-circle" color="#16a34a">
-  ✅ **EFFECTIVE** - Vault ID validation with alphanumeric constraints - CID
-  validation with Base58 format checking - Password validation with UTF-8 and
-  size constraints - Comprehensive validation prevents injection attacks
-</Card>
-
-<Card title="Error Message Sanitization" icon="check-circle" color="#16a34a">
-  ✅ **EFFECTIVE** - SecureError type with public/internal error separation -
-  Structured error codes prevent information leakage - Prevents sensitive
-  information disclosure
-</Card>
-
-<Card
-  title="Rate Limiting and Resource Constraints"
-  icon="check-circle"
-  color="#16a34a"
->
-  ✅ **EFFECTIVE** - 60 ops/minute per vault, max 100 vaults per instance -
-  Protection against resource exhaustion attacks - Well-implemented DoS
-  protection
-</Card>
-
-<Card
-  title="Plugin Integrity Verification"
-  icon="exclamation-triangle"
-  color="#f59e0b"
->
-  ⚠️ **PARTIALLY EFFECTIVE** - Optional SHA256 hash verification - Defaults to
-  empty hash (backward compatibility) - Good foundation but needs enforcement in
-  production
-</Card>
-
-  <Card title="Access Control Implementation" icon="exclamation-triangle" color="#f59e0b">
-    ⚠️ **NEEDS IMPROVEMENT**
-    
-    - Owner-based access with pseudo-authentication
-    - Uses vault ID as owner ID (placeholder implementation)
-    - Insufficient for production use
-  </Card>
-</CardGroup>
-
-## 3. Wallet Operation Security Assessment
-
-<AccordionGroup>
-  <Accordion title="Vault Generation and Key Derivation" defaultOpen>
-    - **Strength:** Uses secure MPC protocol for key generation
-    - **Weakness:** No entropy source verification
-    - **Risk Level:** Medium
-    - **CVSS Score:** 5.3 (AV:N/AC:L/PR:N/UI:N/S:U/C:L/I:N/A:N)
-  </Accordion>
-
-<Accordion title="Transaction Signing (Cosmos, EVM)">
-  - **Strength:** Proper ECDSA implementation with SHA3-256 - **Weakness:**
-  Missing signature malleability protection - **Risk Level:** Medium - **CVSS
-  Score:** 4.8 (AV:N/AC:L/PR:H/UI:R/S:C/C:L/I:L/A:N)
-</Accordion>
-
-<Accordion title="Message Signing and Verification">
-  - **Strength:** Standard ECDSA verification process - **Weakness:** No
-  timestamp validation for replay protection - **Risk Level:** Medium - **CVSS
-  Score:** 5.4 (AV:N/AC:L/PR:L/UI:R/S:C/C:L/I:L/A:N)
-</Accordion>
-
-<Accordion title="Key Rotation and Vault Management">
-  - **Strength:** MPC refresh protocol for key rotation - **Weakness:** No
-  automated rotation enforcement - **Risk Level:** Low - **CVSS Score:** 3.7
-  (AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:L)
-</Accordion>
-
-  <Accordion title="IPFS Storage and Retrieval">
-    - **Strength:** AES-GCM encryption for data at rest
-    - **Weakness:** No integrity verification after retrieval
-    - **Risk Level:** High
-    - **CVSS Score:** 7.5 (AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N)
-  </Accordion>
-</AccordionGroup>
-
-## 4. Threat Analysis by Risk Level
-
-### 4.1 CRITICAL Vulnerabilities (Immediate Action Required)
-
-<Warning>
-  These vulnerabilities require immediate remediation before any production
-  deployment.
-</Warning>
-
-<AccordionGroup>
-  <Accordion title="CRITICAL-001: Weak Authentication System" icon="shield-x">
-    - **Location:** `cmd/vault/main.go:647-676`
-    - **Issue:** Pseudo-authentication using vault ID as owner ID
-    - **Impact:** Complete vault takeover by any user knowing vault ID
-    - **CVSS Score:** 9.8 (AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H)
-    - **Remediation:** Implement proper JWT/OAuth2 authentication with cryptographic proofs
-  </Accordion>
-
-<Accordion
-  title="CRITICAL-002: Missing WASM Integrity Enforcement"
-  icon="shield-x"
->
-  - **Location:** `internal/vault/vault.go:138` - **Issue:** WASM hash
-  verification disabled by default (empty ExpectedSHA256) - **Impact:**
-  Malicious WASM plugin execution - **CVSS Score:** 9.1
-  (AV:N/AC:L/PR:N/UI:N/S:C/C:H/I:H/A:N) - **Remediation:** Enforce mandatory
-  WASM integrity checks in production
-</Accordion>
-
-  <Accordion title="CRITICAL-003: Hardcoded Default Passwords" icon="shield-x">
-    - **Location:** `x/dwn/keeper/keeper.go:404`
-    - **Issue:** Default password generation based on predictable values
-    - **Impact:** Vault encryption key compromise
-    - **CVSS Score:** 8.8 (AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H)
-    - **Remediation:** Implement secure password derivation or user-provided passwords
-  </Accordion>
-</AccordionGroup>
-
-### 4.2 HIGH Risk Vulnerabilities
-
-<AccordionGroup>
-  <Accordion title="HIGH-001: No Encrypted Data Integrity Verification" icon="alert-triangle">
-    - **Location:** `crypto/mpc/enclave.go:51-68`
-    - **Issue:** No HMAC or authenticated encryption verification after IPFS retrieval
-    - **Impact:** Data tampering attacks on stored vault data
-    - **CVSS Score:** 7.5 (AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N)
-  </Accordion>
-
-<Accordion
-  title="HIGH-002: Missing Signature Malleability Protection"
-  icon="alert-triangle"
->
-  - **Location:** `crypto/mpc/enclave.go:111-121` - **Issue:** ECDSA signatures
-  vulnerable to malleability attacks - **Impact:** Transaction replay with
-  modified signatures - **CVSS Score:** 7.4
-  (AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:N)
-</Accordion>
-
-<Accordion
-  title="HIGH-003: Insufficient Input Sanitization for IPFS Operations"
-  icon="alert-triangle"
->
-  - **Location:** `cmd/vault/main.go:321-392` - **Issue:** Direct CID usage
-  without additional validation - **Impact:** IPFS injection attacks or resource
-  exhaustion - **CVSS Score:** 7.1 (AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H)
-</Accordion>
-
-  <Accordion title="HIGH-004: Race Conditions in Concurrent Vault Access" icon="alert-triangle">
-    - **Location:** `cmd/vault/main.go:505-568`
-    - **Issue:** Inadequate synchronization for concurrent vault operations
-    - **Impact:** Data corruption or inconsistent vault state
-    - **CVSS Score:** 6.8 (AV:N/AC:H/PR:H/UI:N/S:U/C:H/I:H/A:H)
-  </Accordion>
-</AccordionGroup>
-
-### 4.3 MEDIUM Risk Vulnerabilities
-
-<AccordionGroup>
-  <Accordion title="MEDIUM-001: Weak Key Derivation for Encryption">
-    - **Location:** `crypto/mpc/enclave.go:78`
-    - **CVSS Score:** 5.9 (AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:N/A:N)
-  </Accordion>
-
-<Accordion title="MEDIUM-002: Missing Request Replay Protection">
-  - **Location:** Various signing functions - **CVSS Score:** 5.4
-  (AV:N/AC:L/PR:L/UI:R/S:C/C:L/I:L/A:N)
-</Accordion>
-
-<Accordion title="MEDIUM-003: Insufficient Error Context in Logs">
-  - **Location:** Throughout codebase - **CVSS Score:** 4.3
-  (AV:N/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:L)
-</Accordion>
-
-<Accordion title="MEDIUM-004: No Key Rotation Enforcement">
-  - **Location:** `cmd/vault/main.go:986-988` - **CVSS Score:** 4.2
-  (AV:N/AC:L/PR:H/UI:N/S:U/C:L/I:L/A:N)
-</Accordion>
-
-<Accordion title="MEDIUM-005: WebAuthn Implementation Placeholder">
-  - **Location:** `cmd/vault/main.go:947-954` - **CVSS Score:** 5.8
-  (AV:N/AC:L/PR:N/UI:R/S:C/C:L/I:L/A:N)
-</Accordion>
-
-  <Accordion title="MEDIUM-006: Insufficient Resource Cleanup">
-    - **Location:** `cmd/vault/main.go:976-983`
-    - **CVSS Score:** 4.9 (AV:L/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:L)
-  </Accordion>
-</AccordionGroup>
-
-### 4.4 LOW Risk Issues
-
-<Accordion title="Low Risk Issues Summary">
-  - LOW-001: Predictable Enclave ID Generation - LOW-002: Missing Rate Limit
-  Bypass Protection - LOW-003: Insufficient Logging for Security Events -
-  LOW-004: No Vault Backup/Recovery Mechanism - LOW-005: Missing Health Check
-  Attestation Validation - LOW-006: Hardcoded Configuration Values - LOW-007: No
-  Circuit Breaker for IPFS Operations - LOW-008: Missing Input Length Validation
-  Edge Cases
-</Accordion>
-
-## 5. Production Readiness Assessment
-
-<CardGroup cols={3}>
-  <Card title="Testnet Deployment" icon="exclamation-triangle" color="#f59e0b">
-    ⚠️ **CONDITIONAL APPROVAL**
-    
-    Suitable with immediate critical fixes:
-    - Fix CRITICAL-001 (Authentication)
-    - Fix CRITICAL-002 (WASM Integrity)
-    - Fix CRITICAL-003 (Default Passwords)
-    
-    **Timeline:** 2-3 weeks with dedicated security effort
-  </Card>
-
-<Card title="Mainnet with User Funds" icon="x-circle" color="#dc2626">
-  ❌ **NOT RECOMMENDED** Requires comprehensive security hardening: - All
-  CRITICAL and HIGH issues resolved - External security audit by certified firm
-  - Bug bounty program - Comprehensive monitoring and alerting **Timeline:** 3-4
-  months minimum
-</Card>
-
-  <Card title="Enterprise/Institutional Use" icon="x-circle" color="#dc2626">
-    ❌ **NOT RECOMMENDED**
-    
-    Requires enterprise-grade security controls:
-    - SOC 2 Type II compliance
-    - Multi-signature authorization workflows
-    - Hardware Security Module (HSM) integration
-    - Advanced threat detection and response
-    
-    **Timeline:** 6-8 months minimum
-  </Card>
-</CardGroup>
-
-## 6. Remediation Recommendations
-
-### 6.1 Immediate Actions (0-2 weeks)
-
-<Steps>
-  <Step title="Implement Proper Authentication System">
-    - Replace pseudo-authentication with JWT/OAuth2
-    - Add cryptographic proof of vault ownership
-    - Implement session management with timeout
-  </Step>
-
-<Step title="Enforce WASM Integrity Verification">
-  - Remove backward compatibility for empty hashes - Implement automatic hash
-  verification - Add WASM signature verification
-</Step>
-
-  <Step title="Replace Hardcoded Password Generation">
-    - Implement secure key derivation functions (PBKDF2/Argon2)
-    - Add user-provided password support
-    - Implement password strength requirements
-  </Step>
-</Steps>
-
-### 6.2 Short-term Actions (2-8 weeks)
-
-<Steps>
-  <Step title="Add Data Integrity Verification">
-    - Implement HMAC for IPFS stored data
-    - Add checksum verification after retrieval
-    - Implement authenticated encryption (AES-GCM with additional data)
-  </Step>
-
-<Step title="Implement Signature Malleability Protection">
-  - Use deterministic ECDSA (RFC 6979) - Add signature canonicalization -
-  Implement proper nonce generation
-</Step>
-
-  <Step title="Enhance WebAuthn Integration">
-    - Complete WebAuthn assertion verification
-    - Add biometric authentication support
-    - Implement proper challenge-response flow
-  </Step>
-</Steps>
-
-## 7. Implementation Timeline
-
-<AccordionGroup>
-  <Accordion title="Phase 1: Critical Security Fixes (2-3 weeks)" defaultOpen>
-    - Authentication system implementation
-    - WASM integrity enforcement
-    - Password security enhancement
-    - Basic monitoring setup
-  </Accordion>
-
-<Accordion title="Phase 2: High-Risk Remediation (4-6 weeks)">
-  - Data integrity verification - Signature security improvements - Input
-  validation enhancements - Concurrent access protection
-</Accordion>
-
-<Accordion title="Phase 3: Production Hardening (8-12 weeks)">
-  - Comprehensive monitoring implementation - Advanced security controls -
-  Performance optimization - External security audit preparation
-</Accordion>
-
-  <Accordion title="Phase 4: Enterprise Readiness (6-8 months)">
-    - Compliance framework implementation
-    - Advanced threat protection
-    - HSM integration
-    - Comprehensive testing and validation
-  </Accordion>
-</AccordionGroup>
-
-## 8. Compliance and Standards Assessment
-
-### 8.1 Current Compliance Status
-
-<CardGroup cols={2}>
-  <Card title="OWASP Top 10" icon="x-circle" color="#dc2626">
-    ❌ Multiple violations identified
-  </Card>
-  <Card title="NIST Cybersecurity Framework" icon="x-circle" color="#dc2626">
-    ❌ Partial implementation
-  </Card>
-  <Card title="ISO 27001" icon="x-circle" color="#dc2626">
-    ❌ Insufficient security controls
-  </Card>
-  <Card title="SOC 2" icon="x-circle" color="#dc2626">
-    ❌ Not compliant
-  </Card>
-</CardGroup>
-
-### 8.2 Recommended Standards Implementation
-
-1. Implement OWASP secure coding practices
-2. Adopt NIST cybersecurity framework controls
-3. Prepare for SOC 2 Type II audit
-4. Consider ISO 27001 certification for enterprise use
-
-## 9. Conclusion
-
-The Sonr MPC vault system demonstrates good architectural principles and has implemented several important security improvements. However, critical vulnerabilities prevent immediate production deployment with user funds.
-
-<Note>
-  The system is suitable for testnet deployment with immediate remediation of
-  the three critical issues identified. A comprehensive security hardening
-  effort over 3-4 months is required before mainnet deployment with user funds
-  is recommended.
-</Note>
-
-<Warning>
-  **Immediate Priority:** Address the three critical vulnerabilities before any
-  production deployment.
-</Warning>
-
-**Recommendation:** Engage a certified security firm for external audit before mainnet launch.
-
----
-
-**Report Prepared By:** Claude (Senior Security Auditor)  
-**Date:** August 5, 2025  
-**Classification:** Confidential - Internal Use Only
-
diff --git a/docs/guides/security/compliance.mdx b/docs/guides/security/compliance.mdx
deleted file mode 100644
index 50c21eb07..000000000
--- a/docs/guides/security/compliance.mdx
+++ /dev/null
@@ -1,352 +0,0 @@
----
-title: "Security Compliance Checklist"
-sidebarTitle: "Compliance Checklist"
-description: "Comprehensive security compliance checklist for MPC vault system production readiness"
-icon: "list-check"
----
-
-## MPC Vault System Production Readiness
-
-**Version:** 1.0  
-**Date:** August 5, 2025  
-**Owner:** Security Team  
-**Review Cycle:** Monthly
-
-<Warning>
-  This checklist must be completed before production deployment. Critical
-  security requirements are mandatory for testnet deployment.
-</Warning>
-
-## Critical Security Requirements (0% Complete)
-
-<AccordionGroup>
-  <Accordion title="UCAN-Based Vault Authorization" icon="shield-keyhole" defaultOpen>
-    <CardGroup cols={2}>
-      <Card title="Authentication" icon="key">
-        - [ ] **UCAN Token Validation** - Replace pseudo-authentication with proper UCAN token verification
-        - [ ] **Vault Capability Verification** - Implement vault operation authorization using UCAN capabilities
-        - [ ] **Delegation Chain Validation** - Verify complete UCAN delegation chains for vault access
-      </Card>
-      <Card title="Access Control" icon="lock">
-        - [ ] **Capability-Based Access Control** - Use UCAN capabilities for fine-grained vault permissions
-        - [ ] **Cryptographic Proof of Ownership** - Validate UCAN signatures for vault ownership verification
-        - [ ] **UCAN Expiration Handling** - Implement automatic capability expiration and renewal
-      </Card>
-    </CardGroup>
-  </Accordion>
-
-<Accordion title="Traditional Authentication Support" icon="fingerprint">
-  - [ ] **WebAuthn Integration** - Multi-factor authentication for
-  biometric/hardware key support - [ ] **Session Management** - Secure session
-  handling with configurable timeouts for web interfaces - [ ] **API Rate
-  Limiting** - Per-user and per-capability rate limiting beyond current
-  per-vault limits - [ ] **Emergency Access Controls** - Fallback authentication
-  mechanisms for capability recovery
-</Accordion>
-
-<Accordion title="Cryptographic Security" icon="shield-check">
-  <Steps>
-    <Step title="WASM Security">
-      - [ ] **WASM Integrity Enforcement** - Mandatory SHA256 hash verification
-      for all plugins - [ ] **Code Signing** - Digital signature verification
-      for WASM modules
-    </Step>
-    <Step title="Key Management">
-      - [ ] **Secure Password Handling** - Replace hardcoded passwords with
-      user-provided secrets - [ ] **Key Derivation Functions** - Implement
-      Argon2id for password-based key derivation
-    </Step>
-    <Step title="Signature Security">
-      - [ ] **Signature Canonicalization** - Prevent ECDSA signature
-      malleability attacks - [ ] **Deterministic ECDSA** - Use RFC 6979 for
-      secure nonce generation
-    </Step>
-  </Steps>
-</Accordion>
-
-  <Accordion title="Data Integrity & Encryption" icon="database">
-    - [ ] **HMAC Data Integrity** - Add integrity verification for all encrypted data
-    - [ ] **Authenticated Encryption** - Use AES-GCM with proper additional data
-    - [ ] **Salt Storage** - Secure salt management for key derivation
-    - [ ] **Key Rotation** - Automated and enforced key rotation policies
-    - [ ] **Secure Memory Handling** - Proper zeroization of sensitive data in memory
-  </Accordion>
-</AccordionGroup>
-
-## High Priority Security Requirements (15% Complete)
-
-<AccordionGroup>
-  <Accordion title="Input Validation & Sanitization" icon="filter">
-    <CardGroup cols={2}>
-      <Card title="Implemented ✅" icon="check-circle" color="#16a34a">
-        - [x] **Vault ID Validation** - Regex-based validation implemented ✅
-        - [x] **CID Format Validation** - IPFS CID format checking ✅
-        - [x] **Password Length Validation** - Basic length constraints ✅
-      </Card>
-      <Card title="Pending" icon="clock" color="#f59e0b">
-        - [ ] **Advanced Input Sanitization** - Comprehensive injection attack prevention
-        - [ ] **Schema Validation** - JSON schema validation for all API inputs
-        - [ ] **File Upload Security** - Secure handling of WASM plugin uploads
-      </Card>
-    </CardGroup>
-  </Accordion>
-
-<Accordion
-  title="Error Handling & Information Disclosure"
-  icon="alert-triangle"
->
-  <CardGroup cols={2}>
-    <Card title="Implemented ✅" icon="check-circle" color="#16a34a">
-      - [x] **Error Message Sanitization** - SecureError implementation ✅ - [x]
-      **Structured Error Codes** - Consistent error code system ✅
-    </Card>
-    <Card title="Pending" icon="clock" color="#f59e0b">
-      - [ ] **Security Event Logging** - Comprehensive audit trail for security
-      events - [ ] **Sensitive Data Masking** - Ensure no secrets in logs or
-      error messages - [ ] **Error Rate Monitoring** - Automated detection of
-      unusual error patterns
-    </Card>
-  </CardGroup>
-</Accordion>
-
-  <Accordion title="Network Security" icon="network">
-    <CardGroup cols={2}>
-      <Card title="Implemented ✅" icon="check-circle" color="#16a34a">
-        - [x] **WASM Sandbox Restrictions** - Limited network access for plugins ✅
-        - [x] **IPFS Endpoint Configuration** - Configurable but restricted IPFS access ✅
-      </Card>
-      <Card title="Pending" icon="clock" color="#f59e0b">
-        - [ ] **TLS/SSL Configuration** - Proper certificate management and validation
-        - [ ] **Network Segmentation** - Isolated network zones for vault operations
-        - [ ] **Firewall Rules** - Restrictive network access policies
-      </Card>
-    </CardGroup>
-  </Accordion>
-</AccordionGroup>
-
-## Medium Priority Security Requirements (25% Complete)
-
-<AccordionGroup>
-  <Accordion title="Monitoring & Alerting" icon="activity">
-    <CardGroup cols={2}>
-      <Card title="Implemented ✅" icon="check-circle" color="#16a34a">
-        - [x] **Basic Rate Limiting** - Per-vault operation limits ✅
-        - [x] **Resource Constraints** - Maximum vault limits per instance ✅
-      </Card>
-      <Card title="Pending" icon="clock" color="#f59e0b">
-        - [ ] **Real-time Threat Detection** - Automated anomaly detection
-        - [ ] **Security Information and Event Management (SIEM)** - Centralized log analysis
-        - [ ] **Intrusion Detection System (IDS)** - Network-based threat detection
-        - [ ] **Performance Monitoring** - Resource usage and performance metrics
-      </Card>
-    </CardGroup>
-  </Accordion>
-
-<Accordion title="Backup & Recovery" icon="hard-drive">
-  - [ ] **Encrypted Backup System** - Secure vault data backup procedures - [ ]
-  **Disaster Recovery Plan** - Documented recovery procedures - [ ] **Data
-  Retention Policies** - Compliant data lifecycle management - [ ] **Backup
-  Integrity Verification** - Regular backup validation procedures - [ ]
-  **Point-in-time Recovery** - Granular recovery capabilities
-</Accordion>
-
-  <Accordion title="Compliance & Governance" icon="clipboard-check">
-    - [ ] **Data Privacy Controls** - GDPR/CCPA compliance measures
-    - [ ] **Audit Trail Integrity** - Immutable audit logging
-    - [ ] **Compliance Reporting** - Automated compliance status reporting
-    - [ ] **Risk Assessment Framework** - Regular security risk evaluations
-    - [ ] **Security Policy Documentation** - Comprehensive security procedures
-  </Accordion>
-</AccordionGroup>
-
-## Infrastructure Security Requirements (0% Complete)
-
-<AccordionGroup>
-  <Accordion title="Container & Orchestration Security" icon="container">
-    - [ ] **Container Image Scanning** - Vulnerability scanning for all images
-    - [ ] **Pod Security Policies** - Kubernetes security context enforcement
-    - [ ] **Network Policies** - Micro-segmentation for container communication
-    - [ ] **Secret Management** - Secure handling of API keys and certificates
-    - [ ] **Resource Quotas** - Prevent resource exhaustion attacks
-  </Accordion>
-
-<Accordion title="Database Security" icon="database">
-  - [ ] **Encryption at Rest** - Database-level encryption implementation - [ ]
-  **Connection Security** - TLS encryption for all database connections - [ ]
-  **Access Control** - Database user privilege management - [ ] **Query
-  Monitoring** - SQL injection and anomaly detection - [ ] **Backup Encryption**
-  - Encrypted database backup procedures
-</Accordion>
-
-  <Accordion title="IPFS Security" icon="folder-tree">
-    - [ ] **Content Addressing Verification** - Validate IPFS content integrity
-    - [ ] **Pinning Strategy** - Secure content persistence policies
-    - [ ] **Access Control** - Restrict IPFS node access and operations
-    - [ ] **Network Security** - Secure IPFS node communication
-    - [ ] **Content Filtering** - Prevent malicious content storage
-  </Accordion>
-</AccordionGroup>
-
-## Testing & Validation Requirements (10% Complete)
-
-<AccordionGroup>
-  <Accordion title="Security Testing" icon="bug">
-    <CardGroup cols={2}>
-      <Card title="Implemented ✅" icon="check-circle" color="#16a34a">
-        - [x] **Unit Tests** - Basic functionality testing ✅
-      </Card>
-      <Card title="Pending" icon="clock" color="#f59e0b">
-        - [ ] **Security Unit Tests** - Dedicated security-focused test cases
-        - [ ] **Integration Security Testing** - End-to-end security validation
-        - [ ] **Penetration Testing** - Third-party security assessment
-        - [ ] **Vulnerability Scanning** - Automated security scanning
-        - [ ] **Fuzzing** - Input validation robustness testing
-      </Card>
-    </CardGroup>
-  </Accordion>
-
-<Accordion title="Performance & Load Testing" icon="zap">
-  - [ ] **Load Testing** - Performance under high concurrent load - [ ] **Stress
-  Testing** - System behavior under extreme conditions - [ ] **Security Load
-  Testing** - Security controls under load - [ ] **Failover Testing** - System
-  resilience validation - [ ] **Capacity Planning** - Resource requirements
-  assessment
-</Accordion>
-
-  <Accordion title="Compliance Testing" icon="certificate">
-    - [ ] **OWASP Top 10 Validation** - Verify protection against common vulnerabilities
-    - [ ] **NIST Framework Assessment** - Cybersecurity framework compliance
-    - [ ] **Industry Standards Testing** - Blockchain-specific security standards
-    - [ ] **Regulatory Compliance Testing** - Financial services compliance validation
-  </Accordion>
-</AccordionGroup>
-
-## Operational Security Requirements (5% Complete)
-
-<AccordionGroup>
-  <Accordion title="Incident Response" icon="siren">
-    - [ ] **Security Incident Response Plan** - Documented procedures for security incidents
-    - [ ] **Incident Detection Systems** - Automated incident detection and alerting
-    - [ ] **Forensic Capabilities** - Digital forensics tools and procedures
-    - [ ] **Communication Procedures** - Stakeholder notification processes
-    - [ ] **Recovery Procedures** - System restoration and continuity planning
-  </Accordion>
-
-<Accordion title="Security Operations" icon="shield">
-  - [ ] **Security Operations Center (SOC)** - 24/7 security monitoring - [ ]
-  **Threat Intelligence** - External threat intelligence integration - [ ]
-  **Vulnerability Management** - Regular vulnerability assessment and patching -
-  [ ] **Security Training** - Developer and operations team security training -
-  [ ] **Security Awareness Program** - Organization-wide security awareness
-</Accordion>
-
-  <Accordion title="Change Management" icon="git-branch">
-    - [ ] **Secure Development Lifecycle** - Security integrated into development process
-    - [ ] **Code Review Process** - Security-focused code review procedures
-    - [ ] **Deployment Security** - Secure deployment pipelines and procedures
-    - [ ] **Configuration Management** - Secure configuration baseline management
-    - [ ] **Patch Management** - Timely security update procedures
-  </Accordion>
-</AccordionGroup>
-
-## Deployment Readiness Gates
-
-<CardGroup cols={3}>
-  <Card title="Testnet Deployment Prerequisites" icon="test-tube" color="#f59e0b">
-    <Warning>Required for testnet deployment</Warning>
-    
-    - [ ] All CRITICAL vulnerabilities resolved (CRITICAL-001, CRITICAL-002, CRITICAL-003)
-    - [ ] UCAN-based vault authorization system implemented and tested
-    - [ ] WASM integrity verification enforced
-    - [ ] Secure password/key derivation implemented
-    - [ ] Basic monitoring and alerting configured
-    - [ ] UCAN capability validation for all vault operations
-    - [ ] Delegation chain verification system operational
-  </Card>
-
-<Card title="Mainnet Beta Prerequisites" icon="flask" color="#3b82f6">
-  <Info>Required for mainnet beta</Info>- [ ] All CRITICAL and HIGH
-  vulnerabilities resolved - [ ] External security audit completed with
-  satisfactory results - [ ] Comprehensive monitoring and alerting system
-  deployed - [ ] Incident response procedures tested and validated - [ ] Bug
-  bounty program launched and initial issues resolved
-</Card>
-
-  <Card title="Production Mainnet Prerequisites" icon="check-circle" color="#16a34a">
-    <Note>Required for full production</Note>
-    
-    - [ ] All CRITICAL, HIGH, and MEDIUM vulnerabilities resolved
-    - [ ] SOC 2 Type II audit completed (for institutional use)
-    - [ ] Comprehensive security testing completed
-    - [ ] Hardware Security Module (HSM) integration (for enterprise)
-    - [ ] Disaster recovery and business continuity plans tested
-    - [ ] Regulatory compliance validation completed
-  </Card>
-</CardGroup>
-
-## Review and Approval Process
-
-### Security Review Board
-
-<CardGroup cols={2}>
-  <Card title="Review Board Members" icon="users">
-    - **Chief Security Officer** - Overall security strategy approval
-    - **Lead Security Engineer** - Technical security implementation review
-    - **Compliance Officer** - Regulatory and compliance validation
-    - **DevOps Lead** - Infrastructure security validation
-    - **Product Manager** - Business impact and user experience review
-  </Card>
-
-  <Card title="Approval Checkpoints" icon="checkpoint">
-    1. **Critical Fix Review** - After resolving all critical vulnerabilities
-    2. **Security Architecture Review** - Complete system security design validation
-    3. **Penetration Test Review** - External security assessment results
-    4. **Compliance Review** - Regulatory and standards compliance validation
-    5. **Production Readiness Review** - Final deployment approval
-  </Card>
-</CardGroup>
-
-### Documentation Requirements
-
-<Steps>
-  <Step title="Architecture Documentation">
-    - [ ] Security architecture documentation updated
-    - [ ] Threat model documentation complete
-  </Step>
-
-<Step title="Operational Documentation">
-  - [ ] Incident response runbooks validated - [ ] User security guidelines
-  published
-</Step>
-
-  <Step title="Compliance Documentation">
-    - [ ] Compliance certification documentation complete
-  </Step>
-</Steps>
-
-## Success Metrics
-
-<CardGroup cols={2}>
-  <Card title="Security KPIs" icon="target">
-    - **Zero Critical Vulnerabilities** - No unresolved critical security issues
-    - **Less than 5% High Risk Issues** - Minimal high-risk vulnerabilities remaining
-    - **99.9% Uptime** - High availability with security controls active
-    - **Less than 1s Authentication Latency** - Performance impact of security controls
-    - **Zero Data Breaches** - No unauthorized access to vault data
-  </Card>
-
-  <Card title="Compliance Metrics" icon="chart-bar">
-    - **100% Critical Control Coverage** - All critical security controls implemented
-    - **<30 Day Vulnerability Resolution** - Rapid security issue resolution
-    - **100% Security Event Monitoring** - Complete visibility into security events
-    - **<15 Minute Incident Detection** - Rapid threat detection capability
-    - **100% Audit Trail Coverage** - Complete audit logging for all operations
-  </Card>
-</CardGroup>
-
----
-
-**Next Review Date:** September 5, 2025  
-**Document Owner:** Security Team  
-**Approval Status:** Draft - Pending Security Review Board Approval
-
diff --git a/docs/guides/security/cryptography.mdx b/docs/guides/security/cryptography.mdx
deleted file mode 100644
index 6731f743b..000000000
--- a/docs/guides/security/cryptography.mdx
+++ /dev/null
@@ -1,120 +0,0 @@
----
-title: "Cryptographic Security Enhancements"
-description: "Comprehensive overview of cryptographic security enhancements in the Sonr blockchain"
-sidebarTitle: "Cryptography Usage"
-icon: "lock"
----
-
-import { Callout } from "mintlify/components";
-import { CodeBlock } from "mintlify/components";
-import { Tabs, Tab } from "mintlify/components";
-
-# Cryptographic Security Enhancements
-
-<Callout type="info">
-  This document details the comprehensive cryptographic security enhancements
-  implemented in the Sonr blockchain to address critical vulnerabilities and
-  strengthen the overall security posture.
-</Callout>
-
-## Table of Contents
-
-1. [WASM Plugin Security](#wasm-plugin-security)
-2. [Password Security](#password-security)
-3. [ECDSA Signature Security](#ecdsa-signature-security)
-4. [Key Derivation](#key-derivation)
-5. [Security Testing](#security-testing)
-6. [Migration Guide](#migration-guide)
-
-## WASM Plugin Security
-
-### SHA256 Hash Verification
-
-<Callout type="warning">
-  All WASM plugins are now verified using SHA256 hashes before execution to
-  prevent tampering and ensure integrity.
-</Callout>
-
-**Implementation**: `crypto/wasm/verifier.go`
-
-<CodeBlock language="go">
-{`// Usage example
-verifier := wasm.NewHashVerifier()
-hash := verifier.ComputeHash(wasmBytes)
-verifier.AddTrustedHash("motr.wasm", hash)
-
-// Verify before execution
-err := verifier.VerifyHash("motr.wasm", wasmBytes)
-if err != nil {
-// Plugin verification failed - do not execute
-}`}
-
-</CodeBlock>
-
-**Features**:
-
-- Automatic hash computation on plugin load
-- Hash chain verification for secure updates
-- Trusted hash whitelist management
-- Maximum size enforcement (10MB default)
-
-### Ed25519 Code Signing
-
-<Callout type="warning">
-  WASM plugins must be signed with Ed25519 signatures to ensure authenticity and
-  prevent unauthorized modifications.
-</Callout>
-
-**Implementation**: `crypto/wasm/signer.go`
-
-<CodeBlock language="go">
-{`// Sign a plugin
-signer := wasm.NewSigner(privateKey, publicKey)
-signature, err := signer.SignModule(wasmBytes, "motr.wasm", "v1.0.0")
-
-// Verify signature
-manifest := &wasm.SignatureManifest{
-ModuleHash: hash,
-Signatures: []wasm.SignatureEntry{\*signature},
-TrustedKeys: trustedKeys,
-}
-err = signer.VerifyWithManifest(wasmBytes, manifest)`}
-
-</CodeBlock>
-
-### Remaining sections follow the same pattern, using MDX components to enhance readability
-
-## Security Considerations
-
-<Callout type="warning">
-  ### Best Practices 1. **Always validate passwords** before use 2. **Never
-  store passwords in plaintext** or logs 3. **Use deterministic ECDSA** for all
-  signatures 4. **Canonicalize all signatures** before storage 5. **Verify WASM
-  plugins** before execution
-</Callout>
-
-## Support
-
-<Callout type="info">
-  For questions or issues related to cryptographic security: 1. Check the test
-  suites for usage examples 2. Review the security test scenarios 3. Open an
-  issue on GitHub with the `security` label 4. Contact the security team for
-  sensitive issues
-</Callout>
-
-## Changelog
-
-### Version 0.10.34
-
-- Added WASM hash verification (`crypto/wasm/verifier.go`)
-- Added Ed25519 code signing (`crypto/wasm/signer.go`)
-- Replaced hardcoded passwords with secure validation (`crypto/password/validator.go`)
-- Implemented Argon2id key derivation (`crypto/argon2/kdf.go`)
-- Added RFC 6979 deterministic ECDSA (`crypto/ecdsa/deterministic.go`)
-- Implemented signature canonicalization (`crypto/ecdsa/canonical.go`)
-- Added comprehensive security test suite (`crypto/security_test.go`)
-
----
-
-_Last Updated: 2024_
-_Security Contact: security@sonr.io_
diff --git a/docs/guides/security/vulnerabilities.mdx b/docs/guides/security/vulnerabilities.mdx
deleted file mode 100644
index 772878d46..000000000
--- a/docs/guides/security/vulnerabilities.mdx
+++ /dev/null
@@ -1,202 +0,0 @@
----
-title: "Vulnerability Remediation Report"
-description: "Comprehensive report documenting the resolution of critical security vulnerabilities in the Sonr blockchain"
-sidebarTitle: "Vulnerability Remediation"
-icon: "bug-off"
----
-
-import { Callout } from 'mintlify/components'
-import { CodeBlock } from 'mintlify/components'
-import { Tabs, Tab } from 'mintlify/components'
-
-# Vulnerability Remediation Report
-
-<Callout type="info">
-  This report documents the critical security vulnerabilities identified in the Sonr blockchain cryptographic implementation and the comprehensive remediation measures implemented to address them.
-</Callout>
-
-## Vulnerabilities Addressed
-
-### 1. WASM Plugin Tampering (Critical)
-
-<Callout type="warning">
-  **CVE Category**: CWE-494 (Download of Code Without Integrity Check)
-  
-  **Impact**: Remote code execution, data exfiltration, system compromise
-</Callout>
-
-**Remediation**:
-- Implemented SHA256 hash verification (`crypto/wasm/verifier.go`)
-- Added Ed25519 digital signatures (`crypto/wasm/signer.go`)
-- Created hash chain for secure updates
-- Enforced maximum plugin size limits
-
-**Status**: ✅ RESOLVED
-
-### 2. Hardcoded Password Generation (Critical)
-
-<Callout type="warning">
-  **CVE Category**: CWE-798 (Use of Hard-coded Credentials)
-  
-  **Impact**: Unauthorized vault access, credential theft, data breach
-</Callout>
-
-**Vulnerable Code (Removed)**:
-<CodeBlock language="go">
-{`password := fmt.Sprintf("vault-password-%s-%s", did, owner)`}
-</CodeBlock>
-
-**Remediation**:
-- Removed all hardcoded password generation
-- Implemented secure password validation (`crypto/password/validator.go`)
-- Added entropy requirements (minimum 50 bits)
-- Integrated Argon2id for key derivation
-
-**Status**: ✅ RESOLVED
-
-### 3. ECDSA Nonce Reuse Vulnerability (High)
-
-<Callout type="warning">
-  **CVE Category**: CWE-330 (Use of Insufficiently Random Values)
-  
-  **Impact**: Private key extraction, signature forgery, account compromise
-</Callout>
-
-**Remediation**:
-- Implemented RFC 6979 deterministic ECDSA (`crypto/ecdsa/deterministic.go`)
-- Eliminated dependency on random number generation
-- Added comprehensive test coverage
-
-**Status**: ✅ RESOLVED
-
-### 4. Signature Malleability (High)
-
-<Callout type="warning">
-  **CVE Category**: CWE-347 (Improper Verification of Cryptographic Signature)
-  
-  **Impact**: Transaction replay, double-spending, consensus issues
-</Callout>
-
-**Remediation**:
-- Implemented signature canonicalization (`crypto/ecdsa/canonical.go`)
-- Enforced s ≤ N/2 requirement
-- Added automatic canonicalization and validation
-
-**Status**: ✅ RESOLVED
-
-### 5. Weak Password Storage (High)
-
-<Callout type="warning">
-  **CVE Category**: CWE-916 (Use of Password Hash With Insufficient Computational Effort)
-  
-  **Impact**: Password cracking, unauthorized access, account takeover
-</Callout>
-
-**Remediation**:
-- Implemented Argon2id with secure defaults (`crypto/argon2/kdf.go`)
-- Added configurable security profiles
-- Enforced minimum memory requirements (64MB default)
-- Implemented PHC format for standardized storage
-
-**Status**: ✅ RESOLVED
-
-### 6. Timing Attack Vulnerabilities (Medium)
-
-<Callout type="warning">
-  **CVE Category**: CWE-208 (Observable Timing Discrepancy)
-  
-  **Impact**: Information disclosure, side-channel attacks
-</Callout>
-
-**Remediation**:
-- Implemented constant-time comparison functions
-- Used `crypto/subtle.ConstantTimeCompare`
-- Added timing attack resistance tests
-
-**Status**: ✅ RESOLVED
-
-## Verification Methods
-
-### Automated Testing
-
-<Callout type="info">
-  All remediations include comprehensive test suites.
-</Callout>
-
-<CodeBlock language="bash">
-{`# Run security tests
-go test ./crypto/security_test.go -v
-
-# Run individual component tests
-go test ./crypto/argon2 -v
-go test ./crypto/ecdsa -v
-go test ./crypto/wasm -v
-
-# Run benchmarks
-go test -bench=. ./crypto/...`}
-</CodeBlock>
-
-## Security Metrics
-
-<Callout type="warning">
-  ### Before Remediation
-
-  | Metric | Value | Risk Level |
-  |--------|-------|------------|
-  | Hardcoded Passwords | Yes | Critical |
-  | WASM Verification | None | Critical |
-  | Nonce Generation | Random | High |
-  | Signature Format | Non-canonical | High |
-  | Password Hashing | Basic | High |
-  | Timing Resistance | No | Medium |
-
-  ### After Remediation
-
-  | Metric | Value | Risk Level |
-  |--------|-------|------------|
-  | Hardcoded Passwords | Eliminated | None |
-  | WASM Verification | SHA256 + Ed25519 | None |
-  | Nonce Generation | RFC 6979 Deterministic | None |
-  | Signature Format | Canonical (s ≤ N/2) | None |
-  | Password Hashing | Argon2id | None |
-  | Timing Resistance | Constant-time | None |
-</Callout>
-
-## Recommendations
-
-<Callout type="info">
-  ### Immediate Actions
-
-  1. ✅ **Deploy remediations** to all environments
-  2. ✅ **Update documentation** for developers
-  3. ✅ **Train team** on new security requirements
-  4. ✅ **Audit existing deployments** for compliance
-</Callout>
-
-## Conclusion
-
-<Callout type="success">
-  All identified cryptographic vulnerabilities have been successfully remediated through comprehensive security enhancements:
-
-  - **6 critical/high vulnerabilities resolved**
-  - **7 new security modules implemented**
-  - **200+ security tests added**
-  - **100% backward compatibility maintained**
-  - **Zero security debt remaining**
-
-  The Sonr blockchain now implements industry-leading cryptographic security practices that protect against current and emerging threats.
-</Callout>
-
-## Contact
-
-For security-related inquiries:
-- Security Team: security@sonr.io
-- Bug Bounty Program: https://sonr.io/security/bug-bounty
-- Security Advisories: https://github.com/sonr-io/sonr/security/advisories
-
----
-
-*Report Date: 2024*
-*Classification: Public*
-*Version: 1.0*
-EOF < /dev/null
diff --git a/docs/guides/vrf-key-management.mdx b/docs/guides/vrf-key-management.mdx
deleted file mode 100644
index ac4c30faa..000000000
--- a/docs/guides/vrf-key-management.mdx
+++ /dev/null
@@ -1,294 +0,0 @@
----
-title: VRF Key Management
-description: Guide to managing VRF keys for multi-validator encryption
----
-
-# VRF Key Management
-
-VRF (Verifiable Random Function) keys are essential for consensus-based encryption in multi-validator Sonr networks. This guide explains how VRF keys work, how to manage them, and how to troubleshoot common issues.
-
-## Overview
-
-VRF keys enable:
-- **Deterministic randomness** in distributed systems
-- **Multi-validator encryption** key derivation
-- **Consensus-based key rotation** when validator sets change
-- **Secure encryption** without requiring shared secrets
-
-## Automatic Generation
-
-VRF keys are automatically generated when you initialize a new node:
-
-```bash
-snrd init <moniker> --chain-id sonrtest_1-1
-```
-
-This creates:
-- VRF keypair at `~/.sonr/vrf_secret.key`
-- Deterministic generation from chain-id
-- Secure 0600 permissions (owner read/write only)
-
-## VRF Key Commands
-
-The `snrd keys vrf` command suite provides complete VRF key management:
-
-### Show VRF Key Information
-
-Display your node's VRF public key and verify configuration:
-
-```bash
-snrd keys vrf show
-```
-
-Example output:
-```
-VRF Key Information:
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-Key Path:        /home/user/.sonr/vrf_secret.key
-Public Key:      d2d8f52119ba12f7f41b004314e3d040526393f09ba434f5b4196c4242ddac0d
-Key Size:        64 bytes
-Public Key Size: 32 bytes
-Permissions:     -rw-------
-Modified:        2025-09-27 00:33:11
-
-✓ VRF keys are properly configured
-```
-
-### Verify VRF Functionality
-
-Test that VRF keys are working correctly:
-
-```bash
-snrd keys vrf verify
-```
-
-This performs:
-- VRF key loading
-- Public key derivation
-- Test VRF computation with proof
-- Cryptographic verification
-
-### Generate New VRF Keys
-
-Generate or regenerate VRF keys (with backup):
-
-```bash
-# Generate for current chain
-snrd keys vrf generate
-
-# Generate for specific chain
-snrd keys vrf generate --chain-id sonrtest_1-1
-
-# Force regenerate (creates backup)
-snrd keys vrf generate --force
-```
-
-**⚠️ Warning**: Regenerating VRF keys will invalidate existing consensus-based encryption keys. Only do this if you understand the implications.
-
-## Multi-Validator Testnet Setup
-
-When setting up a multi-validator testnet, ensure each validator generates unique VRF keys:
-
-### Using Scripts
-
-The testnet scripts automatically generate VRF keys:
-
-```bash
-# Single node testnet
-CHAIN_ID="sonrtest_1-1" CLEAN=true bash scripts/test_node.sh
-
-# Multi-node testnet with Starship
-make start
-```
-
-### Manual Setup
-
-For manual validator setup:
-
-1. **Initialize each validator**:
-   ```bash
-   snrd init validator-01 --chain-id sonrtest_1-1
-   ```
-
-2. **Verify VRF keys**:
-   ```bash
-   snrd keys vrf verify
-   ```
-
-3. **Check permissions**:
-   ```bash
-   ls -la ~/.sonr/vrf_secret.key
-   # Should show: -rw------- (0600)
-   ```
-
-## Encryption Configuration
-
-VRF keys are only required when encryption is enabled. You can control encryption via module parameters:
-
-### Check Encryption Status
-
-```bash
-snrd query dwn params
-```
-
-Look for the `encryption_enabled` field.
-
-### Disable Encryption
-
-If you don't need encryption features, you can disable them:
-
-```bash
-# Via governance proposal
-snrd tx gov submit-proposal param-change proposal.json
-```
-
-With `proposal.json`:
-```json
-{
-  "title": "Disable DWN Encryption",
-  "description": "Disable encryption features",
-  "changes": [
-    {
-      "subspace": "dwn",
-      "key": "EncryptionEnabled",
-      "value": "false"
-    }
-  ]
-}
-```
-
-## Troubleshooting
-
-### Error: "VRF keys not loaded"
-
-**Cause**: VRF keys are missing or corrupted.
-
-**Solution**:
-1. Check if keys exist:
-   ```bash
-   ls -la ~/.sonr/vrf_secret.key
-   ```
-
-2. If missing, generate keys:
-   ```bash
-   snrd keys vrf generate --chain-id sonrtest_1-1
-   ```
-
-3. If present but corrupted, regenerate:
-   ```bash
-   snrd keys vrf generate --force
-   ```
-
-### Error: "Failed to check and perform key rotation"
-
-**Cause**: VRF keys not available during EndBlock, but encryption is enabled.
-
-**Solution**:
-1. Verify VRF keys:
-   ```bash
-   snrd keys vrf verify
-   ```
-
-2. Or disable encryption if not needed:
-   ```bash
-   # Check current params
-   snrd query dwn params
-
-   # Submit governance proposal to disable
-   ```
-
-### Incorrect Permissions
-
-**Cause**: VRF key file has insecure permissions.
-
-**Fix**:
-```bash
-chmod 0600 ~/.sonr/vrf_secret.key
-```
-
-### Single-Node vs Multi-Validator
-
-- **Single-node development**: Works without VRF keys (deterministic fallback)
-- **Multi-validator testnet**: Requires VRF keys for consensus encryption
-- **Production**: Always use VRF keys with proper security
-
-## Security Best Practices
-
-### Key Storage
-
-- **Never share** VRF private keys between validators
-- **Backup** VRF keys securely (offline storage)
-- **Rotate** validator nodes if keys are compromised
-- **Monitor** file permissions regularly
-
-### File Permissions
-
-Always ensure restrictive permissions:
-
-```bash
-# Check permissions
-ls -la ~/.sonr/vrf_secret.key
-
-# Fix if needed
-chmod 0600 ~/.sonr/vrf_secret.key
-chown $(whoami):$(whoami) ~/.sonr/vrf_secret.key
-```
-
-### Key Backup
-
-Backup your VRF keys securely:
-
-```bash
-# Create encrypted backup
-tar -czf vrf-backup.tar.gz -C ~/.sonr vrf_secret.key
-gpg --symmetric --cipher-algo AES256 vrf-backup.tar.gz
-
-# Store vrf-backup.tar.gz.gpg securely offline
-```
-
-### Recovery
-
-Restore from backup:
-
-```bash
-# Decrypt backup
-gpg --decrypt vrf-backup.tar.gz.gpg > vrf-backup.tar.gz
-
-# Extract to correct location
-tar -xzf vrf-backup.tar.gz -C ~/.sonr/
-
-# Verify permissions
-chmod 0600 ~/.sonr/vrf_secret.key
-snrd keys vrf verify
-```
-
-## Advanced Topics
-
-### Deterministic Generation
-
-VRF keys are generated deterministically from the chain-id using SHA256. This means:
-- Same chain-id = same VRF keys
-- Different validators should use different chain configurations
-- Re-running `snrd init` with same chain-id produces same keys
-
-### VRF Algorithm
-
-Sonr uses **VRF based on Ed25519** (Curve25519):
-- Private key: 64 bytes (32 bytes secret + 32 bytes public)
-- Public key: 32 bytes
-- Proof: 80 bytes
-- Output: 32 bytes of verifiable randomness
-
-### Consensus Encryption
-
-Multi-validator encryption key derivation:
-1. Each validator computes VRF output from consensus input
-2. VRF outputs are combined to derive encryption key
-3. Automatic rotation when validator set changes
-4. Keys are never transmitted over network
-
-## See Also
-
-- [Configure Local Node](/guides/configure-local-node) - Node setup guide
-- [Development](/guides/development) - Development environment setup
-- [Deployment](/guides/deployment) - Production deployment guide
diff --git a/docs/guides/vrf-migration.mdx b/docs/guides/vrf-migration.mdx
deleted file mode 100644
index 6b2a667b2..000000000
--- a/docs/guides/vrf-migration.mdx
+++ /dev/null
@@ -1,562 +0,0 @@
----
-title: VRF Key Migration Guide
-description: Migrate existing validator nodes to use VRF keys without downtime
----
-
-# VRF Key Migration Guide
-
-This guide provides step-by-step instructions for adding VRF keys to existing Sonr validator nodes that were initialized before VRF key support was added.
-
-## Overview
-
-VRF (Verifiable Random Function) keys are required for:
-- Multi-validator encryption features (added in v0.1.12)
-- Consensus-based key rotation
-- Secure encryption key derivation
-
-Existing nodes initialized before v0.1.12 may not have VRF keys generated.
-
-## Pre-Migration Checklist
-
-Before starting the migration:
-
-- [ ] **Backup** your validator keys and configuration
-- [ ] **Identify** which validators need VRF keys
-- [ ] **Plan** migration during low-traffic period
-- [ ] **Coordinate** with other validators (for governance proposals)
-- [ ] **Test** on testnet first
-
-## Migration Scenarios
-
-### Scenario 1: Encryption Not Needed
-
-If your network doesn't use encryption features, you can disable encryption instead of generating VRF keys.
-
-**Option A: Disable via Governance**
-
-1. Create governance proposal:
-
-```bash
-cat > disable-encryption-proposal.json <<EOF
-{
-  "messages": [
-    {
-      "@type": "/cosmos.params.v1beta1.MsgUpdateParams",
-      "authority": "sonr10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t",
-      "params": {
-        "encryption_enabled": false
-      }
-    }
-  ],
-  "metadata": "Disable encryption until VRF keys are configured",
-  "deposit": "10000000usnr",
-  "title": "Disable DWN Encryption",
-  "summary": "Temporary disable encryption to allow gradual VRF key rollout"
-}
-EOF
-```
-
-2. Submit proposal:
-
-```bash
-snrd tx gov submit-proposal disable-encryption-proposal.json \
-  --from validator \
-  --chain-id sonrtest_1-1 \
-  --gas auto \
-  --gas-adjustment 1.5
-```
-
-3. Vote and wait for execution.
-
-**Option B: Genesis Parameter (New Networks Only)**
-
-For new networks, set in genesis:
-
-```json
-{
-  "app_state": {
-    "dwn": {
-      "params": {
-        "encryption_enabled": false
-      }
-    }
-  }
-}
-```
-
-### Scenario 2: Gradual Migration (Recommended)
-
-Migrate validators one at a time to minimize risk.
-
-**Step 1: Disable Encryption Temporarily**
-
-Follow Scenario 1, Option A to disable encryption via governance.
-
-**Step 2: Generate VRF Keys for Each Validator**
-
-On each validator node:
-
-1. **Stop the validator** (optional, but recommended):
-   ```bash
-   systemctl stop snrd
-   # or
-   pkill snrd
-   ```
-
-2. **Generate VRF keys**:
-   ```bash
-   snrd keys vrf generate --chain-id sonrtest_1-1
-   ```
-
-3. **Verify generation**:
-   ```bash
-   snrd keys vrf show
-   snrd keys vrf verify
-   ```
-
-4. **Check permissions**:
-   ```bash
-   ls -la ~/.sonr/vrf_secret.key
-   # Should show: -rw------- (0600)
-   ```
-
-5. **Restart validator**:
-   ```bash
-   systemctl start snrd
-   # or start manually
-   ```
-
-6. **Verify node is syncing**:
-   ```bash
-   snrd status | jq '.SyncInfo'
-   ```
-
-**Step 3: Verify All Validators Have VRF Keys**
-
-On each validator, run:
-
-```bash
-snrd keys vrf verify
-```
-
-All validators should show:
-```
-✓ VRF keys are fully functional
-```
-
-**Step 4: Re-enable Encryption**
-
-Once all validators have VRF keys:
-
-1. Create governance proposal:
-
-```bash
-cat > enable-encryption-proposal.json <<EOF
-{
-  "messages": [
-    {
-      "@type": "/cosmos.params.v1beta1.MsgUpdateParams",
-      "authority": "sonr10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t",
-      "params": {
-        "encryption_enabled": true
-      }
-    }
-  ],
-  "metadata": "Re-enable encryption after VRF key deployment",
-  "deposit": "10000000usnr",
-  "title": "Enable DWN Encryption",
-  "summary": "Re-enable encryption now that all validators have VRF keys"
-}
-EOF
-```
-
-2. Submit and execute proposal.
-
-### Scenario 3: Coordinated Network Upgrade
-
-For critical production networks, coordinate a network-wide upgrade.
-
-**Phase 1: Preparation (1-2 weeks before)**
-
-1. **Announce upgrade** to all validators
-2. **Share migration plan** and timeline
-3. **Test on testnet** with same validator set
-4. **Prepare rollback plan**
-
-**Phase 2: Pre-Upgrade (1 day before)**
-
-1. **Verify all validators** are ready:
-   ```bash
-   # Check validator set
-   snrd query staking validators --output json | jq '.validators[] | {moniker, status}'
-   ```
-
-2. **Backup critical data**:
-   ```bash
-   # Backup validator state
-   tar -czf validator-backup-$(date +%Y%m%d).tar.gz \
-     ~/.sonr/config/ \
-     ~/.sonr/data/priv_validator_state.json
-   ```
-
-3. **Sync upgrade binary**:
-   ```bash
-   # Ensure all validators have same version
-   snrd version
-   ```
-
-**Phase 3: Migration Window**
-
-1. **Stop network** at agreed block height:
-   ```bash
-   # All validators stop
-   systemctl stop snrd
-   ```
-
-2. **Generate VRF keys** on each validator:
-   ```bash
-   snrd keys vrf generate --chain-id sonrtest_1-1
-   snrd keys vrf verify
-   ```
-
-3. **Verify permissions**:
-   ```bash
-   chmod 0600 ~/.sonr/vrf_secret.key
-   ```
-
-4. **Restart validators** in coordination:
-   ```bash
-   systemctl start snrd
-   ```
-
-5. **Monitor network recovery**:
-   ```bash
-   # Watch consensus
-   snrd status | jq '.SyncInfo.catching_up'
-
-   # Watch block production
-   watch -n 1 'snrd status | jq ".SyncInfo.latest_block_height"'
-   ```
-
-**Phase 4: Post-Migration Verification**
-
-1. **Check all validators online**:
-   ```bash
-   snrd query tendermint-validator-set | jq '.validators[].address'
-   ```
-
-2. **Verify VRF functionality**:
-   ```bash
-   # On each validator
-   snrd keys vrf verify
-   ```
-
-3. **Test encryption features**:
-   ```bash
-   # Create encrypted record
-   snrd tx dwn create-record \
-     --protocol "encrypted-protocol" \
-     --data "test-data" \
-     --from validator
-   ```
-
-4. **Monitor for errors**:
-   ```bash
-   journalctl -u snrd -f | grep -i "vrf\|encryption"
-   ```
-
-## Rollback Procedures
-
-If issues arise during migration:
-
-### Emergency Rollback
-
-1. **Stop affected validators**:
-   ```bash
-   systemctl stop snrd
-   ```
-
-2. **Disable encryption via governance** (if network is running):
-   ```bash
-   # Submit emergency proposal
-   snrd tx gov submit-proposal disable-encryption-proposal.json --expedited
-   ```
-
-3. **Restore from backup**:
-   ```bash
-   # Stop node
-   systemctl stop snrd
-
-   # Restore backup
-   tar -xzf validator-backup-YYYYMMDD.tar.gz -C ~/
-
-   # Restart
-   systemctl start snrd
-   ```
-
-4. **Verify recovery**:
-   ```bash
-   snrd status
-   ```
-
-### Gradual Rollback
-
-If only some validators have issues:
-
-1. Keep VRF keys on working validators
-2. Remove VRF keys from problematic validators:
-   ```bash
-   mv ~/.sonr/vrf_secret.key ~/.sonr/vrf_secret.key.backup
-   ```
-3. Disable encryption temporarily
-4. Debug issues before retry
-
-## Validation & Testing
-
-### Pre-Migration Testing
-
-Test on a private testnet first:
-
-```bash
-# Setup test network
-CHAIN_ID="test-migration" make localnet
-
-# Test VRF generation
-snrd keys vrf generate --chain-id test-migration
-snrd keys vrf verify
-
-# Test with encryption enabled
-snrd query dwn params
-
-# Test key rotation
-# (trigger validator set change)
-```
-
-### Post-Migration Validation
-
-After migration, verify:
-
-1. **All validators have VRF keys**:
-   ```bash
-   # On each validator
-   snrd keys vrf show
-   ```
-
-2. **No VRF errors in logs**:
-   ```bash
-   journalctl -u snrd --since "1 hour ago" | grep -i "vrf" | grep -i "error"
-   # Should return nothing
-   ```
-
-3. **Encryption working**:
-   ```bash
-   snrd query dwn params | jq '.params.encryption_enabled'
-   # Should return: true
-   ```
-
-4. **Key rotation functional**:
-   ```bash
-   # Check encryption state
-   snrd query dwn encryption-state
-   ```
-
-## Troubleshooting
-
-### Issue: "VRF keys not loaded"
-
-**Cause**: Keys not generated or file permissions incorrect.
-
-**Fix**:
-```bash
-# Regenerate keys
-snrd keys vrf generate --chain-id <your-chain-id> --force
-
-# Fix permissions
-chmod 0600 ~/.sonr/vrf_secret.key
-
-# Verify
-snrd keys vrf verify
-```
-
-### Issue: "Failed to check and perform key rotation"
-
-**Cause**: Encryption enabled but VRF keys missing on some validators.
-
-**Fix**:
-1. Identify validators without VRF keys
-2. Temporarily disable encryption
-3. Generate VRF keys on all validators
-4. Re-enable encryption
-
-### Issue: Network Stalled During Migration
-
-**Cause**: Too many validators offline simultaneously.
-
-**Fix**:
-1. Ensure >2/3 voting power online
-2. Coordinate restart timing
-3. Use smaller migration windows per validator
-
-### Issue: Inconsistent VRF Keys
-
-**Cause**: Different chain-id used during generation.
-
-**Fix**:
-```bash
-# Check chain-id in genesis
-jq '.chain_id' ~/.sonr/config/genesis.json
-
-# Regenerate with correct chain-id
-snrd keys vrf generate --chain-id <correct-chain-id> --force
-```
-
-## Best Practices
-
-### Before Migration
-
-- ✅ Test on testnet with same topology
-- ✅ Backup all validator data
-- ✅ Document rollback procedures
-- ✅ Prepare monitoring dashboards
-- ✅ Schedule during low-traffic period
-
-### During Migration
-
-- ✅ Migrate one validator at a time (gradual)
-- ✅ Monitor logs continuously
-- ✅ Verify each step before proceeding
-- ✅ Keep communication channels open
-- ✅ Document any issues encountered
-
-### After Migration
-
-- ✅ Verify all validators functional
-- ✅ Test encryption features
-- ✅ Monitor performance metrics
-- ✅ Update documentation
-- ✅ Schedule follow-up verification
-
-## Timeline Recommendations
-
-### Small Network (3-5 validators)
-- **Preparation**: 3-5 days
-- **Migration**: 1-2 hours
-- **Verification**: 1 day
-
-### Medium Network (10-20 validators)
-- **Preparation**: 1 week
-- **Migration**: 4-6 hours (gradual) or 30 minutes (coordinated)
-- **Verification**: 2-3 days
-
-### Large Network (50+ validators)
-- **Preparation**: 2-3 weeks
-- **Migration**: 1-2 days (gradual) or network upgrade
-- **Verification**: 1 week
-
-## Support & Resources
-
-- **VRF Key Management Guide**: `/guides/vrf-key-management`
-- **GitHub Issues**: https://github.com/sonr-io/sonr/issues
-- **Discord**: Validator support channel
-- **Documentation**: https://docs.sonr.io
-
-## Appendix: Automation Script
-
-For networks with many validators, use this automation script:
-
-```bash
-#!/bin/bash
-# vrf-migration.sh - Automated VRF key migration helper
-
-set -e
-
-CHAIN_ID="${CHAIN_ID:-sonrtest_1-1}"
-BACKUP_DIR="${BACKUP_DIR:-$HOME/vrf-backup}"
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-log_info() {
-    echo -e "${GREEN}[INFO]${NC} $1"
-}
-
-log_warn() {
-    echo -e "${YELLOW}[WARN]${NC} $1"
-}
-
-log_error() {
-    echo -e "${RED}[ERROR]${NC} $1"
-}
-
-# Backup existing data
-backup_validator() {
-    log_info "Creating backup..."
-    mkdir -p "$BACKUP_DIR"
-    tar -czf "$BACKUP_DIR/validator-$(date +%Y%m%d-%H%M%S).tar.gz" \
-        ~/.sonr/config/ \
-        ~/.sonr/data/priv_validator_state.json 2>/dev/null || true
-    log_info "Backup created at $BACKUP_DIR"
-}
-
-# Generate VRF keys
-generate_vrf() {
-    log_info "Generating VRF keys for chain: $CHAIN_ID"
-    if snrd keys vrf generate --chain-id "$CHAIN_ID"; then
-        log_info "VRF keys generated successfully"
-    else
-        log_error "Failed to generate VRF keys"
-        exit 1
-    fi
-}
-
-# Verify VRF keys
-verify_vrf() {
-    log_info "Verifying VRF keys..."
-    if snrd keys vrf verify; then
-        log_info "VRF keys verified successfully"
-    else
-        log_error "VRF key verification failed"
-        exit 1
-    fi
-}
-
-# Fix permissions
-fix_permissions() {
-    log_info "Fixing VRF key permissions..."
-    chmod 0600 ~/.sonr/vrf_secret.key
-    log_info "Permissions set to 0600"
-}
-
-# Main migration flow
-main() {
-    log_info "Starting VRF key migration..."
-    log_info "Chain ID: $CHAIN_ID"
-
-    # Backup
-    backup_validator
-
-    # Generate keys
-    generate_vrf
-
-    # Fix permissions
-    fix_permissions
-
-    # Verify
-    verify_vrf
-
-    log_info "Migration completed successfully!"
-    log_info "Please restart your validator node"
-}
-
-# Run migration
-main
-```
-
-Save and run:
-```bash
-chmod +x vrf-migration.sh
-CHAIN_ID="sonrtest_1-1" ./vrf-migration.sh
-```
diff --git a/docs/index.mdx b/docs/index.mdx
index 414f6ea40..efa3e6c12 100644
--- a/docs/index.mdx
+++ b/docs/index.mdx
@@ -1,27 +1,37 @@
 ---
 title: Introduction
 description: The peer-to-peer identity and asset management system that makes Web3 as easy as Web2 through DID documents, WebAuthn, and IPFS—providing users with secure, portable decentralized identity
-sidebarTitle: "Overview"
-icon: "play"
+icon: "house"
+sidebar:
+  label: "Introduction"
 ---
 
-# Introduction to Sonr
+Sonr is a Cosmos SDK chain that replaces wallet addresses with W3C DIDs, seed
+phrases with passkeys, and unlimited token approvals with scoped UCAN
+capabilities. Start wherever you are:
 
-<Note title="Scope">
-  This document introduces Sonr's blockchain architecture, core components, and
-  integration patterns. It covers identity management, authentication, data
-  sovereignty, and cross-chain operations. This document does not cover
-  implementation details or code examples—see the Quick Start Guide for hands-on
-  tutorials.
-</Note>
+<CardGroup cols={2}>
+  <Card title="Install snrd" href="/install" icon="download">
+    Get the binary, join a network, and run your first query.
+  </Card>
+  <Card title="Set up your environment" href="/development" icon="code">
+    The development workflow: local node, codegen, and testing.
+  </Card>
+  <Card title="Become a validator" href="/onboarding" icon="boxes">
+    Join the active set and start signing blocks.
+  </Card>
+  <Card title="Module reference" href="/reference/modules/did" icon="boxes">
+    `x/did`, `x/dwn`, `x/svc`, and `x/dex` — messages, queries, and state.
+  </Card>
+</CardGroup>
 
-<Note title="Audience">
-  **Developers** building Web3 applications who want simple integration
-  patterns. **Validators** interested in securing a next-generation blockchain
-  network. **Users** seeking sovereign digital identity solutions.
-  Prerequisites: Basic understanding of web development (HTML/JavaScript) for
-  developers; blockchain consensus for validators.
-</Note>
+:::note[Who this is for]
+**Developers** integrating identity and payments with standard web APIs.
+**Validators** securing the network. **Users** who want sovereign identity
+without seed phrases. This page covers architecture and integration patterns —
+for hands-on walkthroughs start with [Get Started](/development), and for exact
+signatures see the [Reference](/reference).
+:::
 
 ## Summary
 
@@ -64,16 +74,16 @@ Sonr provides:
 ## Core Architecture
 
 <CardGroup>
-  <Card title="Decentralized Identity (DID)" href="/blockchain/modules/did/">
+  <Card title="Decentralized Identity (DID)" href="/reference/modules/did">
     W3C-compliant identity system using WebAuthn for passwordless authentication
   </Card>
-  <Card title="Decentralized Web Nodes (DWN)" href="/blockchain/modules/dwn/">
+  <Card title="Decentralized Web Nodes (DWN)" href="/reference/concepts/sonrmodules/dwn/">
     Personal Vaults acting as user-controlled agents for blockchain interactions
   </Card>
-  <Card title="UCAN Authorization" href="/blockchain/modules/svc/ucan">
+  <Card title="UCAN Authorization" href="/reference/modules/svc">
     Capability-based permissions replacing dangerous unlimited approve patterns
   </Card>
-  <Card title="Service Registry" href="/blockchain/modules/svc/">
+  <Card title="Service Registry" href="/reference/modules/svc">
     Stake-based trust system for service discovery and DNS verification
   </Card>
 </CardGroup>
@@ -110,7 +120,7 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
 ### Developer Resources
 
 <CardGroup>
-  <Card title="Browser Integration" href="/quickstart/browser">
+  <Card title="Browser Integration" href="/onboardingbrowser">
     Web browser integration patterns and examples
   </Card>
   <Card title="Highway Wallet" href="/highway/">
@@ -119,7 +129,7 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
   <Card title="Payment Integration" href="/highway/wallets/sending-payments">
     Payment integration guide
   </Card>
-  <Card title="Blockchain Modules" href="/blockchain/">
+  <Card title="Blockchain Modules" href="/reference/concepts/sonr">
     Core blockchain modules and architecture
   </Card>
 </CardGroup>
@@ -131,16 +141,16 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
 Validators secure four critical systems:
 
 <CardGroup>
-  <Card title="Blockchain Core" href="/blockchain/">
+  <Card title="Blockchain Core" href="/reference/concepts/sonr">
     Cosmos SDK with IBC for cross-chain operations
   </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
+  <Card title="Token Economics" href="/reference/concepts/sonrtoken/">
     Tokenomics, staking, and governance
   </Card>
   <Card title="Highway Proxy" href="/highway/">
     HTTP bridge supporting WebAuthn authentication
   </Card>
-  <Card title="Validator Setup" href="/quickstart/validators">
+  <Card title="Validator Setup" href="/deployment">
     Validator node setup and operations
   </Card>
 </CardGroup>
@@ -167,10 +177,10 @@ Validators perform five key functions:
 ### Identity Management
 
 <CardGroup>
-  <Card title="Identity System" href="/blockchain/modules/did/">
+  <Card title="Identity System" href="/reference/modules/did">
     W3C DIDs with WebAuthn for digital sovereignty
   </Card>
-  <Card title="DID Module" href="/blockchain/modules/did/">
+  <Card title="DID Module" href="/reference/modules/did">
     Blockchain implementation of identity management
   </Card>
 </CardGroup>
@@ -178,10 +188,10 @@ Validators perform five key functions:
 ### Data Sovereignty
 
 <CardGroup>
-  <Card title="DWN Module" href="/blockchain/modules/dwn/">
+  <Card title="DWN Module" href="/reference/concepts/sonrmodules/dwn/">
     Personal Vaults for user-controlled data and agents
   </Card>
-  <Card title="Blockchain Network" href="/blockchain/network">
+  <Card title="Blockchain Network" href="/reference/concepts/sonrnetwork">
     Network architecture and specifications
   </Card>
 </CardGroup>
@@ -189,10 +199,10 @@ Validators perform five key functions:
 ### Authorization System
 
 <CardGroup>
-  <Card title="UCAN Module" href="/blockchain/modules/svc/ucan">
+  <Card title="UCAN Module" href="/reference/modules/svc">
     Capability-based permissions for secure delegation
   </Card>
-  <Card title="Service Module" href="/blockchain/modules/svc/">
+  <Card title="Service Module" href="/reference/modules/svc">
     Registration, verification, and trust management
   </Card>
 </CardGroup>
@@ -200,7 +210,7 @@ Validators perform five key functions:
 ### Cross-Chain Features
 
 <CardGroup>
-  <Card title="Blockchain Network" href="/blockchain/network">
+  <Card title="Blockchain Network" href="/reference/concepts/sonrnetwork">
     Network architecture and cross-chain features
   </Card>
   <Card title="Payment Handler" href="/highway/wallets/sending-payments">
@@ -215,13 +225,13 @@ Validators perform five key functions:
 Build Web3 applications without blockchain complexity:
 
 <CardGroup>
-  <Card title="Quick Start" href="/quickstart/">
+  <Card title="Quick Start" href="/onboarding">
     Create your first Sonr application in 10 minutes
   </Card>
-  <Card title="Browser Integration" href="/quickstart/browser">
+  <Card title="Browser Integration" href="/onboardingbrowser">
     Real-world integration patterns for web applications
   </Card>
-  <Card title="CLI Tools" href="/quickstart/cli">
+  <Card title="CLI Tools" href="/onboardingcli">
     Command line tools and utilities
   </Card>
 </CardGroup>
@@ -231,10 +241,10 @@ Build Web3 applications without blockchain complexity:
 Secure the future of digital sovereignty:
 
 <CardGroup>
-  <Card title="Node Setup" href="/quickstart/validators">
+  <Card title="Node Setup" href="/deployment">
     Complete validator installation guide
   </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
+  <Card title="Token Economics" href="/reference/concepts/sonrtoken/">
     Token distribution, staking, and governance
   </Card>
   <Card title="Security" href="/reference/security/">
@@ -247,10 +257,10 @@ Secure the future of digital sovereignty:
 Experience true digital ownership:
 
 <CardGroup>
-  <Card title="Create Identity" href="/blockchain/modules/did/onboarding">
+  <Card title="Create Identity" href="/onboarding">
     30-second setup with biometric authentication
   </Card>
-  <Card title="Use Your Vault" href="/blockchain/modules/dwn/">
+  <Card title="Use Your Vault" href="/reference/concepts/sonrmodules/dwn/">
     Master your personal Web3 agent
   </Card>
   <Card title="Security Guide" href="/reference/security/">
@@ -260,13 +270,13 @@ Experience true digital ownership:
 
 ## Next Steps
 
-<Note title="Ready to Build?" type="success">
-**Developers**: Start with the [Quick Start Guide](/quickstart/) to build your first Sonr application.
+:::note[Ready to Build?]
+**Developers**: Start with the [Quick Start Guide](/onboarding) to build your first Sonr application.
 
-**Validators**: Follow the [Node Setup Guide](/quickstart/validators) to join the network.
+**Validators**: Follow the [Node Setup Guide](/deployment) to join the network.
 
-**Users**: [Create your identity](/blockchain/modules/did/onboarding) in under 30 seconds.
+**Users**: [Create your identity](/onboarding) in under 30 seconds.
 
-</Note>
+:::
 
 Explore the concepts above or dive into specific topics using the navigation menu. Join us in building the sovereign internet where identity belongs to individuals, not platforms.
diff --git a/docs/install.mdx b/docs/install.mdx
index a05be3053..bede7d998 100644
--- a/docs/install.mdx
+++ b/docs/install.mdx
@@ -1,8 +1,9 @@
 ---
 title: Build with Sonr
 description: The peer-to-peer identity and asset management system that makes Web3 as easy as Web2 through DID documents, WebAuthn, and IPFS—providing users with secure, portable decentralized identity
-sidebarTitle: "Installation"
 icon: "download"
+sidebar:
+  label: "Installation"
 ---
 
 ## Summary
@@ -46,16 +47,16 @@ Sonr provides:
 ## Core Architecture
 
 <CardGroup>
-  <Card title="Decentralized Identity (DID)" href="/blockchain/modules/did/">
+  <Card title="Decentralized Identity (DID)" href="/reference/modules/did">
     W3C-compliant identity system using WebAuthn for passwordless authentication
   </Card>
-  <Card title="Decentralized Web Nodes (DWN)" href="/blockchain/modules/dwn/">
+  <Card title="Decentralized Web Nodes (DWN)" href="/reference/concepts/sonrmodules/dwn/">
     Personal Vaults acting as user-controlled agents for blockchain interactions
   </Card>
-  <Card title="UCAN Authorization" href="/blockchain/modules/svc/ucan">
+  <Card title="UCAN Authorization" href="/reference/modules/svc">
     Capability-based permissions replacing dangerous unlimited approve patterns
   </Card>
-  <Card title="Service Registry" href="/blockchain/modules/svc/">
+  <Card title="Service Registry" href="/reference/modules/svc">
     Stake-based trust system for service discovery and DNS verification
   </Card>
 </CardGroup>
@@ -92,7 +93,7 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
 ### Developer Resources
 
 <CardGroup>
-  <Card title="Browser Integration" href="/quickstart/browser">
+  <Card title="Browser Integration" href="/onboardingbrowser">
     Web browser integration patterns and examples
   </Card>
   <Card title="Highway Wallet" href="/highway/">
@@ -101,7 +102,7 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
   <Card title="Payment Integration" href="/highway/wallets/sending-payments">
     Payment integration guide
   </Card>
-  <Card title="Blockchain Modules" href="/blockchain/">
+  <Card title="Blockchain Modules" href="/reference/concepts/sonr">
     Core blockchain modules and architecture
   </Card>
 </CardGroup>
@@ -113,16 +114,16 @@ Users approve with biometrics. Vaults handle transactions. No wallet connections
 Validators secure four critical systems:
 
 <CardGroup>
-  <Card title="Blockchain Core" href="/blockchain/">
+  <Card title="Blockchain Core" href="/reference/concepts/sonr">
     Cosmos SDK with IBC for cross-chain operations
   </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
+  <Card title="Token Economics" href="/reference/concepts/sonrtoken/">
     Tokenomics, staking, and governance
   </Card>
   <Card title="Highway Proxy" href="/highway/">
     HTTP bridge supporting WebAuthn authentication
   </Card>
-  <Card title="Validator Setup" href="/quickstart/validators">
+  <Card title="Validator Setup" href="/deployment">
     Validator node setup and operations
   </Card>
 </CardGroup>
@@ -149,10 +150,10 @@ Validators perform five key functions:
 ### Identity Management
 
 <CardGroup>
-  <Card title="Identity System" href="/blockchain/modules/did/">
+  <Card title="Identity System" href="/reference/modules/did">
     W3C DIDs with WebAuthn for digital sovereignty
   </Card>
-  <Card title="DID Module" href="/blockchain/modules/did/">
+  <Card title="DID Module" href="/reference/modules/did">
     Blockchain implementation of identity management
   </Card>
 </CardGroup>
@@ -160,10 +161,10 @@ Validators perform five key functions:
 ### Data Sovereignty
 
 <CardGroup>
-  <Card title="DWN Module" href="/blockchain/modules/dwn/">
+  <Card title="DWN Module" href="/reference/concepts/sonrmodules/dwn/">
     Personal Vaults for user-controlled data and agents
   </Card>
-  <Card title="Blockchain Network" href="/blockchain/network">
+  <Card title="Blockchain Network" href="/reference/concepts/sonrnetwork">
     Network architecture and specifications
   </Card>
 </CardGroup>
@@ -171,10 +172,10 @@ Validators perform five key functions:
 ### Authorization System
 
 <CardGroup>
-  <Card title="UCAN Module" href="/blockchain/modules/svc/ucan">
+  <Card title="UCAN Module" href="/reference/modules/svc">
     Capability-based permissions for secure delegation
   </Card>
-  <Card title="Service Module" href="/blockchain/modules/svc/">
+  <Card title="Service Module" href="/reference/modules/svc">
     Registration, verification, and trust management
   </Card>
 </CardGroup>
@@ -182,7 +183,7 @@ Validators perform five key functions:
 ### Cross-Chain Features
 
 <CardGroup>
-  <Card title="Blockchain Network" href="/blockchain/network">
+  <Card title="Blockchain Network" href="/reference/concepts/sonrnetwork">
     Network architecture and cross-chain features
   </Card>
   <Card title="Payment Handler" href="/highway/wallets/sending-payments">
@@ -197,13 +198,13 @@ Validators perform five key functions:
 Build Web3 applications without blockchain complexity:
 
 <CardGroup>
-  <Card title="Quick Start" href="/quickstart/">
+  <Card title="Quick Start" href="/onboarding">
     Create your first Sonr application in 10 minutes
   </Card>
-  <Card title="Browser Integration" href="/quickstart/browser">
+  <Card title="Browser Integration" href="/onboardingbrowser">
     Real-world integration patterns for web applications
   </Card>
-  <Card title="CLI Tools" href="/quickstart/cli">
+  <Card title="CLI Tools" href="/onboardingcli">
     Command line tools and utilities
   </Card>
 </CardGroup>
@@ -213,10 +214,10 @@ Build Web3 applications without blockchain complexity:
 Secure the future of digital sovereignty:
 
 <CardGroup>
-  <Card title="Node Setup" href="/quickstart/validators">
+  <Card title="Node Setup" href="/deployment">
     Complete validator installation guide
   </Card>
-  <Card title="Token Economics" href="/blockchain/token/">
+  <Card title="Token Economics" href="/reference/concepts/sonrtoken/">
     Token distribution, staking, and governance
   </Card>
   <Card title="Security" href="/reference/security/">
@@ -229,10 +230,10 @@ Secure the future of digital sovereignty:
 Experience true digital ownership:
 
 <CardGroup>
-  <Card title="Create Identity" href="/blockchain/modules/did/onboarding">
+  <Card title="Create Identity" href="/onboarding">
     30-second setup with biometric authentication
   </Card>
-  <Card title="Use Your Vault" href="/blockchain/modules/dwn/">
+  <Card title="Use Your Vault" href="/reference/concepts/sonrmodules/dwn/">
     Master your personal Web3 agent
   </Card>
   <Card title="Security Guide" href="/reference/security/">
@@ -242,13 +243,13 @@ Experience true digital ownership:
 
 ## Next Steps
 
-<Note title="Ready to Build?" type="success">
-**Developers**: Start with the [Quick Start Guide](/quickstart/) to build your first Sonr application.
+:::note[Ready to Build?]
+**Developers**: Start with the [Quick Start Guide](/onboarding) to build your first Sonr application.
 
-**Validators**: Follow the [Node Setup Guide](/quickstart/validators) to join the network.
+**Validators**: Follow the [Node Setup Guide](/deployment) to join the network.
 
-**Users**: [Create your identity](/blockchain/modules/did/onboarding) in under 30 seconds.
+**Users**: [Create your identity](/onboarding) in under 30 seconds.
 
-</Note>
+:::
 
 Explore the concepts above or dive into specific topics using the navigation menu. Join us in building the sovereign internet where identity belongs to individuals, not platforms.
diff --git a/docs/quickstart/developers.mdx b/docs/quickstart/developers.mdx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/quickstart/users.mdx b/docs/quickstart/users.mdx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/quickstart/validators.mdx b/docs/quickstart/validators.mdx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/reference/commands/snrd.mdx b/docs/reference/commands/snrd.mdx
index 434d1e0f6..a2ded6a21 100644
--- a/docs/reference/commands/snrd.mdx
+++ b/docs/reference/commands/snrd.mdx
@@ -3,8 +3,6 @@ title: snrd
 description: The Sonr blockchain daemon (server) command
 ---
 
-# snrd
-
 The main command for running and interacting with the Sonr blockchain node.
 
 ## Usage
@@ -40,61 +38,24 @@ snrd [command]
 
 ## Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  Adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="help" type="boolean">
-  Help for snrd
-</ParamField>
-
-<ParamField path="home" type="string" default="~/.sonr">
-  Directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="boolean">
-  Disable colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="boolean">
-  Print out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction (e.g., 10aatom)" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "Adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g., 10aatom)" },
+    "help": { type: "boolean", description: "Help for snrd" },
+    "home": { type: "string", default: "~/.sonr", description: "Directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "boolean", description: "Disable colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "boolean", description: "Print out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -124,9 +85,9 @@ snrd [command] --help
 
 ## See Also
 
-- [snrd auth](./snrd_auth.mdx) - User authentication with Passkeys
-- [snrd genesis](./snrd_genesis.mdx) - Genesis-related subcommands
-- [snrd init](./snrd_init.mdx) - Initialize node configuration
-- [snrd keys](./snrd_keys.mdx) - Manage application keys
-- [snrd query](./snrd_query.mdx) - Query blockchain state
-- [snrd tx](./snrd_tx.mdx) - Submit transactions
\ No newline at end of file
+- [snrd auth](./snrd_auth) - User authentication with Passkeys
+- [snrd genesis](./snrd_genesis) - Genesis-related subcommands
+- [snrd init](./snrd_init) - Initialize node configuration
+- [snrd keys](./snrd_keys) - Manage application keys
+- [snrd query](./snrd_query) - Query blockchain state
+- [snrd tx](./snrd_tx) - Submit transactions
diff --git a/docs/reference/commands/snrd_auth.mdx b/docs/reference/commands/snrd_auth.mdx
index d9dcc2191..5c744efac 100644
--- a/docs/reference/commands/snrd_auth.mdx
+++ b/docs/reference/commands/snrd_auth.mdx
@@ -3,8 +3,6 @@ title: snrd auth
 description: User authentication with Passkeys
 ---
 
-# snrd auth
-
 Manage user authentication using WebAuthn/Passkey technology for decentralized identity.
 
 ## Usage
@@ -22,63 +20,31 @@ snrd auth [command]
 
 ## Flags
 
-<ParamField path="help" type="boolean">
-  Help for auth
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "boolean", description: "Help for auth" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  Adjustment factor to be multiplied against the estimate returned by the tx simulation
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="~/.sonr">
-  Directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled)
-</ParamField>
-
-<ParamField path="log_no_color" type="boolean">
-  Disable colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  Tendermint RPC interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="boolean">
-  Print out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction (e.g., 10aatom)" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "Adjustment factor to be multiplied against the estimate returned by the tx simulation" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g., 10aatom)" },
+    "home": { type: "string", default: "~/.sonr", description: "Directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled)" },
+    "log_no_color": { type: "boolean", description: "Disable colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "Tendermint RPC interface for this chain" },
+    "trace": { type: "boolean", description: "Print out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -96,5 +62,5 @@ snrd auth login --username alice
 
 ## See Also
 
-- [snrd auth register](./snrd_auth_register.mdx) - Register a new identity using WebAuthn
-- [snrd auth login](./snrd_auth_login.mdx) - Login with WebAuthn authentication
\ No newline at end of file
+- [snrd auth register](./snrd_auth_register) - Register a new identity using WebAuthn
+- [snrd auth login](./snrd_auth) - Login with WebAuthn authentication
diff --git a/docs/reference/commands/snrd_auth_register.mdx b/docs/reference/commands/snrd_auth_register.mdx
index 55c0f42de..2c5572b66 100644
--- a/docs/reference/commands/snrd_auth_register.mdx
+++ b/docs/reference/commands/snrd_auth_register.mdx
@@ -3,8 +3,6 @@ title: snrd auth register
 description: Register a new decentralized identity using WebAuthn/Passkey authentication
 ---
 
-# snrd auth register
-
 Register a new decentralized identity using WebAuthn/Passkey authentication.
 
 This command will:
@@ -21,75 +19,34 @@ snrd auth register [flags]
 
 ## Flags
 
-<ParamField path="username" type="string" required>
-  Username for the new identity
-</ParamField>
-
-<ParamField path="auto-vault" type="boolean" default="true">
-  Automatically create vault for DID
-</ParamField>
-
-<ParamField path="webauthn" type="boolean" default="true">
-  Use WebAuthn for registration
-</ParamField>
-
-<ParamField path="help" type="boolean">
-  Help for register
-</ParamField>
+<TypeTable
+  type={{
+    "username": { type: "string", required: true, description: "Username for the new identity" },
+    "auto-vault": { type: "boolean", default: "true", description: "Automatically create vault for DID" },
+    "webauthn": { type: "boolean", default: "true", description: "Use WebAuthn for registration" },
+    "help": { type: "boolean", description: "Help for register" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  Adjustment factor to be multiplied against the estimate returned by the tx simulation
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="~/.sonr">
-  Directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level
-</ParamField>
-
-<ParamField path="log_no_color" type="boolean">
-  Disable colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  Tendermint RPC interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="boolean">
-  Print out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction (e.g., 10aatom)" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "Adjustment factor to be multiplied against the estimate returned by the tx simulation" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g., 10aatom)" },
+    "home": { type: "string", default: "~/.sonr", description: "Directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level" },
+    "log_no_color": { type: "boolean", description: "Disable colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "Tendermint RPC interface for this chain" },
+    "trace": { type: "boolean", description: "Print out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -113,5 +70,5 @@ snrd auth register --username alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd auth](./snrd_auth.mdx) - User authentication with Passkeys
-- [snrd auth login](./snrd_auth_login.mdx) - Login with WebAuthn authentication
\ No newline at end of file
+- [snrd auth](./snrd_auth) - User authentication with Passkeys
+- [snrd auth login](./snrd_auth) - Login with WebAuthn authentication
diff --git a/docs/reference/commands/snrd_genesis.mdx b/docs/reference/commands/snrd_genesis.mdx
index 0c6f76c11..625baa228 100644
--- a/docs/reference/commands/snrd_genesis.mdx
+++ b/docs/reference/commands/snrd_genesis.mdx
@@ -3,10 +3,6 @@ title: snrd genesis
 description: Application's genesis-related subcommands
 ---
 
-# snrd genesis
-
-Application's genesis-related subcommands
-
 ## Usage
 
 ```shell
@@ -29,63 +25,31 @@ snrd genesis [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for genesis
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for genesis" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -97,4 +61,4 @@ snrd genesis
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_genesis_add-genesis-account.mdx b/docs/reference/commands/snrd_genesis_add-genesis-account.mdx
index d85fe34ec..fc1912201 100644
--- a/docs/reference/commands/snrd_genesis_add-genesis-account.mdx
+++ b/docs/reference/commands/snrd_genesis_add-genesis-account.mdx
@@ -3,10 +3,6 @@ title: snrd genesis add-genesis-account
 description: Add a genesis account to genesis.json. The provided account must specify
 ---
 
-# snrd genesis add-genesis-account
-
-Add a genesis account to genesis.json. The provided account must specify
-
 ## Usage
 
 ```shell
@@ -15,99 +11,40 @@ snrd genesis add-genesis-account [address_or_key_name] [coin][,[coin]] [flags]
 
 ## Flags
 
-<ParamField path="append" type="string">
-  the coins to an account already in the genesis.json file
-</ParamField>
-
-<ParamField path="grpc-addr" type="string">
-  the gRPC endpoint to use for this chain
-</ParamField>
-
-<ParamField path="grpc-insecure" type="string">
-  gRPC over insecure channels, if not the server must use TLS
-</ParamField>
-
-<ParamField path="height" type="integer">
-  Use a specific height to query state at (this can error if the node is pruning state)
-</ParamField>
-
-<ParamField path="help" type="string">
-  for add-genesis-account
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|kwallet|pass|test)
-</ParamField>
-
-<ParamField path="module-name" type="string">
-  module account name
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to CometBFT RPC interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="vesting-amount" type="string">
-  amount of coins for vesting accounts
-</ParamField>
-
-<ParamField path="vesting-end-time" type="integer">
-  schedule end time (unix epoch) for vesting accounts
-</ParamField>
-
-<ParamField path="vesting-start-time" type="integer">
-  schedule start time (unix epoch) for vesting accounts
-</ParamField>
+<TypeTable
+  type={{
+    "append": { type: "string", description: "the coins to an account already in the genesis.json file" },
+    "grpc-addr": { type: "string", description: "the gRPC endpoint to use for this chain" },
+    "grpc-insecure": { type: "string", description: "gRPC over insecure channels, if not the server must use TLS" },
+    "height": { type: "integer", description: "Use a specific height to query state at (this can error if the node is pruning state)" },
+    "help": { type: "string", description: "for add-genesis-account" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|kwallet|pass|test)" },
+    "module-name": { type: "string", description: "module account name" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to CometBFT RPC interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "vesting-amount": { type: "string", description: "amount of coins for vesting accounts" },
+    "vesting-end-time": { type: "integer", description: "schedule end time (unix epoch) for vesting accounts" },
+    "vesting-start-time": { type: "integer", description: "schedule start time (unix epoch) for vesting accounts" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -119,4 +56,4 @@ snrd genesis add-genesis-account alice 1000000snr
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Parent command
+- [snrd genesis](./snrd_genesis) - Parent command
diff --git a/docs/reference/commands/snrd_genesis_collect-gentxs.mdx b/docs/reference/commands/snrd_genesis_collect-gentxs.mdx
index cc4c72f69..670fea0b5 100644
--- a/docs/reference/commands/snrd_genesis_collect-gentxs.mdx
+++ b/docs/reference/commands/snrd_genesis_collect-gentxs.mdx
@@ -3,8 +3,6 @@ title: snrd genesis collect-gentxs
 description: Collect genesis txs and output a genesis.json file
 ---
 
-# snrd genesis collect-gentxs
-
 Collect genesis txs and output a genesis.json file. This command iterates over all genesis transactions in the gentx directory and merges them into the genesis.json file.
 
 ## Usage
@@ -15,67 +13,32 @@ snrd genesis collect-gentxs [flags]
 
 ## Flags
 
-<ParamField path="gentx-dir" type="string">
-  Override default "gentx" directory from which collect and execute genesis transactions; default [--home]/config/gentx/
-</ParamField>
-
-<ParamField path="help" type="boolean">
-  Help for collect-gentxs
-</ParamField>
-
-<ParamField path="home" type="string" default="~/.sonr">
-  The application home directory
-</ParamField>
+<TypeTable
+  type={{
+    "gentx-dir": { type: "string", description: "Override default \"gentx\" directory from which collect and execute genesis transactions; default [--home]/config/gentx/" },
+    "help": { type: "boolean", description: "Help for collect-gentxs" },
+    "home": { type: "string", default: "~/.sonr", description: "The application home directory" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  Adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g., 10aatom)
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="boolean">
-  Disable colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="boolean">
-  Print out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction (e.g., 10aatom)" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "Adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g., 10aatom)" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "boolean", description: "Disable colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "boolean", description: "Print out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -93,6 +56,6 @@ snrd genesis collect-gentxs --gentx-dir ./custom-gentx/
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Genesis-related subcommands
-- [snrd genesis gentx](./snrd_genesis_gentx.mdx) - Generate a genesis tx carrying a self delegation
-- [snrd genesis add-genesis-account](./snrd_genesis_add-genesis-account.mdx) - Add a genesis account to genesis.json
\ No newline at end of file
+- [snrd genesis](./snrd_genesis) - Genesis-related subcommands
+- [snrd genesis gentx](./snrd_genesis_gentx) - Generate a genesis tx carrying a self delegation
+- [snrd genesis add-genesis-account](./snrd_genesis_add-genesis-account) - Add a genesis account to genesis.json
diff --git a/docs/reference/commands/snrd_genesis_export.mdx b/docs/reference/commands/snrd_genesis_export.mdx
index 12a3550e0..1841c4cb5 100644
--- a/docs/reference/commands/snrd_genesis_export.mdx
+++ b/docs/reference/commands/snrd_genesis_export.mdx
@@ -3,10 +3,6 @@ title: snrd genesis export
 description: Application's genesis-related subcommands
 ---
 
-# snrd genesis export
-
-Application's genesis-related subcommands
-
 ## Usage
 
 ```shell
@@ -29,63 +25,31 @@ snrd genesis [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for genesis
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for genesis" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -97,4 +61,4 @@ snrd genesis export
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Parent command
+- [snrd genesis](./snrd_genesis) - Parent command
diff --git a/docs/reference/commands/snrd_genesis_gentx.mdx b/docs/reference/commands/snrd_genesis_gentx.mdx
index 48dca50ae..a3e4a0268 100644
--- a/docs/reference/commands/snrd_genesis_gentx.mdx
+++ b/docs/reference/commands/snrd_genesis_gentx.mdx
@@ -3,10 +3,6 @@ title: snrd genesis gentx
 description: Generate a genesis transaction that creates a validator with a self-delegation,
 ---
 
-# snrd genesis gentx
-
-Generate a genesis transaction that creates a validator with a self-delegation,
-
 ## Usage
 
 ```shell
@@ -15,187 +11,62 @@ snrd genesis gentx [key_name] [amount] [flags]
 
 ## Flags
 
-<ParamField path="account-number" type="string">
-  The account number of the signing account (offline mode only)
-</ParamField>
-
-<ParamField path="amount" type="string">
-  Amount of coins to bond
-</ParamField>
-
-<ParamField path="aux" type="string">
-  aux signer data instead of sending a tx
-</ParamField>
-
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="commission-max-change-rate" type="string">
-  The maximum commission change rate percentage (per day)
-</ParamField>
-
-<ParamField path="commission-max-rate" type="string">
-  The maximum commission rate percentage
-</ParamField>
-
-<ParamField path="commission-rate" type="string">
-  The initial commission rate percentage
-</ParamField>
-
-<ParamField path="details" type="string">
-  The validator's (optional) details
-</ParamField>
-
-<ParamField path="dry-run" type="string">
-  the --gas flag and perform a simulation of a transaction, but don't broadcast it (when enabled, the local Keybase is not accessible)
-</ParamField>
-
-<ParamField path="fee-granter" type="string">
-  Fee granter grants fees for the transaction
-</ParamField>
-
-<ParamField path="fee-payer" type="string">
-  Fee payer pays fees for the transaction instead of deducting from the signer
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10uatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas" type="string" default="200000">
-  gas limit to set per-transaction; set to "auto" to calculate sufficient gas automatically. Note: "auto" option doesn't always report accurate results. Set a valid coin value to adjust the result. Can be used instead of "fees".
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)
-</ParamField>
-
-<ParamField path="generate-only" type="string">
-  an unsigned transaction and write it to STDOUT (when enabled, the local Keybase only accessed when providing a key name)
-</ParamField>
-
-<ParamField path="help" type="string">
-  for gentx
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="identity" type="string">
-  The (optional) identity signature (ex. UPort or Keybase)
-</ParamField>
-
-<ParamField path="ip" type="string" default="192.168.1.203">
-  The node's public P2P IP
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|kwallet|pass|test|memory)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="ledger" type="string">
-  a connected Ledger device
-</ParamField>
-
-<ParamField path="min-self-delegation" type="string">
-  The minimum self delegation required on the validator
-</ParamField>
-
-<ParamField path="moniker" type="string">
-  The validator's (optional) moniker
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to CometBFT rpc interface for this chain
-</ParamField>
-
-<ParamField path="node-id" type="string">
-  The node's NodeID
-</ParamField>
-
-<ParamField path="note" type="string">
-  Note to add a description to the transaction (previously --memo)
-</ParamField>
-
-<ParamField path="offline" type="string">
-  mode (does not allow any online functionality)
-</ParamField>
-
-<ParamField path="output-document" type="string">
-  Write the genesis transaction JSON document to the given file instead of the default location
-</ParamField>
-
-<ParamField path="p2p-port" type="string" default="26656">
-  The node's public P2P port
-</ParamField>
-
-<ParamField path="pubkey" type="string">
-  The validator's Protobuf JSON encoded public key
-</ParamField>
-
-<ParamField path="security-contact" type="string">
-  The validator's (optional) security contact email
-</ParamField>
-
-<ParamField path="sequence" type="string">
-  The sequence number of the signing account (offline mode only)
-</ParamField>
-
-<ParamField path="sign-mode" type="string">
-  Choose sign mode (direct|amino-json|direct-aux|textual), this is an advanced feature
-</ParamField>
-
-<ParamField path="timeout-height" type="string">
-  Set a block timeout height to prevent the tx from being committed past a certain height
-</ParamField>
-
-<ParamField path="tip" type="string">
-  Tip is the amount that is going to be transferred to the fee payer on the target chain. This flag is only valid when used with --aux, and is ignored if the target chain didn't enable the TipDecorator
-</ParamField>
-
-<ParamField path="website" type="string">
-  The validator's (optional) website
-</ParamField>
-
-<ParamField path="yes" type="string">
-  tx broadcasting prompt confirmation
-</ParamField>
+<TypeTable
+  type={{
+    "account-number": { type: "string", description: "The account number of the signing account (offline mode only)" },
+    "amount": { type: "string", description: "Amount of coins to bond" },
+    "aux": { type: "string", description: "aux signer data instead of sending a tx" },
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "commission-max-change-rate": { type: "string", description: "The maximum commission change rate percentage (per day)" },
+    "commission-max-rate": { type: "string", description: "The maximum commission rate percentage" },
+    "commission-rate": { type: "string", description: "The initial commission rate percentage" },
+    "details": { type: "string", description: "The validator's (optional) details" },
+    "dry-run": { type: "string", description: "the --gas flag and perform a simulation of a transaction, but don't broadcast it (when enabled, the local Keybase is not accessible)" },
+    "fee-granter": { type: "string", description: "Fee granter grants fees for the transaction" },
+    "fee-payer": { type: "string", description: "Fee payer pays fees for the transaction instead of deducting from the signer" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10uatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas": { type: "string", default: "200000", description: "gas limit to set per-transaction; set to \"auto\" to calculate sufficient gas automatically. Note: \"auto\" option doesn't always report accurate results. Set a valid coin value to adjust the result. Can be used instead of \"fees\"." },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)" },
+    "generate-only": { type: "string", description: "an unsigned transaction and write it to STDOUT (when enabled, the local Keybase only accessed when providing a key name)" },
+    "help": { type: "string", description: "for gentx" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "identity": { type: "string", description: "The (optional) identity signature (ex. UPort or Keybase)" },
+    "ip": { type: "string", default: "192.168.1.203", description: "The node's public P2P IP" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|kwallet|pass|test|memory)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "ledger": { type: "string", description: "a connected Ledger device" },
+    "min-self-delegation": { type: "string", description: "The minimum self delegation required on the validator" },
+    "moniker": { type: "string", description: "The validator's (optional) moniker" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to CometBFT rpc interface for this chain" },
+    "node-id": { type: "string", description: "The node's NodeID" },
+    "note": { type: "string", description: "Note to add a description to the transaction (previously --memo)" },
+    "offline": { type: "string", description: "mode (does not allow any online functionality)" },
+    "output-document": { type: "string", description: "Write the genesis transaction JSON document to the given file instead of the default location" },
+    "p2p-port": { type: "string", default: "26656", description: "The node's public P2P port" },
+    "pubkey": { type: "string", description: "The validator's Protobuf JSON encoded public key" },
+    "security-contact": { type: "string", description: "The validator's (optional) security contact email" },
+    "sequence": { type: "string", description: "The sequence number of the signing account (offline mode only)" },
+    "sign-mode": { type: "string", description: "Choose sign mode (direct|amino-json|direct-aux|textual), this is an advanced feature" },
+    "timeout-height": { type: "string", description: "Set a block timeout height to prevent the tx from being committed past a certain height" },
+    "tip": { type: "string", description: "Tip is the amount that is going to be transferred to the fee payer on the target chain. This flag is only valid when used with --aux, and is ignored if the target chain didn't enable the TipDecorator" },
+    "website": { type: "string", description: "The validator's (optional) website" },
+    "yes": { type: "string", description: "tx broadcasting prompt confirmation" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -207,4 +78,4 @@ snrd genesis gentx alice 1000000snr --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Parent command
+- [snrd genesis](./snrd_genesis) - Parent command
diff --git a/docs/reference/commands/snrd_genesis_init.mdx b/docs/reference/commands/snrd_genesis_init.mdx
index 74a673291..de2f93e58 100644
--- a/docs/reference/commands/snrd_genesis_init.mdx
+++ b/docs/reference/commands/snrd_genesis_init.mdx
@@ -3,10 +3,6 @@ title: snrd genesis init
 description: Application's genesis-related subcommands
 ---
 
-# snrd genesis init
-
-Application's genesis-related subcommands
-
 ## Usage
 
 ```shell
@@ -29,63 +25,31 @@ snrd genesis [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for genesis
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for genesis" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -97,4 +61,4 @@ snrd genesis init
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Parent command
+- [snrd genesis](./snrd_genesis) - Parent command
diff --git a/docs/reference/commands/snrd_genesis_migrate.mdx b/docs/reference/commands/snrd_genesis_migrate.mdx
index a7b8afff2..9999e4bf3 100644
--- a/docs/reference/commands/snrd_genesis_migrate.mdx
+++ b/docs/reference/commands/snrd_genesis_migrate.mdx
@@ -3,10 +3,6 @@ title: snrd genesis migrate
 description: Migrate the source genesis into the target version and print to STDOUT
 ---
 
-# snrd genesis migrate
-
-Migrate the source genesis into the target version and print to STDOUT
-
 ## Usage
 
 ```shell
@@ -15,71 +11,33 @@ snrd genesis migrate [target-version] [genesis-file] [flags]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  Override chain_id with this flag
-</ParamField>
-
-<ParamField path="genesis-time" type="string">
-  Override genesis_time with this flag
-</ParamField>
-
-<ParamField path="help" type="string">
-  for migrate
-</ParamField>
-
-<ParamField path="output-document" type="string">
-  Exported state is written to the given file instead of STDOUT
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "Override chain_id with this flag" },
+    "genesis-time": { type: "string", description: "Override genesis_time with this flag" },
+    "help": { type: "string", description: "for migrate" },
+    "output-document": { type: "string", description: "Exported state is written to the given file instead of STDOUT" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -91,4 +49,4 @@ snrd genesis migrate
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Parent command
+- [snrd genesis](./snrd_genesis) - Parent command
diff --git a/docs/reference/commands/snrd_genesis_validate.mdx b/docs/reference/commands/snrd_genesis_validate.mdx
index a7e422971..501ace75c 100644
--- a/docs/reference/commands/snrd_genesis_validate.mdx
+++ b/docs/reference/commands/snrd_genesis_validate.mdx
@@ -3,10 +3,6 @@ title: snrd genesis validate
 description: Validates the genesis file at the default location or at the location passed as an arg
 ---
 
-# snrd genesis validate
-
-Validates the genesis file at the default location or at the location passed as an arg
-
 ## Usage
 
 ```shell
@@ -15,63 +11,31 @@ snrd genesis validate [file] [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for validate
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for validate" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -83,4 +47,4 @@ snrd genesis validate
 
 ## See Also
 
-- [snrd genesis](./snrd_genesis.mdx) - Parent command
+- [snrd genesis](./snrd_genesis) - Parent command
diff --git a/docs/reference/commands/snrd_help.mdx b/docs/reference/commands/snrd_help.mdx
index 621fcad14..450510b29 100644
--- a/docs/reference/commands/snrd_help.mdx
+++ b/docs/reference/commands/snrd_help.mdx
@@ -3,10 +3,6 @@ title: snrd help
 description: Help provides help for any command in the application.
 ---
 
-# snrd help
-
-Help provides help for any command in the application.
-
 ## Usage
 
 ```shell
@@ -15,63 +11,31 @@ snrd help [command] [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for help
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for help" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -83,4 +47,4 @@ snrd help
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_init.mdx b/docs/reference/commands/snrd_init.mdx
index 77711b576..cb8917be8 100644
--- a/docs/reference/commands/snrd_init.mdx
+++ b/docs/reference/commands/snrd_init.mdx
@@ -3,10 +3,6 @@ title: snrd init
 description: Initialize validators's and node's configuration files.
 ---
 
-# snrd init
-
-Initialize validators's and node's configuration files.
-
 ## Usage
 
 ```shell
@@ -15,79 +11,35 @@ snrd init [moniker] [flags]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  genesis file chain-id, if left blank will be randomly created
-</ParamField>
-
-<ParamField path="default-denom" type="string">
-  genesis file default denomination, if left blank default value is 'stake'
-</ParamField>
-
-<ParamField path="help" type="string">
-  for init
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  node's home directory
-</ParamField>
-
-<ParamField path="initial-height" type="integer" default="1">
-  specify the initial block height at genesis
-</ParamField>
-
-<ParamField path="overwrite" type="string">
-  the genesis.json file
-</ParamField>
-
-<ParamField path="recover" type="string">
-  seed phrase to recover existing key instead of creating
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "genesis file chain-id, if left blank will be randomly created" },
+    "default-denom": { type: "string", description: "genesis file default denomination, if left blank default value is 'stake'" },
+    "help": { type: "string", description: "for init" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "node's home directory" },
+    "initial-height": { type: "integer", default: "1", description: "specify the initial block height at genesis" },
+    "overwrite": { type: "string", description: "the genesis.json file" },
+    "recover": { type: "string", description: "seed phrase to recover existing key instead of creating" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -99,4 +51,4 @@ snrd init
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_keys.mdx b/docs/reference/commands/snrd_keys.mdx
index cd8eae235..c04757057 100644
--- a/docs/reference/commands/snrd_keys.mdx
+++ b/docs/reference/commands/snrd_keys.mdx
@@ -3,10 +3,6 @@ title: snrd keys
 description: Keyring management commands. These keys may be in any format supported by the
 ---
 
-# snrd keys
-
-Keyring management commands. These keys may be in any format supported by the
-
 ## Usage
 
 ```shell
@@ -15,71 +11,33 @@ snrd keys [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for keys
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for keys" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -91,4 +49,4 @@ snrd keys
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_keys_add.mdx b/docs/reference/commands/snrd_keys_add.mdx
index a25e398d9..45da388a4 100644
--- a/docs/reference/commands/snrd_keys_add.mdx
+++ b/docs/reference/commands/snrd_keys_add.mdx
@@ -3,10 +3,6 @@ title: snrd keys add
 description: Derive a new private key and encrypt to disk.
 ---
 
-# snrd keys add
-
-Derive a new private key and encrypt to disk.
-
 ## Usage
 
 ```shell
@@ -15,135 +11,49 @@ snrd keys add <name> [flags]
 
 ## Flags
 
-<ParamField path="account" type="integer">
-  Account number for HD derivation (less than equal 2147483647)
-</ParamField>
-
-<ParamField path="coin-type" type="integer" default="60">
-  coin type number for HD derivation
-</ParamField>
-
-<ParamField path="dry-run" type="string">
-  action, but don't add key to local keystore
-</ParamField>
-
-<ParamField path="hd-path" type="string">
-  Manual HD Path derivation (overrides BIP44 config)
-</ParamField>
-
-<ParamField path="help" type="string">
-  for add
-</ParamField>
-
-<ParamField path="index" type="integer">
-  Address index number for HD derivation (less than equal 2147483647)
-</ParamField>
-
-<ParamField path="interactive" type="string">
-  prompt user for BIP39 passphrase and mnemonic
-</ParamField>
-
-<ParamField path="key-type" type="string" default="eth_secp256k1">
-  Key signing algorithm to generate keys for
-</ParamField>
-
-<ParamField path="ledger" type="string">
-  a local reference to a private key on a Ledger device
-</ParamField>
-
-<ParamField path="multisig" type="string">
-  List of key names stored in keyring to construct a public legacy multisig key
-</ParamField>
-
-<ParamField path="multisig-threshold" type="integer" default="1">
-  K out of N required signatures. For use in conjunction with --multisig
-</ParamField>
-
-<ParamField path="no-backup" type="string">
-  print out seed phrase (if others are watching the terminal)
-</ParamField>
-
-<ParamField path="nosort" type="string">
-  passed to --multisig are taken in the order they're supplied
-</ParamField>
-
-<ParamField path="pubkey" type="string">
-  Parse a public key in JSON format and saves key info to &lt;name&gt; file.
-</ParamField>
-
-<ParamField path="pubkey-base64" type="string">
-  Parse a public key in base64 format and saves key info.
-</ParamField>
-
-<ParamField path="recover" type="string">
-  seed phrase to recover existing key instead of creating
-</ParamField>
-
-<ParamField path="source" type="string">
-  Import mnemonic from a file (only usable when recover or interactive is passed)
-</ParamField>
+<TypeTable
+  type={{
+    "account": { type: "integer", description: "Account number for HD derivation (less than equal 2147483647)" },
+    "coin-type": { type: "integer", default: "60", description: "coin type number for HD derivation" },
+    "dry-run": { type: "string", description: "action, but don't add key to local keystore" },
+    "hd-path": { type: "string", description: "Manual HD Path derivation (overrides BIP44 config)" },
+    "help": { type: "string", description: "for add" },
+    "index": { type: "integer", description: "Address index number for HD derivation (less than equal 2147483647)" },
+    "interactive": { type: "string", description: "prompt user for BIP39 passphrase and mnemonic" },
+    "key-type": { type: "string", default: "eth_secp256k1", description: "Key signing algorithm to generate keys for" },
+    "ledger": { type: "string", description: "a local reference to a private key on a Ledger device" },
+    "multisig": { type: "string", description: "List of key names stored in keyring to construct a public legacy multisig key" },
+    "multisig-threshold": { type: "integer", default: "1", description: "K out of N required signatures. For use in conjunction with --multisig" },
+    "no-backup": { type: "string", description: "print out seed phrase (if others are watching the terminal)" },
+    "nosort": { type: "string", description: "passed to --multisig are taken in the order they're supplied" },
+    "pubkey": { type: "string", description: "Parse a public key in JSON format and saves key info to &lt;name&gt; file." },
+    "pubkey-base64": { type: "string", description: "Parse a public key in base64 format and saves key info." },
+    "recover": { type: "string", description: "seed phrase to recover existing key instead of creating" },
+    "source": { type: "string", description: "Import mnemonic from a file (only usable when recover or interactive is passed)" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -155,4 +65,4 @@ snrd keys add alice
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_delete.mdx b/docs/reference/commands/snrd_keys_delete.mdx
index cc659c4ce..4e8ff5c29 100644
--- a/docs/reference/commands/snrd_keys_delete.mdx
+++ b/docs/reference/commands/snrd_keys_delete.mdx
@@ -3,10 +3,6 @@ title: snrd keys delete
 description: Delete keys from the Keybase backend.
 ---
 
-# snrd keys delete
-
-Delete keys from the Keybase backend.
-
 ## Usage
 
 ```shell
@@ -15,79 +11,35 @@ snrd keys delete <name>... [flags]
 
 ## Flags
 
-<ParamField path="force" type="string">
-  the key unconditionally without asking for the passphrase. Deprecated.
-</ParamField>
-
-<ParamField path="help" type="string">
-  for delete
-</ParamField>
-
-<ParamField path="yes" type="string">
-  confirmation prompt when deleting offline or ledger key references
-</ParamField>
+<TypeTable
+  type={{
+    "force": { type: "string", description: "the key unconditionally without asking for the passphrase. Deprecated." },
+    "help": { type: "string", description: "for delete" },
+    "yes": { type: "string", description: "confirmation prompt when deleting offline or ledger key references" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -99,4 +51,4 @@ snrd keys delete
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_export.mdx b/docs/reference/commands/snrd_keys_export.mdx
index a22abd5d6..52d055001 100644
--- a/docs/reference/commands/snrd_keys_export.mdx
+++ b/docs/reference/commands/snrd_keys_export.mdx
@@ -3,10 +3,6 @@ title: snrd keys export
 description: Export a private key from the local keyring in ASCII-armored encrypted format.
 ---
 
-# snrd keys export
-
-Export a private key from the local keyring in ASCII-armored encrypted format.
-
 ## Usage
 
 ```shell
@@ -15,79 +11,35 @@ snrd keys export <name> [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for export
-</ParamField>
-
-<ParamField path="unarmored-hex" type="string">
-  unarmored hex privkey. Requires --unsafe.
-</ParamField>
-
-<ParamField path="unsafe" type="string">
-  unsafe operations. This flag must be switched on along with all unsafe operation-specific options.
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for export" },
+    "unarmored-hex": { type: "string", description: "unarmored hex privkey. Requires --unsafe." },
+    "unsafe": { type: "string", description: "unsafe operations. This flag must be switched on along with all unsafe operation-specific options." },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -99,4 +51,4 @@ snrd keys export
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_import.mdx b/docs/reference/commands/snrd_keys_import.mdx
index 4d64f68f5..77864afae 100644
--- a/docs/reference/commands/snrd_keys_import.mdx
+++ b/docs/reference/commands/snrd_keys_import.mdx
@@ -3,10 +3,6 @@ title: snrd keys import
 description: Import a ASCII armored private key into the local keybase.
 ---
 
-# snrd keys import
-
-Import a ASCII armored private key into the local keybase.
-
 ## Usage
 
 ```shell
@@ -15,71 +11,33 @@ snrd keys import <name> <keyfile> [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for import
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for import" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -91,4 +49,4 @@ snrd keys import
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_list.mdx b/docs/reference/commands/snrd_keys_list.mdx
index ec7df9375..e66a85c7c 100644
--- a/docs/reference/commands/snrd_keys_list.mdx
+++ b/docs/reference/commands/snrd_keys_list.mdx
@@ -3,10 +3,6 @@ title: snrd keys list
 description: Return a list of all public keys stored by this key manager
 ---
 
-# snrd keys list
-
-Return a list of all public keys stored by this key manager
-
 ## Usage
 
 ```shell
@@ -15,75 +11,34 @@ snrd keys list [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for list
-</ParamField>
-
-<ParamField path="list-names" type="string">
-  names only
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for list" },
+    "list-names": { type: "string", description: "names only" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -95,4 +50,4 @@ snrd keys list
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_migrate.mdx b/docs/reference/commands/snrd_keys_migrate.mdx
index bea1079a7..09bd429de 100644
--- a/docs/reference/commands/snrd_keys_migrate.mdx
+++ b/docs/reference/commands/snrd_keys_migrate.mdx
@@ -3,10 +3,6 @@ title: snrd keys migrate
 description: Migrate keys from Amino to Protocol Buffers records.
 ---
 
-# snrd keys migrate
-
-Migrate keys from Amino to Protocol Buffers records.
-
 ## Usage
 
 ```shell
@@ -15,71 +11,33 @@ snrd keys migrate [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for migrate
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for migrate" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -91,4 +49,4 @@ snrd keys migrate
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_parse.mdx b/docs/reference/commands/snrd_keys_parse.mdx
index 397548ebe..d091348f4 100644
--- a/docs/reference/commands/snrd_keys_parse.mdx
+++ b/docs/reference/commands/snrd_keys_parse.mdx
@@ -3,10 +3,6 @@ title: snrd keys parse
 description: Convert and print to stdout key addresses and fingerprints from
 ---
 
-# snrd keys parse
-
-Convert and print to stdout key addresses and fingerprints from
-
 ## Usage
 
 ```shell
@@ -15,71 +11,33 @@ snrd keys parse <hex-or-bech32-address> [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for parse
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for parse" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -91,4 +49,4 @@ snrd keys parse
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_keys_show.mdx b/docs/reference/commands/snrd_keys_show.mdx
index 077acee6c..6d2a8b484 100644
--- a/docs/reference/commands/snrd_keys_show.mdx
+++ b/docs/reference/commands/snrd_keys_show.mdx
@@ -3,10 +3,6 @@ title: snrd keys show
 description: Display keys details. If multiple names or addresses are provided,
 ---
 
-# snrd keys show
-
-Display keys details. If multiple names or addresses are provided,
-
 ## Usage
 
 ```shell
@@ -15,91 +11,38 @@ snrd keys show [name_or_address [name_or_address...]] [flags]
 
 ## Flags
 
-<ParamField path="address" type="string">
-  the address only (cannot be used with --output)
-</ParamField>
-
-<ParamField path="bech" type="string" default="acc">
-  The Bech32 prefix encoding for a key (acc|val|cons)
-</ParamField>
-
-<ParamField path="device" type="string">
-  the address in a ledger device (cannot be used with --pubkey)
-</ParamField>
-
-<ParamField path="help" type="string">
-  for show
-</ParamField>
-
-<ParamField path="multisig-threshold" type="integer" default="1">
-  K out of N required signatures
-</ParamField>
-
-<ParamField path="pubkey" type="string">
-  the public key only (cannot be used with --output)
-</ParamField>
+<TypeTable
+  type={{
+    "address": { type: "string", description: "the address only (cannot be used with --output)" },
+    "bech": { type: "string", default: "acc", description: "The Bech32 prefix encoding for a key (acc|val|cons)" },
+    "device": { type: "string", description: "the address in a ledger device (cannot be used with --pubkey)" },
+    "help": { type: "string", description: "for show" },
+    "multisig-threshold": { type: "integer", default: "1", description: "K out of N required signatures" },
+    "pubkey": { type: "string", description: "the public key only (cannot be used with --output)" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend (os|file|test)
-</ParamField>
-
-<ParamField path="keyring-dir" type="string">
-  The client Keyring directory; if omitted, the default 'home' directory will be used
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend (os|file|test)" },
+    "keyring-dir": { type: "string", description: "The client Keyring directory; if omitted, the default 'home' directory will be used" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -111,4 +54,4 @@ snrd keys show
 
 ## See Also
 
-- [snrd keys](./snrd_keys.mdx) - Parent command
+- [snrd keys](./snrd_keys) - Parent command
diff --git a/docs/reference/commands/snrd_migrate.mdx b/docs/reference/commands/snrd_migrate.mdx
index 519455eae..a81690082 100644
--- a/docs/reference/commands/snrd_migrate.mdx
+++ b/docs/reference/commands/snrd_migrate.mdx
@@ -3,8 +3,6 @@ title: snrd migrate
 description: unknown command "migrate" for "snrd"
 ---
 
-# snrd migrate
-
 unknown command "migrate" for "snrd"
 
 ## Examples
@@ -17,4 +15,4 @@ snrd migrate
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_node.mdx b/docs/reference/commands/snrd_node.mdx
index d29ec84e9..6b44b503a 100644
--- a/docs/reference/commands/snrd_node.mdx
+++ b/docs/reference/commands/snrd_node.mdx
@@ -3,8 +3,6 @@ title: snrd node
 description: unknown command "node" for "snrd"
 ---
 
-# snrd node
-
 unknown command "node" for "snrd"
 
 ## Examples
@@ -17,4 +15,4 @@ snrd node
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_prune.mdx b/docs/reference/commands/snrd_prune.mdx
index 034035a39..3b66ecdcf 100644
--- a/docs/reference/commands/snrd_prune.mdx
+++ b/docs/reference/commands/snrd_prune.mdx
@@ -3,10 +3,6 @@ title: snrd prune
 description: Prune app history states by keeping the recent heights and deleting old heights.
 ---
 
-# snrd prune
-
-Prune app history states by keeping the recent heights and deleting old heights.
-
 ## Usage
 
 ```shell
@@ -15,75 +11,34 @@ snrd prune [pruning-method] [flags]
 
 ## Flags
 
-<ParamField path="app-db-backend" type="string">
-  The type of database for application and snapshots databases
-</ParamField>
-
-<ParamField path="help" type="string">
-  for prune
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
-
-<ParamField path="pruning-interval" type="string">
-  Height interval at which pruned heights are removed from disk (ignored if pruning is not 'custom'),
-</ParamField>
-
-<ParamField path="pruning-keep-recent" type="string">
-  Number of recent heights to keep on disk (ignored if pruning is not 'custom')
-</ParamField>
+<TypeTable
+  type={{
+    "app-db-backend": { type: "string", description: "The type of database for application and snapshots databases" },
+    "help": { type: "string", description: "for prune" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+    "pruning-interval": { type: "string", description: "Height interval at which pruned heights are removed from disk (ignored if pruning is not 'custom')," },
+    "pruning-keep-recent": { type: "string", description: "Number of recent heights to keep on disk (ignored if pruning is not 'custom')" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -95,4 +50,4 @@ snrd prune
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_query.mdx b/docs/reference/commands/snrd_query.mdx
index 9b543b8e8..aa8ad0dc0 100644
--- a/docs/reference/commands/snrd_query.mdx
+++ b/docs/reference/commands/snrd_query.mdx
@@ -3,10 +3,6 @@ title: snrd query
 description: Querying subcommands
 ---
 
-# snrd query
-
-Querying subcommands
-
 ## Usage
 
 ```shell
@@ -60,63 +56,31 @@ snrd query [command]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="help" type="string">
-  for query
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "help": { type: "string", description: "for query" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -128,4 +92,4 @@ snrd query
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_query_account.mdx b/docs/reference/commands/snrd_query_account.mdx
index 5d9aa8293..04a2c148a 100644
--- a/docs/reference/commands/snrd_query_account.mdx
+++ b/docs/reference/commands/snrd_query_account.mdx
@@ -3,10 +3,6 @@ title: snrd query account
 description: Querying subcommands
 ---
 
-# snrd query account
-
-Querying subcommands
-
 ## Usage
 
 ```shell
@@ -60,63 +56,31 @@ snrd query [command]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="help" type="string">
-  for query
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "help": { type: "string", description: "for query" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -128,4 +92,4 @@ snrd query account
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_accounts.mdx b/docs/reference/commands/snrd_query_accounts.mdx
index 4120353e6..65a8aafa7 100644
--- a/docs/reference/commands/snrd_query_accounts.mdx
+++ b/docs/reference/commands/snrd_query_accounts.mdx
@@ -3,10 +3,6 @@ title: snrd query accounts
 description: Querying subcommands
 ---
 
-# snrd query accounts
-
-Querying subcommands
-
 ## Usage
 
 ```shell
@@ -60,63 +56,31 @@ snrd query [command]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="help" type="string">
-  for query
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "help": { type: "string", description: "for query" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -128,4 +92,4 @@ snrd query accounts
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_auth.mdx b/docs/reference/commands/snrd_query_auth.mdx
index 8a2ba25b4..33cbde955 100644
--- a/docs/reference/commands/snrd_query_auth.mdx
+++ b/docs/reference/commands/snrd_query_auth.mdx
@@ -3,10 +3,6 @@ title: snrd query auth
 description: Querying commands for the auth module
 ---
 
-# snrd query auth
-
-Querying commands for the auth module
-
 ## Usage
 
 ```shell
@@ -34,63 +30,31 @@ snrd query auth [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for auth
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for auth" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -102,4 +66,4 @@ snrd query auth
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_bank.mdx b/docs/reference/commands/snrd_query_bank.mdx
index 71d71d78c..46cd4a4aa 100644
--- a/docs/reference/commands/snrd_query_bank.mdx
+++ b/docs/reference/commands/snrd_query_bank.mdx
@@ -3,10 +3,6 @@ title: snrd query bank
 description: Querying commands for the bank module
 ---
 
-# snrd query bank
-
-Querying commands for the bank module
-
 ## Usage
 
 ```shell
@@ -36,63 +32,31 @@ snrd query bank [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for bank
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for bank" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -104,4 +68,4 @@ snrd query bank
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_consensus.mdx b/docs/reference/commands/snrd_query_consensus.mdx
index 0bb03e22b..a8a226619 100644
--- a/docs/reference/commands/snrd_query_consensus.mdx
+++ b/docs/reference/commands/snrd_query_consensus.mdx
@@ -3,10 +3,6 @@ title: snrd query consensus
 description: Querying commands for the consensus module
 ---
 
-# snrd query consensus
-
-Querying commands for the consensus module
-
 ## Usage
 
 ```shell
@@ -26,63 +22,31 @@ snrd query consensus [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for consensus
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for consensus" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -94,4 +58,4 @@ snrd query consensus
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_delegation.mdx b/docs/reference/commands/snrd_query_delegation.mdx
index 23afcd11b..0b1279eae 100644
--- a/docs/reference/commands/snrd_query_delegation.mdx
+++ b/docs/reference/commands/snrd_query_delegation.mdx
@@ -3,10 +3,6 @@ title: snrd query delegation
 description: Querying subcommands
 ---
 
-# snrd query delegation
-
-Querying subcommands
-
 ## Usage
 
 ```shell
@@ -60,63 +56,31 @@ snrd query [command]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="help" type="string">
-  for query
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "help": { type: "string", description: "for query" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -128,4 +92,4 @@ snrd query delegation
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_did.mdx b/docs/reference/commands/snrd_query_did.mdx
index b091a2430..126612ccb 100644
--- a/docs/reference/commands/snrd_query_did.mdx
+++ b/docs/reference/commands/snrd_query_did.mdx
@@ -3,10 +3,6 @@ title: snrd query did
 description: Querying commands for the did module
 ---
 
-# snrd query did
-
-Querying commands for the did module
-
 ## Usage
 
 ```shell
@@ -34,63 +30,31 @@ snrd query did [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for did
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for did" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -102,4 +66,4 @@ snrd query did
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_distribution.mdx b/docs/reference/commands/snrd_query_distribution.mdx
index 02463bedd..1d292f9ee 100644
--- a/docs/reference/commands/snrd_query_distribution.mdx
+++ b/docs/reference/commands/snrd_query_distribution.mdx
@@ -3,10 +3,6 @@ title: snrd query distribution
 description: Querying commands for the distribution module
 ---
 
-# snrd query distribution
-
-Querying commands for the distribution module
-
 ## Usage
 
 ```shell
@@ -34,63 +30,31 @@ snrd query distribution [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for distribution
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for distribution" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -102,4 +66,4 @@ snrd query distribution
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_dwn.mdx b/docs/reference/commands/snrd_query_dwn.mdx
index 76596db8c..c0051a2b8 100644
--- a/docs/reference/commands/snrd_query_dwn.mdx
+++ b/docs/reference/commands/snrd_query_dwn.mdx
@@ -3,10 +3,6 @@ title: snrd query dwn
 description: Querying commands for the dwn module
 ---
 
-# snrd query dwn
-
-Querying commands for the dwn module
-
 ## Usage
 
 ```shell
@@ -37,63 +33,31 @@ snrd query dwn [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for dwn
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for dwn" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -105,4 +69,4 @@ snrd query dwn
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_feegrant.mdx b/docs/reference/commands/snrd_query_feegrant.mdx
index 9ccda5646..d4910f67e 100644
--- a/docs/reference/commands/snrd_query_feegrant.mdx
+++ b/docs/reference/commands/snrd_query_feegrant.mdx
@@ -3,10 +3,6 @@ title: snrd query feegrant
 description: Querying commands for the feegrant module
 ---
 
-# snrd query feegrant
-
-Querying commands for the feegrant module
-
 ## Usage
 
 ```shell
@@ -27,63 +23,31 @@ snrd query feegrant [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for feegrant
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for feegrant" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -95,4 +59,4 @@ snrd query feegrant
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_gov.mdx b/docs/reference/commands/snrd_query_gov.mdx
index 115c530df..26609445d 100644
--- a/docs/reference/commands/snrd_query_gov.mdx
+++ b/docs/reference/commands/snrd_query_gov.mdx
@@ -3,10 +3,6 @@ title: snrd query gov
 description: Querying commands for the gov module
 ---
 
-# snrd query gov
-
-Querying commands for the gov module
-
 ## Usage
 
 ```shell
@@ -33,63 +29,31 @@ snrd query gov [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for gov
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for gov" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -101,4 +65,4 @@ snrd query gov
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_slashing.mdx b/docs/reference/commands/snrd_query_slashing.mdx
index d558c48a3..7bfb38af9 100644
--- a/docs/reference/commands/snrd_query_slashing.mdx
+++ b/docs/reference/commands/snrd_query_slashing.mdx
@@ -3,10 +3,6 @@ title: snrd query slashing
 description: Querying commands for the slashing module
 ---
 
-# snrd query slashing
-
-Querying commands for the slashing module
-
 ## Usage
 
 ```shell
@@ -27,63 +23,31 @@ snrd query slashing [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for slashing
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for slashing" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -95,4 +59,4 @@ snrd query slashing
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_staking.mdx b/docs/reference/commands/snrd_query_staking.mdx
index 4e128c560..2cb8677cd 100644
--- a/docs/reference/commands/snrd_query_staking.mdx
+++ b/docs/reference/commands/snrd_query_staking.mdx
@@ -3,10 +3,6 @@ title: snrd query staking
 description: Querying commands for the staking module
 ---
 
-# snrd query staking
-
-Querying commands for the staking module
-
 ## Usage
 
 ```shell
@@ -38,63 +34,31 @@ snrd query staking [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for staking
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for staking" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -106,4 +70,4 @@ snrd query staking
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_svc.mdx b/docs/reference/commands/snrd_query_svc.mdx
index d351a960e..6f4a94ddf 100644
--- a/docs/reference/commands/snrd_query_svc.mdx
+++ b/docs/reference/commands/snrd_query_svc.mdx
@@ -3,10 +3,6 @@ title: snrd query svc
 description: Querying commands for the svc module
 ---
 
-# snrd query svc
-
-Querying commands for the svc module
-
 ## Usage
 
 ```shell
@@ -29,63 +25,31 @@ snrd query svc [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for svc
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for svc" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -97,4 +61,4 @@ snrd query svc
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_tendermint.mdx b/docs/reference/commands/snrd_query_tendermint.mdx
index 62eb623c2..8d3da9f7c 100644
--- a/docs/reference/commands/snrd_query_tendermint.mdx
+++ b/docs/reference/commands/snrd_query_tendermint.mdx
@@ -3,10 +3,6 @@ title: snrd query tendermint
 description: Querying subcommands
 ---
 
-# snrd query tendermint
-
-Querying subcommands
-
 ## Usage
 
 ```shell
@@ -60,63 +56,31 @@ snrd query [command]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="help" type="string">
-  for query
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "help": { type: "string", description: "for query" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -128,4 +92,4 @@ snrd query tendermint
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_query_tx.mdx b/docs/reference/commands/snrd_query_tx.mdx
index 2a677d5c3..f2325325c 100644
--- a/docs/reference/commands/snrd_query_tx.mdx
+++ b/docs/reference/commands/snrd_query_tx.mdx
@@ -3,8 +3,6 @@ title: snrd query tx
 description: Query for a transaction by hash or address/sequence combination
 ---
 
-# snrd query tx
-
 Example:
 
 ## Usage
@@ -15,83 +13,36 @@ snrd query tx --type=[hash|acc_seq|signature] [hash|acc_seq|signature] [flags]
 
 ## Flags
 
-<ParamField path="grpc-addr" type="string">
-  the gRPC endpoint to use for this chain
-</ParamField>
-
-<ParamField path="grpc-insecure" type="string">
-  gRPC over insecure channels, if not the server must use TLS
-</ParamField>
-
-<ParamField path="height" type="integer">
-  Use a specific height to query state at (this can error if the node is pruning state)
-</ParamField>
-
-<ParamField path="help" type="string">
-  for tx
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to CometBFT RPC interface for this chain
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
-
-<ParamField path="type" type="string" default="hash">
-  The type to be used when querying tx, can be one of "hash", "acc_seq", "signature"
-</ParamField>
+<TypeTable
+  type={{
+    "grpc-addr": { type: "string", description: "the gRPC endpoint to use for this chain" },
+    "grpc-insecure": { type: "string", description: "gRPC over insecure channels, if not the server must use TLS" },
+    "height": { type: "integer", description: "Use a specific height to query state at (this can error if the node is pruning state)" },
+    "help": { type: "string", description: "for tx" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to CometBFT RPC interface for this chain" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+    "type": { type: "string", default: "hash", description: "The type to be used when querying tx, can be one of \"hash\", \"acc_seq\", \"signature\"" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -103,4 +54,4 @@ snrd query tx
 
 ## See Also
 
-- [snrd query](./snrd_query.mdx) - Parent command
+- [snrd query](./snrd_query) - Parent command
diff --git a/docs/reference/commands/snrd_rollback.mdx b/docs/reference/commands/snrd_rollback.mdx
index 0cce3d33e..b2cfe5ac4 100644
--- a/docs/reference/commands/snrd_rollback.mdx
+++ b/docs/reference/commands/snrd_rollback.mdx
@@ -3,10 +3,6 @@ title: snrd rollback
 description: A state rollback is performed to recover from an incorrect application state transition,
 ---
 
-# snrd rollback
-
-A state rollback is performed to recover from an incorrect application state transition,
-
 ## Usage
 
 ```shell
@@ -15,67 +11,32 @@ snrd rollback [flags]
 
 ## Flags
 
-<ParamField path="hard" type="string">
-  last block as well as state
-</ParamField>
-
-<ParamField path="help" type="string">
-  for rollback
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  The application home directory
-</ParamField>
+<TypeTable
+  type={{
+    "hard": { type: "string", description: "last block as well as state" },
+    "help": { type: "string", description: "for rollback" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "The application home directory" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -87,4 +48,4 @@ snrd rollback
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_status.mdx b/docs/reference/commands/snrd_status.mdx
index 2be0d2e21..1a0c554eb 100644
--- a/docs/reference/commands/snrd_status.mdx
+++ b/docs/reference/commands/snrd_status.mdx
@@ -3,10 +3,6 @@ title: snrd status
 description: Query remote node for status
 ---
 
-# snrd status
-
-Query remote node for status
-
 ## Usage
 
 ```shell
@@ -15,67 +11,32 @@ snrd status [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for status
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  Node to connect to
-</ParamField>
-
-<ParamField path="output" type="string" default="json">
-  Output format (text|json)
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for status" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "Node to connect to" },
+    "output": { type: "string", default: "json", description: "Output format (text|json)" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -87,4 +48,4 @@ snrd status
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_tendermint.mdx b/docs/reference/commands/snrd_tendermint.mdx
index 41f4ffc5c..d008a066e 100644
--- a/docs/reference/commands/snrd_tendermint.mdx
+++ b/docs/reference/commands/snrd_tendermint.mdx
@@ -3,10 +3,6 @@ title: snrd tendermint
 description: CometBFT subcommands
 ---
 
-# snrd tendermint
-
-CometBFT subcommands
-
 ## Usage
 
 ```shell
@@ -27,63 +23,31 @@ snrd comet [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for comet
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for comet" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -95,4 +59,4 @@ snrd tendermint
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_tx.mdx b/docs/reference/commands/snrd_tx.mdx
index 636682f8a..494b73c1c 100644
--- a/docs/reference/commands/snrd_tx.mdx
+++ b/docs/reference/commands/snrd_tx.mdx
@@ -3,10 +3,6 @@ title: snrd tx
 description: Transactions subcommands
 ---
 
-# snrd tx
-
-Transactions subcommands
-
 ## Usage
 
 ```shell
@@ -64,63 +60,31 @@ snrd tx [command]
 
 ## Flags
 
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="help" type="string">
-  for tx
-</ParamField>
+<TypeTable
+  type={{
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "help": { type: "string", description: "for tx" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -132,4 +96,4 @@ snrd tx --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/commands/snrd_tx_bank.mdx b/docs/reference/commands/snrd_tx_bank.mdx
index 11dc84c17..27f3e30ae 100644
--- a/docs/reference/commands/snrd_tx_bank.mdx
+++ b/docs/reference/commands/snrd_tx_bank.mdx
@@ -3,10 +3,6 @@ title: snrd tx bank
 description: Bank transaction subcommands
 ---
 
-# snrd tx bank
-
-Bank transaction subcommands
-
 ## Usage
 
 ```shell
@@ -26,63 +22,31 @@ snrd tx bank [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for bank
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for bank" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -94,4 +58,4 @@ snrd tx bank --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_consensus.mdx b/docs/reference/commands/snrd_tx_consensus.mdx
index 6f4acafaa..6baae28a9 100644
--- a/docs/reference/commands/snrd_tx_consensus.mdx
+++ b/docs/reference/commands/snrd_tx_consensus.mdx
@@ -3,10 +3,6 @@ title: snrd tx consensus
 description: Transactions commands for the consensus module
 ---
 
-# snrd tx consensus
-
-Transactions commands for the consensus module
-
 ## Usage
 
 ```shell
@@ -15,63 +11,31 @@ snrd tx consensus [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for consensus
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for consensus" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -83,4 +47,4 @@ snrd tx consensus --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_crisis.mdx b/docs/reference/commands/snrd_tx_crisis.mdx
index 6bd6380c4..be506d680 100644
--- a/docs/reference/commands/snrd_tx_crisis.mdx
+++ b/docs/reference/commands/snrd_tx_crisis.mdx
@@ -3,10 +3,6 @@ title: snrd tx crisis
 description: Transactions commands for the crisis module
 ---
 
-# snrd tx crisis
-
-Transactions commands for the crisis module
-
 ## Usage
 
 ```shell
@@ -25,63 +21,31 @@ snrd tx crisis [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for crisis
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for crisis" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -93,4 +57,4 @@ snrd tx crisis --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_did.mdx b/docs/reference/commands/snrd_tx_did.mdx
index 820742fd6..42d8130d5 100644
--- a/docs/reference/commands/snrd_tx_did.mdx
+++ b/docs/reference/commands/snrd_tx_did.mdx
@@ -3,10 +3,6 @@ title: snrd tx did
 description: Transactions commands for the did module
 ---
 
-# snrd tx did
-
-Transactions commands for the did module
-
 ## Usage
 
 ```shell
@@ -36,63 +32,31 @@ snrd tx did [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for did
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for did" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -104,4 +68,4 @@ snrd tx did --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_distribution.mdx b/docs/reference/commands/snrd_tx_distribution.mdx
index 2606ed2f6..4c3e5f118 100644
--- a/docs/reference/commands/snrd_tx_distribution.mdx
+++ b/docs/reference/commands/snrd_tx_distribution.mdx
@@ -3,10 +3,6 @@ title: snrd tx distribution
 description: Distribution transactions subcommands
 ---
 
-# snrd tx distribution
-
-Distribution transactions subcommands
-
 ## Usage
 
 ```shell
@@ -29,63 +25,31 @@ snrd tx distribution [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for distribution
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for distribution" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -97,4 +61,4 @@ snrd tx distribution --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_dwn.mdx b/docs/reference/commands/snrd_tx_dwn.mdx
index 2d22a0a1e..8530ef00f 100644
--- a/docs/reference/commands/snrd_tx_dwn.mdx
+++ b/docs/reference/commands/snrd_tx_dwn.mdx
@@ -3,10 +3,6 @@ title: snrd tx dwn
 description: Transactions commands for the dwn module
 ---
 
-# snrd tx dwn
-
-Transactions commands for the dwn module
-
 ## Usage
 
 ```shell
@@ -31,63 +27,31 @@ snrd tx dwn [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for dwn
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for dwn" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -99,4 +63,4 @@ snrd tx dwn --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_feegrant.mdx b/docs/reference/commands/snrd_tx_feegrant.mdx
index 74564d7ff..25479788f 100644
--- a/docs/reference/commands/snrd_tx_feegrant.mdx
+++ b/docs/reference/commands/snrd_tx_feegrant.mdx
@@ -3,10 +3,6 @@ title: snrd tx feegrant
 description: Grant and revoke fee allowance for a grantee by a granter
 ---
 
-# snrd tx feegrant
-
-Grant and revoke fee allowance for a grantee by a granter
-
 ## Usage
 
 ```shell
@@ -27,63 +23,31 @@ snrd tx feegrant [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for feegrant
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for feegrant" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -95,4 +59,4 @@ snrd tx feegrant --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_gov.mdx b/docs/reference/commands/snrd_tx_gov.mdx
index 49dc17876..ccc55ed64 100644
--- a/docs/reference/commands/snrd_tx_gov.mdx
+++ b/docs/reference/commands/snrd_tx_gov.mdx
@@ -3,10 +3,6 @@ title: snrd tx gov
 description: Governance transactions subcommands
 ---
 
-# snrd tx gov
-
-Governance transactions subcommands
-
 ## Usage
 
 ```shell
@@ -31,63 +27,31 @@ snrd tx gov [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for gov
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for gov" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -99,4 +63,4 @@ snrd tx gov --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_slashing.mdx b/docs/reference/commands/snrd_tx_slashing.mdx
index 20f003e65..3d6bfb76c 100644
--- a/docs/reference/commands/snrd_tx_slashing.mdx
+++ b/docs/reference/commands/snrd_tx_slashing.mdx
@@ -3,10 +3,6 @@ title: snrd tx slashing
 description: Transactions commands for the slashing module
 ---
 
-# snrd tx slashing
-
-Transactions commands for the slashing module
-
 ## Usage
 
 ```shell
@@ -25,63 +21,31 @@ snrd tx slashing [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for slashing
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for slashing" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -93,4 +57,4 @@ snrd tx slashing --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_staking.mdx b/docs/reference/commands/snrd_tx_staking.mdx
index 01894ec21..104c4a808 100644
--- a/docs/reference/commands/snrd_tx_staking.mdx
+++ b/docs/reference/commands/snrd_tx_staking.mdx
@@ -3,10 +3,6 @@ title: snrd tx staking
 description: Staking transaction subcommands
 ---
 
-# snrd tx staking
-
-Staking transaction subcommands
-
 ## Usage
 
 ```shell
@@ -30,63 +26,31 @@ snrd tx staking [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for staking
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for staking" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -98,4 +62,4 @@ snrd tx staking --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_tx_svc.mdx b/docs/reference/commands/snrd_tx_svc.mdx
index f0d19e0f6..14136925d 100644
--- a/docs/reference/commands/snrd_tx_svc.mdx
+++ b/docs/reference/commands/snrd_tx_svc.mdx
@@ -3,10 +3,6 @@ title: snrd tx svc
 description: Transactions commands for the svc module
 ---
 
-# snrd tx svc
-
-Transactions commands for the svc module
-
 ## Usage
 
 ```shell
@@ -28,63 +24,31 @@ snrd tx svc [command]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for svc
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for svc" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  The network chain ID
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "The network chain ID" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -96,4 +60,4 @@ snrd tx svc --from alice --chain-id sonrtest_1-1
 
 ## See Also
 
-- [snrd tx](./snrd_tx.mdx) - Parent command
+- [snrd tx](./snrd_tx) - Parent command
diff --git a/docs/reference/commands/snrd_version.mdx b/docs/reference/commands/snrd_version.mdx
index f84ed7e51..ee0fdf3e2 100644
--- a/docs/reference/commands/snrd_version.mdx
+++ b/docs/reference/commands/snrd_version.mdx
@@ -3,10 +3,6 @@ title: snrd version
 description: Print the application binary version information
 ---
 
-# snrd version
-
-Print the application binary version information
-
 ## Usage
 
 ```shell
@@ -15,71 +11,33 @@ snrd version [flags]
 
 ## Flags
 
-<ParamField path="help" type="string">
-  for version
-</ParamField>
-
-<ParamField path="long" type="string">
-  long version information
-</ParamField>
-
-<ParamField path="output" type="string" default="text">
-  Output format (text|json)
-</ParamField>
+<TypeTable
+  type={{
+    "help": { type: "string", description: "for version" },
+    "long": { type: "string", description: "long version information" },
+    "output": { type: "string", default: "text", description: "Output format (text|json)" },
+  }}
+/>
 
 ## Global Flags
 
-<ParamField path="broadcast-mode" type="string" default="sync">
-  Transaction broadcasting mode (sync|async)
-</ParamField>
-
-<ParamField path="chain-id" type="string">
-  Specify Chain ID for sending Tx
-</ParamField>
-
-<ParamField path="fees" type="string">
-  Fees to pay along with transaction; eg: 10aatom
-</ParamField>
-
-<ParamField path="from" type="string">
-  Name or address of private key with which to sign
-</ParamField>
-
-<ParamField path="gas-adjustment" type="float" default="1">
-  adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored
-</ParamField>
-
-<ParamField path="gas-prices" type="string">
-  Gas prices to determine the transaction fee (e.g. 10aatom)
-</ParamField>
-
-<ParamField path="home" type="string" default="/Users/prad/.sonr">
-  directory for config and data
-</ParamField>
-
-<ParamField path="keyring-backend" type="string" default="os">
-  Select keyring's backend
-</ParamField>
-
-<ParamField path="log_format" type="string" default="plain">
-  The logging format (json|plain)
-</ParamField>
-
-<ParamField path="log_level" type="string" default="info">
-  The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')
-</ParamField>
-
-<ParamField path="log_no_color" type="string">
-  colored logs
-</ParamField>
-
-<ParamField path="node" type="string" default="tcp://localhost:26657">
-  &lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain
-</ParamField>
-
-<ParamField path="trace" type="string">
-  out full stack trace on errors
-</ParamField>
+<TypeTable
+  type={{
+    "broadcast-mode": { type: "string", default: "sync", description: "Transaction broadcasting mode (sync|async)" },
+    "chain-id": { type: "string", description: "Specify Chain ID for sending Tx" },
+    "fees": { type: "string", description: "Fees to pay along with transaction; eg: 10aatom" },
+    "from": { type: "string", description: "Name or address of private key with which to sign" },
+    "gas-adjustment": { type: "float", default: "1", description: "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored" },
+    "gas-prices": { type: "string", description: "Gas prices to determine the transaction fee (e.g. 10aatom)" },
+    "home": { type: "string", default: "/Users/prad/.sonr", description: "directory for config and data" },
+    "keyring-backend": { type: "string", default: "os", description: "Select keyring's backend" },
+    "log_format": { type: "string", default: "plain", description: "The logging format (json|plain)" },
+    "log_level": { type: "string", default: "info", description: "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:&lt;level&gt;,&lt;key&gt;:&lt;level&gt;')" },
+    "log_no_color": { type: "string", description: "colored logs" },
+    "node": { type: "string", default: "tcp://localhost:26657", description: "&lt;host&gt;:&lt;port&gt; to tendermint rpc interface for this chain" },
+    "trace": { type: "string", description: "out full stack trace on errors" },
+  }}
+/>
 
 ## Examples
 
@@ -91,4 +49,4 @@ snrd version
 
 ## See Also
 
-- [snrd](./snrd.mdx) - Parent command
+- [snrd](./snrd) - Parent command
diff --git a/docs/reference/concepts/motr.mdx b/docs/reference/concepts/motr.mdx
index 6d5b6533a..4b973d7c7 100644
--- a/docs/reference/concepts/motr.mdx
+++ b/docs/reference/concepts/motr.mdx
@@ -1,12 +1,11 @@
 ---
 title: "Motr WASM Light-Node"
-sidebarTitle: "Motr Overview"
 description: "Learn how to use the Motor WASM plugin as an MPC-based UCAN source for decentralized token operations"
 icon: "play"
+sidebar:
+  label: "Motr Overview"
 ---
 
-# Motor WASM Plugin: UCAN Source
-
 The Motor WASM plugin is a WebAssembly-based plugin that provides Multi-Party Computation (MPC) powered UCAN (User-Controlled Authorization Networks) token generation and management.
 
 ## Overview
diff --git a/docs/reference/concepts/sonr.mdx b/docs/reference/concepts/sonr.mdx
index acd713c22..c0ef97731 100644
--- a/docs/reference/concepts/sonr.mdx
+++ b/docs/reference/concepts/sonr.mdx
@@ -1,8 +1,9 @@
 ---
 title: The Blockchain for Self-Sovereign Identity
-sidebarTitle: Sonr Overview
 description: A deep dive into Sonr's novel approach to personal data ownership and control.
 icon: play
+sidebar:
+  label: Sonr Overview
 ---
 
 In a world rapidly approaching the era of quantum computing, traditional cryptographic methods face unprecedented challenges. The burden of securing digital identity can no longer rest solely on the user. Sonr is designed to simplify the user experience while providing far greater security over personal data. We achieve this by incorporating the following concepts into our identity primitive.
diff --git a/docs/reference/concepts/token.mdx b/docs/reference/concepts/token.mdx
index 00726d9cf..70e69f44e 100644
--- a/docs/reference/concepts/token.mdx
+++ b/docs/reference/concepts/token.mdx
@@ -1,13 +1,14 @@
 ---
 title: $SNR Economics
 description: "The role of tokenomics in the Sonr ecosystem is twofold: it provides a medium of exchange and serves as a reward mechanism for validators. The platform's native tokens are used to facilitate transactions, secure network integrity, and incentivize behaviors that contribute to the network's longevity and reliability."
-sidebarTitle: "Design Model"
 icon: "star"
+sidebar:
+  label: "Design Model"
 ---
 
-<Note>
+:::note
 The Sonr platform has implemented a sophisticated token handling and treasury process designed to ensure the stability and sustainability of the SNR token. This process is critical in managing the economics of the Sonr ecosystem and ensuring its long-term viability.
-</Note>
+:::
 
 ## Key Economic Processes
 
@@ -50,10 +51,6 @@ The Sonr platform has implemented a sophisticated token handling and treasury pr
 </CardGroup>
 
 
-
-
-
-
 ## Validator Incentives
 
 Validators play a pivotal role in the network, responsible for processing authentication requests and maintaining the blockchain's integrity. They are incentivized through a task claiming process based on a first-come-first-serve mechanism and are remunerated via transaction fees and token rewards. This incentive structure ensures the high performance and reliability of services within the network.
diff --git a/docs/reference/messages/dex-add-liquidity.mdx b/docs/reference/messages/dex-add-liquidity.mdx
index c0f2da6da..5bc297415 100644
--- a/docs/reference/messages/dex-add-liquidity.mdx
+++ b/docs/reference/messages/dex-add-liquidity.mdx
@@ -1,15 +1,16 @@
 ---
-openapi: post /dex.v1.Msg/ProvideLiquidity
 title: Provide Liquidity to Pool
 description: Add liquidity to DEX pools and earn LP tokens
-og:title: Add Liquidity to Cross-Chain Pools
-tag: x/dex
+sidebar:
+  badge: x/dex
+seo:
+  title: "Add Liquidity to Cross-Chain Pools"
 ---
 
-<Info>
-  LP tokens represent your proportional share of the pool and accrue trading fees.
-</Info>
+:::info
+LP tokens represent your proportional share of the pool and accrue trading fees.
+:::
 
-<Note>
-  Impermanent loss may occur when providing liquidity. Research the risks before proceeding.
-</Note>
+:::note
+Impermanent loss may occur when providing liquidity. Research the risks before proceeding.
+:::
diff --git a/docs/reference/messages/dex-cancel-order.mdx b/docs/reference/messages/dex-cancel-order.mdx
index 79589567a..465bfb3e5 100644
--- a/docs/reference/messages/dex-cancel-order.mdx
+++ b/docs/reference/messages/dex-cancel-order.mdx
@@ -1,16 +1,17 @@
 ---
-openapi: post /dex.v1.Msg/CancelOrder
 title: Cancel Limit Order
 description: Cancel active orders on remote DEX chains
-og:title: Cancel Cross-Chain Orders
-tag: x/dex
+sidebar:
+  badge: x/dex
+seo:
+  title: "Cancel Cross-Chain Orders"
 ---
 
-<Warning>
-  Order cancellation is not instant. There's a small window where the order
-  might still be filled before cancellation is processed.
-</Warning>
+:::warning
+Order cancellation is not instant. There's a small window where the order
+might still be filled before cancellation is processed.
+:::
 
-<Tip>
-  Monitor the IBC packet acknowledgment to confirm successful cancellation.
-</Tip>
+:::tip
+Monitor the IBC packet acknowledgment to confirm successful cancellation.
+:::
diff --git a/docs/reference/messages/dex-create-account.mdx b/docs/reference/messages/dex-create-account.mdx
index ddd6bdc2c..315b31ced 100644
--- a/docs/reference/messages/dex-create-account.mdx
+++ b/docs/reference/messages/dex-create-account.mdx
@@ -1,15 +1,16 @@
 ---
-openapi: post /dex.v1.Msg/RegisterDEXAccount
 title: Register Interchain DEX Account
 description: Create a new ICA account for cross-chain trading operations
-og:title: Setup Cross-Chain Trading Account
-tag: x/dex
+sidebar:
+  badge: x/dex
+seo:
+  title: "Setup Cross-Chain Trading Account"
 ---
 
-<Note>
-  Account creation is asynchronous. Monitor the IBC packet acknowledgment to confirm the account address.
-</Note>
+:::note
+Account creation is asynchronous. Monitor the IBC packet acknowledgment to confirm the account address.
+:::
 
-<Warning>
-  Each DID is limited to a maximum number of DEX accounts as configured in module parameters.
-</Warning>
+:::warning
+Each DID is limited to a maximum number of DEX accounts as configured in module parameters.
+:::
diff --git a/docs/reference/messages/dex-create-limit-order.mdx b/docs/reference/messages/dex-create-limit-order.mdx
index 4e20f9163..f728b6a7c 100644
--- a/docs/reference/messages/dex-create-limit-order.mdx
+++ b/docs/reference/messages/dex-create-limit-order.mdx
@@ -1,17 +1,18 @@
 ---
-openapi: post /dex.v1.Msg/CreateLimitOrder
 title: Create Limit Order
 description: Place limit orders on remote DEX chains
-og:title: Place Cross-Chain Limit Orders
-tag: x/dex
+sidebar:
+  badge: x/dex
+seo:
+  title: "Place Cross-Chain Limit Orders"
 ---
 
-<Info>
-  Limit orders allow you to specify the exact price at which you want to trade,
-  providing better control over execution prices.
-</Info>
+:::info
+Limit orders allow you to specify the exact price at which you want to trade,
+providing better control over execution prices.
+:::
 
-<Note>
-  Orders are subject to maker fees on most DEXs. Check the specific DEX documentation
-  for fee structures.
-</Note>
+:::note
+Orders are subject to maker fees on most DEXs. Check the specific DEX documentation
+for fee structures.
+:::
diff --git a/docs/reference/messages/dex-execute-token-swap.mdx b/docs/reference/messages/dex-execute-token-swap.mdx
index c1f08ec9a..71ea65ad9 100644
--- a/docs/reference/messages/dex-execute-token-swap.mdx
+++ b/docs/reference/messages/dex-execute-token-swap.mdx
@@ -1,16 +1,17 @@
 ---
-openapi: post /dex.v1.Msg/ExecuteSwap
 title: Execute Cross-Chain Swap
 description: Perform token swaps on remote DEX chains with slippage protection
-og:title: Cross-Chain Token Swap
-tag: x/dex
+sidebar:
+  badge: x/dex
+seo:
+  title: "Cross-Chain Token Swap"
 ---
 
-<Tip>
-  For better execution prices, consider breaking large swaps into smaller transactions
-  or using the multi-hop routing feature.
-</Tip>
+:::tip
+For better execution prices, consider breaking large swaps into smaller transactions
+or using the multi-hop routing feature.
+:::
 
-<Warning>
-  Platform fees apply to all swaps. Check the current fee structure in module parameters.
-</Warning>
+:::warning
+Platform fees apply to all swaps. Check the current fee structure in module parameters.
+:::
diff --git a/docs/reference/messages/dex-remove-liquidity.mdx b/docs/reference/messages/dex-remove-liquidity.mdx
index 0eb358028..015041099 100644
--- a/docs/reference/messages/dex-remove-liquidity.mdx
+++ b/docs/reference/messages/dex-remove-liquidity.mdx
@@ -1,16 +1,17 @@
 ---
-openapi: post /dex.v1.Msg/RemoveLiquidity
 title: Remove Liquidity from Pool
 description: Withdraw assets from DEX pools by burning LP tokens
-og:title: Withdraw Liquidity from Cross-Chain Pools
-tag: x/dex
+sidebar:
+  badge: x/dex
+seo:
+  title: "Withdraw Liquidity from Cross-Chain Pools"
 ---
 
-<Warning>
-  Removing liquidity during high volatility may result in receiving different asset ratios
-  than initially provided.
-</Warning>
+:::warning
+Removing liquidity during high volatility may result in receiving different asset ratios
+than initially provided.
+:::
 
-<Tip>
-  Set appropriate minimum amounts to protect against unfavorable price movements.
-</Tip>
+:::tip
+Set appropriate minimum amounts to protect against unfavorable price movements.
+:::
diff --git a/docs/reference/messages/did-add-service-endpoint.mdx b/docs/reference/messages/did-add-service-endpoint.mdx
index 1161b457f..c80591f42 100644
--- a/docs/reference/messages/did-add-service-endpoint.mdx
+++ b/docs/reference/messages/did-add-service-endpoint.mdx
@@ -1,17 +1,18 @@
 ---
-openapi: post /did.v1.Msg/AddService
 title: Add Service Endpoint
 description: Associate services and interaction endpoints with your DID
-og:title: Add DID Service
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Add DID Service"
 ---
 
-<Tip>
-  Service endpoints enable others to discover how to interact with
-  your DID for specific purposes (messaging, data exchange, etc.).
-</Tip>
+:::tip
+Service endpoints enable others to discover how to interact with
+your DID for specific purposes (messaging, data exchange, etc.).
+:::
 
-<Note>
-  Service URLs should use HTTPS for security. Consider using
-  decentralized storage for resilience.
-</Note>
+:::note
+Service URLs should use HTTPS for security. Consider using
+decentralized storage for resilience.
+:::
diff --git a/docs/reference/messages/did-add-verification-method.mdx b/docs/reference/messages/did-add-verification-method.mdx
index ae83a666f..f8910abfb 100644
--- a/docs/reference/messages/did-add-verification-method.mdx
+++ b/docs/reference/messages/did-add-verification-method.mdx
@@ -1,17 +1,18 @@
 ---
-openapi: post /did.v1.Msg/AddVerificationMethod
 title: Add Verification Method
 description: Add cryptographic keys and authentication methods to your DID
-og:title: Enhance DID Security
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Enhance DID Security"
 ---
 
-<Info>
-  Adding multiple verification methods provides redundancy and enables
-  different use cases (signing, encryption, authentication).
-</Info>
+:::info
+Adding multiple verification methods provides redundancy and enables
+different use cases (signing, encryption, authentication).
+:::
 
-<Tip>
-  Best practice: Add at least one backup verification method to prevent
-  lockout if your primary method becomes unavailable.
-</Tip>
+:::tip
+Best practice: Add at least one backup verification method to prevent
+lockout if your primary method becomes unavailable.
+:::
diff --git a/docs/reference/messages/did-create-document.mdx b/docs/reference/messages/did-create-document.mdx
index 35975fd37..7f9631e29 100644
--- a/docs/reference/messages/did-create-document.mdx
+++ b/docs/reference/messages/did-create-document.mdx
@@ -1,15 +1,16 @@
 ---
-openapi: post /did.v1.Msg/CreateDID
 title: Create W3C DID Document
 description: Create a new decentralized identifier with verification methods and services
-og:title: Create Decentralized Identity
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Create Decentralized Identity"
 ---
 
-<Note>
-  DID creation requires an existing account with tokens unless using gasless WebAuthn registration.
-</Note>
+:::note
+DID creation requires an existing account with tokens unless using gasless WebAuthn registration.
+:::
 
-<Tip>
-  Enable auto-vault creation to automatically set up secure credential storage.
-</Tip>
+:::tip
+Enable auto-vault creation to automatically set up secure credential storage.
+:::
diff --git a/docs/reference/messages/did-deactivate.mdx b/docs/reference/messages/did-deactivate.mdx
index 7cc727968..d855c7360 100644
--- a/docs/reference/messages/did-deactivate.mdx
+++ b/docs/reference/messages/did-deactivate.mdx
@@ -1,18 +1,19 @@
 ---
-openapi: post /did.v1.Msg/DeactivateDID
 title: Deactivate DID Document
 description: Permanently disable a decentralized identifier
-og:title: Deactivate Digital Identity
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Deactivate Digital Identity"
 ---
 
-<Warning>
-  **This operation is PERMANENT and IRREVERSIBLE.**
-  Deactivated DIDs cannot be reactivated. Ensure you have migrated
-  any necessary data before deactivation.
-</Warning>
+:::warning
+**This operation is PERMANENT and IRREVERSIBLE.**
+Deactivated DIDs cannot be reactivated. Ensure you have migrated
+any necessary data before deactivation.
+:::
 
-<Info>
-  Deactivation is useful for key compromise scenarios or when
-  transitioning to a new identity.
-</Info>
+:::info
+Deactivation is useful for key compromise scenarios or when
+transitioning to a new identity.
+:::
diff --git a/docs/reference/messages/did-issue-verifiable-credential.mdx b/docs/reference/messages/did-issue-verifiable-credential.mdx
index d32f722c2..c33909b14 100644
--- a/docs/reference/messages/did-issue-verifiable-credential.mdx
+++ b/docs/reference/messages/did-issue-verifiable-credential.mdx
@@ -1,21 +1,21 @@
 ---
-openapi: post /did.v1.Msg/IssueVerifiableCredential
 title: Issue W3C Verifiable Credential
 description: Create cryptographically signed credentials for identity claims
-og:title: Issue Digital Credentials
+seo:
+  title: "Issue Digital Credentials"
 ---
 
-<Note>
-  Only DIDs with appropriate verification methods can issue credentials.
-  The issuer's reputation affects credential trustworthiness.
-</Note>
+:::note
+Only DIDs with appropriate verification methods can issue credentials.
+The issuer's reputation affects credential trustworthiness.
+:::
 
-<Tip>
-  Set reasonable expiration dates for credentials that represent
-  time-bound claims (e.g., memberships, certifications).
-</Tip>
+:::tip
+Set reasonable expiration dates for credentials that represent
+time-bound claims (e.g., memberships, certifications).
+:::
 
-<Warning>
-  Issued credentials cannot be modified. To update claims,
-  revoke the old credential and issue a new one.
-</Warning>
+:::warning
+Issued credentials cannot be modified. To update claims,
+revoke the old credential and issue a new one.
+:::
diff --git a/docs/reference/messages/did-link-external-wallet.mdx b/docs/reference/messages/did-link-external-wallet.mdx
index 0c8b878c5..fe121c2ca 100644
--- a/docs/reference/messages/did-link-external-wallet.mdx
+++ b/docs/reference/messages/did-link-external-wallet.mdx
@@ -1,22 +1,23 @@
 ---
-openapi: post /did.v1.Msg/LinkExternalWallet
 title: Link External Wallet to DID
 description: Connect MetaMask, Keplr, or other wallets to your decentralized identity
-og:title: External Wallet Integration
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "External Wallet Integration"
 ---
 
-<Note>
-  Each wallet can only be linked to one DID. Attempting to link the same wallet
-  to multiple DIDs will fail.
-</Note>
+:::note
+Each wallet can only be linked to one DID. Attempting to link the same wallet
+to multiple DIDs will fail.
+:::
 
-<Warning>
-  Ensure you have control of the wallet before linking. Lost wallet access
-  means losing this verification method.
-</Warning>
+:::warning
+Ensure you have control of the wallet before linking. Lost wallet access
+means losing this verification method.
+:::
 
-<Tip>
-  After linking, you can use your external wallet to sign transactions
-  and authenticate operations on behalf of your DID.
-</Tip>
+:::tip
+After linking, you can use your external wallet to sign transactions
+and authenticate operations on behalf of your DID.
+:::
diff --git a/docs/reference/messages/did-remove-service-endpoint.mdx b/docs/reference/messages/did-remove-service-endpoint.mdx
index f6df892a6..627cc9437 100644
--- a/docs/reference/messages/did-remove-service-endpoint.mdx
+++ b/docs/reference/messages/did-remove-service-endpoint.mdx
@@ -1,16 +1,17 @@
 ---
-openapi: post /did.v1.Msg/RemoveService
 title: Remove Service Endpoint
 description: Remove service associations from your DID
-og:title: Remove DID Service
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Remove DID Service"
 ---
 
-<Note>
-  Removing a service doesn't delete the actual service,
-  only its association with the DID.
-</Note>
+:::note
+Removing a service doesn't delete the actual service,
+only its association with the DID.
+:::
 
-<Tip>
-  Consider deprecation notices before removing widely-used services.
-</Tip>
+:::tip
+Consider deprecation notices before removing widely-used services.
+:::
diff --git a/docs/reference/messages/did-remove-verification-method.mdx b/docs/reference/messages/did-remove-verification-method.mdx
index 5f4964169..53922aa65 100644
--- a/docs/reference/messages/did-remove-verification-method.mdx
+++ b/docs/reference/messages/did-remove-verification-method.mdx
@@ -1,17 +1,18 @@
 ---
-openapi: post /did.v1.Msg/RemoveVerificationMethod
 title: Remove Verification Method
 description: Remove keys and authentication methods from your DID
-og:title: Remove DID Verification Method
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Remove DID Verification Method"
 ---
 
-<Warning>
-  Ensure you have alternative verification methods before removing.
-  Removing all methods locks you out of your DID.
-</Warning>
+:::warning
+Ensure you have alternative verification methods before removing.
+Removing all methods locks you out of your DID.
+:::
 
-<Tip>
-  Best practice: Add new verification methods before removing old ones
-  to maintain continuous access.
-</Tip>
+:::tip
+Best practice: Add new verification methods before removing old ones
+to maintain continuous access.
+:::
diff --git a/docs/reference/messages/did-revoke-verifiable-credential.mdx b/docs/reference/messages/did-revoke-verifiable-credential.mdx
index 45788f4d4..f70b5ec76 100644
--- a/docs/reference/messages/did-revoke-verifiable-credential.mdx
+++ b/docs/reference/messages/did-revoke-verifiable-credential.mdx
@@ -1,17 +1,18 @@
 ---
-openapi: post /did.v1.Msg/RevokeVerifiableCredential
 title: Revoke Verifiable Credential
 description: Permanently invalidate an issued credential
-og:title: Revoke Digital Credential
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Revoke Digital Credential"
 ---
 
-<Warning>
-  Revocation is permanent. Revoked credentials cannot be reinstated.
-  To restore credentials, issue a new one with updated information.
-</Warning>
+:::warning
+Revocation is permanent. Revoked credentials cannot be reinstated.
+To restore credentials, issue a new one with updated information.
+:::
 
-<Info>
-  Always provide a clear revocation reason for transparency and
-  audit trail purposes.
-</Info>
+:::info
+Always provide a clear revocation reason for transparency and
+audit trail purposes.
+:::
diff --git a/docs/reference/messages/did-update-document.mdx b/docs/reference/messages/did-update-document.mdx
index 0d9c11e1a..963f8a1c0 100644
--- a/docs/reference/messages/did-update-document.mdx
+++ b/docs/reference/messages/did-update-document.mdx
@@ -1,17 +1,18 @@
 ---
-openapi: post /did.v1.Msg/UpdateDID
 title: Update DID Document
 description: Modify verification methods, services, and controllers of your DID
-og:title: Update Decentralized Identity
-tag: x/did
+sidebar:
+  badge: x/did
+seo:
+  title: "Update Decentralized Identity"
 ---
 
-<Warning>
-  Updates are permanent and create a new version. Previous versions
-  remain accessible for historical reference.
-</Warning>
+:::warning
+Updates are permanent and create a new version. Previous versions
+remain accessible for historical reference.
+:::
 
-<Tip>
-  Use specific add/remove operations for individual changes rather
-  than full document updates when possible.
-</Tip>
+:::tip
+Use specific add/remove operations for individual changes rather
+than full document updates when possible.
+:::
diff --git a/docs/reference/messages/did-update-module-parameters.mdx b/docs/reference/messages/did-update-module-parameters.mdx
index a49b593a4..0da93e591 100644
--- a/docs/reference/messages/did-update-module-parameters.mdx
+++ b/docs/reference/messages/did-update-module-parameters.mdx
@@ -1,7 +1,8 @@
 ---
 title: Update DID Module Parameters
 description: Modify module parameters for decentralized identifier operations
-og:title: Update DID Module Parameters
-tag: x/did
-openapi: post /did.v1.Msg/UpdateParams
+sidebar:
+  badge: x/did
+seo:
+  title: "Update DID Module Parameters"
 ---
diff --git a/docs/reference/messages/dwn-configure-protocol.mdx b/docs/reference/messages/dwn-configure-protocol.mdx
index 1cb9c1d07..f9695ccf0 100644
--- a/docs/reference/messages/dwn-configure-protocol.mdx
+++ b/docs/reference/messages/dwn-configure-protocol.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/ProtocolsConfigure
 title: Configure DWN Protocol
 description: Define structured data models and access patterns for interoperable applications
-og:title: DWN Protocol Configuration
+seo:
+  title: "DWN Protocol Configuration"
 ---
 
-<Info>
-  Protocols are the foundation of data interoperability in DWN, enabling applications to share and understand structured data.
-</Info>
+:::info
+Protocols are the foundation of data interoperability in DWN, enabling applications to share and understand structured data.
+:::
 
 ## Protocol Architecture
 
@@ -44,9 +44,9 @@ og:title: DWN Protocol Configuration
 
 ## Publishing Protocols
 
-<Tip>
-  Set `published: true` to make your protocol discoverable and reusable by the community.
-</Tip>
+:::tip
+Set `published: true` to make your protocol discoverable and reusable by the community.
+:::
 
 ### Benefits of Published Protocols
 - **Discoverability**: Others can find and adopt your protocol
@@ -70,6 +70,6 @@ og:title: DWN Protocol Configuration
 - Time-series organization
 - Aggregation rules
 
-<Warning>
-  Protocol URIs must be unique. Consider using versioned URIs (e.g., `/v1`, `/v2`) for upgrades.
-</Warning>
+:::warning
+Protocol URIs must be unique. Consider using versioned URIs (e.g., `/v1`, `/v2`) for upgrades.
+:::
diff --git a/docs/reference/messages/dwn-delete-record.mdx b/docs/reference/messages/dwn-delete-record.mdx
index ac8770e24..03965eb90 100644
--- a/docs/reference/messages/dwn-delete-record.mdx
+++ b/docs/reference/messages/dwn-delete-record.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/RecordsDelete
 title: Delete DWN Record
 description: Remove records from your personal data vault with optional cascading deletion
-og:title: DWN Record Deletion
+seo:
+  title: "DWN Record Deletion"
 ---
 
-<Warning>
-  Record deletion is **permanent** and cannot be undone. Ensure you have backups if needed.
-</Warning>
+:::warning
+Record deletion is **permanent** and cannot be undone. Ensure you have backups if needed.
+:::
 
 ## Deletion Options
 
@@ -28,15 +28,15 @@ You must have one of the following:
 - **Permission**: Have explicit delete permission
 - **Protocol Authority**: Have protocol-level delete rights
 
-<Note>
-  The `deletedCount` in the response includes all pruned child records.
-</Note>
+:::note
+The `deletedCount` in the response includes all pruned child records.
+:::
 
 ## Safety Considerations
 
-<Tip>
-  Query child records before pruning to understand the impact:
-  ```bash
-  snrd query dwn records-query --parent-id <record_id>
-  ```
-</Tip>
+:::tip
+Query child records before pruning to understand the impact:
+```bash
+snrd query dwn records-query --parent-id <record_id>
+```
+:::
diff --git a/docs/reference/messages/dwn-grant-permission.mdx b/docs/reference/messages/dwn-grant-permission.mdx
index 90716ac23..13e543cbd 100644
--- a/docs/reference/messages/dwn-grant-permission.mdx
+++ b/docs/reference/messages/dwn-grant-permission.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/PermissionsGrant
 title: Grant DWN Access Permission
 description: Authorize other users to access your data with fine-grained control
-og:title: DWN Permission Management
+seo:
+  title: "DWN Permission Management"
 ---
 
-<Info>
-  DWN permissions enable secure data sharing with granular access control down to individual records.
-</Info>
+:::info
+DWN permissions enable secure data sharing with granular access control down to individual records.
+:::
 
 ## Permission Scopes
 
@@ -44,9 +44,9 @@ Grant access to specific records:
 
 ## Conditional Permissions
 
-<Tip>
-  Use conditions to create dynamic access rules that adapt to context.
-</Tip>
+:::tip
+Use conditions to create dynamic access rules that adapt to context.
+:::
 
 ### Time-Based Conditions
 ```json
@@ -77,9 +77,9 @@ Grant access to specific records:
 
 ## Security Best Practices
 
-<Warning>
-  Always set expiration times for permissions to limit exposure window.
-</Warning>
+:::warning
+Always set expiration times for permissions to limit exposure window.
+:::
 
 1. **Principle of Least Privilege**: Grant minimum necessary access
 2. **Time Limits**: Use `expiresAt` for temporary access
diff --git a/docs/reference/messages/dwn-revoke-permission.mdx b/docs/reference/messages/dwn-revoke-permission.mdx
index dd921ecef..4c4848f36 100644
--- a/docs/reference/messages/dwn-revoke-permission.mdx
+++ b/docs/reference/messages/dwn-revoke-permission.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/PermissionsRevoke
 title: Revoke DWN Permission
 description: Immediately remove access rights previously granted to other users
-og:title: DWN Permission Revocation
+seo:
+  title: "DWN Permission Revocation"
 ---
 
-<Warning>
-  Permission revocation takes effect **immediately**. Active sessions using the permission will be terminated.
-</Warning>
+:::warning
+Permission revocation takes effect **immediately**. Active sessions using the permission will be terminated.
+:::
 
 ## Revocation Process
 
@@ -24,12 +24,12 @@ og:title: DWN Permission Revocation
 
 ## Finding Permissions to Revoke
 
-<Tip>
-  Query your active permissions before revoking:
-  ```bash
-  snrd query dwn permissions-request --grantor <your_did>
-  ```
-</Tip>
+:::tip
+Query your active permissions before revoking:
+```bash
+snrd query dwn permissions-request --grantor <your_did>
+```
+:::
 
 ## Authorization Requirements
 
@@ -57,6 +57,6 @@ snrd tx dwn permissions-revoke --permission-id <team_permission>
 snrd tx dwn permissions-revoke --permission-id <unused_permission>
 ```
 
-<Note>
-  Consider notifying affected users before revoking permissions to avoid disruption.
-</Note>
+:::note
+Consider notifying affected users before revoking permissions to avoid disruption.
+:::
diff --git a/docs/reference/messages/dwn-rotate-vault-keys.mdx b/docs/reference/messages/dwn-rotate-vault-keys.mdx
index b6acbb2a3..1699221e5 100644
--- a/docs/reference/messages/dwn-rotate-vault-keys.mdx
+++ b/docs/reference/messages/dwn-rotate-vault-keys.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/RotateVaultKeys
 title: Rotate Vault Encryption Keys
 description: Perform cryptographic key rotation for enhanced vault security
-og:title: DWN Vault Key Rotation
+seo:
+  title: "DWN Vault Key Rotation"
 ---
 
-<Warning>
-  Key rotation is a **critical security operation** that requires validator consensus or governance approval.
-</Warning>
+:::warning
+Key rotation is a **critical security operation** that requires validator consensus or governance approval.
+:::
 
 ## Key Rotation Architecture
 
@@ -43,9 +43,9 @@ og:title: DWN Vault Key Rotation
 
 ## Rotation Process
 
-<Info>
-  The rotation process is designed to be seamless with zero downtime for users.
-</Info>
+:::info
+The rotation process is designed to be seamless with zero downtime for users.
+:::
 
 ### Phase 1: Preparation
 1. Generate new key material in enclave
@@ -65,9 +65,9 @@ og:title: DWN Vault Key Rotation
 ## Security Considerations
 
 ### Single-Node Fallback
-<Note>
-  In development mode with `singleNodeFallback: true`, rotation uses local key generation.
-</Note>
+:::note
+In development mode with `singleNodeFallback: true`, rotation uses local key generation.
+:::
 
 ### Production Requirements
 - Minimum validator participation (67% default)
@@ -83,13 +83,13 @@ og:title: DWN Vault Key Rotation
 - New encryptions use latest keys
 
 ### Performance
-- Slight latency during rotation (< 1s)
+- Slight latency during rotation (&lt; 1s)
 - Background re-encryption process
 - No data availability impact
 
-<Tip>
-  Monitor rotation events via:
-  ```bash
-  snrd query dwn vault-status --vault-id <id>
-  ```
-</Tip>
+:::tip
+Monitor rotation events via:
+```bash
+snrd query dwn vault-status --vault-id <id>
+```
+:::
diff --git a/docs/reference/messages/dwn-update-module-parameters.mdx b/docs/reference/messages/dwn-update-module-parameters.mdx
index 4e4ebd381..a0261bb99 100644
--- a/docs/reference/messages/dwn-update-module-parameters.mdx
+++ b/docs/reference/messages/dwn-update-module-parameters.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/UpdateParams
 title: Update DWN Module Parameters
 description: Configure module-wide settings for data storage, protocols, and security policies
-og:title: DWN Module Governance
+seo:
+  title: "DWN Module Governance"
 ---
 
-<Warning>
-  This operation requires **governance approval** and is typically executed through on-chain proposals.
-</Warning>
+:::warning
+This operation requires **governance approval** and is typically executed through on-chain proposals.
+:::
 
 ## Parameter Categories
 
@@ -27,6 +27,6 @@ og:title: DWN Module Governance
 - **encryptedProtocols**: Protocol URIs requiring mandatory encryption
 - **encryptedSchemas**: Schema URIs requiring mandatory encryption
 
-<Note>
-  Changes to these parameters affect all DWN operations network-wide.
-</Note>
+:::note
+Changes to these parameters affect all DWN operations network-wide.
+:::
diff --git a/docs/reference/messages/dwn-write-record.mdx b/docs/reference/messages/dwn-write-record.mdx
index 45949574b..461ade9c4 100644
--- a/docs/reference/messages/dwn-write-record.mdx
+++ b/docs/reference/messages/dwn-write-record.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /dwn.v1.Msg/RecordsWrite
 title: Write Data Record to DWN
 description: Store structured data in your personal data vault with encryption and access control
-og:title: DWN Record Storage
+seo:
+  title: "DWN Record Storage"
 ---
 
-<Info>
-  Records are the fundamental unit of data storage in DWN, supporting any data type with optional encryption.
-</Info>
+:::info
+Records are the fundamental unit of data storage in DWN, supporting any data type with optional encryption.
+:::
 
 ## Key Features
 
@@ -27,9 +27,9 @@ og:title: DWN Record Storage
 - **Social Content**: Share public posts or media
 - **Health Records**: Store sensitive medical data with encryption
 
-<Tip>
-  Use protocol definitions to ensure data interoperability across applications.
-</Tip>
+:::tip
+Use protocol definitions to ensure data interoperability across applications.
+:::
 
 ## Example Record Types
 
@@ -43,6 +43,6 @@ og:title: DWN Record Storage
 }
 ```
 
-<Warning>
-  Records exceeding `maxRecordSize` will be rejected. Large files should be stored in IPFS with only metadata on-chain.
-</Warning>
+:::warning
+Records exceeding `maxRecordSize` will be rejected. Large files should be stored in IPFS with only metadata on-chain.
+:::
diff --git a/docs/reference/messages/svc-complete-domain-verification.mdx b/docs/reference/messages/svc-complete-domain-verification.mdx
index 713e849ad..b82dbf85b 100644
--- a/docs/reference/messages/svc-complete-domain-verification.mdx
+++ b/docs/reference/messages/svc-complete-domain-verification.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /svc.v1.Msg/VerifyDomain
 title: Complete Domain Verification
 description: Validate DNS TXT record to prove domain ownership
-og:title: Finalize Domain Ownership
+seo:
+  title: "Finalize Domain Ownership"
 ---
 
-<Info>
-  This endpoint validates the DNS TXT record to permanently bind the domain to your address.
-</Info>
+:::info
+This endpoint validates the DNS TXT record to permanently bind the domain to your address.
+:::
 
 ## Prerequisites
 
@@ -32,12 +32,12 @@ The system performs these checks:
 ### Common Issues
 
 #### DNS Not Propagated
-<Tip>
-  Wait 5-30 minutes after adding the TXT record. Check propagation:
-  ```bash
-  dig TXT example.com +short
-  ```
-</Tip>
+:::tip
+Wait 5-30 minutes after adding the TXT record. Check propagation:
+```bash
+dig TXT example.com +short
+```
+:::
 
 #### Token Mismatch
 - Ensure exact token from initiation response
@@ -57,9 +57,9 @@ Once verified:
 - **Trust Established**: Domain ownership proven
 - **No Re-verification**: One-time process per domain
 
-<Warning>
-  Domain ownership is permanent. Ensure you're verifying with the correct address.
-</Warning>
+:::warning
+Domain ownership is permanent. Ensure you're verifying with the correct address.
+:::
 
 ## Next Steps
 
diff --git a/docs/reference/messages/svc-initiate-domain-verification.mdx b/docs/reference/messages/svc-initiate-domain-verification.mdx
index 7a641baf9..c24d2b388 100644
--- a/docs/reference/messages/svc-initiate-domain-verification.mdx
+++ b/docs/reference/messages/svc-initiate-domain-verification.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /svc.v1.Msg/InitiateDomainVerification
 title: Start Domain Verification
 description: Generate DNS TXT record token for domain ownership proof
-og:title: Domain Ownership Verification
+seo:
+  title: "Domain Ownership Verification"
 ---
 
-<Info>
-  Domain verification ensures only legitimate domain owners can register services, establishing trust in the ecosystem.
-</Info>
+:::info
+Domain verification ensures only legitimate domain owners can register services, establishing trust in the ecosystem.
+:::
 
 ## Verification Process
 
@@ -37,22 +37,22 @@ snrd tx svc verify-domain example.com --from alice
 ### Cloudflare
 1. Go to DNS settings
 2. Add record → Type: TXT
-3. Name: @ → Value: sonr-verification=<token>
+3. Name: @ → Value: sonr-verification=&lt;token>
 4. Save and wait for propagation
 
 ### Route53 (AWS)
 1. Navigate to Hosted zones
 2. Create record → Type: TXT
 3. Record name: (leave blank for root)
-4. Value: "sonr-verification=<token>"
+4. Value: "sonr-verification=&lt;token>"
 
-<Tip>
-  Use DNS lookup tools to verify your TXT record is propagated before completing verification:
-  ```bash
-  dig TXT example.com
-  nslookup -type=TXT example.com
-  ```
-</Tip>
+:::tip
+Use DNS lookup tools to verify your TXT record is propagated before completing verification:
+```bash
+dig TXT example.com
+nslookup -type=TXT example.com
+```
+:::
 
 ## Requirements
 
@@ -61,6 +61,6 @@ snrd tx svc verify-domain example.com --from alice
 - **Unique Ownership**: Each domain can only have one owner
 - **Time Limit**: Complete within 7 days of initiation
 
-<Warning>
-  Verification tokens expire after 7 days. If expired, you must initiate a new verification.
-</Warning>
+:::warning
+Verification tokens expire after 7 days. If expired, you must initiate a new verification.
+:::
diff --git a/docs/reference/messages/svc-register-service-with-verified-domain.mdx b/docs/reference/messages/svc-register-service-with-verified-domain.mdx
index d90c2cc58..4e33245f5 100644
--- a/docs/reference/messages/svc-register-service-with-verified-domain.mdx
+++ b/docs/reference/messages/svc-register-service-with-verified-domain.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /svc.v1.Msg/RegisterService
 title: Register Decentralized Service
 description: Create a new service with domain binding and UCAN permissions
-og:title: Service Registration
+seo:
+  title: "Service Registration"
 ---
 
-<Info>
-  Services are the foundation of decentralized applications in Sonr, providing trusted interaction points through verified domains.
-</Info>
+:::info
+Services are the foundation of decentralized applications in Sonr, providing trusted interaction points through verified domains.
+:::
 
 ## Prerequisites
 
@@ -68,9 +68,9 @@ Services request permissions users must grant:
 }
 ```
 
-<Tip>
-  Request only necessary permissions. Users are more likely to grant minimal permission sets.
-</Tip>
+:::tip
+Request only necessary permissions. Users are more likely to grant minimal permission sets.
+:::
 
 ## UCAN Integration
 
@@ -116,9 +116,9 @@ Provide existing UCAN chain for pre-authorized capabilities.
 - **Clear Purpose**: Document why each permission
 - **Future Growth**: Design for expansion
 
-<Warning>
-  Service registration is permanent. Choose your service ID carefully as it cannot be changed.
-</Warning>
+:::warning
+Service registration is permanent. Choose your service ID carefully as it cannot be changed.
+:::
 
 ## Post-Registration
 
@@ -134,6 +134,6 @@ snrd query svc services-by-domain example.com
 ipfs cat <root_capability_cid>
 ```
 
-<Note>
-  Services become immediately discoverable after registration. Ensure your application is ready to handle user interactions.
-</Note>
+:::note
+Services become immediately discoverable after registration. Ensure your application is ready to handle user interactions.
+:::
diff --git a/docs/reference/messages/svc-update-module-parameters.mdx b/docs/reference/messages/svc-update-module-parameters.mdx
index 24ec923ba..7b75405b2 100644
--- a/docs/reference/messages/svc-update-module-parameters.mdx
+++ b/docs/reference/messages/svc-update-module-parameters.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: post /svc.v1.Msg/UpdateParams
 title: Update SVC Module Parameters
 description: Configure service registration limits, domain verification, and UCAN settings
-og:title: SVC Module Governance
+seo:
+  title: "SVC Module Governance"
 ---
 
-<Warning>
-  This operation requires **governance approval** and is typically executed through on-chain proposals.
-</Warning>
+:::warning
+This operation requires **governance approval** and is typically executed through on-chain proposals.
+:::
 
 ## Parameter Categories
 
@@ -31,6 +31,6 @@ og:title: SVC Module Governance
 - **domainVerificationFee**: Fee for domain verification
 - **minServiceStake**: Minimum stake to maintain service
 
-<Note>
-  Changes affect all service operations network-wide. Plan parameter updates carefully.
-</Note>
+:::note
+Changes affect all service operations network-wide. Plan parameter updates carefully.
+:::
diff --git a/docs/reference/modules/dex.mdx b/docs/reference/modules/dex.mdx
index da5f7ff4b..783c2e72d 100644
--- a/docs/reference/modules/dex.mdx
+++ b/docs/reference/modules/dex.mdx
@@ -1,24 +1,17 @@
 ---
 title: "Decentralized Exchange (x/dex)"
-sidebarTitle: "Interchain Exchange"
 icon: "coins"
-tag: "x/dex"
 description: "Cross-chain trading through IBC Interchain Accounts with DID-based authorization"
+sidebar:
+  label: "Interchain Exchange"
+  badge: "x/dex"
 ---
 
-import { Card, CardGrid } from '@/components/mdx'
-import { Tabs, Tab } from '@/components/mdx'
-import { Accordion, AccordionItem } from '@/components/mdx'
-import { CodeGroup } from '@/components/mdx'
-import { Info } from '@/components/mdx'
-
-# Sonr DEX Module
-
 The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain trading infrastructure that enables seamless, secure, and self-sovereign trading across the Cosmos ecosystem.
 
 ## Overview
 
-<CardGrid>
+<CardGroup>
   <Card title="Cross-Chain Trading" icon="swap">
     Execute swaps on remote DEX chains via Interchain Accounts (ICA)
   </Card>
@@ -31,7 +24,7 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
   <Card title="Multi-DEX Support" icon="globe">
     Connect to multiple DEX chains simultaneously
   </Card>
-</CardGrid>
+</CardGroup>
 
 ## Core Concepts
 
@@ -51,7 +44,7 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
 
 ## Trading Operations
 
-<Tabs>
+<Tabs inline>
   <Tab title="Swaps">
     <CodeGroup>
       ```bash
@@ -68,9 +61,9 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
       ```
     </CodeGroup>
     
-    <Info>
+    <Callout type="info">
       Swap operations are protected against slippage with `min-amount-out` parameter.
-    </Info>
+    </Callout>
   </Tab>
   
   <Tab title="Liquidity">
@@ -88,9 +81,9 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
       ```
     </CodeGroup>
     
-    <Info>
+    <Callout type="info">
       Liquidity providers receive LP tokens proportional to their contribution.
-    </Info>
+    </Callout>
   </Tab>
   
   <Tab title="Orders">
@@ -110,15 +103,15 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
       ```
     </CodeGroup>
     
-    <Info>
+    <Callout type="info">
       Limit orders can be created with precise price and expiration settings.
-    </Info>
+    </Callout>
   </Tab>
 </Tabs>
 
 ## Security and Performance
 
-<CardGrid>
+<CardGroup>
   <Card title="DID Authentication" icon="shield">
     All operations require valid DID signatures
   </Card>
@@ -131,7 +124,7 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
   <Card title="Batch Operations" icon="rocket">
     Multiple operations can be executed in a single transaction
   </Card>
-</CardGrid>
+</CardGroup>
 
 ## Supported DEX Chains
 
@@ -165,7 +158,7 @@ The Sonr Decentralized Exchange (DEX) module provides a powerful cross-chain tra
 
 ## Technical Details
 
-<Tabs>
+<Tabs inline>
   <Tab title="Protobuf Definitions">
     ```protobuf
     message MsgExecuteSwap {
diff --git a/docs/reference/modules/did.mdx b/docs/reference/modules/did.mdx
index 87bc3f4bd..53d3bbb57 100644
--- a/docs/reference/modules/did.mdx
+++ b/docs/reference/modules/did.mdx
@@ -1,13 +1,12 @@
 ---
 title: "Decentralized Identity"
-sidebarTitle: "Universal Identifiers"
 description: "Sonr's Decentralized Identifier (DID) Module: W3C-Compliant Identity Management"
 icon: "fingerprint"
-tag: "x/did"
+sidebar:
+  label: "Universal Identifiers"
+  badge: "x/did"
 ---
 
-# Decentralized Identifier (DID) Module
-
 The Sonr DID module implements a comprehensive W3C DID specification, providing a decentralized identity layer that enables self-sovereign identity management across the Sonr blockchain ecosystem.
 
 ## Key Features
@@ -122,4 +121,4 @@ Link external wallets like MetaMask and Keplr directly to your DID, enabling cro
 
 ## Documentation and Examples
 
-Refer to the [Blockchain Documentation](/blockchain/) for detailed guides, API references, and integration tutorials.
+Refer to the [Blockchain Documentation](/reference/concepts/sonr) for detailed guides, API references, and integration tutorials.
diff --git a/docs/reference/modules/dwn.mdx b/docs/reference/modules/dwn.mdx
index aa9370c20..d1af8280a 100644
--- a/docs/reference/modules/dwn.mdx
+++ b/docs/reference/modules/dwn.mdx
@@ -1,13 +1,12 @@
 ---
 title: "Decentralized Web Node (x/dwn)"
-sidebarTitle: "Smart Wallets"
 description: "Decentralized Web Node (DWN) Module: Personal Data Stores, Protocols, and Secure Vaults"
 icon: "wallet"
-tag: "x/dwn"
+sidebar:
+  label: "Smart Wallets"
+  badge: "x/dwn"
 ---
 
-# Decentralized Web Node (DWN) Module
-
 The `x/dwn` module is the foundational engine of the Sonr ecosystem. It provides a comprehensive **Decentralized Web Node (DWN)** implementation that serves as the backbone for user-controlled data storage, protocol management, and secure vault operations. The module enables users to maintain sovereign control over their data while participating in a decentralized ecosystem.
 
 ## Overview
diff --git a/docs/reference/modules/svc.mdx b/docs/reference/modules/svc.mdx
index 158258391..7dd671c89 100644
--- a/docs/reference/modules/svc.mdx
+++ b/docs/reference/modules/svc.mdx
@@ -1,13 +1,12 @@
 ---
 title: "On-Chain Authorization (x/svc)"
-sidebarTitle: "Web Service Registry"
 description: "Service registration and management with domain verification and UCAN integration"
 icon: "factory"
-tag: "x/svc"
+sidebar:
+  label: "Web Service Registry"
+  badge: "x/svc"
 ---
 
-# Sonr Service (SVC) Module
-
 The Service (SVC) module manages the registration and operation of decentralized services within the Sonr ecosystem. It provides a comprehensive framework for services to register with verified domains, define their permission requirements, and integrate with the broader Sonr authorization system through UCAN capabilities.
 
 ## Key Capabilities
@@ -20,20 +19,20 @@ The Service (SVC) module manages the registration and operation of decentralized
 
 ## System Architecture
 
-<Mermaid
-  chart={`graph TB
+```mermaid
+graph TB
     subgraph "Client Layer"
         U[User]
         B[Browser]
         WA[WebAuthn API]
     end
-    
+
     subgraph "Application Layer"
         APP[App Frontend]
         SDK[Sonr SDK]
         SVC_SDK[Service SDK]
     end
-    
+
     subgraph "Blockchain Layer"
         BC[Sonr Blockchain]
         subgraph "Modules"
@@ -43,12 +42,12 @@ The Service (SVC) module manages the registration and operation of decentralized
             SVC[x/svc]
         end
     end
-    
+
     subgraph "Storage Layer"
         IPFS[IPFS Network]
         VAULT[Vault Storage]
     end
-    
+
     U --> B
     B --> WA
     B --> APP
@@ -62,34 +61,33 @@ The Service (SVC) module manages the registration and operation of decentralized
     BC --> SVC
     DWN --> IPFS
     DWN --> VAULT
-`}
-/>
+```
 
 ## Trust Model
 
-<Mermaid
-  chart={`graph LR
+```mermaid
+graph LR
     subgraph "Trust Anchors"
         WA[WebAuthn<br/>Hardware]
         BC[Blockchain<br/>Consensus]
         DNS[DNS<br/>Domain Verification]
     end
-    
+
     subgraph "Identity Layer"
         DID[DID Documents]
         CRED[WebAuthn Credentials]
     end
-    
+
     subgraph "Authorization Layer"
         UCAN[UCAN Tokens]
         CAP[Capabilities]
     end
-    
+
     subgraph "Service Layer"
         SVC[Service Records]
         PERM[Permissions]
     end
-    
+
     WA --> CRED
     BC --> DID
     DNS --> SVC
@@ -98,8 +96,7 @@ The Service (SVC) module manages the registration and operation of decentralized
     UCAN --> CAP
     CAP --> PERM
     SVC --> PERM
-`}
-/>
+```
 
 ## Core Concepts
 
diff --git a/docs/reference/queries/query-dex-get-account.mdx b/docs/reference/queries/query-dex-get-account.mdx
index b3ceb2ddb..b3137f62e 100644
--- a/docs/reference/queries/query-dex-get-account.mdx
+++ b/docs/reference/queries/query-dex-get-account.mdx
@@ -1,11 +1,11 @@
 ---
-openapi: get /sonr/dex/v1/account/{did}/{connectionId}
 title: Query DEX Account Details
 description: Get information about a specific Interchain Account for DEX operations
-og:title: DEX Account Information
+seo:
+  title: "DEX Account Information"
 ---
 
-<Note>
-  Account addresses are only available after successful IBC acknowledgment.
-  Pending accounts will have an empty address field.
-</Note>
+:::note
+Account addresses are only available after successful IBC acknowledgment.
+Pending accounts will have an empty address field.
+:::
diff --git a/docs/reference/queries/query-dex-get-module-parameters.mdx b/docs/reference/queries/query-dex-get-module-parameters.mdx
index bce0888bb..219508b92 100644
--- a/docs/reference/queries/query-dex-get-module-parameters.mdx
+++ b/docs/reference/queries/query-dex-get-module-parameters.mdx
@@ -1,11 +1,11 @@
 ---
-openapi: get /sonr/dex/v1/params
 title: DEX Module Parameters
 description: Retrieve current configuration and operational limits for the DEX module
-og:title: Query DEX Module Configuration
+seo:
+  title: "Query DEX Module Configuration"
 ---
 
-<Tip>
-  Cache parameter responses client-side as they change infrequently.
-  Refresh periodically or after governance proposals.
-</Tip>
+:::tip
+Cache parameter responses client-side as they change infrequently.
+Refresh periodically or after governance proposals.
+:::
diff --git a/docs/reference/queries/query-dex-get-pool-information.mdx b/docs/reference/queries/query-dex-get-pool-information.mdx
index 74d6cd5f1..adc97bfdb 100644
--- a/docs/reference/queries/query-dex-get-pool-information.mdx
+++ b/docs/reference/queries/query-dex-get-pool-information.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /sonr/dex/v1/pool/{connectionId}/{poolId}
 title: Query Liquidity Pool Details
 description: Get comprehensive information about DEX liquidity pools
-og:title: Liquidity Pool Information
+seo:
+  title: "Liquidity Pool Information"
 ---
 
-<Info>
-  Pool information is essential for calculating optimal liquidity provision
-  amounts and understanding potential returns.
-</Info>
+:::info
+Pool information is essential for calculating optimal liquidity provision
+amounts and understanding potential returns.
+:::
 
-<Warning>
-  Pool compositions can change rapidly. Always fetch current data
-  before providing liquidity.
-</Warning>
+:::warning
+Pool compositions can change rapidly. Always fetch current data
+before providing liquidity.
+:::
diff --git a/docs/reference/queries/query-dex-get-remote-chain-balance.mdx b/docs/reference/queries/query-dex-get-remote-chain-balance.mdx
index 822a89212..46036301f 100644
--- a/docs/reference/queries/query-dex-get-remote-chain-balance.mdx
+++ b/docs/reference/queries/query-dex-get-remote-chain-balance.mdx
@@ -1,15 +1,15 @@
 ---
-openapi: get /sonr/dex/v1/balance/{did}/{connectionId}
 title: Query Remote Chain Balances
 description: Check token balances in your ICA account on remote chains
-og:title: Cross-Chain Balance Query
+seo:
+  title: "Cross-Chain Balance Query"
 ---
 
-<Tip>
-  Use the optional `denom` parameter to check specific token balances
-  without fetching the entire balance list.
-</Tip>
+:::tip
+Use the optional `denom` parameter to check specific token balances
+without fetching the entire balance list.
+:::
 
-<Note>
-  Balances are fetched in real-time from the remote chain via IBC queries.
-</Note>
+:::note
+Balances are fetched in real-time from the remote chain via IBC queries.
+:::
diff --git a/docs/reference/queries/query-dex-get-transaction-history.mdx b/docs/reference/queries/query-dex-get-transaction-history.mdx
index b9823dc1b..1a5c5028a 100644
--- a/docs/reference/queries/query-dex-get-transaction-history.mdx
+++ b/docs/reference/queries/query-dex-get-transaction-history.mdx
@@ -1,21 +1,21 @@
 ---
-openapi: get /sonr/dex/v1/history/{did}
 title: Query Trading History
 description: Access complete cross-chain trading history for a DID
-og:title: DEX Transaction History
+seo:
+  title: "DEX Transaction History"
 ---
 
-<Info>
-  Transaction history is stored permanently on the Sonr chain,
-  providing a complete audit trail of all DEX operations.
-</Info>
+:::info
+Transaction history is stored permanently on the Sonr chain,
+providing a complete audit trail of all DEX operations.
+:::
 
-<Tip>
-  Export historical data regularly for tax reporting and portfolio analysis.
-  Use filters to focus on specific time periods or operation types.
-</Tip>
+:::tip
+Export historical data regularly for tax reporting and portfolio analysis.
+Use filters to focus on specific time periods or operation types.
+:::
 
-<Note>
-  Large histories may require multiple paginated requests.
-  Use the pagination key for efficient retrieval.
-</Note>
+:::note
+Large histories may require multiple paginated requests.
+Use the pagination key for efficient retrieval.
+:::
diff --git a/docs/reference/queries/query-dex-list-all-accounts.mdx b/docs/reference/queries/query-dex-list-all-accounts.mdx
index 96e488292..dc6634573 100644
--- a/docs/reference/queries/query-dex-list-all-accounts.mdx
+++ b/docs/reference/queries/query-dex-list-all-accounts.mdx
@@ -1,11 +1,11 @@
 ---
-openapi: get /sonr/dex/v1/accounts/{did}
 title: List User's DEX Accounts
 description: Retrieve all Interchain Accounts associated with a DID
-og:title: List Cross-Chain Trading Accounts
+seo:
+  title: "List Cross-Chain Trading Accounts"
 ---
 
-<Info>
-  Each DID can have multiple accounts across different chains,
-  subject to the `maxAccountsPerDid` parameter limit.
-</Info>
+:::info
+Each DID can have multiple accounts across different chains,
+subject to the `maxAccountsPerDid` parameter limit.
+:::
diff --git a/docs/reference/queries/query-dex-list-orders.mdx b/docs/reference/queries/query-dex-list-orders.mdx
index c4f3dda18..a8828efe9 100644
--- a/docs/reference/queries/query-dex-list-orders.mdx
+++ b/docs/reference/queries/query-dex-list-orders.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /sonr/dex/v1/orders/{did}/{connectionId}
 title: List User Orders
 description: Retrieve limit orders for a DID on specific DEX chains
-og:title: Query Cross-Chain Orders
+seo:
+  title: "Query Cross-Chain Orders"
 ---
 
-<Tip>
-  Use the `status` filter to query only active orders for portfolio management
-  or historical orders for tax reporting.
-</Tip>
+:::tip
+Use the `status` filter to query only active orders for portfolio management
+or historical orders for tax reporting.
+:::
 
-<Note>
-  Order history is retained for a limited time on most DEXs.
-  Archive important order data locally.
-</Note>
+:::note
+Order history is retained for a limited time on most DEXs.
+Archive important order data locally.
+:::
diff --git a/docs/reference/queries/query-did-get-all-credentials-by-id.mdx b/docs/reference/queries/query-did-get-all-credentials-by-id.mdx
index 7471fa9be..f757a529b 100644
--- a/docs/reference/queries/query-did-get-all-credentials-by-id.mdx
+++ b/docs/reference/queries/query-did-get-all-credentials-by-id.mdx
@@ -1,26 +1,26 @@
 ---
-openapi: get /did/v1/credentials/did/{did}
 title: Get All DID Credentials
 description: Retrieve complete credential portfolio for a decentralized identity
-og:title: DID Credential Portfolio
+seo:
+  title: "DID Credential Portfolio"
 ---
 
-<Info>
-  This endpoint provides a complete view of all credentials associated
-  with a DID, useful for identity wallets and credential management.
-</Info>
+:::info
+This endpoint provides a complete view of all credentials associated
+with a DID, useful for identity wallets and credential management.
+:::
 
-<Note>
-  WebAuthn credentials are device-specific and cannot be transferred
-  between devices, unlike verifiable credentials.
-</Note>
+:::note
+WebAuthn credentials are device-specific and cannot be transferred
+between devices, unlike verifiable credentials.
+:::
 
-<Tip>
-  Use filter parameters to retrieve only the credential types your
-  application needs, reducing response size and processing time.
-</Tip>
+:::tip
+Use filter parameters to retrieve only the credential types your
+application needs, reducing response size and processing time.
+:::
 
-<Warning>
-  Sensitive credential data may be encrypted when stored in vaults.
-  Ensure proper decryption keys are available for encrypted credentials.
-</Warning>
+:::warning
+Sensitive credential data may be encrypted when stored in vaults.
+Ensure proper decryption keys are available for encrypted credentials.
+:::
diff --git a/docs/reference/queries/query-did-get-by-controller.mdx b/docs/reference/queries/query-did-get-by-controller.mdx
index a0d669711..b9e469444 100644
--- a/docs/reference/queries/query-did-get-by-controller.mdx
+++ b/docs/reference/queries/query-did-get-by-controller.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /did/v1/documents/controller/{controller}
 title: Query DIDs by Controller
 description: Find all decentralized identities controlled by an address
-og:title: Controller DID Lookup
+seo:
+  title: "Controller DID Lookup"
 ---
 
-<Info>
-  A single address can control multiple DIDs, useful for managing
-  different identity contexts (personal, professional, etc.).
-</Info>
+:::info
+A single address can control multiple DIDs, useful for managing
+different identity contexts (personal, professional, etc.).
+:::
 
-<Tip>
-  Use this endpoint to build identity management interfaces that
-  show all DIDs a user controls from a single account.
-</Tip>
+:::tip
+Use this endpoint to build identity management interfaces that
+show all DIDs a user controls from a single account.
+:::
diff --git a/docs/reference/queries/query-did-get-document.mdx b/docs/reference/queries/query-did-get-document.mdx
index bbf5065a3..9f8bc25e2 100644
--- a/docs/reference/queries/query-did-get-document.mdx
+++ b/docs/reference/queries/query-did-get-document.mdx
@@ -1,11 +1,11 @@
 ---
-openapi: get /did/v1/document/{did}
 title: Get DID Document
 description: Retrieve DID document with implementation details
-og:title: DID Document Query
+seo:
+  title: "DID Document Query"
 ---
 
-<Tip>
-  Use ResolveDID for W3C-compliant resolution. Use this endpoint
-  when you need Sonr-specific implementation details.
-</Tip>
+:::tip
+Use ResolveDID for W3C-compliant resolution. Use this endpoint
+when you need Sonr-specific implementation details.
+:::
diff --git a/docs/reference/queries/query-did-get-module-parameters.mdx b/docs/reference/queries/query-did-get-module-parameters.mdx
index affc9449c..96044c4d4 100644
--- a/docs/reference/queries/query-did-get-module-parameters.mdx
+++ b/docs/reference/queries/query-did-get-module-parameters.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /did/v1/params
 title: DID Module Parameters
 description: Retrieve configuration settings and limits for the DID system
-og:title: Query DID Module Configuration
+seo:
+  title: "Query DID Module Configuration"
 ---
 
-<Tip>
-  Check module parameters before creating DIDs to understand current
-  limits and supported features.
-</Tip>
+:::tip
+Check module parameters before creating DIDs to understand current
+limits and supported features.
+:::
 
-<Note>
-  Parameters can be updated through governance proposals.
-  Monitor changes that might affect your application.
-</Note>
+:::note
+Parameters can be updated through governance proposals.
+Monitor changes that might affect your application.
+:::
diff --git a/docs/reference/queries/query-did-get-service-endpoint.mdx b/docs/reference/queries/query-did-get-service-endpoint.mdx
index a084bd384..727803dca 100644
--- a/docs/reference/queries/query-did-get-service-endpoint.mdx
+++ b/docs/reference/queries/query-did-get-service-endpoint.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /did/v1/service/{did}/{serviceId}
 title: Get Service Endpoint
 description: Retrieve interaction endpoints and service definitions
-og:title: Query DID Service
+seo:
+  title: "Query DID Service"
 ---
 
-<Info>
-  Service endpoints tell others how to interact with the DID subject
-  for specific purposes like messaging or data exchange.
-</Info>
+:::info
+Service endpoints tell others how to interact with the DID subject
+for specific purposes like messaging or data exchange.
+:::
 
-<Tip>
-  Check service types to understand the interaction protocol before
-  attempting to connect to service endpoints.
-</Tip>
+:::tip
+Check service types to understand the interaction protocol before
+attempting to connect to service endpoints.
+:::
diff --git a/docs/reference/queries/query-did-get-verifiable-credential.mdx b/docs/reference/queries/query-did-get-verifiable-credential.mdx
index 4fdd12d8b..3320cea2b 100644
--- a/docs/reference/queries/query-did-get-verifiable-credential.mdx
+++ b/docs/reference/queries/query-did-get-verifiable-credential.mdx
@@ -1,21 +1,21 @@
 ---
-openapi: get /did/v1/credential/{credentialId}
 title: Get Verifiable Credential
 description: Retrieve W3C verifiable credentials with cryptographic proofs
-og:title: Query Digital Credential
+seo:
+  title: "Query Digital Credential"
 ---
 
-<Info>
-  Verifiable credentials are cryptographically signed claims that can
-  be independently verified without contacting the issuer.
-</Info>
+:::info
+Verifiable credentials are cryptographically signed claims that can
+be independently verified without contacting the issuer.
+:::
 
-<Warning>
-  Always check the `revoked` field and expiration date before
-  accepting a credential as valid.
-</Warning>
+:::warning
+Always check the `revoked` field and expiration date before
+accepting a credential as valid.
+:::
 
-<Tip>
-  Verify the issuer's DID to ensure the credential comes from a
-  trusted authority in your trust framework.
-</Tip>
+:::tip
+Verify the issuer's DID to ensure the credential comes from a
+trusted authority in your trust framework.
+:::
diff --git a/docs/reference/queries/query-did-get-verification-method.mdx b/docs/reference/queries/query-did-get-verification-method.mdx
index a772b9a33..da7d6d977 100644
--- a/docs/reference/queries/query-did-get-verification-method.mdx
+++ b/docs/reference/queries/query-did-get-verification-method.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /did/v1/verification-method/{did}/{methodId}
 title: Get Verification Method
 description: Retrieve specific cryptographic keys or authentication methods
-og:title: Query DID Verification Method
+seo:
+  title: "Query DID Verification Method"
 ---
 
-<Note>
-  Verification methods contain public keys only. Private keys are
-  never stored on-chain and must be managed securely off-chain.
-</Note>
+:::note
+Verification methods contain public keys only. Private keys are
+never stored on-chain and must be managed securely off-chain.
+:::
 
-<Tip>
-  Use this endpoint to retrieve specific keys for signature verification
-  or encryption operations.
-</Tip>
+:::tip
+Use this endpoint to retrieve specific keys for signature verification
+or encryption operations.
+:::
diff --git a/docs/reference/queries/query-did-list-all-documents.mdx b/docs/reference/queries/query-did-list-all-documents.mdx
index 16fed8735..4754feb63 100644
--- a/docs/reference/queries/query-did-list-all-documents.mdx
+++ b/docs/reference/queries/query-did-list-all-documents.mdx
@@ -1,16 +1,16 @@
 ---
-openapi: get /did/v1/documents
 title: List All DID Documents
 description: Browse all decentralized identifiers in the system
-og:title: DID Directory
+seo:
+  title: "DID Directory"
 ---
 
-<Note>
-  This endpoint returns all DIDs including deactivated ones.
-  Filter by the `deactivated` field for active DIDs only.
-</Note>
+:::note
+This endpoint returns all DIDs including deactivated ones.
+Filter by the `deactivated` field for active DIDs only.
+:::
 
-<Tip>
-  For large systems, use pagination parameters to retrieve documents
-  in manageable chunks. Start with a reasonable limit like 50-100.
-</Tip>
+:::tip
+For large systems, use pagination parameters to retrieve documents
+in manageable chunks. Start with a reasonable limit like 50-100.
+:::
diff --git a/docs/reference/queries/query-did-list-verifiable-credentials.mdx b/docs/reference/queries/query-did-list-verifiable-credentials.mdx
index 0e34a2a9b..682602bba 100644
--- a/docs/reference/queries/query-did-list-verifiable-credentials.mdx
+++ b/docs/reference/queries/query-did-list-verifiable-credentials.mdx
@@ -1,21 +1,21 @@
 ---
-openapi: get /did/v1/credentials
 title: List Verifiable Credentials
 description: Browse and filter W3C verifiable credentials
-og:title: Credential Registry
+seo:
+  title: "Credential Registry"
 ---
 
-<Note>
-  By default, revoked credentials are excluded. Set `includeRevoked=true`
-  to include them in results.
-</Note>
+:::note
+By default, revoked credentials are excluded. Set `includeRevoked=true`
+to include them in results.
+:::
 
-<Tip>
-  Use issuer filtering to find all credentials from trusted authorities
-  in your ecosystem.
-</Tip>
+:::tip
+Use issuer filtering to find all credentials from trusted authorities
+in your ecosystem.
+:::
 
-<Info>
-  Large credential sets should use pagination to avoid timeout issues.
-  Start with a reasonable limit like 50-100 credentials per page.
-</Info>
+:::info
+Large credential sets should use pagination to avoid timeout issues.
+Start with a reasonable limit like 50-100 credentials per page.
+:::
diff --git a/docs/reference/queries/query-did-resolve.mdx b/docs/reference/queries/query-did-resolve.mdx
index 5f72944d5..a6d5f1683 100644
--- a/docs/reference/queries/query-did-resolve.mdx
+++ b/docs/reference/queries/query-did-resolve.mdx
@@ -1,21 +1,21 @@
 ---
-openapi: get /did/v1/resolve/{did}
 title: Resolve W3C DID Document
 description: Retrieve complete DID document with verification methods and services
-og:title: DID Resolution
+seo:
+  title: "DID Resolution"
 ---
 
-<Info>
-  DID resolution is the primary way to discover how to interact with
-  a decentralized identity, including available keys and services.
-</Info>
+:::info
+DID resolution is the primary way to discover how to interact with
+a decentralized identity, including available keys and services.
+:::
 
-<Warning>
-  Deactivated DIDs cannot be resolved. The query will return an error
-  indicating the DID has been permanently disabled.
-</Warning>
+:::warning
+Deactivated DIDs cannot be resolved. The query will return an error
+indicating the DID has been permanently disabled.
+:::
 
-<Tip>
-  Cache resolved DID documents client-side with appropriate TTL based
-  on your security requirements and update frequency needs.
-</Tip>
+:::tip
+Cache resolved DID documents client-side with appropriate TTL based
+on your security requirements and update frequency needs.
+:::
diff --git a/docs/reference/queries/query-dwn-encryption-status.mdx b/docs/reference/queries/query-dwn-encryption-status.mdx
index 570e9359f..ae8c774d8 100644
--- a/docs/reference/queries/query-dwn-encryption-status.mdx
+++ b/docs/reference/queries/query-dwn-encryption-status.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/encryption/status
 title: Query Encryption Status
 description: Monitor the health and state of the consensus encryption system
-og:title: DWN Encryption System Status
+seo:
+  title: "DWN Encryption System Status"
 ---
 
-<Info>
-  The encryption system uses validator consensus to generate keys that no single party controls.
-</Info>
+:::info
+The encryption system uses validator consensus to generate keys that no single party controls.
+:::
 
 ## System Components
 
@@ -26,9 +26,9 @@ og:title: DWN Encryption System Status
 
 ## Health Monitoring
 
-<Tip>
-  Set up alerts for upcoming key rotations to ensure smooth operations.
-</Tip>
+:::tip
+Set up alerts for upcoming key rotations to ensure smooth operations.
+:::
 
 ### Health Checks
 
@@ -55,9 +55,9 @@ const recordGrowthRate = totalEncryptedRecords / daysSinceLaunch;
 - Security incidents
 - Validator changes
 
-<Warning>
-  Key rotation requires sufficient validator participation. Monitor validator set health.
-</Warning>
+:::warning
+Key rotation requires sufficient validator participation. Monitor validator set health.
+:::
 
 ## Development vs Production
 
@@ -73,9 +73,9 @@ const recordGrowthRate = totalEncryptedRecords / daysSinceLaunch;
 
 ## Monitoring Dashboard
 
-<Note>
-  Create monitoring dashboards using these metrics for operational visibility.
-</Note>
+:::note
+Create monitoring dashboards using these metrics for operational visibility.
+:::
 
 ### Key Metrics
 ```bash
diff --git a/docs/reference/queries/query-dwn-ipfs-content-by-cid.mdx b/docs/reference/queries/query-dwn-ipfs-content-by-cid.mdx
index 438833d5f..40280edea 100644
--- a/docs/reference/queries/query-dwn-ipfs-content-by-cid.mdx
+++ b/docs/reference/queries/query-dwn-ipfs-content-by-cid.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/ipfs/{cid}
 title: Retrieve IPFS Content
 description: Fetch distributed content using its Content Identifier
-og:title: IPFS Content Retrieval
+seo:
+  title: "IPFS Content Retrieval"
 ---
 
-<Info>
-  Content Identifiers (CIDs) are cryptographic hashes that uniquely identify content in IPFS.
-</Info>
+:::info
+Content Identifiers (CIDs) are cryptographic hashes that uniquely identify content in IPFS.
+:::
 
 ## CID Resolution
 
@@ -29,18 +29,18 @@ CIDv1: bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi
 
 ## Performance Considerations
 
-<Tip>
-  Pin frequently accessed content to your local IPFS node for faster retrieval.
-</Tip>
+:::tip
+Pin frequently accessed content to your local IPFS node for faster retrieval.
+:::
 
 ### Caching Strategy
 - Hot data: Keep pinned locally
 - Warm data: Cache with TTL
 - Cold data: Fetch on demand
 
-<Warning>
-  Large files may take time to retrieve if not cached locally or on nearby peers.
-</Warning>
+:::warning
+Large files may take time to retrieve if not cached locally or on nearby peers.
+:::
 
 ## Error Handling
 
diff --git a/docs/reference/queries/query-dwn-ipfs-status.mdx b/docs/reference/queries/query-dwn-ipfs-status.mdx
index 740b4b6c0..0d1d51c16 100644
--- a/docs/reference/queries/query-dwn-ipfs-status.mdx
+++ b/docs/reference/queries/query-dwn-ipfs-status.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/ipfs
 title: Query IPFS Node Status
 description: Check connectivity and status of the distributed storage layer
-og:title: IPFS Node Information
+seo:
+  title: "IPFS Node Information"
 ---
 
-<Info>
-  IPFS provides distributed storage for large objects, vault exports, and encrypted backups.
-</Info>
+:::info
+IPFS provides distributed storage for large objects, vault exports, and encrypted backups.
+:::
 
 ## IPFS Integration
 
@@ -23,9 +23,9 @@ og:title: IPFS Node Information
 - **Protocol Assets**: Store protocol-related media
 - **Public Content**: Distribute public records efficiently
 
-<Tip>
-  Store only metadata and CIDs on-chain for gas efficiency, with actual data in IPFS.
-</Tip>
+:::tip
+Store only metadata and CIDs on-chain for gas efficiency, with actual data in IPFS.
+:::
 
 ## Common Patterns
 
@@ -36,6 +36,6 @@ ipfs add large_file.pdf
 snrd tx dwn records-write --data-cid <cid>
 ```
 
-<Warning>
-  Ensure IPFS node is running and accessible before storing large objects.
-</Warning>
+:::warning
+Ensure IPFS node is running and accessible before storing large objects.
+:::
diff --git a/docs/reference/queries/query-dwn-parameters.mdx b/docs/reference/queries/query-dwn-parameters.mdx
index 8d0b04cea..e45e8a431 100644
--- a/docs/reference/queries/query-dwn-parameters.mdx
+++ b/docs/reference/queries/query-dwn-parameters.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/params
 title: Query DWN Module Parameters
 description: Get current configuration settings for the DWN module
-og:title: DWN Module Configuration
+seo:
+  title: "DWN Module Configuration"
 ---
 
-<Info>
-  Module parameters control the global behavior of all DWN operations on the network.
-</Info>
+:::info
+Module parameters control the global behavior of all DWN operations on the network.
+:::
 
 ## Parameter Categories
 
@@ -28,6 +28,6 @@ og:title: DWN Module Configuration
 - **encryptedSchemas**: Schemas requiring encryption
 - **singleNodeFallback**: Development mode setting
 
-<Tip>
-  Query parameters before designing your application to ensure compliance with network limits.
-</Tip>
+:::tip
+Query parameters before designing your application to ensure compliance with network limits.
+:::
diff --git a/docs/reference/queries/query-dwn-permissions.mdx b/docs/reference/queries/query-dwn-permissions.mdx
index c4250c113..84dca2bc5 100644
--- a/docs/reference/queries/query-dwn-permissions.mdx
+++ b/docs/reference/queries/query-dwn-permissions.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/permissions/{target}
 title: Query DWN Permissions
 description: Audit and manage access control for your data
-og:title: DWN Permission Management
+seo:
+  title: "DWN Permission Management"
 ---
 
-<Info>
-  Regular permission audits are essential for maintaining data security and compliance.
-</Info>
+:::info
+Regular permission audits are essential for maintaining data security and compliance.
+:::
 
 ## Permission Queries
 
@@ -36,9 +36,9 @@ og:title: DWN Permission Management
 
 ## Permission Auditing
 
-<Tip>
-  Schedule regular audits to review and revoke unnecessary permissions.
-</Tip>
+:::tip
+Schedule regular audits to review and revoke unnecessary permissions.
+:::
 
 ### Audit Checklist
 1. **Review Active Permissions**
@@ -47,7 +47,7 @@ og:title: DWN Permission Management
    ```
 
 2. **Check Expired Permissions**
-   - Filter by `expiresAt` < current time
+   - Filter by `expiresAt` &lt; current time
    - Revoke if still active
 
 3. **Verify Grantee Activity**
@@ -70,9 +70,9 @@ og:title: DWN Permission Management
 - Past expiration time
 - Conditions not met
 
-<Warning>
-  Permissions with no expiration should be reviewed more frequently.
-</Warning>
+:::warning
+Permissions with no expiration should be reviewed more frequently.
+:::
 
 ## Security Best Practices
 
@@ -93,6 +93,6 @@ og:title: DWN Permission Management
 ?interfaceName=Protocols
 ```
 
-<Note>
-  Use `pagination.countTotal=true` to track total permission growth over time.
-</Note>
+:::note
+Use `pagination.countTotal=true` to track total permission growth over time.
+:::
diff --git a/docs/reference/queries/query-dwn-protocols.mdx b/docs/reference/queries/query-dwn-protocols.mdx
index 61c10462d..70edb9c50 100644
--- a/docs/reference/queries/query-dwn-protocols.mdx
+++ b/docs/reference/queries/query-dwn-protocols.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/protocols/{target}
 title: Query DWN Protocols
 description: Discover configured protocols and their data models
-og:title: DWN Protocol Discovery
+seo:
+  title: "DWN Protocol Discovery"
 ---
 
-<Info>
-  Protocols enable interoperable data structures across applications and users.
-</Info>
+:::info
+Protocols enable interoperable data structures across applications and users.
+:::
 
 ## Protocol Discovery
 
@@ -25,9 +25,9 @@ Common protocol namespaces:
 
 ## Protocol Adoption
 
-<Tip>
-  Browse published protocols to find existing standards before creating custom ones.
-</Tip>
+:::tip
+Browse published protocols to find existing standards before creating custom ones.
+:::
 
 ### Adopting a Protocol
 1. Query published protocols
@@ -50,15 +50,15 @@ snrd tx dwn protocols-configure --from <discovered_protocol>
 - **Semantic Versioning**: `1.0.0`, `2.0.0`
 - **Date Versioning**: `/2024`, `/2025`
 
-<Warning>
-  Breaking protocol changes should use new URIs to maintain backward compatibility.
-</Warning>
+:::warning
+Breaking protocol changes should use new URIs to maintain backward compatibility.
+:::
 
 ## Pagination
 
-<Note>
-  Large DWNs may have many protocols. Use pagination for efficient retrieval.
-</Note>
+:::note
+Large DWNs may have many protocols. Use pagination for efficient retrieval.
+:::
 
 ```bash
 ?pagination.limit=10&pagination.offset=0
diff --git a/docs/reference/queries/query-dwn-records.mdx b/docs/reference/queries/query-dwn-records.mdx
index dc66c9e74..b7067678c 100644
--- a/docs/reference/queries/query-dwn-records.mdx
+++ b/docs/reference/queries/query-dwn-records.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/records/{target}
 title: Query DWN Records
 description: Search and retrieve data records with advanced filtering
-og:title: DWN Record Query
+seo:
+  title: "DWN Record Query"
 ---
 
-<Info>
-  This endpoint provides powerful querying capabilities for exploring DWN data with multiple filter options.
-</Info>
+:::info
+This endpoint provides powerful querying capabilities for exploring DWN data with multiple filter options.
+:::
 
 ## Query Filters
 
@@ -37,9 +37,9 @@ Show only public records:
 
 ## Pagination Strategy
 
-<Tip>
-  Use cursor-based pagination with `pagination.key` for optimal performance on large datasets.
-</Tip>
+:::tip
+Use cursor-based pagination with `pagination.key` for optimal performance on large datasets.
+:::
 
 ### Efficient Pagination
 ```bash
@@ -73,9 +73,9 @@ Show only public records:
 ?parentId=folder_root&pagination.limit=100
 ```
 
-<Warning>
-  Encrypted records will return encrypted data unless you have decryption permissions.
-</Warning>
+:::warning
+Encrypted records will return encrypted data unless you have decryption permissions.
+:::
 
 ## Response Handling
 
@@ -85,6 +85,6 @@ Show only public records:
 - **Encrypted**: Needs decryption keys
 - **Deleted**: Tombstone markers
 
-<Note>
-  Use `pagination.countTotal=true` sparingly as it impacts query performance.
-</Note>
+:::note
+Use `pagination.countTotal=true` sparingly as it impacts query performance.
+:::
diff --git a/docs/reference/queries/query-dwn-single-protocol.mdx b/docs/reference/queries/query-dwn-single-protocol.mdx
index e61d568f0..e32b41a91 100644
--- a/docs/reference/queries/query-dwn-single-protocol.mdx
+++ b/docs/reference/queries/query-dwn-single-protocol.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/protocols/{target}/{protocolUri}
 title: Query Specific Protocol
 description: Get detailed protocol definition and configuration
-og:title: DWN Protocol Details
+seo:
+  title: "DWN Protocol Details"
 ---
 
-<Info>
-  Protocol definitions specify the complete data model and access rules for structured interactions.
-</Info>
+:::info
+Protocol definitions specify the complete data model and access rules for structured interactions.
+:::
 
 ## Protocol Structure
 
@@ -44,9 +44,9 @@ og:title: DWN Protocol Details
 
 ## Protocol Analysis
 
-<Tip>
-  Examine existing protocols to understand best practices before creating your own.
-</Tip>
+:::tip
+Examine existing protocols to understand best practices before creating your own.
+:::
 
 ### Understanding a Protocol
 1. **Review Types**: What data can be stored?
@@ -71,9 +71,9 @@ og:title: DWN Protocol Details
 - Time-series data structure
 - Rate-limited writes
 
-<Warning>
-  Protocol URIs must be URL-encoded when used as path parameters.
-</Warning>
+:::warning
+Protocol URIs must be URL-encoded when used as path parameters.
+:::
 
 ## Integration Example
 
diff --git a/docs/reference/queries/query-dwn-single-record.mdx b/docs/reference/queries/query-dwn-single-record.mdx
index c182bbce1..05933a1df 100644
--- a/docs/reference/queries/query-dwn-single-record.mdx
+++ b/docs/reference/queries/query-dwn-single-record.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/records/{target}/{recordId}
 title: Query Specific Record
 description: Retrieve a single record by its unique identifier
-og:title: DWN Record Retrieval
+seo:
+  title: "DWN Record Retrieval"
 ---
 
-<Info>
-  Direct record access provides the most efficient way to retrieve known records.
-</Info>
+:::info
+Direct record access provides the most efficient way to retrieve known records.
+:::
 
 ## Record Components
 
@@ -30,9 +30,9 @@ og:title: DWN Record Retrieval
 
 ## Access Patterns
 
-<Tip>
-  Cache frequently accessed record IDs to avoid repeated queries.
-</Tip>
+:::tip
+Cache frequently accessed record IDs to avoid repeated queries.
+:::
 
 ### Public Records
 ```bash
@@ -52,6 +52,6 @@ snrd query dwn record did:sonr:alice record_private_456
 snrd query dwn encrypted-record did:sonr:alice record_encrypted_789
 ```
 
-<Warning>
-  404 errors may indicate either non-existence or lack of permissions.
-</Warning>
+:::warning
+404 errors may indicate either non-existence or lack of permissions.
+:::
diff --git a/docs/reference/queries/query-dwn-single-vault.mdx b/docs/reference/queries/query-dwn-single-vault.mdx
index e177eeedf..6cde0c621 100644
--- a/docs/reference/queries/query-dwn-single-vault.mdx
+++ b/docs/reference/queries/query-dwn-single-vault.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/vaults/{vaultId}
 title: Query Vault Details
 description: Get comprehensive information about a secure vault instance
-og:title: DWN Vault Information
+seo:
+  title: "DWN Vault Information"
 ---
 
-<Info>
-  Vaults provide hardware-backed secure key management through WebAssembly enclaves.
-</Info>
+:::info
+Vaults provide hardware-backed secure key management through WebAssembly enclaves.
+:::
 
 ## Vault Components
 
@@ -30,9 +30,9 @@ og:title: DWN Vault Information
 
 ## Vault Health Check
 
-<Tip>
-  Monitor vault refresh intervals to ensure keys are rotated on schedule.
-</Tip>
+:::tip
+Monitor vault refresh intervals to ensure keys are rotated on schedule.
+:::
 
 ### Health Indicators
 ```javascript
@@ -58,9 +58,9 @@ const needsRotation = keyAge > keyRotationDays;
 - Secure enclave support
 - Hardware key storage
 
-<Warning>
-  Never expose or log vault private data. It's encrypted for a reason.
-</Warning>
+:::warning
+Never expose or log vault private data. It's encrypted for a reason.
+:::
 
 ## Vault Operations
 
@@ -82,6 +82,6 @@ snrd tx dwn vault-export vault_alice_123
 snrd tx dwn vault-import <ipfs_cid>
 ```
 
-<Note>
-  Vault queries return public metadata only. Private keys remain encrypted in the enclave.
-</Note>
+:::note
+Vault queries return public metadata only. Private keys remain encrypted in the enclave.
+:::
diff --git a/docs/reference/queries/query-dwn-vault-by-owner.mdx b/docs/reference/queries/query-dwn-vault-by-owner.mdx
index f22880a75..869e3f5da 100644
--- a/docs/reference/queries/query-dwn-vault-by-owner.mdx
+++ b/docs/reference/queries/query-dwn-vault-by-owner.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/vaults
 title: Query Vaults
 description: List secure vaults with optional owner filtering
-og:title: DWN Vault Listing
+seo:
+  title: "DWN Vault Listing"
 ---
 
-<Info>
-  Users typically have one primary vault, but may have multiple for different security contexts.
-</Info>
+:::info
+Users typically have one primary vault, but may have multiple for different security contexts.
+:::
 
 ## Query Patterns
 
@@ -24,9 +24,9 @@ og:title: DWN Vault Listing
 
 ## Vault Management
 
-<Tip>
-  Create separate vaults for different security levels (personal, business, high-security).
-</Tip>
+:::tip
+Create separate vaults for different security levels (personal, business, high-security).
+:::
 
 ### Vault Strategy
 
@@ -61,9 +61,9 @@ snrd tx dwn vault-create --from alice
 snrd query dwn vaults --owner did:sonr:alice
 ```
 
-<Warning>
-  Vault creation may be disabled by governance. Check module parameters first.
-</Warning>
+:::warning
+Vault creation may be disabled by governance. Check module parameters first.
+:::
 
 ## Pagination
 
@@ -76,6 +76,6 @@ snrd query dwn vaults --owner did:sonr:alice
 ?owner=did:sonr:alice&pagination.key=<next_key>
 ```
 
-<Note>
-  Most users have 1-3 vaults. Pagination is mainly for system-wide queries.
-</Note>
+:::note
+Most users have 1-3 vaults. Pagination is mainly for system-wide queries.
+:::
diff --git a/docs/reference/queries/query-dwn-vrf-consensus-contributions.mdx b/docs/reference/queries/query-dwn-vrf-consensus-contributions.mdx
index 273537d6a..9db15fde6 100644
--- a/docs/reference/queries/query-dwn-vrf-consensus-contributions.mdx
+++ b/docs/reference/queries/query-dwn-vrf-consensus-contributions.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /dwn/v1/encryption/vrf-contributions
 title: Query VRF Contributions
 description: Monitor validator participation in consensus key generation
-og:title: DWN VRF Consensus Tracking
+seo:
+  title: "DWN VRF Consensus Tracking"
 ---
 
-<Info>
-  VRF contributions ensure distributed key generation where no single validator knows the complete key.
-</Info>
+:::info
+VRF contributions ensure distributed key generation where no single validator knows the complete key.
+:::
 
 ## VRF Consensus Process
 
@@ -28,9 +28,9 @@ og:title: DWN VRF Consensus Tracking
 
 ## Query Filters
 
-<Tip>
-  Filter by validator to track specific node participation.
-</Tip>
+:::tip
+Filter by validator to track specific node participation.
+:::
 
 ### By Validator
 ```bash
@@ -63,9 +63,9 @@ og:title: DWN VRF Consensus Tracking
 - **receivedContributions**: Current count
 - **expiryHeight**: Timeout block height
 
-<Warning>
-  Rounds expire if threshold isn't met. Monitor contribution progress.
-</Warning>
+:::warning
+Rounds expire if threshold isn't met. Monitor contribution progress.
+:::
 
 ## Validator Monitoring
 
@@ -112,9 +112,9 @@ CONTRIBUTIONS=$(snrd query dwn vrf-contributions -o json)
 - Prevents minority attacks
 - Ensures decentralization
 
-<Note>
-  VRF contributions are public but the derived key remains secure through threshold cryptography.
-</Note>
+:::note
+VRF contributions are public but the derived key remains secure through threshold cryptography.
+:::
 
 ## Troubleshooting
 
diff --git a/docs/reference/queries/query-svc-domain-verification-status.mdx b/docs/reference/queries/query-svc-domain-verification-status.mdx
index 99afd2c37..e5bdb90d5 100644
--- a/docs/reference/queries/query-svc-domain-verification-status.mdx
+++ b/docs/reference/queries/query-svc-domain-verification-status.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /svc/v1/domain/{domain}
 title: Check Domain Verification Status
 description: Monitor domain ownership verification progress and status
-og:title: Domain Verification Status
+seo:
+  title: "Domain Verification Status"
 ---
 
-<Info>
-  Use this endpoint to track your domain verification progress and troubleshoot issues.
-</Info>
+:::info
+Use this endpoint to track your domain verification progress and troubleshoot issues.
+:::
 
 ## Verification States
 
@@ -81,9 +81,9 @@ while true; do
 done
 ```
 
-<Tip>
-  If status remains PENDING after adding DNS record, wait for propagation (5-30 minutes typical).
-</Tip>
+:::tip
+If status remains PENDING after adding DNS record, wait for propagation (5-30 minutes typical).
+:::
 
 ## Troubleshooting
 
@@ -98,6 +98,6 @@ done
 - Add new token to DNS
 - Complete within 7 days
 
-<Warning>
-  Verification tokens are single-use. Each verification attempt requires a new token.
-</Warning>
+:::warning
+Verification tokens are single-use. Each verification attempt requires a new token.
+:::
diff --git a/docs/reference/queries/query-svc-module-parameters.mdx b/docs/reference/queries/query-svc-module-parameters.mdx
index 6548d3195..e7cd88f12 100644
--- a/docs/reference/queries/query-svc-module-parameters.mdx
+++ b/docs/reference/queries/query-svc-module-parameters.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /svc/v1/params
 title: Query SVC Module Parameters
 description: Get current service registration and domain verification settings
-og:title: SVC Module Configuration
+seo:
+  title: "SVC Module Configuration"
 ---
 
-<Info>
-  Module parameters define the operational constraints and requirements for all services on the network.
-</Info>
+:::info
+Module parameters define the operational constraints and requirements for all services on the network.
+:::
 
 ## Parameter Overview
 
@@ -39,6 +39,6 @@ og:title: SVC Module Configuration
 - **maxUpdatesPerBlock**: Update spam prevention
 - **maxCapabilityGrantsPerBlock**: Grant spam prevention
 
-<Tip>
-  Check these parameters before designing your service to ensure compliance with network limits.
-</Tip>
+:::tip
+Check these parameters before designing your service to ensure compliance with network limits.
+:::
diff --git a/docs/reference/queries/query-svc-service-by-id.mdx b/docs/reference/queries/query-svc-service-by-id.mdx
index e90f58178..ef35dba30 100644
--- a/docs/reference/queries/query-svc-service-by-id.mdx
+++ b/docs/reference/queries/query-svc-service-by-id.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /svc/v1/service/{serviceId}
 title: Query Service Details
 description: Get comprehensive information about a registered service
-og:title: Service Information
+seo:
+  title: "Service Information"
 ---
 
-<Info>
-  This endpoint provides complete service details needed for integration and trust verification.
-</Info>
+:::info
+This endpoint provides complete service details needed for integration and trust verification.
+:::
 
 ## Service Information
 
@@ -79,9 +79,9 @@ ipfs cat $CID
 
 ## Permission Verification
 
-<Tip>
-  Always verify service permissions match your security requirements before granting access.
-</Tip>
+:::tip
+Always verify service permissions match your security requirements before granting access.
+:::
 
 ### Common Permission Sets
 
@@ -122,6 +122,6 @@ if [ "$SERVICE_DOMAIN" = "$EXPECTED" ]; then
 fi
 ```
 
-<Warning>
-  Never trust a service without verifying its domain binding and active status.
-</Warning>
+:::warning
+Never trust a service without verifying its domain binding and active status.
+:::
diff --git a/docs/reference/queries/query-svc-services-by-domain.mdx b/docs/reference/queries/query-svc-services-by-domain.mdx
index 8e4013a74..bf15d6dd4 100644
--- a/docs/reference/queries/query-svc-services-by-domain.mdx
+++ b/docs/reference/queries/query-svc-services-by-domain.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /svc/v1/services/domain/{domain}
 title: Query Services by Domain
 description: Discover all services registered under a specific domain
-og:title: Domain Service Discovery
+seo:
+  title: "Domain Service Discovery"
 ---
 
-<Info>
-  Domain-based discovery helps users find and trust services through verified domain ownership.
-</Info>
+:::info
+Domain-based discovery helps users find and trust services through verified domain ownership.
+:::
 
 ## Discovery Patterns
 
@@ -92,9 +92,9 @@ async function discoverServices(domain) {
 - `vault@secure.example.com` - Vault manager
 - `wallet@finance.example.com` - Wallet service
 
-<Tip>
-  Use subdomains to organize services by category or security level.
-</Tip>
+:::tip
+Use subdomains to organize services by category or security level.
+:::
 
 ## Trust Establishment
 
@@ -142,9 +142,9 @@ Test services on subdomains:
 - `staging@dev.example.com` - Staging service
 - `prod@example.com` - Production service
 
-<Warning>
-  Always verify domain ownership status before trusting services bound to that domain.
-</Warning>
+:::warning
+Always verify domain ownership status before trusting services bound to that domain.
+:::
 
 ## Usage Analytics
 
@@ -162,6 +162,6 @@ snrd query svc services-by-domain example.com -o json |
   jq '[.services[].permissions] | flatten | unique'
 ```
 
-<Note>
-  Domains can host multiple services, each with unique IDs and permission sets. Plan your service architecture accordingly.
-</Note>
+:::note
+Domains can host multiple services, each with unique IDs and permission sets. Plan your service architecture accordingly.
+:::
diff --git a/docs/reference/queries/query-svc-services-by-owner.mdx b/docs/reference/queries/query-svc-services-by-owner.mdx
index af00582f2..3062d2db5 100644
--- a/docs/reference/queries/query-svc-services-by-owner.mdx
+++ b/docs/reference/queries/query-svc-services-by-owner.mdx
@@ -1,13 +1,13 @@
 ---
-openapi: get /svc/v1/services/owner/{owner}
 title: Query Services by Owner
 description: List all services registered by a specific account
-og:title: Owner Service Portfolio
+seo:
+  title: "Owner Service Portfolio"
 ---
 
-<Info>
-  This endpoint helps owners manage their service portfolio and monitor service health.
-</Info>
+:::info
+This endpoint helps owners manage their service portfolio and monitor service health.
+:::
 
 ## Use Cases
 
@@ -81,7 +81,8 @@ Returns array of services:
 ```bash
 # Check for non-active services
 SERVICES=$(snrd query svc services-by-owner $ADDR -o json)
-echo $SERVICES | jq '.services[] | select(.status != "ACTIVE")'          ```
+echo $SERVICES | jq '.services[] | select(.status != "ACTIVE")'
+```
 
 ### Permission Audit
 ```bash
@@ -96,9 +97,9 @@ echo $SERVICES | jq '.services[].permissions' |
 echo $SERVICES | jq -r '.services[].domain' | sort | uniq
 ```
 
-<Tip>
-  Regularly audit your services to ensure they're active and permissions are appropriate.
-</Tip>
+:::tip
+Regularly audit your services to ensure they're active and permissions are appropriate.
+:::
 
 ## Limits and Constraints
 
@@ -113,6 +114,6 @@ echo $SERVICES | jq -r '.services[].domain' | sort | uniq
 - **Regular Audits**: Review inactive services
 - **Clean Up**: Remove unused services
 
-<Warning>
-  Approaching the service limit? Consider consolidating services or requesting limit increase through governance.
-</Warning>
+:::warning
+Approaching the service limit? Consider consolidating services or requesting limit increase through governance.
+:::