diff --git a/.changeset/curly-peas-decide.md b/.changeset/curly-peas-decide.md
new file mode 100644
index 0000000000..9bb5dc2d6e
--- /dev/null
+++ b/.changeset/curly-peas-decide.md
@@ -0,0 +1,40 @@
+---
+'@examples/next-wagmi-pages-router': minor
+'@examples/next-wagmi-app-router': minor
+'@reown/appkit-adapter-ethers5': minor
+'@reown/appkit-adapter-ethers': minor
+'@reown/appkit-adapter-solana': minor
+'@reown/appkit-adapter-wagmi': minor
+'@reown/appkit-utils': minor
+'@examples/react-wagmi': minor
+'@reown/appkit-scaffold-ui': minor
+'@examples/next-wagmi': minor
+'@apps/laboratory': minor
+'@reown/appkit': minor
+'@reown/appkit-common': minor
+'@reown/appkit-solana': minor
+'@reown/appkit-wagmi': minor
+'@reown/appkit-core': minor
+'@reown/appkit-siwe': minor
+'@reown/appkit-cdn': minor
+'@reown/appkit-ui': minor
+'@apps/demo': minor
+'@apps/gallery': minor
+'@examples/html-ethers': minor
+'@examples/html-ethers5': minor
+'@examples/html-wagmi': minor
+'@examples/next-ethers': minor
+'@examples/react-ethers': minor
+'@examples/react-ethers5': minor
+'@examples/react-solana': minor
+'@examples/vue-ethers5': minor
+'@examples/vue-solana': minor
+'@examples/vue-wagmi': minor
+'@reown/appkit-adapter-polkadot': minor
+'@reown/appkit-ethers': minor
+'@reown/appkit-ethers5': minor
+'@reown/appkit-polyfills': minor
+'@reown/appkit-wallet': minor
+---
+
+Add Viem chains support
diff --git a/apps/laboratory/src/components/Ethers/Ethers5TransactionTest.tsx b/apps/laboratory/src/components/Ethers/Ethers5TransactionTest.tsx
index cbefc5d5ba..9c0ca636e4 100644
--- a/apps/laboratory/src/components/Ethers/Ethers5TransactionTest.tsx
+++ b/apps/laboratory/src/components/Ethers/Ethers5TransactionTest.tsx
@@ -49,7 +49,7 @@ export function Ethers5TransactionTest() {
     }
   }
 
-  return Number(chainId) !== mainnet.chainId && address ? (
+  return chainId !== mainnet.id && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-testid="sign-transaction-button"
diff --git a/apps/laboratory/src/components/Ethers/Ethers5WriteContractTest.tsx b/apps/laboratory/src/components/Ethers/Ethers5WriteContractTest.tsx
index 7c9885dacd..fe3b765fea 100644
--- a/apps/laboratory/src/components/Ethers/Ethers5WriteContractTest.tsx
+++ b/apps/laboratory/src/components/Ethers/Ethers5WriteContractTest.tsx
@@ -47,9 +47,9 @@ export function Ethers5WriteContractTest() {
       setLoading(false)
     }
   }
-  const allowedChains = [sepolia.chainId, optimism.chainId]
+  const allowedChains = [sepolia.id, optimism.id]
 
-  return allowedChains.includes(Number(chainId)) && address ? (
+  return allowedChains.find(chain => chain === chainId) && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-testid="sign-transaction-button"
diff --git a/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx b/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx
index 7cceb62ca9..d6c6b739c5 100644
--- a/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx
+++ b/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx
@@ -48,7 +48,7 @@ export function EthersTransactionTest() {
     }
   }
 
-  return Number(chainId) !== mainnet.chainId && address ? (
+  return chainId !== mainnet.id && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-testid="sign-transaction-button"
diff --git a/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx b/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx
index 00bb8c8f2f..7dc28cb020 100644
--- a/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx
+++ b/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx
@@ -46,9 +46,9 @@ export function EthersWriteContractTest() {
       setLoading(false)
     }
   }
-  const allowedChains = [sepolia.chainId, optimism.chainId]
+  const allowedChains = [sepolia.id, optimism.id]
 
-  return allowedChains.includes(Number(chainId)) && address ? (
+  return allowedChains.find(chain => chain === chainId) && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-testid="sign-transaction-button"
diff --git a/apps/laboratory/src/components/Solana/SolanaTests.tsx b/apps/laboratory/src/components/Solana/SolanaTests.tsx
index 83bbacec4c..e7ae510965 100644
--- a/apps/laboratory/src/components/Solana/SolanaTests.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaTests.tsx
@@ -38,7 +38,7 @@ export function SolanaTests() {
             </Heading>
             <SolanaSignMessageTest />
           </Box>
-          {caipNetwork?.chainId === solana.chainId && (
+          {caipNetwork?.id === solana.id && (
             <Box>
               <Text fontSize="md" color="yellow">
                 Please be aware that you are connected to the mainnet. Be careful with your
@@ -99,8 +99,7 @@ export function SolanaTests() {
             <SolanaSignJupiterSwapTest />
           </Box>
 
-          {(caipNetwork?.chainId === solanaTestnet.chainId ||
-            caipNetwork?.chainId === solanaDevnet.chainId) && (
+          {(caipNetwork?.id === solanaTestnet.id || caipNetwork?.id === solanaDevnet.id) && (
             <Stack divider={<StackDivider />} spacing="4">
               <Box>
                 <Heading size="xs" textTransform="uppercase" pb="2">
diff --git a/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx b/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx
index 441668ef1b..15caeecc73 100644
--- a/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaWriteContractTest.tsx
@@ -26,7 +26,7 @@ export function SolanaWriteContractTest() {
   async function onIncrementCounter() {
     setLoading(true)
 
-    const PROGRAM_ID = new PublicKey(detectProgramId(caipNetwork?.chainId?.toString() ?? ''))
+    const PROGRAM_ID = new PublicKey(detectProgramId(caipNetwork?.id?.toString() ?? ''))
 
     try {
       if (!walletProvider?.publicKey) {
diff --git a/apps/laboratory/src/components/UPA/UpaSolanaSignMessageTest.tsx b/apps/laboratory/src/components/UPA/UpaSolanaSignMessageTest.tsx
index 57209a89b7..e917f53770 100644
--- a/apps/laboratory/src/components/UPA/UpaSolanaSignMessageTest.tsx
+++ b/apps/laboratory/src/components/UPA/UpaSolanaSignMessageTest.tsx
@@ -25,8 +25,8 @@ export function UpaSolanaSignMessageTest() {
           pubkey: address
         }
       }
-      const chain = caipNetwork?.id
-      await walletProvider.request(payload, chain)
+
+      await walletProvider.request(payload, caipNetwork?.caipNetworkId)
 
       toast({
         title: ConstantsUtil.SigningSucceededToastTitle,
diff --git a/apps/laboratory/src/pages/library/wagmi.tsx b/apps/laboratory/src/pages/library/wagmi.tsx
index 2466f0cc07..806bf03a6e 100644
--- a/apps/laboratory/src/pages/library/wagmi.tsx
+++ b/apps/laboratory/src/pages/library/wagmi.tsx
@@ -18,7 +18,7 @@ const wagmiAdapter = new WagmiAdapter({
 
 const modal = createAppKit({
   adapters: [wagmiAdapter],
-  networks: ConstantsUtil.EvmNetworks,
+  networks: wagmiAdapter.caipNetworks,
   projectId: ConstantsUtil.ProjectId,
   features: {
     analytics: true,
diff --git a/apps/laboratory/src/utils/ConstantsUtil.ts b/apps/laboratory/src/utils/ConstantsUtil.ts
index 88f4ed4ada..ec0b3e3cea 100644
--- a/apps/laboratory/src/utils/ConstantsUtil.ts
+++ b/apps/laboratory/src/utils/ConstantsUtil.ts
@@ -9,8 +9,9 @@ import {
   solanaTestnet,
   solanaDevnet,
   base,
+  baseSepolia,
   gnosis,
-  baseSepolia
+  type AppKitNetwork
 } from '@reown/appkit/networks'
 import { getLocalStorageItem } from './LocalStorage'
 import type { CaipNetwork } from '@reown/appkit'
@@ -58,22 +59,27 @@ const EvmNetworks = [
   zkSync,
   arbitrum,
   base,
+  baseSepolia,
   sepolia,
-  gnosis,
-  baseSepolia
-]
+  gnosis
+] as [AppKitNetwork, ...AppKitNetwork[]]
 
 export const solanaNotExist = {
-  id: 'solana:chaindoesntexist',
-  chainId: 'chaindoesntexist',
+  id: 'chaindoesntexist',
+  caipNetworkId: 'solana:chaindoesntexist',
+  chainNamespace: 'solana',
   name: 'Solana Unsupported',
-  currency: 'SOL',
-  explorerUrl: 'https://explorer.solana.com/?cluster=unsupported',
-  rpcUrl: 'https://api.unsupported.solana.com',
-  chainNamespace: 'solana'
+  nativeCurrency: { name: 'Solana', symbol: 'SOL', decimals: 9 },
+  blockExplorers: {
+    default: { name: 'Solscan', url: 'https://explorer.solana.com/?cluster=unsupported' }
+  },
+  rpcUrls: { default: { http: ['https://api.unsupported.solana.com'] } }
 } as CaipNetwork
 
-const SolanaNetworks = [solana, solanaTestnet, solanaDevnet, solanaNotExist]
+const SolanaNetworks = [solana, solanaTestnet, solanaDevnet, solanaNotExist] as [
+  AppKitNetwork,
+  ...AppKitNetwork[]
+]
 
 export const ConstantsUtil = {
   SigningSucceededToastTitle: 'Signing Succeeded',
@@ -131,5 +137,5 @@ export const ConstantsUtil = {
   ProjectId: projectId,
   EvmNetworks,
   SolanaNetworks,
-  AllNetworks: [...EvmNetworks, ...SolanaNetworks]
+  AllNetworks: [...EvmNetworks, ...SolanaNetworks] as [AppKitNetwork, ...AppKitNetwork[]]
 }
diff --git a/apps/laboratory/src/utils/EthersConstants.ts b/apps/laboratory/src/utils/EthersConstants.ts
index 1f35f1181d..505a8d788d 100644
--- a/apps/laboratory/src/utils/EthersConstants.ts
+++ b/apps/laboratory/src/utils/EthersConstants.ts
@@ -3,7 +3,7 @@ import {
   aurora,
   avalanche,
   base,
-  binanceSmartChain,
+  bsc,
   celo,
   gnosis,
   mainnet,
@@ -21,7 +21,7 @@ export const EthersConstants = {
     arbitrum,
     polygon,
     avalanche,
-    binanceSmartChain,
+    bsc,
     optimism,
     gnosis,
     zkSync,
diff --git a/apps/laboratory/src/utils/SiweUtils.ts b/apps/laboratory/src/utils/SiweUtils.ts
index 42d9da236c..b3da95dcc5 100644
--- a/apps/laboratory/src/utils/SiweUtils.ts
+++ b/apps/laboratory/src/utils/SiweUtils.ts
@@ -13,7 +13,7 @@ export const siweConfig = createSIWEConfig({
   getMessageParams: async () => ({
     domain: window.location.host,
     uri: window.location.origin,
-    chains: chains.map(chain => chain.chainId as number),
+    chains: chains.map(chain => chain.id as number),
     statement: 'Please sign with your account',
     iat: new Date().toISOString()
   }),
diff --git a/apps/laboratory/src/utils/SolanaConstants.ts b/apps/laboratory/src/utils/SolanaConstants.ts
index 4490d49f88..cefd737121 100644
--- a/apps/laboratory/src/utils/SolanaConstants.ts
+++ b/apps/laboratory/src/utils/SolanaConstants.ts
@@ -7,11 +7,11 @@ export const SolanaConstantsUtil = {
   chains: [solana, solanaTestnet, solanaDevnet],
   programIds: [
     {
-      chainId: solanaDevnet.chainId,
+      chainId: solanaDevnet.id,
       programId: 'Cb5aXEgXptKqHHWLifvXu5BeAuVLjojQ5ypq6CfQj1hy'
     },
     {
-      chainId: solanaTestnet.chainId,
+      chainId: solanaTestnet.id,
       programId: 'FZn4xQoKKvcxDADDRdqNAAPnVv9qYCbUTbP3y4Rn1BBr'
     }
   ]
diff --git a/apps/laboratory/tests/email.spec.ts b/apps/laboratory/tests/email.spec.ts
index 05f5bcbd48..286d83cdb1 100644
--- a/apps/laboratory/tests/email.spec.ts
+++ b/apps/laboratory/tests/email.spec.ts
@@ -66,7 +66,7 @@ emailTest('it should reject sign', async () => {
 
 emailTest('it should switch network and sign', async ({ library }) => {
   let targetChain = library === 'solana' ? 'Solana Testnet' : 'Polygon'
-  let caipNetworkId = library === 'solana' ? solanaTestnet.id : polygon.id
+  let caipNetworkId: number | string = library === 'solana' ? solanaTestnet.id : polygon.id
 
   await page.switchNetwork(targetChain)
   await validator.expectSwitchedNetworkOnNetworksView(targetChain)
diff --git a/apps/laboratory/tests/multichain/multichain-basic.spec.ts b/apps/laboratory/tests/multichain/multichain-basic.spec.ts
index f15f680df1..e7656dfb6e 100644
--- a/apps/laboratory/tests/multichain/multichain-basic.spec.ts
+++ b/apps/laboratory/tests/multichain/multichain-basic.spec.ts
@@ -37,7 +37,7 @@ test.afterAll(async () => {
 // -- Tests --------------------------------------------------------------------
 
 test('it should switch networks and sign', async () => {
-  const chains = ['Optimism', 'Solana']
+  const chains = ['Polygon', 'Solana']
 
   async function processChain(index: number) {
     if (index >= chains.length) {
diff --git a/apps/laboratory/tests/shared/constants/index.ts b/apps/laboratory/tests/shared/constants/index.ts
index 070fa819de..6734422c85 100644
--- a/apps/laboratory/tests/shared/constants/index.ts
+++ b/apps/laboratory/tests/shared/constants/index.ts
@@ -8,5 +8,5 @@ export const DEFAULT_SESSION_PARAMS: SessionParams = {
   optAccounts: ['1', '2'],
   accept: true
 }
-export const SECURE_WEBSITE_URL = 'https://secure.walletconnect.org'
+export const SECURE_WEBSITE_URL = 'https://secure.reown.com'
 export const DEFAULT_CHAIN_NAME = process.env['DEFAULT_CHAIN_NAME'] || 'Ethereum'
diff --git a/apps/laboratory/tests/shared/validators/ModalValidator.ts b/apps/laboratory/tests/shared/validators/ModalValidator.ts
index 8aa0ed2cb9..285b35d57d 100644
--- a/apps/laboratory/tests/shared/validators/ModalValidator.ts
+++ b/apps/laboratory/tests/shared/validators/ModalValidator.ts
@@ -84,7 +84,9 @@ export class ModalValidator {
 
   async expectCaipAddressHaveCorrectNetworkId(caipNetworkId: CaipNetworkId) {
     const address = this.page.getByTestId('appkit-caip-address')
-    await expect(address, 'Correct CAIP address should be present').toContainText(caipNetworkId)
+    await expect(address, 'Correct CAIP address should be present').toContainText(
+      caipNetworkId.toString()
+    )
   }
 
   async expectNetwork(network: string) {
@@ -237,6 +239,12 @@ export class ModalValidator {
     throw new Error('Call status not confirmed')
   }
 
+  async expectNetworkVisible(name: string) {
+    const network = this.page.getByTestId(`w3m-network-switch-${name}`)
+    await expect(network).toBeVisible()
+    await expect(network).toBeDisabled()
+  }
+
   async expectNetworksDisabled(name: string) {
     const disabledNetwork = this.page.getByTestId(`w3m-network-switch-${name}`)
     await expect(disabledNetwork.locator('button')).toBeDisabled()
diff --git a/apps/laboratory/tests/siwe.spec.ts b/apps/laboratory/tests/siwe.spec.ts
index f4c98f7c4d..a83ba1d827 100644
--- a/apps/laboratory/tests/siwe.spec.ts
+++ b/apps/laboratory/tests/siwe.spec.ts
@@ -44,7 +44,7 @@ siweWalletTest('it should be authenticated', async () => {
 })
 
 siweWalletTest('it should require re-authentication when switching networks', async () => {
-  await modalPage.switchNetwork('ZkSync')
+  await modalPage.switchNetwork('Polygon')
   await modalValidator.expectUnauthenticated()
   await modalPage.promptSiwe()
   await walletPage.handleRequest({ accept: true })
diff --git a/examples/next-wagmi-app-router/src/config/index.ts b/examples/next-wagmi-app-router/src/config/index.ts
index c5ea1294b8..79bd0fc549 100755
--- a/examples/next-wagmi-app-router/src/config/index.ts
+++ b/examples/next-wagmi-app-router/src/config/index.ts
@@ -1,6 +1,6 @@
 import { cookieStorage, createStorage } from '@wagmi/core'
 import { WagmiAdapter } from '@reown/appkit-adapter-wagmi'
-import { mainnet, arbitrum } from '@reown/appkit/networks'
+import { mainnet, arbitrum, type AppKitNetwork } from '@reown/appkit/networks'
 
 // Get projectId from https://cloud.reown.com
 export const projectId = process.env.NEXT_PUBLIC_PROJECT_ID
@@ -9,7 +9,7 @@ if (!projectId) {
   throw new Error('Project ID is not defined')
 }
 
-export const networks = [mainnet, arbitrum]
+export const networks = [mainnet, arbitrum] as [AppKitNetwork, ...AppKitNetwork[]]
 
 // Set up the Wagmi Adapter (Config)
 export const wagmiAdapter = new WagmiAdapter({
diff --git a/examples/next-wagmi-app-router/src/context/index.tsx b/examples/next-wagmi-app-router/src/context/index.tsx
index e090e88481..b9e7d86370 100644
--- a/examples/next-wagmi-app-router/src/context/index.tsx
+++ b/examples/next-wagmi-app-router/src/context/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 
-import { wagmiAdapter, projectId } from '@/config'
+import { wagmiAdapter, projectId, networks } from '@/config'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createAppKit } from '@reown/appkit/react'
-import { mainnet } from '@reown/appkit/networks'
+import { mainnet, arbitrum, type AppKitNetwork } from '@reown/appkit/networks'
 import React, { type ReactNode } from 'react'
 import { cookieToInitialState, WagmiProvider, type Config } from 'wagmi'
 
@@ -26,7 +26,7 @@ const metadata = {
 export const modal = createAppKit({
   adapters: [wagmiAdapter],
   projectId,
-  networks: wagmiAdapter.caipNetworks,
+  networks,
   defaultNetwork: mainnet,
   metadata: metadata,
   themeMode: 'light',
diff --git a/examples/next-wagmi-pages-router/src/context/index.tsx b/examples/next-wagmi-pages-router/src/context/index.tsx
index 59dc5cdae6..6815ef77eb 100644
--- a/examples/next-wagmi-pages-router/src/context/index.tsx
+++ b/examples/next-wagmi-pages-router/src/context/index.tsx
@@ -6,7 +6,7 @@ import { State, WagmiProvider } from 'wagmi'
 
 import { cookieStorage, createStorage } from '@wagmi/core'
 import { WagmiAdapter } from '@reown/appkit-adapter-wagmi'
-import { mainnet, arbitrum } from '@reown/appkit/networks'
+import { mainnet, arbitrum, type AppKitNetwork } from '@reown/appkit/networks'
 import { createAppKit } from '@reown/appkit/react'
 
 // Setup queryClient
@@ -16,7 +16,7 @@ const projectId = process.env.NEXT_PUBLIC_PROJECT_ID
 
 if (!projectId) throw new Error('Project ID is not defined')
 
-export const networks = [mainnet, arbitrum]
+export const networks = [mainnet, arbitrum] as [AppKitNetwork, ...AppKitNetwork[]]
 
 export const wagmiAdapter = new WagmiAdapter({
   storage: createStorage({
diff --git a/examples/next-wagmi/src/config/index.ts b/examples/next-wagmi/src/config/index.ts
index 8638620efd..00a824f993 100644
--- a/examples/next-wagmi/src/config/index.ts
+++ b/examples/next-wagmi/src/config/index.ts
@@ -1,6 +1,14 @@
 import { cookieStorage, createStorage } from '@wagmi/core'
 import { WagmiAdapter } from '@reown/appkit-adapter-wagmi'
-import { mainnet, arbitrum, avalanche, base, optimism, polygon } from '@reown/appkit/networks'
+import {
+  mainnet,
+  arbitrum,
+  avalanche,
+  base,
+  optimism,
+  polygon,
+  type AppKitNetwork
+} from '@reown/appkit/networks'
 
 export const projectId = process.env['NEXT_PUBLIC_PROJECT_ID']
 
@@ -8,7 +16,10 @@ if (!projectId) {
   throw new Error('Project ID is not defined')
 }
 
-export const networks = [mainnet, arbitrum, avalanche, base, optimism, polygon]
+export const networks = [mainnet, arbitrum, avalanche, base, optimism, polygon] as [
+  AppKitNetwork,
+  ...AppKitNetwork[]
+]
 
 export const wagmiAdapter = new WagmiAdapter({
   storage: createStorage({
diff --git a/examples/react-wagmi/src/App.tsx b/examples/react-wagmi/src/App.tsx
index 0126bbaa80..c0daf98468 100644
--- a/examples/react-wagmi/src/App.tsx
+++ b/examples/react-wagmi/src/App.tsx
@@ -5,7 +5,7 @@ import {
   useAppKitState,
   useAppKitTheme
 } from '@reown/appkit/react'
-import { mainnet, polygon } from '@reown/appkit/networks'
+import { mainnet, polygon, bsc } from '@reown/appkit/networks'
 import { WagmiAdapter } from '@reown/appkit-adapter-wagmi'
 import { WagmiProvider } from 'wagmi'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
@@ -23,7 +23,7 @@ if (!projectId) {
 // 2. Setup wagmi adapter
 const wagmiAdapter = new WagmiAdapter({
   projectId,
-  networks: [mainnet, polygon]
+  networks: [mainnet, polygon, bsc]
 })
 
 // 3. Create modal
diff --git a/packages/adapters/ethers/src/client.ts b/packages/adapters/ethers/src/client.ts
index c137baca1c..afa0f4aae1 100644
--- a/packages/adapters/ethers/src/client.ts
+++ b/packages/adapters/ethers/src/client.ts
@@ -1,6 +1,5 @@
-import type { AppKitOptions } from '@reown/appkit'
+import type { AppKitOptions, AppKitOptionsWithCaipNetworks } from '@reown/appkit'
 import {
-  NetworkUtil,
   SafeLocalStorage,
   SafeLocalStorageKeys,
   type AdapterType,
@@ -33,7 +32,13 @@ import {
 } from '@reown/appkit-wallet'
 import { ConstantsUtil as CoreConstantsUtil } from '@reown/appkit-core'
 import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common'
-import { ConstantsUtil, ErrorUtil, HelpersUtil, PresetsUtil } from '@reown/appkit-utils'
+import {
+  CaipNetworksUtil,
+  ConstantsUtil,
+  ErrorUtil,
+  HelpersUtil,
+  PresetsUtil
+} from '@reown/appkit-utils'
 import UniversalProvider from '@walletconnect/universal-provider'
 import type { ConnectionControllerClient, NetworkControllerClient } from '@reown/appkit-core'
 import { WcConstantsUtil } from '@reown/appkit'
@@ -146,9 +151,7 @@ export class EthersAdapter {
       const coinbaseWallet = new CoinbaseWalletSDK({
         appName: options?.metadata?.name,
         appLogoUrl: options?.metadata?.icons[0],
-        appChainIds: options.networks?.map(caipNetwork => caipNetwork.chainId as number) || [
-          1, 84532
-        ]
+        appChainIds: options.networks?.map(caipNetwork => caipNetwork.id as number) || [1, 84532]
       })
 
       coinbaseProvider = coinbaseWallet.makeWeb3Provider({
@@ -214,17 +217,22 @@ export class EthersAdapter {
     )
   }
 
-  public construct(appKit: AppKit, options: AppKitOptions) {
+  public construct(appKit: AppKit, options: AppKitOptionsWithCaipNetworks) {
     this.appKit = appKit
     this.options = options
     this.caipNetworks = options.networks
-    this.defaultCaipNetwork = options.defaultNetwork || options.networks[0]
+    this.defaultCaipNetwork = options.defaultNetwork
+      ? CaipNetworksUtil.extendCaipNetwork(options.defaultNetwork, {
+          customNetworkImageUrls: options.chainImages,
+          projectId: options.projectId
+        })
+      : this.caipNetworks[0]
     this.tokens = HelpersUtil.getCaipTokens(options.tokens)
     this.ethersConfig = this.createEthersConfig(options)
 
     this.networkControllerClient = {
       switchCaipNetwork: async caipNetwork => {
-        if (caipNetwork?.chainId) {
+        if (caipNetwork?.id) {
           try {
             await this.switchNetwork(caipNetwork)
           } catch (error) {
@@ -398,12 +406,7 @@ export class EthersAdapter {
           throw new Error('Provider is undefined')
         }
 
-        return await EthersMethods.estimateGas(
-          data,
-          provider,
-          address,
-          Number(caipNetwork?.chainId)
-        )
+        return await EthersMethods.estimateGas(data, provider, address, Number(caipNetwork?.id))
       },
 
       sendTransaction: async data => {
@@ -423,12 +426,7 @@ export class EthersAdapter {
           throw new Error('Provider is undefined')
         }
 
-        return await EthersMethods.sendTransaction(
-          data,
-          provider,
-          address,
-          Number(caipNetwork?.chainId)
-        )
+        return await EthersMethods.sendTransaction(data, provider, address, Number(caipNetwork?.id))
       },
 
       writeContract: async data => {
@@ -445,12 +443,7 @@ export class EthersAdapter {
           throw new Error('Provider is undefined')
         }
 
-        return await EthersMethods.writeContract(
-          data,
-          provider,
-          address,
-          Number(caipNetwork?.chainId)
-        )
+        return await EthersMethods.writeContract(data, provider, address, Number(caipNetwork?.id))
       },
 
       getEnsAddress: async (value: string) => {
@@ -464,7 +457,7 @@ export class EthersAdapter {
       getEnsAvatar: async (value: string) => {
         const caipNetwork = this.appKit?.getCaipNetwork()
 
-        return await EthersMethods.getEnsAvatar(value, Number(caipNetwork?.chainId))
+        return await EthersMethods.getEnsAvatar(value, Number(caipNetwork?.id))
       }
     }
 
@@ -638,10 +631,7 @@ export class EthersAdapter {
         preferredAccountType,
         accounts = []
       } = await this.authProvider.connect({
-        chainId: Number(
-          NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id) ??
-            this.caipNetworks[0]?.chainId
-        )
+        chainId: Number(this.appKit?.getCaipNetwork()?.id || this.caipNetworks[0]?.id)
       })
 
       const { smartAccountEnabledNetworks } =
@@ -713,7 +703,7 @@ export class EthersAdapter {
     const chainChangedHandler = (chainId: string) => {
       const chainIdNumber =
         typeof chainId === 'string' ? EthersHelpersUtil.hexStringToNumber(chainId) : Number(chainId)
-      const caipNetwork = this.caipNetworks.find(c => c.chainId === chainIdNumber)
+      const caipNetwork = this.caipNetworks.find(c => c.id === chainIdNumber)
       const currentCaipNetwork = this.appKit?.getCaipNetwork()
 
       if (!currentCaipNetwork || currentCaipNetwork?.id !== caipNetwork?.id) {
@@ -828,8 +818,8 @@ export class EthersAdapter {
     }
 
     this.appKit?.setLoading(true)
-    const chainId = NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id)
-    this.appKit?.setCaipAddress(`eip155:${chainId}:${address}`, this.chainNamespace)
+    const chainId = this.appKit?.getCaipNetwork()?.id
+    this.appKit?.setCaipAddress(`${this.chainNamespace}:${chainId}:${address}`, this.chainNamespace)
     this.appKit?.setStatus('connected', this.chainNamespace)
     this.appKit?.setPreferredAccountType(type as W3mFrameTypes.AccountType, this.chainNamespace)
 
@@ -868,16 +858,19 @@ export class EthersAdapter {
     if (address) {
       if (isEipNetwork) {
         this.appKit?.setPreferredAccountType(preferredAccountType, this.chainNamespace)
-        this.appKit?.setCaipAddress(`${caipNetworkId}:${address}`, this.chainNamespace)
+        this.appKit?.setCaipAddress(
+          `${this.chainNamespace}:${caipNetworkId}:${address}`,
+          this.chainNamespace
+        )
 
         this.syncConnectedWalletInfo()
         if (this.ethersConfig) {
           this.checkActiveProviders(this.ethersConfig)
         }
 
-        if (currentCaipNetwork?.explorerUrl) {
+        if (currentCaipNetwork?.blockExplorers?.default.url) {
           this.appKit?.setAddressExplorerUrl(
-            `${currentCaipNetwork.explorerUrl}/address/${address}`,
+            `${currentCaipNetwork.blockExplorers.default.url}/address/${address}`,
             this.chainNamespace
           )
         }
@@ -911,7 +904,7 @@ export class EthersAdapter {
         await this.syncReownName(address)
       }
     } catch {
-      if (caipNetwork?.chainId === 1) {
+      if (caipNetwork?.id === 1) {
         const ensProvider = new InfuraProvider('mainnet')
         const name = await ensProvider.lookupAddress(address)
         const avatar = await ensProvider.getAvatar(address)
@@ -938,8 +931,8 @@ export class EthersAdapter {
     const isEVMNetwork = caipNetwork.chainNamespace === CommonConstantsUtil.CHAIN.EVM
 
     if (caipNetwork && isExistingNetwork && isEVMNetwork) {
-      const jsonRpcProvider = new JsonRpcProvider(caipNetwork.rpcUrl, {
-        chainId: caipNetwork.chainId as number,
+      const jsonRpcProvider = new JsonRpcProvider(caipNetwork.rpcUrls.default.http[0], {
+        chainId: caipNetwork.id as number,
         name: caipNetwork.name
       })
 
@@ -947,7 +940,11 @@ export class EthersAdapter {
         const balance = await jsonRpcProvider.getBalance(address)
         const formattedBalance = formatEther(balance)
 
-        this.appKit?.setBalance(formattedBalance, caipNetwork.currency, this.chainNamespace)
+        this.appKit?.setBalance(
+          formattedBalance,
+          caipNetwork.nativeCurrency.symbol,
+          this.chainNamespace
+        )
       }
     }
   }
@@ -1010,7 +1007,7 @@ export class EthersAdapter {
       try {
         await provider.request({
           method: 'wallet_switchEthereumChain',
-          params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.chainId) }]
+          params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id) }]
         })
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (switchError: any) {
@@ -1046,11 +1043,9 @@ export class EthersAdapter {
           if (this.authProvider) {
             try {
               this.appKit?.setLoading(true)
-              const { chainId } = await this.authProvider.switchNetwork(
-                caipNetwork.chainId as number
-              )
+              const { chainId } = await this.authProvider.switchNetwork(caipNetwork.id as number)
               const { address, preferredAccountType } = await this.authProvider.connect({
-                chainId: caipNetwork.chainId as number | undefined
+                chainId: caipNetwork.id as number | undefined
               })
               const caipAddress = `${this.chainNamespace}:${chainId}:${address}`
 
diff --git a/packages/adapters/ethers/src/tests/client.test.ts b/packages/adapters/ethers/src/tests/client.test.ts
index e6df11eb68..9c488f4709 100644
--- a/packages/adapters/ethers/src/tests/client.test.ts
+++ b/packages/adapters/ethers/src/tests/client.test.ts
@@ -6,8 +6,14 @@ import { mockCreateEthersConfig } from './mocks/EthersConfig'
 import mockAppKit from './mocks/AppKit'
 import { mockAuthConnector } from './mocks/AuthConnector'
 import { EthersHelpersUtil, type ProviderId, type ProviderType } from '@reown/appkit-utils/ethers'
-import { ConstantsUtil } from '@reown/appkit-utils'
-import { arbitrum, mainnet, polygon } from '@reown/appkit/networks'
+import { CaipNetworksUtil, ConstantsUtil } from '@reown/appkit-utils'
+import {
+  arbitrum as AppkitArbitrum,
+  mainnet as AppkitMainnet,
+  polygon as AppkitPolygon,
+  optimism as AppkitOptimism,
+  bsc as AppkitBsc
+} from '@reown/appkit/networks'
 import { ProviderUtil } from '@reown/appkit/store'
 import { SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common'
 import { type BlockchainApiLookupEnsName } from '@reown/appkit'
@@ -15,6 +21,13 @@ import { InfuraProvider, JsonRpcProvider } from 'ethers'
 
 import type { CaipNetwork, ChainNamespace } from '@reown/appkit-common'
 
+const [mainnet, arbitrum, polygon, optimism, bsc] = CaipNetworksUtil.extendCaipNetworks(
+  [AppkitMainnet, AppkitArbitrum, AppkitPolygon, AppkitOptimism, AppkitBsc],
+  { customNetworkImageUrls: {}, projectId: '1234' }
+) as [CaipNetwork, CaipNetwork, CaipNetwork, CaipNetwork, CaipNetwork]
+
+const caipNetworks = [mainnet, arbitrum, polygon] as [CaipNetwork, ...CaipNetwork[]]
+
 vi.mock('@reown/appkit-wallet', () => ({
   W3mFrameProvider: vi.fn().mockImplementation(() => mockAuthConnector),
   W3mFrameHelpers: {
@@ -26,13 +39,16 @@ vi.mock('@reown/appkit-wallet', () => ({
   }
 }))
 
-vi.mock('@reown/appkit-utils', () => {
+vi.mock('@reown/appkit-utils', async importOriginal => {
+  const actual = await importOriginal()
   const INJECTED_CONNECTOR_ID = 'injected'
   const COINBASE_SDK_CONNECTOR_ID = 'coinbaseWallet'
   const EIP6963_CONNECTOR_ID = 'eip6963'
   const WALLET_CONNECT_CONNECTOR_ID = 'walletConnect'
   const AUTH_CONNECTOR_ID = 'w3mAuth'
   return {
+    // @ts-expect-error - actual is not typed
+    ...actual,
     PresetsUtil: {
       ConnectorTypesMap: {
         [INJECTED_CONNECTOR_ID]: 'INJECTED',
@@ -99,6 +115,8 @@ describe('EthersAdapter', () => {
     client = new EthersAdapter()
     const optionsWithEthersConfig = {
       ...mockOptions,
+      networks: caipNetworks,
+      defaultNetwork: undefined,
       ethersConfig: mockCreateEthersConfig()
     }
     client.construct(mockAppKit, optionsWithEthersConfig)
@@ -115,11 +133,11 @@ describe('EthersAdapter', () => {
     })
 
     it('should set caipNetworks to provided caipNetworks options', () => {
-      expect(client.caipNetworks).toEqual(mockOptions.networks)
+      expect(client.caipNetworks).toEqual(caipNetworks)
     })
 
     it('should set defaultNetwork to first caipNetwork option', () => {
-      expect(client.defaultCaipNetwork).toEqual(mockOptions.networks[0])
+      expect(client.defaultCaipNetwork).toEqual(mainnet)
     })
 
     it('should create ethers config', () => {
@@ -144,16 +162,9 @@ describe('EthersAdapter', () => {
     })
 
     it('should switch network for injected provider', async () => {
-      const newNetwork = {
-        id: 'eip155:137',
-        name: 'Polygon',
-        chainId: '137',
-        rpcUrl: 'https://polygon-rpc.com'
-      } as unknown as CaipNetwork
-
       mockProvider.request.mockResolvedValueOnce(null)
 
-      await client.switchNetwork(newNetwork)
+      await client.switchNetwork(polygon)
 
       expect(mockProvider.request).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -168,18 +179,11 @@ describe('EthersAdapter', () => {
     })
 
     it('should add network if not recognized by wallet', async () => {
-      const newNetwork = {
-        id: 'eip155:42161',
-        name: 'Arbitrum One',
-        chainId: '42161',
-        rpcUrl: 'https://arb1.arbitrum.io/rpc'
-      } as unknown as CaipNetwork
-
       const switchError = { code: 4902 }
       mockProvider.request.mockRejectedValueOnce(switchError)
       mockProvider.request.mockResolvedValueOnce(null)
 
-      await client.switchNetwork(newNetwork)
+      await client.switchNetwork(arbitrum)
 
       expect(mockProvider.request).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -194,17 +198,10 @@ describe('EthersAdapter', () => {
     })
 
     it('should throw error if switching fails', async () => {
-      const newNetwork = {
-        id: 'eip155:56',
-        name: 'Binance Smart Chain',
-        chainId: '56',
-        rpcUrl: 'https://bsc-dataseed.binance.org'
-      } as unknown as CaipNetwork
-
       const switchError = new Error('User rejected the request')
       mockProvider.request.mockRejectedValueOnce(switchError)
 
-      await expect(client.switchNetwork(newNetwork)).rejects.toThrow('Chain is not supported')
+      await expect(client.switchNetwork(bsc)).rejects.toThrow('Chain is not supported')
     })
 
     it('should use universal adapter for WalletConnect', async () => {
@@ -214,18 +211,11 @@ describe('EthersAdapter', () => {
         polkadot: undefined
       })
 
-      const newNetwork = {
-        id: 'eip155:10',
-        name: 'Optimism',
-        chainId: '10',
-        rpcUrl: 'https://mainnet.optimism.io'
-      } as unknown as CaipNetwork
-
-      await client.switchNetwork(newNetwork)
+      await client.switchNetwork(optimism)
 
       expect(
         mockAppKit.universalAdapter?.networkControllerClient.switchCaipNetwork
-      ).toHaveBeenCalledWith(newNetwork)
+      ).toHaveBeenCalledWith(optimism)
     })
 
     it('should set requested CAIP networks for each unique chain namespace', () => {
@@ -758,7 +748,7 @@ describe('EthersAdapter', () => {
 
       await client['syncBalance'](mockAddress, mainnet)
 
-      expect(JsonRpcProvider).toHaveBeenCalledWith(mainnet.rpcUrl, {
+      expect(JsonRpcProvider).toHaveBeenCalledWith(mainnet.rpcUrls.default.http[0], {
         chainId: 1,
         name: 'Ethereum'
       })
diff --git a/packages/adapters/ethers5/src/client.ts b/packages/adapters/ethers5/src/client.ts
index baa9d28291..266c1d1c1c 100644
--- a/packages/adapters/ethers5/src/client.ts
+++ b/packages/adapters/ethers5/src/client.ts
@@ -1,6 +1,5 @@
-import type { AppKitOptions } from '@reown/appkit'
+import type { AppKitOptions, AppKitOptionsWithCaipNetworks } from '@reown/appkit'
 import {
-  NetworkUtil,
   SafeLocalStorage,
   SafeLocalStorageKeys,
   type AdapterType,
@@ -33,7 +32,13 @@ import {
 } from '@reown/appkit-wallet'
 import { ConstantsUtil as CoreConstantsUtil } from '@reown/appkit-core'
 import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common'
-import { ConstantsUtil, ErrorUtil, HelpersUtil, PresetsUtil } from '@reown/appkit-utils'
+import {
+  CaipNetworksUtil,
+  ConstantsUtil,
+  ErrorUtil,
+  HelpersUtil,
+  PresetsUtil
+} from '@reown/appkit-utils'
 import UniversalProvider from '@walletconnect/universal-provider'
 import type { ConnectionControllerClient, NetworkControllerClient } from '@reown/appkit-core'
 import { WcConstantsUtil } from '@reown/appkit'
@@ -146,9 +151,7 @@ export class Ethers5Adapter {
       const coinbaseWallet = new CoinbaseWalletSDK({
         appName: options?.metadata?.name,
         appLogoUrl: options?.metadata?.icons[0],
-        appChainIds: options.networks?.map(caipNetwork => caipNetwork.chainId as number) || [
-          1, 84532
-        ]
+        appChainIds: options.networks?.map(caipNetwork => caipNetwork.id as number) || [1, 84532]
       })
 
       coinbaseProvider = coinbaseWallet.makeWeb3Provider({
@@ -214,17 +217,22 @@ export class Ethers5Adapter {
     )
   }
 
-  public construct(appKit: AppKit, options: AppKitOptions) {
+  public construct(appKit: AppKit, options: AppKitOptionsWithCaipNetworks) {
     this.appKit = appKit
     this.options = options
     this.caipNetworks = options.networks
-    this.defaultCaipNetwork = options.defaultNetwork || options.networks[0]
+    this.defaultCaipNetwork = options.defaultNetwork
+      ? CaipNetworksUtil.extendCaipNetwork(options.defaultNetwork, {
+          customNetworkImageUrls: options.chainImages,
+          projectId: options.projectId
+        })
+      : this.caipNetworks[0]
     this.tokens = HelpersUtil.getCaipTokens(options.tokens)
     this.ethersConfig = this.createEthersConfig(options)
 
     this.networkControllerClient = {
       switchCaipNetwork: async caipNetwork => {
-        if (caipNetwork?.chainId) {
+        if (caipNetwork?.id) {
           try {
             await this.switchNetwork(caipNetwork)
           } catch (error) {
@@ -398,12 +406,7 @@ export class Ethers5Adapter {
           throw new Error('Provider is undefined')
         }
 
-        return await Ethers5Methods.estimateGas(
-          data,
-          provider,
-          address,
-          Number(caipNetwork?.chainId)
-        )
+        return await Ethers5Methods.estimateGas(data, provider, address, Number(caipNetwork?.id))
       },
 
       sendTransaction: async data => {
@@ -427,7 +430,7 @@ export class Ethers5Adapter {
           data,
           provider,
           address,
-          Number(caipNetwork?.chainId)
+          Number(caipNetwork?.id)
         )
       },
 
@@ -445,12 +448,7 @@ export class Ethers5Adapter {
           throw new Error('Provider is undefined')
         }
 
-        return await Ethers5Methods.writeContract(
-          data,
-          provider,
-          address,
-          Number(caipNetwork?.chainId)
-        )
+        return await Ethers5Methods.writeContract(data, provider, address, Number(caipNetwork?.id))
       },
 
       getEnsAddress: async (value: string) => {
@@ -464,7 +462,7 @@ export class Ethers5Adapter {
       getEnsAvatar: async (value: string) => {
         const caipNetwork = this.appKit?.getCaipNetwork()
 
-        return await Ethers5Methods.getEnsAvatar(value, Number(caipNetwork?.chainId))
+        return await Ethers5Methods.getEnsAvatar(value, Number(caipNetwork?.id))
       }
     }
 
@@ -638,10 +636,7 @@ export class Ethers5Adapter {
         preferredAccountType,
         accounts = []
       } = await this.authProvider.connect({
-        chainId: Number(
-          NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id) ??
-            this.caipNetworks[0]?.chainId
-        )
+        chainId: Number(this.appKit?.getCaipNetwork()?.id || this.caipNetworks[0]?.id)
       })
 
       const { smartAccountEnabledNetworks } =
@@ -713,7 +708,7 @@ export class Ethers5Adapter {
     const chainChangedHandler = (chainId: string) => {
       const chainIdNumber =
         typeof chainId === 'string' ? EthersHelpersUtil.hexStringToNumber(chainId) : Number(chainId)
-      const caipNetwork = this.caipNetworks.find(c => c.chainId === chainIdNumber)
+      const caipNetwork = this.caipNetworks.find(c => c.id === chainIdNumber)
       const currentCaipNetwork = this.appKit?.getCaipNetwork()
 
       if (!currentCaipNetwork || currentCaipNetwork?.id !== caipNetwork?.id) {
@@ -828,8 +823,8 @@ export class Ethers5Adapter {
     }
 
     this.appKit?.setLoading(true)
-    const chainId = NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id)
-    this.appKit?.setCaipAddress(`eip155:${chainId}:${address}`, this.chainNamespace)
+    const chainId = this.appKit?.getCaipNetwork()?.id
+    this.appKit?.setCaipAddress(`${this.chainNamespace}:${chainId}:${address}`, this.chainNamespace)
     this.appKit?.setStatus('connected', this.chainNamespace)
     this.appKit?.setPreferredAccountType(type as W3mFrameTypes.AccountType, this.chainNamespace)
 
@@ -868,16 +863,19 @@ export class Ethers5Adapter {
     if (address) {
       if (isEipNetwork) {
         this.appKit?.setPreferredAccountType(preferredAccountType, this.chainNamespace)
-        this.appKit?.setCaipAddress(`${caipNetworkId}:${address}`, this.chainNamespace)
+        this.appKit?.setCaipAddress(
+          `${this.chainNamespace}:${caipNetworkId}:${address}`,
+          this.chainNamespace
+        )
 
         this.syncConnectedWalletInfo()
         if (this.ethersConfig) {
           this.checkActiveProviders(this.ethersConfig)
         }
 
-        if (currentCaipNetwork?.explorerUrl) {
+        if (currentCaipNetwork?.blockExplorers) {
           this.appKit?.setAddressExplorerUrl(
-            `${currentCaipNetwork.explorerUrl}/address/${address}`,
+            `${currentCaipNetwork.blockExplorers.default.url}/address/${address}`,
             this.chainNamespace
           )
         }
@@ -911,7 +909,7 @@ export class Ethers5Adapter {
         await this.syncReownName(address)
       }
     } catch {
-      if (caipNetwork?.chainId === 1) {
+      if (caipNetwork?.id === 1) {
         const ensProvider = new ethers.providers.InfuraProvider('mainnet')
         const name = await ensProvider.lookupAddress(address)
         const avatar = await ensProvider.getAvatar(address)
@@ -938,16 +936,23 @@ export class Ethers5Adapter {
     const isEVMNetwork = caipNetwork.chainNamespace === CommonConstantsUtil.CHAIN.EVM
 
     if (caipNetwork && isExistingNetwork && isEVMNetwork) {
-      const jsonRpcProvider = new ethers.providers.JsonRpcProvider(caipNetwork.rpcUrl, {
-        chainId: caipNetwork.chainId as number,
-        name: caipNetwork.name
-      })
+      const jsonRpcProvider = new ethers.providers.JsonRpcProvider(
+        caipNetwork.rpcUrls.default.http[0],
+        {
+          chainId: caipNetwork.id as number,
+          name: caipNetwork.name
+        }
+      )
 
       if (jsonRpcProvider) {
         const balance = await jsonRpcProvider.getBalance(address)
         const formattedBalance = ethers.utils.formatEther(balance)
 
-        this.appKit?.setBalance(formattedBalance, caipNetwork.currency, this.chainNamespace)
+        this.appKit?.setBalance(
+          formattedBalance,
+          caipNetwork.nativeCurrency.symbol,
+          this.chainNamespace
+        )
       }
     }
   }
@@ -1010,7 +1015,7 @@ export class Ethers5Adapter {
       try {
         await provider.request({
           method: 'wallet_switchEthereumChain',
-          params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.chainId) }]
+          params: [{ chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id) }]
         })
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (switchError: any) {
@@ -1046,11 +1051,9 @@ export class Ethers5Adapter {
           if (this.authProvider) {
             try {
               this.appKit?.setLoading(true)
-              const { chainId } = await this.authProvider.switchNetwork(
-                caipNetwork.chainId as number
-              )
+              const { chainId } = await this.authProvider.switchNetwork(caipNetwork.id as number)
               const { address, preferredAccountType } = await this.authProvider.connect({
-                chainId: caipNetwork.chainId as number | undefined
+                chainId: caipNetwork.id as number | undefined
               })
               const caipAddress = `${this.chainNamespace}:${chainId}:${address}`
 
diff --git a/packages/adapters/ethers5/src/tests/client.test.ts b/packages/adapters/ethers5/src/tests/client.test.ts
index 4276fa7b31..b5b0f2ea2e 100644
--- a/packages/adapters/ethers5/src/tests/client.test.ts
+++ b/packages/adapters/ethers5/src/tests/client.test.ts
@@ -6,8 +6,14 @@ import { mockCreateEthersConfig } from './mocks/EthersConfig'
 import mockAppKit from './mocks/AppKit'
 import { mockAuthConnector } from './mocks/AuthConnector'
 import { EthersHelpersUtil, type ProviderId, type ProviderType } from '@reown/appkit-utils/ethers'
-import { ConstantsUtil } from '@reown/appkit-utils'
-import { arbitrum, mainnet, polygon } from '@reown/appkit/networks'
+import { CaipNetworksUtil, ConstantsUtil } from '@reown/appkit-utils'
+import {
+  arbitrum as AppkitArbitrum,
+  mainnet as AppkitMainnet,
+  polygon as AppkitPolygon,
+  optimism as AppkitOptimism,
+  bsc as AppkitBsc
+} from '@reown/appkit/networks'
 import { ProviderUtil } from '@reown/appkit/store'
 import { SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common'
 import { type BlockchainApiLookupEnsName } from '@reown/appkit'
@@ -15,6 +21,13 @@ import { ethers } from 'ethers'
 
 import type { CaipNetwork, ChainNamespace } from '@reown/appkit-common'
 
+const [mainnet, arbitrum, polygon, optimism, bsc] = CaipNetworksUtil.extendCaipNetworks(
+  [AppkitMainnet, AppkitArbitrum, AppkitPolygon, AppkitOptimism, AppkitBsc],
+  { customNetworkImageUrls: {}, projectId: '1234' }
+) as [CaipNetwork, CaipNetwork, CaipNetwork, CaipNetwork, CaipNetwork]
+
+const caipNetworks = [mainnet, arbitrum, polygon] as [CaipNetwork, ...CaipNetwork[]]
+
 vi.mock('@reown/appkit-wallet', () => ({
   W3mFrameProvider: vi.fn().mockImplementation(() => mockAuthConnector),
   W3mFrameHelpers: {
@@ -26,13 +39,16 @@ vi.mock('@reown/appkit-wallet', () => ({
   }
 }))
 
-vi.mock('@reown/appkit-utils', () => {
+vi.mock('@reown/appkit-utils', async importOriginal => {
+  const actual = await importOriginal()
   const INJECTED_CONNECTOR_ID = 'injected'
   const COINBASE_SDK_CONNECTOR_ID = 'coinbaseWallet'
   const EIP6963_CONNECTOR_ID = 'eip6963'
   const WALLET_CONNECT_CONNECTOR_ID = 'walletConnect'
   const AUTH_CONNECTOR_ID = 'w3mAuth'
   return {
+    // @ts-expect-error - actual is not typed
+    ...actual,
     PresetsUtil: {
       ConnectorTypesMap: {
         [INJECTED_CONNECTOR_ID]: 'INJECTED',
@@ -105,6 +121,8 @@ describe('EthersAdapter', () => {
     client = new Ethers5Adapter()
     const optionsWithEthersConfig = {
       ...mockOptions,
+      networks: caipNetworks,
+      defaultNetwork: undefined,
       ethersConfig: mockCreateEthersConfig()
     }
     client.construct(mockAppKit, optionsWithEthersConfig)
@@ -121,11 +139,11 @@ describe('EthersAdapter', () => {
     })
 
     it('should set caipNetworks to provided caipNetworks options', () => {
-      expect(client.caipNetworks).toEqual(mockOptions.networks)
+      expect(client.caipNetworks).toEqual(caipNetworks)
     })
 
     it('should set defaultNetwork to first caipNetwork option', () => {
-      expect(client.defaultCaipNetwork).toEqual(mockOptions.networks[0])
+      expect(client.defaultCaipNetwork).toEqual(mainnet)
     })
 
     it('should create ethers config', () => {
@@ -150,16 +168,9 @@ describe('EthersAdapter', () => {
     })
 
     it('should switch network for injected provider', async () => {
-      const newNetwork = {
-        id: 'eip155:137',
-        name: 'Polygon',
-        chainId: '137',
-        rpcUrl: 'https://polygon-rpc.com'
-      } as unknown as CaipNetwork
-
       mockProvider.request.mockResolvedValueOnce(null)
 
-      await client.switchNetwork(newNetwork)
+      await client.switchNetwork(polygon)
 
       expect(mockProvider.request).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -174,18 +185,11 @@ describe('EthersAdapter', () => {
     })
 
     it('should add network if not recognized by wallet', async () => {
-      const newNetwork = {
-        id: 'eip155:42161',
-        name: 'Arbitrum One',
-        chainId: '42161',
-        rpcUrl: 'https://arb1.arbitrum.io/rpc'
-      } as unknown as CaipNetwork
-
       const switchError = { code: 4902 }
       mockProvider.request.mockRejectedValueOnce(switchError)
       mockProvider.request.mockResolvedValueOnce(null)
 
-      await client.switchNetwork(newNetwork)
+      await client.switchNetwork(arbitrum)
 
       expect(mockProvider.request).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -200,17 +204,10 @@ describe('EthersAdapter', () => {
     })
 
     it('should throw error if switching fails', async () => {
-      const newNetwork = {
-        id: 'eip155:56',
-        name: 'Binance Smart Chain',
-        chainId: '56',
-        rpcUrl: 'https://bsc-dataseed.binance.org'
-      } as unknown as CaipNetwork
-
       const switchError = new Error('User rejected the request')
       mockProvider.request.mockRejectedValueOnce(switchError)
 
-      await expect(client.switchNetwork(newNetwork)).rejects.toThrow('Chain is not supported')
+      await expect(client.switchNetwork(bsc)).rejects.toThrow('Chain is not supported')
     })
 
     it('should use universal adapter for WalletConnect', async () => {
@@ -220,18 +217,11 @@ describe('EthersAdapter', () => {
         polkadot: undefined
       })
 
-      const newNetwork = {
-        id: 'eip155:10',
-        name: 'Optimism',
-        chainId: '10',
-        rpcUrl: 'https://mainnet.optimism.io'
-      } as unknown as CaipNetwork
-
-      await client.switchNetwork(newNetwork)
+      await client.switchNetwork(optimism)
 
       expect(
         mockAppKit.universalAdapter?.networkControllerClient.switchCaipNetwork
-      ).toHaveBeenCalledWith(newNetwork)
+      ).toHaveBeenCalledWith(optimism)
     })
 
     it('should set requested CAIP networks for each unique chain namespace', () => {
@@ -766,10 +756,13 @@ describe('EthersAdapter', () => {
 
       await client['syncBalance'](mockAddress, mainnet)
 
-      expect(ethers.providers.JsonRpcProvider).toHaveBeenCalledWith(mainnet.rpcUrl, {
-        chainId: 1,
-        name: 'Ethereum'
-      })
+      expect(ethers.providers.JsonRpcProvider).toHaveBeenCalledWith(
+        mainnet.rpcUrls.default.http[0],
+        {
+          chainId: 1,
+          name: 'Ethereum'
+        }
+      )
       expect(mockJsonRpcProvider.getBalance).toHaveBeenCalledWith(mockAddress)
       expect(mockAppKit.setBalance).toHaveBeenCalledWith('1.0', 'ETH', 'eip155')
     })
diff --git a/packages/adapters/solana/src/client.ts b/packages/adapters/solana/src/client.ts
index c2b9967fa6..849bdfe35d 100644
--- a/packages/adapters/solana/src/client.ts
+++ b/packages/adapters/solana/src/client.ts
@@ -40,7 +40,7 @@ import {
 } from '@reown/appkit-wallet'
 import { ConstantsUtil as CoreConstantsUtil } from '@reown/appkit-core'
 import { withSolanaNamespace } from './utils/withSolanaNamespace.js'
-import type { AppKit } from '@reown/appkit'
+import type { AppKit, AppKitOptionsWithCaipNetworks } from '@reown/appkit'
 import type { AppKitOptions as CoreOptions } from '@reown/appkit'
 import { ProviderUtil } from '@reown/appkit/store'
 import { W3mFrameProviderSingleton } from '@reown/appkit/auth-provider'
@@ -124,7 +124,7 @@ export class SolanaAdapter implements ChainAdapter {
     )
   }
 
-  public construct(appKit: AppKit, options: CoreOptions) {
+  public construct(appKit: AppKit, options: AppKitOptionsWithCaipNetworks) {
     const { projectId } = options
 
     this.appKit = appKit
@@ -154,7 +154,7 @@ export class SolanaAdapter implements ChainAdapter {
         if (this.provider) {
           return Promise.resolve({
             supportsAllNetworks: false,
-            approvedCaipNetworkIds: this.provider.chains.map(chain => chain.id)
+            approvedCaipNetworkIds: this.provider.chains.map(chain => chain.caipNetworkId)
           })
         }
 
@@ -204,7 +204,7 @@ export class SolanaAdapter implements ChainAdapter {
       },
 
       estimateGas: async params => {
-        if (params.chainNamespace !== 'solana') {
+        if (params.chainNamespace !== CommonConstantsUtil.CHAIN.SOLANA) {
           throw new Error('Chain namespace is not supported')
         }
 
@@ -238,7 +238,7 @@ export class SolanaAdapter implements ChainAdapter {
       writeContract: async () => await Promise.resolve('0x'),
 
       sendTransaction: async params => {
-        if (params.chainNamespace !== 'solana') {
+        if (params.chainNamespace !== CommonConstantsUtil.CHAIN.SOLANA) {
           throw new Error('Chain namespace is not supported')
         }
 
@@ -311,9 +311,7 @@ export class SolanaAdapter implements ChainAdapter {
     this.syncRequestedNetworks(this.caipNetworks)
 
     ChainController.subscribeKey('activeCaipNetwork', (newCaipNetwork: CaipNetwork | undefined) => {
-      const newChain = this.caipNetworks.find(
-        _chain => _chain.chainId === newCaipNetwork?.id.split(':')[1]
-      )
+      const newChain = this.caipNetworks.find(_chain => _chain.id === newCaipNetwork?.id)
 
       if (!newChain) {
         return
@@ -360,9 +358,14 @@ export class SolanaAdapter implements ChainAdapter {
     caipNetwork: CaipNetwork | undefined
   }) {
     if (address && caipNetwork) {
-      SolStoreUtil.setConnection(new Connection(caipNetwork.rpcUrl, this.connectionSettings))
+      SolStoreUtil.setConnection(
+        new Connection(caipNetwork.rpcUrls.default.http?.[0] as string, this.connectionSettings)
+      )
       this.appKit?.setAllAccounts([{ address, type: 'eoa' }], this.chainNamespace)
-      this.appKit?.setCaipAddress(`${caipNetwork.id}:${address}` as const, this.chainNamespace)
+      this.appKit?.setCaipAddress(
+        `${this.chainNamespace}:${caipNetwork.id}:${address}`,
+        this.chainNamespace
+      )
       await this.syncNetwork(address)
     } else {
       this.appKit?.resetWcConnection()
@@ -390,7 +393,7 @@ export class SolanaAdapter implements ChainAdapter {
 
     this.appKit?.setBalance(
       balance.toString(),
-      this.appKit?.getCaipNetwork()?.currency,
+      this.appKit?.getCaipNetwork()?.nativeCurrency.symbol,
       this.chainNamespace
     )
   }
@@ -417,16 +420,16 @@ export class SolanaAdapter implements ChainAdapter {
 
     if (isConnectedWithAuth) {
       // If user is connected with auth provider, we need to switch the network on the auth provider and await the get user
-      await this.w3mFrameProvider?.switchNetwork(caipNetwork.id)
+      await this.w3mFrameProvider?.switchNetwork(caipNetwork.caipNetworkId)
       const user = await this.w3mFrameProvider?.getUser({
-        chainId: caipNetwork?.id
+        chainId: caipNetwork?.caipNetworkId
       })
       this.authSession = user
       if (user) {
-        const caipAddress = `solana:${caipNetwork.chainId}:${user.address}` as CaipAddress
+        const caipAddress = `${caipNetwork.caipNetworkId}:${user.address}`
         ProviderUtil.setProvider(this.chainNamespace, this.authProvider)
         ProviderUtil.setProviderId(this.chainNamespace, 'walletConnect')
-        this.appKit?.setCaipAddress(caipAddress, this.chainNamespace)
+        this.appKit?.setCaipAddress(caipAddress as CaipAddress, this.chainNamespace)
         this.syncAccount({
           address: user.address,
           caipNetwork
@@ -452,7 +455,9 @@ export class SolanaAdapter implements ChainAdapter {
     }
 
     this.appKit?.setAddressExplorerUrl(
-      caipNetwork.explorerUrl ? `${caipNetwork.explorerUrl}/account/${address}` : undefined,
+      caipNetwork.blockExplorers?.default.url
+        ? `${caipNetwork.blockExplorers.default.url}/account/${address}`
+        : undefined,
       this.chainNamespace
     )
     await this.syncBalance(address)
@@ -462,13 +467,13 @@ export class SolanaAdapter implements ChainAdapter {
     try {
       this.appKit?.setLoading(true)
       const address = await provider.connect()
-      const caipChainId = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID)
+      const caipNetworkId = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID)
 
       const connectionChain =
-        provider.chains.find(chain => chain.id === caipChainId) || provider.chains[0]
+        provider.chains.find(chain => chain.caipNetworkId === caipNetworkId) || provider.chains[0]
 
       if (connectionChain) {
-        const caipAddress = `solana:${connectionChain.chainId}:${address}` as const
+        const caipAddress = `${connectionChain.caipNetworkId}:${address}` as const
         this.appKit?.setCaipAddress(caipAddress, this.chainNamespace)
 
         await this.switchNetwork(connectionChain)
@@ -620,7 +625,7 @@ export class SolanaAdapter implements ChainAdapter {
       if (emailEnabled || socialsEnabled) {
         this.w3mFrameProvider = W3mFrameProviderSingleton.getInstance({
           projectId: opts.projectId,
-          chainId: withSolanaNamespace(this.appKit?.getCaipNetwork(this.chainNamespace)?.chainId),
+          chainId: withSolanaNamespace(this.appKit?.getCaipNetwork(this.chainNamespace)?.id),
           onTimeout: () => {
             AlertController.open(ErrorUtil.ALERT_ERRORS.INVALID_APP_CONFIGURATION_SOCIALS, 'error')
           }
diff --git a/packages/adapters/solana/src/providers/AuthProvider.ts b/packages/adapters/solana/src/providers/AuthProvider.ts
index 4759577f0c..b4fd951489 100644
--- a/packages/adapters/solana/src/providers/AuthProvider.ts
+++ b/packages/adapters/solana/src/providers/AuthProvider.ts
@@ -69,13 +69,13 @@ export class AuthProvider extends ProviderEventEmitter implements Provider, Prov
     const availableChainIds = this.getProvider().getAvailableChainIds()
 
     return this.requestedChains.filter(requestedChain =>
-      availableChainIds.includes(withSolanaNamespace(requestedChain.chainId) as string)
+      availableChainIds.includes(withSolanaNamespace(requestedChain.id) as string)
     )
   }
 
   public async connect() {
     const session = await this.getProvider().connect({
-      chainId: withSolanaNamespace(this.getActiveChain()?.chainId)
+      chainId: withSolanaNamespace(this.getActiveChain()?.id)
     })
     this.setSession(session)
 
diff --git a/packages/adapters/solana/src/providers/CoinbaseWalletProvider.ts b/packages/adapters/solana/src/providers/CoinbaseWalletProvider.ts
index f26f0bc9ff..ca537c8d1c 100644
--- a/packages/adapters/solana/src/providers/CoinbaseWalletProvider.ts
+++ b/packages/adapters/solana/src/providers/CoinbaseWalletProvider.ts
@@ -41,7 +41,7 @@ export class CoinbaseWalletProvider extends ProviderEventEmitter implements Prov
 
   public get chains() {
     // For Coinbase Wallet, we only support the Solana mainnet
-    return this.requestedChains.filter(chain => chain.chainId === solana.chainId)
+    return this.requestedChains.filter(chain => chain.id === solana.id)
   }
 
   public get publicKey() {
diff --git a/packages/adapters/solana/src/providers/WalletConnectProvider.ts b/packages/adapters/solana/src/providers/WalletConnectProvider.ts
index 8be9d9cc8d..9068b34449 100644
--- a/packages/adapters/solana/src/providers/WalletConnectProvider.ts
+++ b/packages/adapters/solana/src/providers/WalletConnectProvider.ts
@@ -61,7 +61,7 @@ export class WalletConnectProvider extends ProviderEventEmitter implements Provi
         }
 
         return this.requestedChains.find(
-          chain => withSolanaNamespace(chain.chainId as string) === chainId
+          chain => withSolanaNamespace(chain.id as string) === chainId
         )
       })
       .filter(Boolean) as CaipNetwork[]
@@ -79,7 +79,7 @@ export class WalletConnectProvider extends ProviderEventEmitter implements Provi
 
   public async connect() {
     const rpcMap = this.requestedChains.reduce<Record<string, string>>((acc, chain) => {
-      acc[withSolanaNamespace(chain.chainId as string)] = chain.rpcUrl
+      acc[withSolanaNamespace(chain.id as string)] = chain.rpcUrls.default.http[0] || ''
 
       return acc
     }, {})
@@ -232,10 +232,10 @@ export class WalletConnectProvider extends ProviderEventEmitter implements Provi
     method: Method,
     params: WalletConnectProvider.RequestMethods[Method]['params']
   ) {
-    const chain = this.chains.find(c => this.getActiveChain()?.chainId === c.chainId)
+    const chain = this.chains.find(c => this.getActiveChain()?.id === c.id)
 
     // This is a workaround for wallets that only accept Solana deprecated networks
-    let chainId = withSolanaNamespace(chain?.chainId)
+    let chainId = withSolanaNamespace(chain?.id)
 
     switch (chainId) {
       case SolConstantsUtil.CHAIN_IDS.Mainnet:
@@ -311,7 +311,7 @@ export class WalletConnectProvider extends ProviderEventEmitter implements Provi
    * This method is a workaround for wallets that only accept Solana deprecated networks
    */
   private getRequestedChainsWithDeprecated() {
-    const chains = this.requestedChains.map(chain => withSolanaNamespace<ChainId>(chain.chainId))
+    const chains = this.requestedChains.map(chain => withSolanaNamespace<ChainId>(chain.id))
 
     if (chains.includes(SolConstantsUtil.CHAIN_IDS.Mainnet)) {
       chains.push(SolConstantsUtil.CHAIN_IDS.Deprecated_Mainnet)
diff --git a/packages/adapters/solana/src/providers/WalletStandardProvider.ts b/packages/adapters/solana/src/providers/WalletStandardProvider.ts
index fd47c1d382..91289eee06 100644
--- a/packages/adapters/solana/src/providers/WalletStandardProvider.ts
+++ b/packages/adapters/solana/src/providers/WalletStandardProvider.ts
@@ -246,7 +246,7 @@ export class WalletStandardProvider extends ProviderEventEmitter implements Prov
 
   private getActiveChainName() {
     const entry = Object.entries(solanaChains).find(
-      ([, chain]) => chain.chainId === this.getActiveChain()?.chainId
+      ([, chain]) => chain.id === this.getActiveChain()?.id
     )
 
     if (!entry) {
diff --git a/packages/adapters/solana/src/tests/AuthProvider.test.ts b/packages/adapters/solana/src/tests/AuthProvider.test.ts
index 5f44676bd6..64b86a9529 100644
--- a/packages/adapters/solana/src/tests/AuthProvider.test.ts
+++ b/packages/adapters/solana/src/tests/AuthProvider.test.ts
@@ -122,10 +122,10 @@ describe('AuthProvider specific tests', () => {
     const listener = vi.fn()
 
     authProvider.on('chainChanged', listener)
-    await authProvider.switchNetwork(newChain.chainId)
+    await authProvider.switchNetwork(newChain.id)
 
-    expect(provider.switchNetwork).toHaveBeenCalledWith(newChain.chainId)
-    expect(listener).toHaveBeenCalledWith(newChain.chainId)
+    expect(provider.switchNetwork).toHaveBeenCalledWith(newChain.id)
+    expect(listener).toHaveBeenCalledWith(newChain.id)
   })
 
   it('should call signAllTransactions with correct params', async () => {
diff --git a/packages/adapters/solana/src/tests/WalletConnectProvider.test.ts b/packages/adapters/solana/src/tests/WalletConnectProvider.test.ts
index 9304db731d..862f7ac91c 100644
--- a/packages/adapters/solana/src/tests/WalletConnectProvider.test.ts
+++ b/packages/adapters/solana/src/tests/WalletConnectProvider.test.ts
@@ -168,7 +168,7 @@ describe('WalletConnectProvider specific tests', () => {
   it('should use the correct chain id for requests', async () => {
     await walletConnectProvider.connect()
     getActiveChain.mockImplementation(
-      () => ({ chainId: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1' }) as CaipNetwork
+      () => ({ id: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1' }) as CaipNetwork
     )
 
     await walletConnectProvider.signMessage(new Uint8Array([1, 2, 3, 4, 5]))
@@ -189,8 +189,8 @@ describe('WalletConnectProvider specific tests', () => {
     vi.spyOn(provider, 'connect').mockImplementation(() =>
       Promise.resolve(
         mockUniversalProviderSession({}, [
-          { chainId: '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ' } as CaipNetwork,
-          { chainId: '8E9rvCKLFQia2Y35HXjjpWzj8weVo44K' } as CaipNetwork
+          { id: '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ' } as CaipNetwork,
+          { id: '8E9rvCKLFQia2Y35HXjjpWzj8weVo44K' } as CaipNetwork
         ])
       )
     )
@@ -214,14 +214,14 @@ describe('WalletConnectProvider specific tests', () => {
     vi.spyOn(provider, 'connect').mockImplementation(() =>
       Promise.resolve(
         mockUniversalProviderSession({}, [
-          { chainId: '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ' } as CaipNetwork,
-          { chainId: '8E9rvCKLFQia2Y35HXjjpWzj8weVo44K' } as CaipNetwork
+          { id: '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ' } as CaipNetwork,
+          { id: '8E9rvCKLFQia2Y35HXjjpWzj8weVo44K' } as CaipNetwork
         ])
       )
     )
 
     getActiveChain.mockImplementation(
-      () => ({ chainId: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1' }) as CaipNetwork
+      () => ({ id: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1' }) as CaipNetwork
     )
 
     await walletConnectProvider.connect()
@@ -305,7 +305,7 @@ describe('WalletConnectProvider specific tests', () => {
               ],
               events: [],
               accounts: [
-                `solana:${TestConstants.chains[0]?.chainId}:${TestConstants.accounts[0].address}`
+                `solana:${TestConstants.chains[0]?.id}:${TestConstants.accounts[0].address}`
               ]
             }
           }
@@ -328,7 +328,7 @@ describe('WalletConnectProvider specific tests', () => {
               methods: [],
               events: [],
               accounts: [
-                `solana:${TestConstants.chains[0]?.chainId}:${TestConstants.accounts[0].address}`
+                `solana:${TestConstants.chains[0]?.id}:${TestConstants.accounts[0].address}`
               ]
             }
           }
@@ -353,7 +353,7 @@ describe('WalletConnectProvider specific tests', () => {
               methods: ['solana_signMessage'],
               events: [],
               accounts: [
-                `solana:${TestConstants.chains[0]?.chainId}:${TestConstants.accounts[0].address}`
+                `solana:${TestConstants.chains[0]?.id}:${TestConstants.accounts[0].address}`
               ]
             }
           }
@@ -378,7 +378,7 @@ describe('WalletConnectProvider specific tests', () => {
               methods: ['solana_signMessage'],
               events: [],
               accounts: [
-                `solana:${TestConstants.chains[0]?.chainId}:${TestConstants.accounts[0].address}`
+                `solana:${TestConstants.chains[0]?.id}:${TestConstants.accounts[0].address}`
               ]
             }
           }
@@ -403,7 +403,7 @@ describe('WalletConnectProvider specific tests', () => {
               methods: ['solana_signMessage'],
               events: [],
               accounts: [
-                `solana:${TestConstants.chains[0]?.chainId}:${TestConstants.accounts[0].address}`
+                `solana:${TestConstants.chains[0]?.id}:${TestConstants.accounts[0].address}`
               ]
             }
           }
@@ -428,7 +428,7 @@ describe('WalletConnectProvider specific tests', () => {
               methods: ['solana_signAllTransactions'],
               events: [],
               accounts: [
-                `solana:${TestConstants.chains[0]?.chainId}:${TestConstants.accounts[0].address}`
+                `solana:${TestConstants.chains[0]?.id}:${TestConstants.accounts[0].address}`
               ]
             }
           }
diff --git a/packages/adapters/solana/src/tests/client.test.ts b/packages/adapters/solana/src/tests/client.test.ts
index cdbf6f2f0f..4d27cb10b0 100644
--- a/packages/adapters/solana/src/tests/client.test.ts
+++ b/packages/adapters/solana/src/tests/client.test.ts
@@ -4,13 +4,31 @@ import { mockOptions } from './mocks/Options'
 import mockAppKit from './mocks/AppKit'
 import { mockAuthConnector } from './mocks/AuthConnector'
 import { Connection } from '@solana/web3.js'
-import { SafeLocalStorage } from '@reown/appkit-common'
+import { SafeLocalStorage, type CaipNetwork } from '@reown/appkit-common'
 import { ProviderUtil } from '@reown/appkit/store'
 import { SolHelpersUtil } from '@reown/appkit-utils/solana'
 import { SolStoreUtil } from '../utils/SolanaStoreUtil.js'
 import { WalletConnectProvider } from '../providers/WalletConnectProvider'
 import UniversalProvider from '@walletconnect/universal-provider'
-import { solana } from '@reown/appkit/networks'
+import {
+  solana as AppKitSolana,
+  solanaTestnet as AppKitSolanaTestnet
+} from '@reown/appkit/networks'
+import { CaipNetworksUtil } from '@reown/appkit-utils'
+
+const [solana, solanaTestnet] = CaipNetworksUtil.extendCaipNetworks(
+  [AppKitSolana, AppKitSolanaTestnet],
+  {
+    customNetworkImageUrls: {},
+    projectId: '1234'
+  }
+) as [CaipNetwork, CaipNetwork]
+
+const mockOptionsExtended = {
+  ...mockOptions,
+  networks: [solana, solanaTestnet] as [CaipNetwork, ...CaipNetwork[]],
+  defaultNetwork: solana
+}
 
 vi.mock('@solana/web3.js', () => ({
   Connection: vi.fn(),
@@ -65,7 +83,7 @@ describe('SolanaAdapter', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     client = new SolanaAdapter({})
-    client.construct(mockAppKit, mockOptions)
+    client.construct(mockAppKit, mockOptionsExtended)
   })
 
   afterEach(() => {
@@ -79,7 +97,7 @@ describe('SolanaAdapter', () => {
     })
 
     it('should set caipNetworks to provided caipNetworks options', () => {
-      expect(client['caipNetworks']).toEqual(mockOptions.networks)
+      expect(client['caipNetworks']).toEqual(mockOptionsExtended.networks)
     })
 
     it('should create network and connection controller clients', () => {
@@ -107,7 +125,7 @@ describe('SolanaAdapter', () => {
       await client['syncNetwork'](mockAddress)
 
       expect(mockAppKit.setAddressExplorerUrl).toHaveBeenCalledWith(
-        `${solana.explorerUrl}/account/${mockAddress}`,
+        `${solana.blockExplorers?.default.url}/account/${mockAddress}`,
         'solana'
       )
       expect(client['syncBalance']).toHaveBeenCalledWith(mockAddress)
@@ -151,7 +169,7 @@ describe('SolanaAdapter', () => {
         connect: vi.fn().mockResolvedValue('DjPi1LtwrXJMAh2AUvuUMajCpMJEKg8N1J1PbLGjCH5B'),
         name: 'MockProvider',
         on: vi.fn(),
-        chains: [{ chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' }]
+        chains: [solana, solanaTestnet]
       }
       vi.spyOn(SafeLocalStorage, 'getItem').mockReturnValue(
         'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
diff --git a/packages/adapters/solana/src/tests/mocks/UniversalProvider.ts b/packages/adapters/solana/src/tests/mocks/UniversalProvider.ts
index b4213210bd..45464f2632 100644
--- a/packages/adapters/solana/src/tests/mocks/UniversalProvider.ts
+++ b/packages/adapters/solana/src/tests/mocks/UniversalProvider.ts
@@ -49,7 +49,7 @@ export function mockUniversalProviderSession(
   replaces: Partial<SessionTypes.Struct> = {},
   inputChains = TestConstants.chains
 ): SessionTypes.Struct {
-  const chains = inputChains.map(chain => `solana:${chain.chainId}`)
+  const chains = inputChains.map(chain => `solana:${chain.id}`)
 
   const accounts = chains.reduce<string[]>((acc, cur) => {
     for (const account of TestConstants.accounts) {
diff --git a/packages/adapters/solana/src/tests/mocks/W3mFrameProvider.ts b/packages/adapters/solana/src/tests/mocks/W3mFrameProvider.ts
index 2b6c21baea..d6bf7b74b5 100644
--- a/packages/adapters/solana/src/tests/mocks/W3mFrameProvider.ts
+++ b/packages/adapters/solana/src/tests/mocks/W3mFrameProvider.ts
@@ -46,6 +46,6 @@ export function mockW3mFrameProvider() {
 export function mockSession(): AuthProvider.Session {
   return {
     address: TestConstants.accounts[0].address,
-    chainId: TestConstants.chains[0]?.chainId || ''
+    chainId: TestConstants.chains[0]?.id || ''
   }
 }
diff --git a/packages/adapters/solana/src/tests/mocks/WalletStandard.ts b/packages/adapters/solana/src/tests/mocks/WalletStandard.ts
index 89da7f495e..204adc0ab3 100644
--- a/packages/adapters/solana/src/tests/mocks/WalletStandard.ts
+++ b/packages/adapters/solana/src/tests/mocks/WalletStandard.ts
@@ -17,7 +17,7 @@ export function mockWalletStandard() {
 
   return {
     accounts,
-    chains: TestConstants.chains.map(chain => `solana:${chain.chainId}` as const),
+    chains: TestConstants.chains.map(chain => `solana:${chain.id}` as const),
     features: {
       'standard:connect': {
         version: '1.0.0',
@@ -87,7 +87,7 @@ export function mockWalletStandard() {
 function mockAccount(account: TestConstants.Account = TestConstants.accounts[0]): WalletAccount {
   return {
     address: account.address,
-    chains: TestConstants.chains.map(chain => `solana:${chain.chainId}` as const),
+    chains: TestConstants.chains.map(chain => `solana:${chain.id}` as const),
     features: [],
     publicKey: account.publicKey.toBytes(),
     icon: 'data:image/png;base64,mocked...',
diff --git a/packages/adapters/wagmi/src/client.ts b/packages/adapters/wagmi/src/client.ts
index 5961554dd7..c40f6ef8ba 100644
--- a/packages/adapters/wagmi/src/client.ts
+++ b/packages/adapters/wagmi/src/client.ts
@@ -49,15 +49,15 @@ import type {
 } from '@reown/appkit-core'
 import { formatUnits, parseUnits } from 'viem'
 import type { Hex } from 'viem'
-import { ConstantsUtil, PresetsUtil, HelpersUtil, ErrorUtil } from '@reown/appkit-utils'
 import {
-  CaipNetworksUtil,
-  isReownName,
-  SafeLocalStorage,
-  SafeLocalStorageKeys
-} from '@reown/appkit-common'
+  ConstantsUtil,
+  PresetsUtil,
+  HelpersUtil,
+  ErrorUtil,
+  CaipNetworksUtil
+} from '@reown/appkit-utils'
+import { isReownName, SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common'
 import {
-  convertToAppKitChains,
   getEmailCaipNetworks,
   getTransport,
   getWalletConnectCaipNetworks,
@@ -67,8 +67,15 @@ import { W3mFrameHelpers, W3mFrameRpcConstants } from '@reown/appkit-wallet'
 import type { W3mFrameProvider, W3mFrameTypes } from '@reown/appkit-wallet'
 import { NetworkUtil } from '@reown/appkit-common'
 import { normalize } from 'viem/ens'
-import type { AppKitOptions } from '@reown/appkit'
-import type { CaipAddress, CaipNetwork, ChainNamespace, AdapterType } from '@reown/appkit-common'
+import type { AppKitOptions, AppKitOptionsWithCaipNetworks } from '@reown/appkit'
+import type {
+  CaipAddress,
+  BaseNetwork,
+  ChainNamespace,
+  AdapterType,
+  CaipNetwork,
+  AppKitNetwork
+} from '@reown/appkit-common'
 import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common'
 import type { AppKit } from '@reown/appkit'
 import { walletConnect } from './connectors/UniversalConnector.js'
@@ -118,9 +125,9 @@ export class WagmiAdapter implements ChainAdapter {
 
   public chainNamespace: ChainNamespace = CommonConstantsUtil.CHAIN.EVM
 
-  public caipNetworks: CaipNetwork[]
+  public caipNetworks: [CaipNetwork, ...CaipNetwork[]]
 
-  public wagmiChains: readonly [Chain, ...Chain[]]
+  public wagmiChains: [BaseNetwork, ...BaseNetwork[]]
 
   public wagmiConfig: AdapterOptions<Config>['wagmiConfig']
 
@@ -138,7 +145,7 @@ export class WagmiAdapter implements ChainAdapter {
 
   public constructor(
     configParams: Partial<CreateConfigParameters> & {
-      networks: CaipNetwork[]
+      networks: AppKitNetwork[]
       projectId: string
     }
   ) {
@@ -146,20 +153,18 @@ export class WagmiAdapter implements ChainAdapter {
       throw new Error(ErrorUtil.ALERT_ERRORS.PROJECT_ID_NOT_CONFIGURED.shortMessage)
     }
 
-    this.caipNetworks = configParams.networks.map(caipNetwork => ({
-      ...caipNetwork,
-      rpcUrl: CaipNetworksUtil.extendRpcUrlWithProjectId(caipNetwork.rpcUrl, configParams.projectId)
-    }))
+    this.caipNetworks = CaipNetworksUtil.extendCaipNetworks(configParams.networks, {
+      projectId: configParams.projectId,
+      customNetworkImageUrls: {}
+    }) as [CaipNetwork, ...CaipNetwork[]]
 
-    this.wagmiChains = convertToAppKitChains(
-      this.caipNetworks.filter(
-        caipNetwork => caipNetwork.chainNamespace === CommonConstantsUtil.CHAIN.EVM
-      )
-    )
+    this.wagmiChains = this.caipNetworks.filter(
+      caipNetwork => caipNetwork.chainNamespace === CommonConstantsUtil.CHAIN.EVM
+    ) as unknown as [BaseNetwork, ...BaseNetwork[]]
 
     const transportsArr = this.wagmiChains.map(chain => [
       chain.id,
-      getTransport({ chain, projectId: configParams.projectId })
+      getTransport({ chain: chain as Chain, projectId: configParams.projectId })
     ])
 
     const transports = Object.fromEntries(transportsArr)
@@ -177,7 +182,7 @@ export class WagmiAdapter implements ChainAdapter {
     const customConnectors: CreateConnectorFn[] = []
 
     if (options.enableWalletConnect !== false) {
-      customConnectors.push(walletConnect(options, appKit))
+      customConnectors.push(walletConnect(options, appKit, this.caipNetworks))
     }
 
     if (options.enableInjected !== false) {
@@ -218,11 +223,10 @@ export class WagmiAdapter implements ChainAdapter {
     })
   }
 
-  public construct(appKit: AppKit, options: AppKitOptions) {
+  public construct(appKit: AppKit, options: AppKitOptionsWithCaipNetworks) {
     this.appKit = appKit
     this.options = options
-    this.caipNetworks = options.networks
-    this.defaultCaipNetwork = options.defaultNetwork || options.networks[0]
+    this.defaultCaipNetwork = options.defaultNetwork || options.networks?.[0]
     this.tokens = HelpersUtil.getCaipTokens(options.tokens)
     this.setCustomConnectors(options, appKit)
 
@@ -232,7 +236,7 @@ export class WagmiAdapter implements ChainAdapter {
 
     this.networkControllerClient = {
       switchCaipNetwork: async caipNetwork => {
-        const chainId = Number(NetworkUtil.caipNetworkIdToNumber(caipNetwork?.id))
+        const chainId = caipNetwork?.id as number | undefined
 
         if (chainId && this.wagmiConfig) {
           await switchChain(this.wagmiConfig, { chainId })
@@ -297,11 +301,11 @@ export class WagmiAdapter implements ChainAdapter {
 
           const chains = this.caipNetworks
             ?.filter(network => network.chainNamespace === 'eip155')
-            .map(chain => chain.id) as string[]
+            .map(chain => chain.caipNetworkId) as string[]
 
           siweParams.chains = this.caipNetworks
             ?.filter(network => network.chainNamespace === 'eip155')
-            .map(chain => chain.chainId) as number[]
+            .map(chain => chain.id) as number[]
 
           const result = await provider.authenticate({
             nonce: await siweConfig.getNonce(),
@@ -347,7 +351,7 @@ export class WagmiAdapter implements ChainAdapter {
           }
         }
 
-        const chainId = Number(NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id))
+        const chainId = this.appKit?.getCaipNetworkId<number>()
         await connect(this.wagmiConfig, { connector, chainId })
       },
       connectExternal: async ({ id, provider, info }) => {
@@ -365,7 +369,7 @@ export class WagmiAdapter implements ChainAdapter {
           // @ts-expect-error Exists on EIP6963Connector
           connector.setEip6963Wallet?.({ provider, info })
         }
-        const chainId = Number(NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id))
+        const chainId = this.appKit?.getCaipNetworkId<number>()
         await connect(this.wagmiConfig, { connector, chainId })
       },
       checkInstalled: ids => {
@@ -450,7 +454,12 @@ export class WagmiAdapter implements ChainAdapter {
       writeContract: async (data: WriteContractArgs) => {
         const caipAddress = this.appKit?.getCaipAddress() || ''
         const account = requireCaipAddress(caipAddress)
-        const chainId = Number(NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id))
+        const chainId = this.appKit?.getCaipNetworkId<number>()
+
+        if (!chainId) {
+          throw new Error('networkControllerClient:writeContract - chainId is undefined')
+        }
+
         const tx = await wagmiWriteContract(this.wagmiConfig, {
           chain: this.wagmiChains?.[chainId],
           chainId,
@@ -470,11 +479,11 @@ export class WagmiAdapter implements ChainAdapter {
               'networkControllerClient:getApprovedCaipNetworksData - wagmiConfig is undefined'
             )
           }
-          const chainId = Number(
-            NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id)
-          )
+          const chainId = this.appKit?.getCaipNetworkId<number>()
+
           let ensName: boolean | GetEnsAddressReturnType = false
           let wcName: boolean | string = false
+
           if (isReownName(value)) {
             wcName = (await this.appKit?.resolveReownName(value)) || false
           }
@@ -491,7 +500,7 @@ export class WagmiAdapter implements ChainAdapter {
         }
       },
       getEnsAvatar: async (value: string) => {
-        const chainId = Number(NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id))
+        const chainId = this.appKit?.getCaipNetworkId<number>()
         if (chainId !== mainnet.id) {
           return false
         }
@@ -560,7 +569,9 @@ export class WagmiAdapter implements ChainAdapter {
     return this.appKit?.subscribeState((state: PublicStateControllerState) =>
       callback({
         ...state,
-        selectedNetworkId: Number(NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId))
+        selectedNetworkId: state.selectedNetworkId
+          ? Number(NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId))
+          : undefined
       })
     )
   }
@@ -615,8 +626,8 @@ export class WagmiAdapter implements ChainAdapter {
     if (this.wagmiConfig) {
       if (connector) {
         if (connector && connector.name === 'WalletConnect' && connector.getProvider && address) {
-          const currentChainId =
-            chainId || Number(NetworkUtil.caipNetworkIdToNumber(this.appKit?.getCaipNetwork()?.id))
+          const activeCaipNetwork = this.appKit?.getCaipNetwork()
+          const currentChainId = chainId || (activeCaipNetwork?.id as number | undefined)
           const provider = (await connector.getProvider()) as UniversalProvider
 
           const namespaces = provider?.session?.namespaces || {}
@@ -634,7 +645,10 @@ export class WagmiAdapter implements ChainAdapter {
             this.appKit?.setPreferredAccountType(preferredAccountType, chainNamespace)
             this.appKit?.setCaipAddress(caipAddress, chainNamespace)
           })
-          if (this.appKit?.getCaipNetwork()?.chainNamespace !== 'solana') {
+          if (
+            this.appKit?.getCaipNetwork()?.chainNamespace !== CommonConstantsUtil.CHAIN.SOLANA &&
+            currentChainId
+          ) {
             this.syncNetwork(address, currentChainId, true)
             await Promise.all([
               this.syncProfile(address, currentChainId),
@@ -681,26 +695,16 @@ export class WagmiAdapter implements ChainAdapter {
   }
 
   private async syncNetwork(address?: Hex, chainId?: number, isConnected?: boolean) {
-    const chain = this.caipNetworks.find((c: CaipNetwork) => c.chainId === chainId)
-
-    if (chain && chainId) {
-      this.appKit?.setCaipNetwork({
-        chainId: chain.chainId,
-        id: chain.id,
-        name: chain.name || '',
-        imageId: PresetsUtil.NetworkImageIds[chain.chainId],
-        imageUrl: this.options?.chainImages?.[chain.chainId],
-        chainNamespace: this.chainNamespace,
-        currency: chain?.currency || '',
-        explorerUrl: chain?.explorerUrl || '',
-        rpcUrl: chain?.rpcUrl || ''
-      })
+    const caipNetwork = this.caipNetworks.find((c: CaipNetwork) => c.id === chainId)
+
+    if (caipNetwork && chainId) {
+      this.appKit?.setCaipNetwork(caipNetwork)
 
       if (isConnected && address && chainId) {
         const caipAddress: CaipAddress = `eip155:${chainId}:${address}`
         this.appKit?.setCaipAddress(caipAddress, this.chainNamespace)
-        if (chain?.explorerUrl) {
-          const url = `${chain.explorerUrl}/address/${address}`
+        if (caipNetwork?.blockExplorers?.default.url) {
+          const url = `${caipNetwork.blockExplorers.default.url}/address/${address}`
           this.appKit?.setAddressExplorerUrl(url, this.chainNamespace)
         } else {
           this.appKit?.setAddressExplorerUrl(undefined, this.chainNamespace)
@@ -768,13 +772,13 @@ export class WagmiAdapter implements ChainAdapter {
   }
 
   private async syncBalance(address: Hex, chainId: number) {
-    const chain = this.caipNetworks.find((c: CaipNetwork) => c.chainId === chainId)
+    const caipNetwork = this.caipNetworks.find((c: CaipNetwork) => c.id === chainId)
 
-    if (chain && this.wagmiConfig) {
+    if (caipNetwork && this.wagmiConfig) {
       const balance = await getBalance(this.wagmiConfig, {
         address,
         chainId,
-        token: this.options?.tokens?.[chain.id]?.address as Hex
+        token: this.options?.tokens?.[caipNetwork.caipNetworkId]?.address as Hex
       })
       this.appKit?.setBalance(balance.formatted, balance.symbol, this.chainNamespace)
 
diff --git a/packages/adapters/wagmi/src/connectors/AuthConnector.ts b/packages/adapters/wagmi/src/connectors/AuthConnector.ts
index ab6fe61129..0dbdbf705b 100644
--- a/packages/adapters/wagmi/src/connectors/AuthConnector.ts
+++ b/packages/adapters/wagmi/src/connectors/AuthConnector.ts
@@ -37,6 +37,7 @@ export function authConnector(parameters: AuthParameters) {
     async connect(options = {}) {
       const provider = await this.getProvider()
       let chainId = options.chainId
+
       if (options.isReconnecting) {
         chainId = provider.getLastUsedChainId()
         if (!chainId) {
diff --git a/packages/adapters/wagmi/src/connectors/UniversalConnector.ts b/packages/adapters/wagmi/src/connectors/UniversalConnector.ts
index 38b68d9b4e..69afd6172e 100644
--- a/packages/adapters/wagmi/src/connectors/UniversalConnector.ts
+++ b/packages/adapters/wagmi/src/connectors/UniversalConnector.ts
@@ -22,7 +22,8 @@ import { WcHelpersUtil } from '@reown/appkit'
 import { StorageUtil } from '@reown/appkit-core'
 import type { AppKitOptions } from '@reown/appkit'
 import type { AppKit } from '@reown/appkit'
-import { convertToAppKitChains } from '../utils/helpers.js'
+import { ConstantsUtil } from '@reown/appkit-common'
+import type { CaipNetwork } from '@reown/appkit-common'
 
 type UniversalConnector = Connector & {
   onDisplayUri(uri: string): void
@@ -35,7 +36,11 @@ export type AppKitOptionsParams = AppKitOptions & {
 
 walletConnect.type = 'walletConnect' as const
 
-export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
+export function walletConnect(
+  parameters: AppKitOptionsParams,
+  appKit: AppKit,
+  caipNetworks: [CaipNetwork, ...CaipNetwork[]]
+) {
   const isNewChainsStale = parameters.isNewChainsStale ?? true
   type Provider = Awaited<ReturnType<(typeof UniversalProviderType)['init']>>
   type Properties = {
@@ -106,14 +111,14 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
 
         // If there isn't an active session or chains are stale, connect.
         if (!provider.session || isChainsStale) {
-          const namespaces = WcHelpersUtil.createNamespaces(parameters.networks)
+          const namespaces = WcHelpersUtil.createNamespaces(caipNetworks)
 
           await provider.connect({
             optionalNamespaces: namespaces,
             ...('pairingTopic' in rest ? { pairingTopic: rest.pairingTopic } : {})
           })
 
-          this.setRequestedChainsIds(parameters.networks.map(x => Number(x.chainId)))
+          this.setRequestedChainsIds(caipNetworks.map(x => Number(x.id)))
         }
 
         // If session exists and chains are authorized, enable provider for required chain
@@ -205,7 +210,7 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
     },
     async getProvider({ chainId } = {}) {
       async function initProvider() {
-        const optionalChains = parameters.networks.map(x => Number(x.chainId))
+        const optionalChains = caipNetworks.map(x => Number(x.id))
 
         if (!optionalChains.length) {
           return undefined
@@ -228,13 +233,13 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
         provider_?.events.setMaxListeners(Number.POSITIVE_INFINITY)
       }
 
-      const currentChainId = appKit.getCaipNetwork()?.chainId
+      const currentChainId = appKit.getCaipNetwork()?.id
 
       if (chainId && currentChainId !== chainId) {
         const storedCaipNetwork = StorageUtil.getStoredActiveCaipNetwork()
 
-        if (storedCaipNetwork && storedCaipNetwork.chainNamespace === 'eip155') {
-          await this.switchChain?.({ chainId: Number(storedCaipNetwork.chainId) })
+        if (storedCaipNetwork && storedCaipNetwork.chainNamespace === ConstantsUtil.CHAIN.EVM) {
+          await this.switchChain?.({ chainId: Number(storedCaipNetwork.id) })
         } else {
           await this.switchChain?.({ chainId })
         }
@@ -244,7 +249,7 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
       return provider_ as Provider
     },
     async getChainId() {
-      const chainId = appKit.getCaipNetwork()?.chainId
+      const chainId = appKit.getCaipNetwork()?.id
 
       if (chainId) {
         return chainId as number
@@ -253,9 +258,9 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
       const provider = await this.getProvider()
       const chain = provider.session?.namespaces['eip155']?.chains?.[0]
 
-      const network = parameters.networks.find(c => c.id === chain)
+      const network = caipNetworks.find(c => c.id === chain)
 
-      return network?.chainId as number
+      return network?.id as number
     },
     async isAuthorized() {
       try {
@@ -286,16 +291,15 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
         throw new ProviderNotFoundError()
       }
 
-      const chain = parameters.networks.find(x => x.chainId === chainId)
-      const [wagmiChain] = chain ? convertToAppKitChains([chain]) : []
+      const chainToSwitch = caipNetworks.find(x => x.id === chainId)
 
-      if (!wagmiChain) {
+      if (!chainToSwitch) {
         throw new SwitchChainError(new ChainNotConfiguredError())
       }
 
       try {
-        if (chain?.id) {
-          provider.setDefaultChain(chain?.id)
+        if (chainToSwitch?.caipNetworkId) {
+          provider.setDefaultChain(chainToSwitch?.caipNetworkId as string)
         }
 
         await provider.request({
@@ -307,7 +311,7 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
         const requestedChains = await this.getRequestedChainsIds()
         this.setRequestedChainsIds([...requestedChains, chainId])
 
-        return wagmiChain
+        return { ...chainToSwitch, id: chainToSwitch.id as number }
       } catch (err) {
         const error = err as RpcError
 
@@ -321,18 +325,18 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
           if (addEthereumChainParameter?.blockExplorerUrls) {
             blockExplorerUrls = addEthereumChainParameter.blockExplorerUrls
           } else {
-            blockExplorerUrls = wagmiChain.blockExplorers?.default.url
-              ? [wagmiChain.blockExplorers?.default.url]
+            blockExplorerUrls = chainToSwitch.blockExplorers?.default.url
+              ? [chainToSwitch.blockExplorers?.default.url]
               : []
           }
 
           const addEthereumChain = {
             blockExplorerUrls,
             chainId: numberToHex(chainId),
-            chainName: wagmiChain.name,
+            chainName: chainToSwitch.name,
             iconUrls: addEthereumChainParameter?.iconUrls,
-            nativeCurrency: wagmiChain.nativeCurrency,
-            rpcUrls: wagmiChain.rpcUrls.default.http
+            nativeCurrency: chainToSwitch.nativeCurrency,
+            rpcUrls: chainToSwitch.rpcUrls.default.http
           } satisfies AddEthereumChainParameter
 
           await provider.request({
@@ -343,7 +347,7 @@ export function walletConnect(parameters: AppKitOptionsParams, appKit: AppKit) {
           const requestedChains = await this.getRequestedChainsIds()
           this.setRequestedChainsIds([...requestedChains, chainId])
 
-          return wagmiChain
+          return { ...chainToSwitch, id: chainToSwitch.id as number }
         } catch (e) {
           throw new UserRejectedRequestError(e as Error)
         }
diff --git a/packages/adapters/wagmi/src/index.ts b/packages/adapters/wagmi/src/index.ts
index 3d7d7725f9..0fecfc9d21 100644
--- a/packages/adapters/wagmi/src/index.ts
+++ b/packages/adapters/wagmi/src/index.ts
@@ -7,6 +7,3 @@ export type { AdapterOptions } from './client.js'
 
 // -- Connectors
 export { authConnector } from './connectors/AuthConnector.js'
-
-// -- Utils
-export { convertToAppKitChains } from './utils/helpers.js'
diff --git a/packages/adapters/wagmi/src/tests/client.test.ts b/packages/adapters/wagmi/src/tests/client.test.ts
index 3191a92cb0..88f193cd69 100644
--- a/packages/adapters/wagmi/src/tests/client.test.ts
+++ b/packages/adapters/wagmi/src/tests/client.test.ts
@@ -1,15 +1,27 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { mockAccount, mockAppKit, mockOptions, mockWagmiClient } from './mocks/adapter.mock'
 import {
-  mockAccount,
-  mockAppKit,
-  mockChain,
-  mockOptions,
-  mockWagmiClient
-} from './mocks/adapter.mock'
-import { arbitrum, mainnet } from '@reown/appkit/networks'
+  arbitrum as AppkitArbitrum,
+  mainnet as AppkitMainnet,
+  polygon as AppkitPolygon,
+  optimism as AppkitOptimism,
+  bsc as AppkitBsc
+} from '@reown/appkit/networks'
 import { connect, disconnect, getAccount, getChainId, getEnsName, getBalance } from '@wagmi/core'
-import { ConstantsUtil } from '@reown/appkit-utils'
+import { CaipNetworksUtil, ConstantsUtil } from '@reown/appkit-utils'
+import type { CaipNetwork } from '@reown/appkit-common'
+
+const [mainnet, arbitrum] = CaipNetworksUtil.extendCaipNetworks(
+  [AppkitMainnet, AppkitArbitrum, AppkitPolygon, AppkitOptimism, AppkitBsc],
+  { customNetworkImageUrls: {}, projectId: '1234' }
+) as [CaipNetwork, CaipNetwork, CaipNetwork, CaipNetwork, CaipNetwork]
+
+const mockOptionsExtended = {
+  ...mockOptions,
+  networks: [mainnet, arbitrum] as [CaipNetwork, ...CaipNetwork[]],
+  defaultNetwork: mainnet
+}
 
 vi.mock('@wagmi/core', async () => {
   const actual = await vi.importActual('@wagmi/core')
@@ -43,8 +55,8 @@ describe('Wagmi Client', () => {
        * Specifically to Wagmi, we are mutating caipNetworks on both Wagmi constructor and when we set adapters.
        * So there is not proper way to compare objects since imageId and imageUrl is added later.
        */
-      mockOptions.networks.forEach((network, index) => {
-        expect(mockWagmiClient.caipNetworks[index]?.name).toEqual(network.name)
+      mockWagmiClient.caipNetworks.forEach((network, index) => {
+        expect(network.name).toEqual(mockOptionsExtended.networks[index]?.name)
       })
     })
 
@@ -53,8 +65,8 @@ describe('Wagmi Client', () => {
        * Specifically to Wagmi, we are mutating caipNetworks on both Wagmi constructor and when we set adapters.
        * So there is not proper way to compare objects since imageId and imageUrl is added later.
        */
-      expect(mockWagmiClient.defaultCaipNetwork?.chainId).toEqual(mockOptions.networks[0]?.chainId)
-      expect(mockWagmiClient.defaultCaipNetwork?.name).toEqual(mockOptions.networks[0]?.name)
+      expect(mockWagmiClient.defaultCaipNetwork?.id).toEqual(mainnet.id)
+      expect(mockWagmiClient.defaultCaipNetwork?.name).toEqual(mainnet.name)
     })
 
     it('should create wagmi config', () => {
@@ -66,13 +78,13 @@ describe('Wagmi Client', () => {
     it('should switch to correct chain', async () => {
       await mockWagmiClient.networkControllerClient?.switchCaipNetwork(arbitrum)
 
-      expect(getChainId(mockWagmiClient.wagmiConfig)).toBe(arbitrum.chainId)
+      expect(getChainId(mockWagmiClient.wagmiConfig)).toBe(arbitrum.id)
     })
 
     it('should sync the correct requested networks', async () => {
       const setRequestedCaipNetworks = vi.spyOn(mockAppKit, 'setRequestedCaipNetworks')
 
-      mockWagmiClient['syncRequestedNetworks'](mockOptions.networks)
+      mockWagmiClient['syncRequestedNetworks']([mainnet, arbitrum])
 
       /**
        * Specifically to Wagmi, we are mutating caipNetworks on both Wagmi constructor and when we set adapters.
@@ -105,7 +117,7 @@ describe('Wagmi Client', () => {
       expect(setApprovedCaipNetworksData).toHaveBeenCalledOnce()
 
       expect(mockAppKit.getCaipAddress()).toBe(
-        `${ConstantsUtil.EIP155}:${mainnet.chainId}:${mockAccount.address}`
+        `${ConstantsUtil.EIP155}:${mainnet.id}:${mockAccount.address}`
       )
 
       const connectedWagmiAccount = getAccount(mockWagmiClient.wagmiConfig)
@@ -166,45 +178,40 @@ describe('Wagmi Client', () => {
     it('should sync network correctly', async () => {
       const mockAddress = '0x1234567890123456789012345678901234567890'
 
-      mockWagmiClient.caipNetworks = [mockChain]
+      mockWagmiClient.caipNetworks = [mainnet, arbitrum]
 
       const setCaipNetworkSpy = vi.spyOn(mockAppKit, 'setCaipNetwork')
       const setCaipAddressSpy = vi.spyOn(mockAppKit, 'setCaipAddress')
       const setAddressExplorerUrlSpy = vi.spyOn(mockAppKit, 'setAddressExplorerUrl')
       const syncBalanceSpy = vi.spyOn(mockWagmiClient as any, 'syncBalance')
 
-      await (mockWagmiClient as any).syncNetwork(mockAddress, mockChain.chainId, true)
+      await (mockWagmiClient as any).syncNetwork(mockAddress, mainnet.id, true)
 
       expect(setCaipNetworkSpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          chainId: 1,
-          id: 'eip155:1',
+          id: 1,
+          caipNetworkId: 'eip155:1',
           name: 'Ethereum',
-          chainNamespace: 'eip155',
-          currency: 'ETH',
-          explorerUrl: 'https://etherscan.io'
+          chainNamespace: 'eip155'
         })
       )
 
       expect(setCaipAddressSpy).toHaveBeenCalledWith(
-        `eip155:${mockChain.chainId}:${mockAddress}`,
+        `eip155:${mainnet.id}:${mockAddress}`,
         'eip155'
       )
       expect(setAddressExplorerUrlSpy).toHaveBeenCalledWith(
         'https://etherscan.io/address/0x1234567890123456789012345678901234567890',
         'eip155'
       )
-      expect(syncBalanceSpy).toHaveBeenCalledWith(mockAddress, mockChain.chainId)
+      expect(syncBalanceSpy).toHaveBeenCalledWith(mockAddress, mainnet.id)
     })
 
     it('should not sync network if chain is not found', async () => {
       const mockAddress = '0x1234567890123456789012345678901234567890'
       const mockChainId = 999
 
-      mockWagmiClient.options = {
-        ...mockOptions,
-        networks: []
-      }
+      mockWagmiClient.options = mockOptionsExtended
       const setCaipNetworkSpy = vi.spyOn(mockAppKit, 'setCaipNetwork')
       const syncBalanceSpy = vi.spyOn(mockWagmiClient as any, 'syncBalance')
 
@@ -265,7 +272,7 @@ describe('Wagmi Client', () => {
     const mockChainId = 1 // Ethereum mainnet
 
     beforeEach(() => {
-      mockWagmiClient.options = { networks: [mockChain], projectId: '123' }
+      mockWagmiClient.options = { networks: [mainnet], projectId: '123' }
       mockAppKit.setBalance = vi.fn()
       ;(getBalance as any).mockReset()
     })
diff --git a/packages/adapters/wagmi/src/tests/mocks/adapter.mock.ts b/packages/adapters/wagmi/src/tests/mocks/adapter.mock.ts
index d73d685bc8..9fe49db065 100644
--- a/packages/adapters/wagmi/src/tests/mocks/adapter.mock.ts
+++ b/packages/adapters/wagmi/src/tests/mocks/adapter.mock.ts
@@ -19,7 +19,7 @@ export const mockWagmiConfig = mockWagmiClient.wagmiConfig
 
 export const mockOptions = {
   adapters: [mockWagmiClient],
-  networks: [mainnet, arbitrum],
+  networks: mockWagmiClient.caipNetworks,
   enableInjected: false,
   enableCoinbase: false,
   enableWalletConnect: false,
@@ -40,11 +40,25 @@ export const mockOptions = {
 export const mockAppKit = new AppKit(mockOptions)
 
 export const mockChain = {
-  id: 'eip155:1',
+  id: 1,
   name: 'Ethereum',
-  chainId: 1,
+  caipNetworkId: 'eip155:1',
   chainNamespace: 'eip155',
-  currency: 'ETH',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: 'https://rpc.example.com'
+  nativeCurrency: {
+    name: 'Ethereum',
+    symbol: 'ETH',
+    decimals: 18
+  },
+  blockExplorers: {
+    default: {
+      name: 'etherscan',
+      url: 'https://etherscan.io',
+      standard: 'EIP3091'
+    }
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.example.com']
+    }
+  }
 } as CaipNetwork
diff --git a/packages/adapters/wagmi/src/utils/helpers.ts b/packages/adapters/wagmi/src/utils/helpers.ts
index 07e3da1577..59b7657795 100644
--- a/packages/adapters/wagmi/src/utils/helpers.ts
+++ b/packages/adapters/wagmi/src/utils/helpers.ts
@@ -1,4 +1,4 @@
-import { type CaipNetwork, type CaipNetworkId } from '@reown/appkit-common'
+import { type CaipNetworkId } from '@reown/appkit-common'
 import { ConstantsUtil, PresetsUtil } from '@reown/appkit-utils'
 import { UniversalProvider } from '@walletconnect/universal-provider'
 import { fallback, http, type Hex } from 'viem'
@@ -37,7 +37,7 @@ export function getEmailCaipNetworks() {
 
 export function getTransport({ chain, projectId }: { chain: Chain; projectId: string }) {
   const RPC_URL = CoreHelperUtil.getBlockchainApiUrl()
-  const chainDefaultUrl = chain.rpcUrls[0]?.http?.[0]
+  const chainDefaultUrl = chain.rpcUrls.default.http?.[0]
 
   if (!PresetsUtil.WalletConnectRpcChainIds.includes(chain.id)) {
     return http(chainDefaultUrl)
@@ -70,32 +70,3 @@ export function requireCaipAddress(caipAddress: string) {
 
   return account
 }
-
-export function convertToAppKitChains(caipNetworks: CaipNetwork[]) {
-  const chains = caipNetworks.map(caipNetwork => ({
-    blockExplorers: {
-      default: {
-        apiUrl: '',
-        name: '',
-        url: caipNetwork.explorerUrl || ''
-      }
-    },
-    fees: undefined,
-    formatters: undefined,
-    id: Number(caipNetwork.chainId),
-    name: caipNetwork.name,
-    nativeCurrency: {
-      decimals: 18,
-      name: caipNetwork.currency,
-      symbol: caipNetwork.currency
-    },
-    rpcUrls: {
-      default: {
-        http: [caipNetwork.rpcUrl]
-      }
-    },
-    serializers: undefined
-  })) as unknown as readonly [Chain, ...Chain[]]
-
-  return chains
-}
diff --git a/packages/appkit-utils/exports/index.ts b/packages/appkit-utils/exports/index.ts
index 0e2022c5e9..35592d057a 100644
--- a/packages/appkit-utils/exports/index.ts
+++ b/packages/appkit-utils/exports/index.ts
@@ -4,6 +4,7 @@ export { PresetsUtil } from '../src/PresetsUtil.js'
 export { HelpersUtil } from '../src/HelpersUtil.js'
 export { ErrorUtil } from '../src/ErrorUtil.js'
 export { LoggerUtil } from '../src/LoggerUtil.js'
+export { CaipNetworksUtil } from '../src/CaipNetworkUtil.js'
 export type { SocialProvider } from '../src/TypeUtil.js'
 import type { W3mFrameProvider } from '@reown/appkit-wallet'
 
diff --git a/packages/appkit-utils/src/CaipNetworkUtil.ts b/packages/appkit-utils/src/CaipNetworkUtil.ts
new file mode 100644
index 0000000000..9de4a905ac
--- /dev/null
+++ b/packages/appkit-utils/src/CaipNetworkUtil.ts
@@ -0,0 +1,174 @@
+import {
+  ConstantsUtil,
+  type AppKitNetwork,
+  type CaipNetwork,
+  type CaipNetworkId
+} from '@reown/appkit-common'
+import { PresetsUtil } from './PresetsUtil.js'
+
+const RPC_URL_HOST = 'rpc.walletconnect.org'
+
+export function getBlockchainApiRpcUrl(caipNetworkId: CaipNetworkId, projectId: string) {
+  const url = new URL('https://rpc.walletconnect.org/v1/')
+  url.searchParams.set('chainId', caipNetworkId)
+  url.searchParams.set('projectId', projectId)
+
+  return url.toString()
+}
+
+const WC_HTTP_RPC_SUPPORTED_CHAINS = [
+  'near:mainnet',
+  'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  'eip155:1101',
+  'eip155:56',
+  'eip155:42161',
+  'eip155:7777777',
+  'eip155:59144',
+  'eip155:324',
+  'solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
+  'eip155:5000',
+  'solana:4sgjmw1sunhzsxgspuhpqldx6wiyjntz',
+  'eip155:80084',
+  'eip155:5003',
+  'eip155:100',
+  'eip155:8453',
+  'eip155:42220',
+  'eip155:1313161555',
+  'eip155:17000',
+  'eip155:1',
+  'eip155:300',
+  'eip155:1313161554',
+  'eip155:1329',
+  'eip155:84532',
+  'eip155:421614',
+  'eip155:11155111',
+  'eip155:8217',
+  'eip155:43114',
+  'solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
+  'eip155:999999999',
+  'eip155:11155420',
+  'eip155:80002',
+  'eip155:97',
+  'eip155:43113',
+  'eip155:137',
+  'eip155:10'
+]
+
+type ExtendCaipNetworkParams = {
+  customNetworkImageUrls: Record<number | string, string> | undefined
+  projectId: string
+}
+
+export const CaipNetworksUtil = {
+  /**
+   * Extends the RPC URL with the project ID if the RPC URL is a Reown URL
+   * @param rpcUrl - The RPC URL to extend
+   * @param projectId - The project ID to extend the RPC URL with
+   * @returns The extended RPC URL
+   */
+  extendRpcUrlWithProjectId(rpcUrl: string, projectId: string) {
+    let isReownUrl = false
+    try {
+      const url = new URL(rpcUrl)
+      isReownUrl = url.host === RPC_URL_HOST
+    } catch (e) {
+      isReownUrl = false
+    }
+
+    if (isReownUrl) {
+      const url = new URL(rpcUrl)
+      if (!url.searchParams.has('projectId')) {
+        url.searchParams.set('projectId', projectId)
+      }
+
+      return url.toString()
+    }
+
+    return rpcUrl
+  },
+
+  isCaipNetwork(network: AppKitNetwork): network is CaipNetwork {
+    return 'chainNamespace' in network && 'caipNetworkId' in network
+  },
+
+  getChainNamespace(network: AppKitNetwork) {
+    if (this.isCaipNetwork(network)) {
+      return network.chainNamespace
+    }
+
+    return ConstantsUtil.CHAIN.EVM
+  },
+
+  getCaipNetworkId(network: AppKitNetwork) {
+    if (this.isCaipNetwork(network)) {
+      return network.caipNetworkId
+    }
+
+    return `${ConstantsUtil.CHAIN.EVM}:${network.id}` as CaipNetworkId
+  },
+
+  getRpcUrl(caipNetwork: AppKitNetwork, caipNetworkId: CaipNetworkId, projectId: string) {
+    const defaultRpcUrl = caipNetwork.rpcUrls?.default?.http?.[0]
+
+    if (WC_HTTP_RPC_SUPPORTED_CHAINS.includes(caipNetworkId)) {
+      return getBlockchainApiRpcUrl(caipNetworkId, projectId)
+    }
+
+    return defaultRpcUrl || ''
+  },
+
+  /**
+   * Extends the CaipNetwork object with the image ID and image URL if the image ID is not provided
+   * @param params - The parameters object
+   * @param params.caipNetwork - The CaipNetwork object to extend
+   * @param params.networkImageIds - The network image IDs
+   * @param params.customNetworkImageUrls - The custom network image URLs
+   * @param params.projectId - The project ID
+   * @returns The extended array of CaipNetwork objects
+   */
+  extendCaipNetwork(
+    caipNetwork: AppKitNetwork,
+    { customNetworkImageUrls, projectId }: ExtendCaipNetworkParams
+  ): CaipNetwork {
+    const caipNetworkId = this.getCaipNetworkId(caipNetwork)
+    const chainNamespace = this.getChainNamespace(caipNetwork)
+    const rpcUrl = this.getRpcUrl(caipNetwork, caipNetworkId, projectId)
+
+    return {
+      ...caipNetwork,
+      chainNamespace,
+      caipNetworkId,
+      assets: {
+        imageId: PresetsUtil.NetworkImageIds[caipNetwork.id],
+        imageUrl: customNetworkImageUrls?.[caipNetwork.id]
+      },
+      rpcUrls: {
+        ...caipNetwork.rpcUrls,
+        default: {
+          http: [rpcUrl]
+        }
+      }
+    }
+  },
+
+  /**
+   * Extends the array of CaipNetwork objects with the image ID and image URL if the image ID is not provided
+   * @param caipNetworks - The array of CaipNetwork objects to extend
+   * @param params - The parameters object
+   * @param params.networkImageIds - The network image IDs
+   * @param params.customNetworkImageUrls - The custom network image URLs
+   * @param params.projectId - The project ID
+   * @returns The extended array of CaipNetwork objects
+   */
+  extendCaipNetworks(
+    caipNetworks: AppKitNetwork[],
+    { customNetworkImageUrls, projectId }: ExtendCaipNetworkParams
+  ) {
+    return caipNetworks.map(caipNetwork =>
+      CaipNetworksUtil.extendCaipNetwork(caipNetwork, {
+        customNetworkImageUrls,
+        projectId
+      })
+    ) as [CaipNetwork, ...CaipNetwork[]]
+  }
+}
diff --git a/packages/appkit-utils/src/ethers/EthersHelpersUtil.ts b/packages/appkit-utils/src/ethers/EthersHelpersUtil.ts
index 2c87ed0a00..2949118467 100644
--- a/packages/appkit-utils/src/ethers/EthersHelpersUtil.ts
+++ b/packages/appkit-utils/src/ethers/EthersHelpersUtil.ts
@@ -1,22 +1,8 @@
-import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common'
 import type { CaipNetwork } from '@reown/appkit-common'
-import { ConstantsUtil } from '../ConstantsUtil.js'
 import { PresetsUtil } from '../PresetsUtil.js'
 import type { Provider } from './EthersTypesUtil.js'
 
 export const EthersHelpersUtil = {
-  getCaipDefaultChain(chain?: CaipNetwork) {
-    if (!chain) {
-      return undefined
-    }
-
-    return {
-      id: `${ConstantsUtil.EIP155}:${chain.chainId}`,
-      name: chain.name,
-      imageId: PresetsUtil.NetworkImageIds[chain.chainId],
-      chainNamespace: CommonConstantsUtil.CHAIN.EVM
-    } as CaipNetwork
-  },
   hexStringToNumber(value: string) {
     const string = value.startsWith('0x') ? value.slice(2) : value
     const number = parseInt(string, 16)
@@ -54,16 +40,12 @@ export const EthersHelpersUtil = {
       method: 'wallet_addEthereumChain',
       params: [
         {
-          chainId: EthersHelpersUtil.numberToHexString(caipNetwork.chainId),
-          rpcUrls: [caipNetwork.rpcUrl],
+          chainId: EthersHelpersUtil.numberToHexString(caipNetwork.id),
+          rpcUrls: caipNetwork.rpcUrls.default.http,
           chainName: caipNetwork.name,
-          nativeCurrency: {
-            name: caipNetwork.currency,
-            decimals: 18,
-            symbol: caipNetwork.currency
-          },
-          blockExplorerUrls: [caipNetwork.explorerUrl],
-          iconUrls: [PresetsUtil.NetworkImageIds[caipNetwork.chainId]]
+          nativeCurrency: caipNetwork.nativeCurrency,
+          blockExplorerUrls: caipNetwork.blockExplorers,
+          iconUrls: [PresetsUtil.NetworkImageIds[caipNetwork.id]]
         }
       ]
     })
diff --git a/packages/appkit-utils/src/solana/SolanaConstantsUtil.ts b/packages/appkit-utils/src/solana/SolanaConstantsUtil.ts
index 3c03554ad3..43659fc430 100644
--- a/packages/appkit-utils/src/solana/SolanaConstantsUtil.ts
+++ b/packages/appkit-utils/src/solana/SolanaConstantsUtil.ts
@@ -22,13 +22,26 @@ export const SolConstantsUtil = {
   ERROR_CODE_UNRECOGNIZED_CHAIN_ID: 4902,
   ERROR_CODE_DEFAULT: 5000,
   DEFAULT_CHAIN: {
-    id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-    chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    caipNetworkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
     name: 'Solana',
     chainNamespace: ConstantsUtil.CHAIN.SOLANA,
-    currency: 'SOL',
-    explorerUrl: 'https://solscan.io',
-    rpcUrl: `${ConstantsUtil.BLOCKCHAIN_API_RPC_URL}/v1`
+    nativeCurrency: {
+      name: 'Solana',
+      decimals: 9,
+      symbol: 'SOL'
+    },
+    blockExplorers: {
+      default: {
+        name: 'Solscan',
+        url: 'https://solscan.io'
+      }
+    },
+    rpcUrls: {
+      default: {
+        http: [`${ConstantsUtil.BLOCKCHAIN_API_RPC_URL}/v1`]
+      }
+    }
   } as CaipNetwork,
   CHAIN_IDS: {
     Mainnet: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
diff --git a/packages/appkit-utils/src/solana/SolanaHelpersUtils.ts b/packages/appkit-utils/src/solana/SolanaHelpersUtils.ts
index 58da7a1d5e..17d1deda51 100644
--- a/packages/appkit-utils/src/solana/SolanaHelpersUtils.ts
+++ b/packages/appkit-utils/src/solana/SolanaHelpersUtils.ts
@@ -12,15 +12,19 @@ const NetworkImageIds = {
 
 export const SolHelpersUtil = {
   detectRpcUrl(chain: CaipNetwork, projectId: string) {
-    if (chain.rpcUrl.includes(new URL(CommonConstantsUtil.BLOCKCHAIN_API_RPC_URL).hostname)) {
-      return `${chain.rpcUrl}?chainId=solana:${chain.chainId}&projectId=${projectId}`
+    if (
+      chain.rpcUrls.default.http[0]?.includes(
+        new URL(CommonConstantsUtil.BLOCKCHAIN_API_RPC_URL).hostname
+      )
+    ) {
+      return `${chain.rpcUrls.default.http[0]}?chainId=solana:${chain.id}&projectId=${projectId}`
     }
 
-    return chain.rpcUrl
+    return chain.rpcUrls.default.http[0]
   },
 
   getChain(chains: CaipNetwork[], chainId: string | null) {
-    const chain = chains.find(lChain => lChain.chainId === chainId)
+    const chain = chains.find(lChain => lChain.id === chainId)
 
     if (chain) {
       return chain
@@ -32,7 +36,7 @@ export const SolHelpersUtil = {
   getChainFromCaip(chains: CaipNetwork[], chainCaipId: string | undefined | null = ':') {
     const chainId: string = (chainCaipId?.split(':')[1] ?? '').replace(/\s/gu, '')
 
-    const selectedChain = chains.find(chain => chain.chainId === chainId)
+    const selectedChain = chains.find(chain => chain.id === chainId)
 
     if (selectedChain) {
       return {
@@ -51,19 +55,6 @@ export const SolHelpersUtil = {
     } as CaipNetwork
   },
 
-  getCaipDefaultChain(chain?: CaipNetwork) {
-    if (!chain) {
-      return undefined
-    }
-
-    return {
-      id: `solana:${chain.chainId}`,
-      name: chain.name,
-      imageId: NetworkImageIds[chain.chainId],
-      chainNamespace: CommonConstantsUtil.CHAIN.SOLANA
-    } as CaipNetwork
-  },
-
   hexStringToNumber(value: string) {
     const hexString = value.startsWith('0x') ? value.slice(2) : value
     const decimalValue = parseInt(hexString, 16)
diff --git a/packages/appkit-utils/tests/EthersHelpersUtil.test.ts b/packages/appkit-utils/tests/EthersHelpersUtil.test.ts
index 8686113526..29bb2fc47c 100644
--- a/packages/appkit-utils/tests/EthersHelpersUtil.test.ts
+++ b/packages/appkit-utils/tests/EthersHelpersUtil.test.ts
@@ -1,38 +1,8 @@
 import { describe, it, expect, vi } from 'vitest'
 import { EthersHelpersUtil } from '../src/ethers/EthersHelpersUtil.js'
-import { ConstantsUtil } from '../src/ConstantsUtil.js'
-import { PresetsUtil } from '../src/PresetsUtil.js'
-import type { CaipNetwork } from '@reown/appkit-common'
-import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common'
 import type { Provider } from '../src/ethers/EthersTypesUtil.js'
 
 describe('EthersHelpersUtil', () => {
-  describe('getCaipDefaultChain', () => {
-    it('should return undefined for undefined input', () => {
-      const result = EthersHelpersUtil.getCaipDefaultChain(undefined)
-      expect(result).toBeUndefined()
-    })
-
-    it('should convert chain to CAIP format', () => {
-      const mockChain: CaipNetwork = {
-        id: 'eip155:1',
-        name: 'Ethereum',
-        chainId: '1',
-        chainNamespace: CommonConstantsUtil.CHAIN.EVM,
-        rpcUrl: 'https://mainnet.infura.io/v3/',
-        currency: 'ETH',
-        explorerUrl: ''
-      }
-      const result = EthersHelpersUtil.getCaipDefaultChain(mockChain)
-      expect(result).toEqual({
-        id: `${ConstantsUtil.EIP155}:1`,
-        name: 'Ethereum',
-        imageId: PresetsUtil.NetworkImageIds['1'],
-        chainNamespace: CommonConstantsUtil.CHAIN.EVM
-      })
-    })
-  })
-
   describe('hexStringToNumber', () => {
     it('should convert hex string to number', () => {
       expect(EthersHelpersUtil.hexStringToNumber('0xa')).toBe(10)
diff --git a/packages/appkit-utils/tests/SolanaHelpersUtil.test.ts b/packages/appkit-utils/tests/SolanaHelpersUtil.test.ts
index 777615d959..6b741026a2 100644
--- a/packages/appkit-utils/tests/SolanaHelpersUtil.test.ts
+++ b/packages/appkit-utils/tests/SolanaHelpersUtil.test.ts
@@ -8,22 +8,48 @@ import type { Provider } from '../src/solana/SolanaTypesUtil.js'
 describe('SolHelpersUtil', () => {
   const mockChains: CaipNetwork[] = [
     {
-      id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+      id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
       name: 'Solana Mainnet',
-      chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+      caipNetworkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
       chainNamespace: CommonConstantsUtil.CHAIN.SOLANA,
-      rpcUrl: 'https://api.mainnet-beta.solana.com',
-      currency: 'SOL',
-      explorerUrl: ''
+      rpcUrls: {
+        default: {
+          http: ['https://api.mainnet-beta.solana.com']
+        }
+      },
+      nativeCurrency: {
+        name: 'Solana',
+        decimals: 9,
+        symbol: 'SOL'
+      },
+      blockExplorers: {
+        default: {
+          name: 'Solscan',
+          url: 'https://solscan.io'
+        }
+      }
     },
     {
-      id: 'solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
+      id: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
       name: 'Solana Testnet',
-      chainId: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
+      caipNetworkId: 'solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
       chainNamespace: CommonConstantsUtil.CHAIN.SOLANA,
-      rpcUrl: 'https://api.testnet.solana.com',
-      currency: 'SOL',
-      explorerUrl: ''
+      rpcUrls: {
+        default: {
+          http: ['https://api.testnet.solana.com']
+        }
+      },
+      nativeCurrency: {
+        name: 'Solana',
+        decimals: 9,
+        symbol: 'SOL'
+      },
+      blockExplorers: {
+        default: {
+          name: 'Solscan',
+          url: 'https://solscan.io'
+        }
+      }
     }
   ]
 
@@ -35,14 +61,14 @@ describe('SolHelpersUtil', () => {
       } as CaipNetwork
       const projectId = 'test-project-id'
       const result = SolHelpersUtil.detectRpcUrl(chain, projectId)
-      expect(result).toBe(chain.rpcUrl)
+      expect(result).toBe(chain.rpcUrls.default.http[0])
     })
 
     it('should return original RPC URL for non-blockchain API URLs', () => {
       const chain = mockChains[0]
       const projectId = 'test-project-id'
       const result = SolHelpersUtil.detectRpcUrl(chain!, projectId)
-      expect(result).toBe(chain?.rpcUrl)
+      expect(result).toBe(chain?.rpcUrls.default.http[0])
     })
   })
 
@@ -83,23 +109,6 @@ describe('SolHelpersUtil', () => {
     })
   })
 
-  describe('getCaipDefaultChain', () => {
-    it('should return undefined for undefined input', () => {
-      const result = SolHelpersUtil.getCaipDefaultChain(undefined)
-      expect(result).toBeUndefined()
-    })
-
-    it('should convert chain to CAIP format', () => {
-      const result = SolHelpersUtil.getCaipDefaultChain(mockChains[0])
-      expect(result).toEqual({
-        id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-        name: 'Solana Mainnet',
-        imageId: 'a1b58899-f671-4276-6a5e-56ca5bd59700',
-        chainNamespace: CommonConstantsUtil.CHAIN.SOLANA
-      })
-    })
-  })
-
   describe('hexStringToNumber', () => {
     it('should convert hex string to number', () => {
       expect(SolHelpersUtil.hexStringToNumber('0xa')).toBe(10)
diff --git a/packages/appkit/package.json b/packages/appkit/package.json
index b7888473e6..3c93e6db8b 100644
--- a/packages/appkit/package.json
+++ b/packages/appkit/package.json
@@ -93,14 +93,15 @@
     "@reown/appkit-core": "workspace:*",
     "@reown/appkit-polyfills": "workspace:*",
     "@reown/appkit-scaffold-ui": "workspace:*",
-    "@reown/appkit-utils": "workspace:*",
     "@reown/appkit-siwe": "workspace:*",
     "@reown/appkit-ui": "workspace:*",
+    "@reown/appkit-utils": "workspace:*",
     "@reown/appkit-wallet": "workspace:*",
     "@walletconnect/types": "2.17.0",
     "@walletconnect/utils": "2.17.0",
     "@walletconnect/universal-provider": "2.17.0",
-    "valtio": "1.11.2"
+    "valtio": "1.11.2",
+    "viem": "2.x"
   },
   "devDependencies": {
     "@types/react": "18.2.0",
@@ -112,7 +113,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "vitest": "2.0.5",
-    "vue": "3.4.3"
+    "vue": "3.x"
   },
   "author": "Reown <support@reown.com> (https://reown.com)",
   "license": "Apache-2.0",
diff --git a/packages/appkit/src/client.ts b/packages/appkit/src/client.ts
index a10eff2992..0efee3b1e1 100644
--- a/packages/appkit/src/client.ts
+++ b/packages/appkit/src/client.ts
@@ -32,13 +32,12 @@ import {
   ConstantsUtil,
   type CaipNetwork,
   type ChainNamespace,
-  CaipNetworksUtil,
   SafeLocalStorage,
   SafeLocalStorageKeys
 } from '@reown/appkit-common'
 import type { AppKitOptions } from './utils/TypesUtil.js'
 import { UniversalAdapterClient } from './universal-adapter/client.js'
-import { ErrorUtil, PresetsUtil } from '@reown/appkit-utils'
+import { CaipNetworksUtil, ErrorUtil } from '@reown/appkit-utils'
 import type { W3mFrameTypes } from '@reown/appkit-wallet'
 import { ProviderUtil } from './store/ProviderUtil.js'
 
@@ -67,6 +66,10 @@ export class AppKit {
 
   private initPromise?: Promise<void> = undefined
 
+  private caipNetworks: [CaipNetwork, ...CaipNetwork[]]
+
+  private defaultCaipNetwork?: CaipNetwork
+
   public constructor(
     options: AppKitOptions & {
       adapters?: ChainAdapter[]
@@ -76,6 +79,8 @@ export class AppKit {
   ) {
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     this.adapter = options.adapters?.[0] as ChainAdapter
+    this.caipNetworks = this.extendCaipNetworks(options)
+    this.defaultCaipNetwork = this.extendDefaultCaipNetwork(options)
     this.initControllers(options)
     this.initOrContinue()
     this.version = options.sdkVersion
@@ -106,7 +111,7 @@ export class AppKit {
   }
 
   public getChainId() {
-    return ChainController.state.activeCaipNetwork?.chainId
+    return ChainController.state.activeCaipNetwork?.id
   }
 
   public switchNetwork(caipNetwork: CaipNetwork) {
@@ -302,6 +307,16 @@ export class AppKit {
     return ChainController.state.activeCaipNetwork
   }
 
+  public getCaipNetworkId = <T extends number | string>(): T | undefined => {
+    const network = this.getCaipNetwork()
+
+    if (network) {
+      return network.id as T
+    }
+
+    return undefined
+  }
+
   public getCaipNetworks = (namespace: ChainNamespace) =>
     ChainController.getRequestedCaipNetworks(namespace)
 
@@ -433,10 +448,9 @@ export class AppKit {
     this.adapters = options.adapters
 
     this.setMetadata(options)
-    this.extendCaipNetworks(options)
     this.initializeUniversalAdapter(options)
     this.initializeAdapters(options)
-    this.setDefaultNetwork(options)
+    this.setDefaultNetwork()
 
     OptionsController.setAllWallets(options.allWallets)
     OptionsController.setIncludeWalletIds(options.includeWalletIds)
@@ -497,42 +511,59 @@ export class AppKit {
   }
 
   private extendCaipNetworks(options: AppKitOptions) {
-    options.networks = CaipNetworksUtil.extendCaipNetworks(options.networks, {
-      networkImageIds: PresetsUtil.NetworkImageIds,
+    const extendedNetworks = CaipNetworksUtil.extendCaipNetworks(options.networks, {
       customNetworkImageUrls: options.chainImages,
       projectId: options.projectId
     })
-    options.defaultNetwork = options.networks.find(n => n.id === options.defaultNetwork?.id)
+
+    return extendedNetworks
+  }
+
+  private extendDefaultCaipNetwork(options: AppKitOptions) {
+    const defaultNetwork = options.networks.find(n => n.id === options.defaultNetwork?.id)
+    const extendedNetwork = defaultNetwork
+      ? CaipNetworksUtil.extendCaipNetwork(defaultNetwork, {
+          customNetworkImageUrls: options.chainImages,
+          projectId: options.projectId
+        })
+      : undefined
+
+    return extendedNetwork
   }
 
   private initializeUniversalAdapter(options: AppKitOptions) {
-    this.universalAdapter = new UniversalAdapterClient(options)
+    const extendedOptions = {
+      ...options,
+      networks: this.caipNetworks,
+      defaultNetwork: this.defaultCaipNetwork
+    }
+
+    this.universalAdapter = new UniversalAdapterClient(extendedOptions)
     ChainController.initializeUniversalAdapter(this.universalAdapter, options.adapters || [])
-    this.universalAdapter.construct?.(this, options)
+    this.universalAdapter.construct?.(this, extendedOptions)
   }
 
   private initializeAdapters(options: AppKitOptions) {
+    const extendedOptions = {
+      ...options,
+      networks: this.caipNetworks,
+      defaultNetwork: this.defaultCaipNetwork
+    }
+
     ChainController.initialize(options.adapters || [])
     options.adapters?.forEach(adapter => {
       // @ts-expect-error will introduce construct later
-      adapter.construct?.(this, options)
+      adapter.construct?.(this, extendedOptions)
     })
   }
 
-  private setDefaultNetwork(options: AppKitOptions) {
-    const extendedDefaultNetwork = options.defaultNetwork
-      ? CaipNetworksUtil.extendCaipNetwork(options.defaultNetwork, {
-          networkImageIds: PresetsUtil.NetworkImageIds,
-          customNetworkImageUrls: options.chainImages,
-          projectId: options.projectId
-        })
-      : undefined
+  private setDefaultNetwork() {
     const previousNetwork = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID)
     const caipNetwork = previousNetwork
-      ? options.networks.find(n => n.id === previousNetwork)
+      ? this.caipNetworks.find(n => n.caipNetworkId === previousNetwork)
       : undefined
 
-    const network = caipNetwork ?? extendedDefaultNetwork ?? options.networks[0]
+    const network = caipNetwork || this.defaultCaipNetwork || this.caipNetworks[0]
     ChainController.setActiveCaipNetwork(network)
   }
 
diff --git a/packages/appkit/src/library/react/index.ts b/packages/appkit/src/library/react/index.ts
index ea9674fceb..b86a19e0c9 100644
--- a/packages/appkit/src/library/react/index.ts
+++ b/packages/appkit/src/library/react/index.ts
@@ -40,6 +40,9 @@ export function getAppKit(appKit: AppKit) {
   }
 }
 
+// -- Core Hooks ---------------------------------------------------------------
+export * from '@reown/appkit-core/react'
+
 export function useAppKitProvider<T>(chainNamespace: ChainNamespace) {
   const { providers, providerIds } = useSnapshot(ProviderUtil.state)
 
diff --git a/packages/appkit/src/library/vue/index.ts b/packages/appkit/src/library/vue/index.ts
index 8c073d414d..9bc7c230a7 100644
--- a/packages/appkit/src/library/vue/index.ts
+++ b/packages/appkit/src/library/vue/index.ts
@@ -1,5 +1,5 @@
 import { onUnmounted, reactive, ref } from 'vue'
-import { AccountController, ChainController, CoreHelperUtil, type Event } from '@reown/appkit-core'
+import { type Event } from '@reown/appkit-core'
 import type {
   W3mAccountButton,
   W3mButton,
@@ -12,6 +12,11 @@ import type { AppKitOptions } from '../../utils/TypesUtil.js'
 import { ProviderUtil } from '../../store/ProviderUtil.js'
 import type { ChainNamespace } from '@reown/appkit-common'
 
+export interface AppKitEvent {
+  timestamp: number
+  data: Event
+}
+
 type OpenOptions = {
   view: 'Account' | 'Connect' | 'Networks' | 'ApproveTransaction' | 'OnRampProviders'
 }
@@ -38,19 +43,8 @@ export function getAppKit(appKit: AppKit) {
   }
 }
 
-export function useAppKitAccount() {
-  const state = ref(ChainController.state)
-  const accountState = ref(AccountController.state)
-  const { activeCaipAddress } = state.value
-  const { status } = accountState.value
-
-  return {
-    caipAddress: activeCaipAddress,
-    address: CoreHelperUtil.getPlainAddress(activeCaipAddress),
-    isConnected: Boolean(activeCaipAddress),
-    status
-  }
-}
+// -- Core Hooks ---------------------------------------------------------------
+export * from '@reown/appkit-core/vue'
 
 export function useAppKitProvider<T>(chainNamespace: ChainNamespace) {
   const state = ref(ProviderUtil.state)
@@ -160,11 +154,6 @@ export function useAppKitState() {
   return reactive({ open, selectedNetworkId })
 }
 
-export interface AppKitEvent {
-  timestamp: number
-  data: Event
-}
-
 export function useAppKitEvents(): AppKitEvent {
   if (!modal) {
     throw new Error('Please call "createAppKit" before using "useAppKitEvents" composable')
diff --git a/packages/appkit/src/networks/index.ts b/packages/appkit/src/networks/index.ts
index cbdaa4dd15..b6838731c7 100644
--- a/packages/appkit/src/networks/index.ts
+++ b/packages/appkit/src/networks/index.ts
@@ -1,195 +1,6 @@
-import type { CaipNetwork, ChainNamespace } from '@reown/appkit-common'
+// -- Networks ---------------------------------------------------------------
+export * from 'viem/chains'
+export * from './solana/index.js'
 
-export function getBlockchainApiRpcUrl(chainId: number | string, namespace: ChainNamespace) {
-  return `https://rpc.walletconnect.org/v1/?chainId=${namespace}:${chainId}`
-}
-
-export const mainnet: CaipNetwork = {
-  id: 'eip155:1',
-  chainId: 1,
-  name: 'Ethereum',
-  currency: 'ETH',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: getBlockchainApiRpcUrl(1, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const arbitrum: CaipNetwork = {
-  id: 'eip155:42161',
-  chainId: 42161,
-  name: 'Arbitrum',
-  currency: 'ETH',
-  explorerUrl: 'https://arbiscan.io',
-  rpcUrl: getBlockchainApiRpcUrl(42161, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const avalanche: CaipNetwork = {
-  id: 'eip155:43114',
-  chainId: 43114,
-  name: 'Avalanche',
-  currency: 'AVAX',
-  explorerUrl: 'https://snowtrace.io',
-  rpcUrl: getBlockchainApiRpcUrl(43114, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const binanceSmartChain: CaipNetwork = {
-  id: 'eip155:56',
-  chainId: 56,
-  name: 'Binance Smart Chain',
-  currency: 'BNB',
-  explorerUrl: 'https://bscscan.com',
-  rpcUrl: getBlockchainApiRpcUrl(56, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const optimism: CaipNetwork = {
-  id: 'eip155:10',
-  chainId: 10,
-  name: 'Optimism',
-  currency: 'ETH',
-  explorerUrl: 'https://optimistic.etherscan.io',
-  rpcUrl: getBlockchainApiRpcUrl(10, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const polygon: CaipNetwork = {
-  id: 'eip155:137',
-  chainId: 137,
-  name: 'Polygon',
-  currency: 'MATIC',
-  explorerUrl: 'https://polygonscan.com',
-  rpcUrl: getBlockchainApiRpcUrl(137, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const gnosis: CaipNetwork = {
-  id: 'eip155:100',
-  chainId: 100,
-  name: 'Gnosis',
-  currency: 'xDAI',
-  explorerUrl: 'https://gnosis.blockscout.com',
-  rpcUrl: getBlockchainApiRpcUrl(100, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const zkSync: CaipNetwork = {
-  id: 'eip155:324',
-  chainId: 324,
-  name: 'ZkSync',
-  currency: 'ETH',
-  explorerUrl: 'https://explorer.zksync.io',
-  rpcUrl: getBlockchainApiRpcUrl(324, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const zora: CaipNetwork = {
-  id: 'eip155:7777777',
-  chainId: 7777777,
-  name: 'Zora',
-  currency: 'ETH',
-  explorerUrl: 'https://explorer.zora.energy',
-  rpcUrl: getBlockchainApiRpcUrl(7777777, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const celo: CaipNetwork = {
-  id: 'eip155:42220',
-  chainId: 42220,
-  name: 'Celo',
-  currency: 'CELO',
-  explorerUrl: 'https://explorer.celo.org/mainnet',
-  rpcUrl: getBlockchainApiRpcUrl(42220, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const base: CaipNetwork = {
-  id: 'eip155:8453',
-  chainId: 8453,
-  name: 'Base',
-  currency: 'BASE',
-  explorerUrl: 'https://basescan.org',
-  rpcUrl: getBlockchainApiRpcUrl(8453, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const aurora: CaipNetwork = {
-  id: 'eip155:1313161554',
-  chainId: 1313161554,
-  name: 'Aurora',
-  currency: 'ETH',
-  explorerUrl: 'https://explorer.aurora.dev',
-  rpcUrl: getBlockchainApiRpcUrl(1313161554, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const sepolia: CaipNetwork = {
-  id: 'eip155:11155111',
-  chainId: 11155111,
-  name: 'Sepolia',
-  currency: 'ETH',
-  explorerUrl: 'https://sepolia.etherscan.io',
-  rpcUrl: getBlockchainApiRpcUrl(11155111, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const baseSepolia: CaipNetwork = {
-  id: 'eip155:84532',
-  chainId: 84532,
-  name: 'Base Sepolia',
-  currency: 'BASE',
-  explorerUrl: 'https://sepolia.basescan.org',
-  rpcUrl: getBlockchainApiRpcUrl(84532, 'eip155'),
-  chainNamespace: 'eip155'
-}
-
-export const solana: CaipNetwork = {
-  id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-  chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-  name: 'Solana',
-  currency: 'SOL',
-  explorerUrl: 'https://solscan.io',
-  rpcUrl: getBlockchainApiRpcUrl('5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp', 'solana'),
-  chainNamespace: 'solana'
-}
-
-export const solanaTestnet: CaipNetwork = {
-  id: 'solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
-  chainId: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
-  name: 'Solana Testnet',
-  currency: 'SOL',
-  explorerUrl: 'https://explorer.solana.com/?cluster=testnet',
-  rpcUrl: getBlockchainApiRpcUrl('4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z', 'solana'),
-  chainNamespace: 'solana'
-}
-
-export const solanaDevnet: CaipNetwork = {
-  id: 'solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
-  chainId: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
-  name: 'Solana Devnet',
-  currency: 'SOL',
-  explorerUrl: 'https://explorer.solana.com/?cluster=devnet',
-  rpcUrl: getBlockchainApiRpcUrl('EtWTRABZaYq6iMfeYKouRu166VU2xqa1', 'solana'),
-  chainNamespace: 'solana'
-}
-
-export const allChains = [
-  mainnet,
-  arbitrum,
-  avalanche,
-  binanceSmartChain,
-  optimism,
-  polygon,
-  gnosis,
-  zkSync,
-  zora,
-  celo,
-  base,
-  aurora,
-  sepolia,
-  baseSepolia,
-  solana,
-  solanaTestnet,
-  solanaDevnet
-]
+// -- Types ---------------------------------------------------------------
+export type { AppKitNetwork } from '@reown/appkit-common'
diff --git a/packages/appkit/src/networks/solana/index.ts b/packages/appkit/src/networks/solana/index.ts
new file mode 100644
index 0000000000..a36555bf8e
--- /dev/null
+++ b/packages/appkit/src/networks/solana/index.ts
@@ -0,0 +1,3 @@
+export * from './solana.js'
+export * from './solanaDevnet.js'
+export * from './solanaTestnet.js'
diff --git a/packages/appkit/src/networks/solana/solana.ts b/packages/appkit/src/networks/solana/solana.ts
new file mode 100644
index 0000000000..a64538ca7b
--- /dev/null
+++ b/packages/appkit/src/networks/solana/solana.ts
@@ -0,0 +1,15 @@
+import { defineChain } from '../utils.js'
+
+export const solana = defineChain({
+  id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  name: 'Solana',
+  network: 'solana-mainnet',
+  nativeCurrency: { name: 'Solana', symbol: 'SOL', decimals: 9 },
+  rpcUrls: {
+    default: { http: ['https://rpc.walletconnect.org/v1'] }
+  },
+  blockExplorers: { default: { name: 'Solscan', url: 'https://solscan.io' } },
+  testnet: false,
+  chainNamespace: 'solana',
+  caipNetworkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
+})
diff --git a/packages/appkit/src/networks/solana/solanaDevnet.ts b/packages/appkit/src/networks/solana/solanaDevnet.ts
new file mode 100644
index 0000000000..ae24a51503
--- /dev/null
+++ b/packages/appkit/src/networks/solana/solanaDevnet.ts
@@ -0,0 +1,15 @@
+import { defineChain } from '../utils.js'
+
+export const solanaDevnet = defineChain({
+  id: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
+  name: 'Solana Devnet',
+  network: 'solana-devnet',
+  nativeCurrency: { name: 'Solana', symbol: 'SOL', decimals: 9 },
+  rpcUrls: {
+    default: { http: ['https://rpc.walletconnect.org/v1'] }
+  },
+  blockExplorers: { default: { name: 'Solscan', url: 'https://solscan.io' } },
+  testnet: true,
+  chainNamespace: 'solana',
+  caipNetworkId: 'solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1'
+})
diff --git a/packages/appkit/src/networks/solana/solanaTestnet.ts b/packages/appkit/src/networks/solana/solanaTestnet.ts
new file mode 100644
index 0000000000..33aa6fe29c
--- /dev/null
+++ b/packages/appkit/src/networks/solana/solanaTestnet.ts
@@ -0,0 +1,15 @@
+import { defineChain } from '../utils.js'
+
+export const solanaTestnet = defineChain({
+  id: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
+  name: 'Solana Testnet',
+  network: 'solana-testnet',
+  nativeCurrency: { name: 'Solana', symbol: 'SOL', decimals: 9 },
+  rpcUrls: {
+    default: { http: ['https://rpc.walletconnect.org/v1'] }
+  },
+  blockExplorers: { default: { name: 'Solscan', url: 'https://solscan.io' } },
+  testnet: true,
+  chainNamespace: 'solana',
+  caipNetworkId: 'solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z'
+})
diff --git a/packages/appkit/src/networks/utils.ts b/packages/appkit/src/networks/utils.ts
new file mode 100644
index 0000000000..59ba152d96
--- /dev/null
+++ b/packages/appkit/src/networks/utils.ts
@@ -0,0 +1,14 @@
+import type { Assign, Prettify, ChainFormatters } from 'viem'
+import type { CaipNetwork } from '@reown/appkit-common'
+
+export function defineChain<
+  formatters extends ChainFormatters,
+  const chain extends CaipNetwork<formatters>
+>(chain: chain): Prettify<Assign<CaipNetwork<undefined>, chain>> {
+  return {
+    formatters: undefined,
+    fees: undefined,
+    serializers: undefined,
+    ...chain
+  } as Assign<CaipNetwork<undefined>, chain>
+}
diff --git a/packages/appkit/src/tests/mocks/UniversalProvider.ts b/packages/appkit/src/tests/mocks/UniversalProvider.ts
index 1a2c67698e..a2e81bb321 100644
--- a/packages/appkit/src/tests/mocks/UniversalProvider.ts
+++ b/packages/appkit/src/tests/mocks/UniversalProvider.ts
@@ -27,7 +27,7 @@ export const mockProvider = {
         'wallet_switchEthereumChain'
       ],
       rpcMap: {
-        '1': 'https://rpc.walletconnect.org/v1/?chainId=eip155:1'
+        '1': 'https://rpc.walletconnect.org/v1/?chainId=eip155%3A1&projectId=test-project-id'
       }
     },
     solana: {
@@ -43,7 +43,7 @@ export const mockProvider = {
       events: ['accountsChanged', 'chainChanged'],
       rpcMap: {
         '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp':
-          'https://rpc.walletconnect.org/v1/?chainId=solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
+          'https://rpc.walletconnect.org/v1/?chainId=solana%3A5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp&projectId=test-project-id'
       }
     }
   },
diff --git a/packages/appkit/src/tests/universal-adapter.test.ts b/packages/appkit/src/tests/universal-adapter.test.ts
index 52bffc0062..558d2466cf 100644
--- a/packages/appkit/src/tests/universal-adapter.test.ts
+++ b/packages/appkit/src/tests/universal-adapter.test.ts
@@ -1,21 +1,33 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'
-import { mainnet, solana } from '../networks'
+import { mainnet as mainnetAppKit, solana as solanaAppKit } from '../networks'
 import { UniversalAdapterClient } from '../universal-adapter'
 import { mockOptions } from './mocks/Options'
 import mockProvider from './mocks/UniversalProvider'
 import type UniversalProvider from '@walletconnect/universal-provider'
 import { ChainController } from '@reown/appkit-core'
 import { ProviderUtil } from '../store/index.js'
-import { ConstantsUtil, PresetsUtil } from '@reown/appkit-utils'
+import { CaipNetworksUtil, ConstantsUtil, PresetsUtil } from '@reown/appkit-utils'
 import mockAppKit from './mocks/AppKit'
+import type { CaipNetwork } from '@reown/appkit-common'
+
+const [mainnet, solana] = CaipNetworksUtil.extendCaipNetworks([mainnetAppKit, solanaAppKit], {
+  customNetworkImageUrls: {},
+  projectId: 'test-project-id'
+})
+
+const mockOptionsExtended = {
+  ...mockOptions,
+  networks: [mainnet, solana] as [CaipNetwork, ...CaipNetwork[]],
+  defaultNetwork: mainnet
+}
 
 describe('UniversalAdapter', () => {
   let universalAdapter: UniversalAdapterClient
 
   beforeEach(() => {
-    universalAdapter = new UniversalAdapterClient(mockOptions)
+    universalAdapter = new UniversalAdapterClient(mockOptionsExtended)
     universalAdapter.walletConnectProvider = mockProvider
-    universalAdapter.construct(mockAppKit, mockOptions)
+    universalAdapter.construct(mockAppKit, mockOptionsExtended)
   })
 
   afterEach(() => {
@@ -24,11 +36,7 @@ describe('UniversalAdapter', () => {
 
   describe('UniversalAdapter - Initialization', () => {
     it('should set caipNetworks to provided caipNetworks options', () => {
-      expect(universalAdapter?.caipNetworks).toEqual(mockOptions.networks)
-    })
-
-    it('should set defaultNetwork to first caipNetwork option', () => {
-      expect(universalAdapter?.defaultNetwork).toEqual(mockOptions.networks[0])
+      expect(universalAdapter?.caipNetworks).toEqual(mockOptionsExtended.networks)
     })
 
     it('should set metadata to metadata options', () => {
@@ -39,6 +47,7 @@ describe('UniversalAdapter', () => {
   describe('UniversalAdapter - Public Methods', () => {
     it('should return walletConnectProvider when getWalletConnectProvider is invoked', async () => {
       const switchNetworkSpy = vi.spyOn(universalAdapter, 'switchNetwork')
+      const mainnet = universalAdapter.caipNetworks[0]
       await universalAdapter.networkControllerClient.switchCaipNetwork(mainnet)
       expect(switchNetworkSpy).toHaveBeenCalledWith(mainnet)
     })
@@ -76,7 +85,8 @@ describe('UniversalAdapter', () => {
     })
 
     it('should set correct requestedCaipNetworks in AppKit when syncRequestedNetworks has been called', () => {
-      ;(universalAdapter as any).syncRequestedNetworks(mockOptions.networks)
+      ;(universalAdapter as any).syncRequestedNetworks(mockOptionsExtended.networks)
+      const mainnet = universalAdapter.caipNetworks[0]
       expect(mockAppKit.setRequestedCaipNetworks).toHaveBeenCalledWith([mainnet], 'eip155')
       expect(mockAppKit.setRequestedCaipNetworks).toHaveBeenCalledWith([solana], 'solana')
     })
diff --git a/packages/appkit/src/tests/utils/HelpersUtil.test.ts b/packages/appkit/src/tests/utils/HelpersUtil.test.ts
index 8add47da9d..2683627bf8 100644
--- a/packages/appkit/src/tests/utils/HelpersUtil.test.ts
+++ b/packages/appkit/src/tests/utils/HelpersUtil.test.ts
@@ -1,36 +1,57 @@
 import { describe, test, expect } from 'vitest'
 import { WcHelpersUtil } from '../../utils/HelpersUtil'
-import type { CaipNetwork } from '@reown/appkit-common'
+import { ConstantsUtil, type CaipNetwork } from '@reown/appkit-common'
 import type { SessionTypes } from '@walletconnect/types'
 
 const mockEthereumNetwork = {
-  id: 'eip155:1',
-  chainNamespace: 'eip155',
-  chainId: '1',
+  id: 1,
+  chainNamespace: ConstantsUtil.CHAIN.EVM,
+  caipNetworkId: 'eip155:1',
   name: 'Ethereum',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID',
-  currency: 'ETH'
+  nativeCurrency: {
+    name: 'Ethereum',
+    decimals: 18,
+    symbol: 'ETH'
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://mainnet.infura.io/v3/YOUR-PROJECT-ID']
+    }
+  }
 } as const
 
 const mockPolygonNetwork = {
-  id: 'eip155:137',
-  chainNamespace: 'eip155',
-  chainId: '137',
+  id: 137,
+  chainNamespace: ConstantsUtil.CHAIN.EVM,
+  caipNetworkId: 'eip155:137',
   name: 'Polygon',
-  explorerUrl: 'https://polygonscan.com',
-  rpcUrl: 'https://polygon.rpc.com',
-  currency: 'MATIC'
+  nativeCurrency: {
+    name: 'Matic',
+    decimals: 18,
+    symbol: 'MATIC'
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://polygon.rpc.com']
+    }
+  }
 } as const
 
 const mockSolanaNetwork = {
-  id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-  chainNamespace: 'solana',
-  chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  chainNamespace: ConstantsUtil.CHAIN.SOLANA,
+  caipNetworkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
   name: 'Solana',
-  explorerUrl: 'https://explorer.solana.com',
-  rpcUrl: 'https://api.mainnet-beta.solana.com',
-  currency: 'SOL'
+  nativeCurrency: {
+    name: 'Solana',
+    decimals: 9,
+    symbol: 'SOL'
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://api.mainnet-beta.solana.com']
+    }
+  }
 } as const
 
 describe('WcHelpersUtil', () => {
diff --git a/packages/appkit/src/universal-adapter/client.ts b/packages/appkit/src/universal-adapter/client.ts
index 260245cc85..b6086e1fa3 100644
--- a/packages/appkit/src/universal-adapter/client.ts
+++ b/packages/appkit/src/universal-adapter/client.ts
@@ -17,9 +17,13 @@ import { WcHelpersUtil } from '../utils/HelpersUtil.js'
 import type { AppKit } from '../client.js'
 import type { SessionTypes } from '@walletconnect/types'
 import type { CaipNetwork, CaipAddress, ChainNamespace, AdapterType } from '@reown/appkit-common'
-import { SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common'
+import {
+  SafeLocalStorage,
+  SafeLocalStorageKeys,
+  ConstantsUtil as CommonConstantsUtil
+} from '@reown/appkit-common'
 import { ProviderUtil } from '../store/index.js'
-import type { AppKitOptions } from '../utils/TypesUtil.js'
+import type { AppKitOptions, AppKitOptionsWithCaipNetworks } from '../utils/TypesUtil.js'
 
 type Metadata = {
   name: string
@@ -54,7 +58,7 @@ export class UniversalAdapterClient {
 
   private appKit: AppKit | undefined = undefined
 
-  public caipNetworks: CaipNetwork[]
+  public caipNetworks: [CaipNetwork, ...CaipNetwork[]]
 
   public walletConnectProvider?: UniversalProvider
 
@@ -64,8 +68,6 @@ export class UniversalAdapterClient {
 
   public chainNamespace: ChainNamespace
 
-  public defaultNetwork: CaipNetwork | undefined = undefined
-
   public networkControllerClient: NetworkControllerClient
 
   public connectionControllerClient: ConnectionControllerClient
@@ -76,26 +78,20 @@ export class UniversalAdapterClient {
 
   public reportErrors = true
 
-  public constructor(options: AppKitOptions) {
+  public constructor(options: AppKitOptionsWithCaipNetworks) {
     const { siweConfig, metadata } = options
 
     this.caipNetworks = options.networks
 
-    this.chainNamespace = 'eip155'
+    this.chainNamespace = CommonConstantsUtil.CHAIN.EVM
 
     this.metadata = metadata
 
-    this.defaultNetwork = options.defaultNetwork || options.networks[0]
-
     this.networkControllerClient = {
       // @ts-expect-error switchCaipNetwork is async for some adapter but not for this adapter
       switchCaipNetwork: caipNetwork => {
         if (caipNetwork) {
-          try {
-            this.switchNetwork(caipNetwork)
-          } catch (error) {
-            throw new Error('networkControllerClient:switchCaipNetwork - unable to switch chain')
-          }
+          this.switchNetwork(caipNetwork)
         }
       },
 
@@ -152,19 +148,19 @@ export class UniversalAdapterClient {
             siweParams &&
             isProviderSupported &&
             isSiweParamsValid &&
-            ChainController.state.activeChain === 'eip155'
+            ChainController.state.activeChain === CommonConstantsUtil.CHAIN.EVM
           ) {
             const { SIWEController, getDidChainId, getDidAddress } = await import(
               '@reown/appkit-siwe'
             )
 
             const chains = this.caipNetworks
-              ?.filter(network => network.chainNamespace === 'eip155')
-              .map(chain => chain.id) as string[]
+              ?.filter(network => network.chainNamespace === CommonConstantsUtil.CHAIN.EVM)
+              .map(chain => chain.caipNetworkId) as string[]
 
             siweParams.chains = this.caipNetworks
-              ?.filter(network => network.chainNamespace === 'eip155')
-              .map(chain => chain.chainId) as number[]
+              ?.filter(network => network.chainNamespace === CommonConstantsUtil.CHAIN.EVM)
+              .map(chain => chain.id) as number[]
 
             const result = await WalletConnectProvider.authenticate({
               nonce: await siweConfig?.getNonce?.(),
@@ -226,8 +222,8 @@ export class UniversalAdapterClient {
 
         await this.walletConnectProvider?.disconnect()
 
-        this.appKit?.resetAccount('eip155')
-        this.appKit?.resetAccount('solana')
+        this.appKit?.resetAccount(CommonConstantsUtil.CHAIN.EVM)
+        this.appKit?.resetAccount(CommonConstantsUtil.CHAIN.SOLANA)
       },
 
       signMessage: async (message: string) => {
@@ -269,7 +265,7 @@ export class UniversalAdapterClient {
   }
 
   // -- Public ------------------------------------------------------------------
-  public construct(appkit: AppKit, options: AppKitOptions) {
+  public construct(appkit: AppKit, options: AppKitOptionsWithCaipNetworks) {
     this.appKit = appkit
     this.options = options
 
@@ -281,7 +277,7 @@ export class UniversalAdapterClient {
   public switchNetwork(caipNetwork: CaipNetwork) {
     if (caipNetwork) {
       if (this.walletConnectProvider) {
-        this.walletConnectProvider.setDefaultChain(caipNetwork.id)
+        this.walletConnectProvider.setDefaultChain(caipNetwork.caipNetworkId)
       }
     }
   }
@@ -289,8 +285,8 @@ export class UniversalAdapterClient {
   public async disconnect() {
     if (this.walletConnectProvider) {
       await (this.walletConnectProvider as unknown as UniversalProvider).disconnect()
-      this.appKit?.resetAccount('eip155')
-      this.appKit?.resetAccount('solana')
+      this.appKit?.resetAccount(CommonConstantsUtil.CHAIN.EVM)
+      this.appKit?.resetAccount(CommonConstantsUtil.CHAIN.SOLANA)
     }
   }
 
@@ -352,7 +348,7 @@ export class UniversalAdapterClient {
     await this.checkActiveWalletConnectProvider()
   }
 
-  private syncRequestedNetworks(caipNetworks: AppKitOptions['networks']) {
+  private syncRequestedNetworks(caipNetworks: CaipNetwork[]) {
     const uniqueChainNamespaces = [
       ...new Set(caipNetworks.map(caipNetwork => caipNetwork.chainNamespace))
     ]
@@ -406,7 +402,7 @@ export class UniversalAdapterClient {
           ChainController.setActiveCaipNetwork(storedCaipNetwork)
         } else if (
           !activeCaipNetwork ||
-          !ChainController.getAllApprovedCaipNetworkIds().includes(activeCaipNetwork.id)
+          !ChainController.getAllApprovedCaipNetworkIds().includes(activeCaipNetwork.caipNetworkId)
         ) {
           this.setDefaultNetwork(nameSpaces)
         }
@@ -431,7 +427,7 @@ export class UniversalAdapterClient {
           const requestedCaipNetworks = ChainController.getRequestedCaipNetworks(chainNamespace)
 
           if (requestedCaipNetworks) {
-            const network = requestedCaipNetworks.find(c => c.id === chainId)
+            const network = requestedCaipNetworks.find(c => c.caipNetworkId === chainId)
 
             if (network) {
               ChainController.setActiveCaipNetwork(network as unknown as CaipNetwork)
@@ -466,18 +462,26 @@ export class UniversalAdapterClient {
 
     const chainChanged = (chainId: number | string) => {
       // eslint-disable-next-line eqeqeq
-      const caipNetwork = this.caipNetworks.find(c => c.chainId == chainId)
+      const caipNetwork = this.caipNetworks.find(c => c.id == chainId)
       const currentCaipNetwork = this.appKit?.getCaipNetwork()
 
       if (!caipNetwork) {
+        const namespace = this.appKit?.getActiveChainNamespace() || CommonConstantsUtil.CHAIN.EVM
         ChainController.setActiveCaipNetwork({
-          chainId: Number(chainId),
-          id: `eip155:${chainId}`,
+          id: chainId,
+          caipNetworkId: `${namespace}:${chainId}`,
           name: 'Unknown Network',
-          currency: '',
-          explorerUrl: '',
-          rpcUrl: '',
-          chainNamespace: this.appKit?.getActiveChainNamespace() || 'eip155'
+          chainNamespace: namespace,
+          nativeCurrency: {
+            name: '',
+            decimals: 0,
+            symbol: ''
+          },
+          rpcUrls: {
+            default: {
+              http: []
+            }
+          }
         })
 
         return
@@ -581,8 +585,14 @@ export class UniversalAdapterClient {
           chainNamespace
         )
       } else if (currentActiveWallet) {
-        this.appKit?.setConnectedWalletInfo({ name: currentActiveWallet }, 'eip155')
-        this.appKit?.setConnectedWalletInfo({ name: currentActiveWallet }, 'solana')
+        this.appKit?.setConnectedWalletInfo(
+          { name: currentActiveWallet },
+          CommonConstantsUtil.CHAIN.EVM
+        )
+        this.appKit?.setConnectedWalletInfo(
+          { name: currentActiveWallet },
+          CommonConstantsUtil.CHAIN.SOLANA
+        )
       }
     })
   }
diff --git a/packages/appkit/src/utils/HelpersUtil.ts b/packages/appkit/src/utils/HelpersUtil.ts
index ebc3f247dc..10da34d9cd 100644
--- a/packages/appkit/src/utils/HelpersUtil.ts
+++ b/packages/appkit/src/utils/HelpersUtil.ts
@@ -37,7 +37,8 @@ export const WcHelpersUtil = {
 
   createNamespaces(caipNetworks: CaipNetwork[]): NamespaceConfig {
     return caipNetworks.reduce<NamespaceConfig>((acc, chain) => {
-      const { chainId, chainNamespace, rpcUrl } = chain
+      const { id, chainNamespace, rpcUrls } = chain
+      const rpcUrl = rpcUrls.default.http[0]
 
       const methods = this.getMethodsByChainNamespace(chainNamespace)
 
@@ -50,15 +51,15 @@ export const WcHelpersUtil = {
         } satisfies Namespace
       }
 
-      const fullChainId = `${chainNamespace}:${chainId}`
+      const caipNetworkId = `${chainNamespace}:${id}`
 
       // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
       const namespace = acc[chainNamespace] as Namespace
 
-      namespace.chains.push(fullChainId)
+      namespace.chains.push(caipNetworkId)
 
-      if (namespace?.rpcMap) {
-        namespace.rpcMap[chainId] = rpcUrl
+      if (namespace?.rpcMap && rpcUrl) {
+        namespace.rpcMap[id] = rpcUrl
       }
 
       return acc
diff --git a/packages/appkit/src/utils/TypesUtil.ts b/packages/appkit/src/utils/TypesUtil.ts
index 877dc18c77..d9ce7c5982 100644
--- a/packages/appkit/src/utils/TypesUtil.ts
+++ b/packages/appkit/src/utils/TypesUtil.ts
@@ -1,4 +1,4 @@
-import type { CaipNetwork, ThemeVariables } from '@reown/appkit-common'
+import type { AppKitNetwork, CaipNetwork, ThemeVariables } from '@reown/appkit-common'
 import type { ChainAdapter, Metadata, OptionsControllerState, ThemeMode } from '@reown/appkit-core'
 import type { AppKitSIWEClient } from '@reown/appkit-siwe'
 
@@ -41,12 +41,12 @@ export type AppKitOptions = {
    * You can set the desired caipnetworks for the app:
    * @see https://docs.reown.com/appkit/react/core/options#defaultchain
    */
-  networks: CaipNetwork[]
+  networks: [AppKitNetwork, ...AppKitNetwork[]]
   /**
    * You can set a desired caipnetwork for the initial connection:
    * @see https://docs.reown.com/appkit/react/core/options#defaultchain
    */
-  defaultNetwork?: CaipNetwork
+  defaultNetwork?: AppKitNetwork
   /**
    * Add or override the modal's network images.
    * @see https://docs.reown.com/appkit/react/core/options#chainimages
@@ -73,3 +73,8 @@ export type AppKitOptions = {
    */
   metadata?: Metadata
 } & OptionsControllerState
+
+export type AppKitOptionsWithCaipNetworks = Omit<AppKitOptions, 'defaultNetwork' | 'networks'> & {
+  defaultNetwork?: CaipNetwork
+  networks: [CaipNetwork, ...CaipNetwork[]]
+}
diff --git a/packages/cdn/package.json b/packages/cdn/package.json
index ac801a2a0d..f189b11e04 100644
--- a/packages/cdn/package.json
+++ b/packages/cdn/package.json
@@ -31,7 +31,7 @@
     "@reown/appkit-polyfills": "workspace:*",
     "@wagmi/connectors": "5.1.9",
     "@wagmi/core": "2.13.4",
-    "viem": "2.21.4",
+    "viem": "2.x",
     "vite": "5.2.11",
     "wagmi": "2.12.9"
   }
diff --git a/packages/common/index.ts b/packages/common/index.ts
index ffdae5220e..ed4e4a1e7c 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -11,7 +11,6 @@ export { ParseUtil } from './src/utils/ParseUtil.js'
 export { SafeLocalStorage, SafeLocalStorageKeys } from './src/utils/SafeLocalStorage.js'
 export { getW3mThemeVariables } from './src/utils/ThemeUtil.js'
 export { isReownName } from './src/utils/NamesUtil.js'
-export { CaipNetworksUtil } from './src/utils/CaipNetworksUtil.js'
 
 // -- Types -------------------------------------------------------------------
 export type * from './src/utils/ThemeUtil.js'
diff --git a/packages/common/package.json b/packages/common/package.json
index d4167df640..858bb6ce2c 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -18,11 +18,12 @@
   },
   "dependencies": {
     "bignumber.js": "9.1.2",
-    "dayjs": "1.11.10"
+    "dayjs": "1.11.10",
+    "viem": "2.x"
   },
   "devDependencies": {
-    "vitest": "2.0.5",
-    "@vitest/coverage-v8": "2.0.5"
+    "@vitest/coverage-v8": "2.0.5",
+    "vitest": "2.0.5"
   },
   "keywords": [
     "utils",
diff --git a/packages/common/src/utils/CaipNetworksUtil.ts b/packages/common/src/utils/CaipNetworksUtil.ts
deleted file mode 100644
index 7c968554f7..0000000000
--- a/packages/common/src/utils/CaipNetworksUtil.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import type { CaipNetwork } from './TypeUtil.js'
-
-const RPC_URL_HOST = 'rpc.walletconnect.org'
-
-type ExtendCaipNetworkParams = {
-  networkImageIds: Record<number | string, string>
-  customNetworkImageUrls: Record<number | string, string> | undefined
-  projectId: string
-}
-
-export const CaipNetworksUtil = {
-  /**
-   * Extends the RPC URL with the project ID if the RPC URL is a Reown URL
-   * @param rpcUrl - The RPC URL to extend
-   * @param projectId - The project ID to extend the RPC URL with
-   * @returns The extended RPC URL
-   */
-  extendRpcUrlWithProjectId(rpcUrl: string, projectId: string) {
-    const isReownUrl = rpcUrl.includes(RPC_URL_HOST)
-
-    if (isReownUrl) {
-      const url = new URL(rpcUrl)
-      if (!url.searchParams.has('projectId')) {
-        url.searchParams.set('projectId', projectId)
-      }
-
-      return url.toString()
-    }
-
-    return rpcUrl
-  },
-
-  /**
-   * Extends the CaipNetwork object with the image ID and image URL if the image ID is not provided
-   * @param params - The parameters object
-   * @param params.caipNetwork - The CaipNetwork object to extend
-   * @param params.networkImageIds - The network image IDs
-   * @param params.customNetworkImageUrls - The custom network image URLs
-   * @param params.projectId - The project ID
-   * @returns The extended array of CaipNetwork objects
-   */
-  extendCaipNetwork(
-    caipNetwork: CaipNetwork,
-    { networkImageIds, customNetworkImageUrls, projectId }: ExtendCaipNetworkParams
-  ): CaipNetwork {
-    return {
-      ...caipNetwork,
-      imageId: networkImageIds[caipNetwork.chainId],
-      imageUrl: customNetworkImageUrls?.[caipNetwork.chainId],
-      rpcUrl: CaipNetworksUtil.extendRpcUrlWithProjectId(caipNetwork.rpcUrl, projectId)
-    }
-  },
-
-  /**
-   * Extends the array of CaipNetwork objects with the image ID and image URL if the image ID is not provided
-   * @param caipNetworks - The array of CaipNetwork objects to extend
-   * @param params - The parameters object
-   * @param params.networkImageIds - The network image IDs
-   * @param params.customNetworkImageUrls - The custom network image URLs
-   * @param params.projectId - The project ID
-   * @returns The extended array of CaipNetwork objects
-   */
-  extendCaipNetworks(
-    caipNetworks: CaipNetwork[],
-    { networkImageIds, customNetworkImageUrls, projectId }: ExtendCaipNetworkParams
-  ): CaipNetwork[] {
-    return caipNetworks.map(caipNetwork =>
-      CaipNetworksUtil.extendCaipNetwork(caipNetwork, {
-        networkImageIds,
-        customNetworkImageUrls,
-        projectId
-      })
-    )
-  }
-}
diff --git a/packages/common/src/utils/TypeUtil.ts b/packages/common/src/utils/TypeUtil.ts
index 3a5eb64533..8550913090 100644
--- a/packages/common/src/utils/TypeUtil.ts
+++ b/packages/common/src/utils/TypeUtil.ts
@@ -1,3 +1,28 @@
+import type { Chain as BaseChain } from 'viem/chains'
+import type { ChainFormatters } from 'viem'
+
+export type { BaseChain }
+
+export type BaseNetwork<
+  formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
+  custom extends Record<string, unknown> | undefined = Record<string, unknown> | undefined
+> = BaseChain<formatters, custom>
+
+export type CaipNetwork<
+  formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
+  custom extends Record<string, unknown> | undefined = Record<string, unknown> | undefined
+> = Omit<BaseChain<formatters, custom>, 'id'> & {
+  id: number | string
+  chainNamespace: ChainNamespace
+  caipNetworkId: CaipNetworkId
+  assets?: {
+    imageId: string | undefined
+    imageUrl: string | undefined
+  }
+}
+
+export type AppKitNetwork = BaseNetwork | CaipNetwork
+
 export type CaipNetworkId = `${ChainNamespace}:${ChainId}`
 
 export type CaipAddress = `${ChainNamespace}:${ChainId}:${string}`
@@ -6,18 +31,6 @@ export type ChainId = string | number
 
 export type ChainNamespace = 'eip155' | 'solana' | 'polkadot'
 
-export type CaipNetwork = {
-  id: CaipNetworkId
-  chainId: ChainId
-  chainNamespace: ChainNamespace
-  name: string
-  currency: string
-  explorerUrl: string
-  rpcUrl: string
-  imageUrl?: string
-  imageId?: string
-}
-
 export type AdapterType = 'solana' | 'wagmi' | 'ethers' | 'ethers5' | 'universal' | 'polkadot'
 
 export type CoinbaseTransactionStatus =
diff --git a/packages/core/exports/react.ts b/packages/core/exports/react.ts
index 4f531196a1..8e678821be 100644
--- a/packages/core/exports/react.ts
+++ b/packages/core/exports/react.ts
@@ -2,16 +2,23 @@ import { useSnapshot } from 'valtio'
 import { AccountController } from '../src/controllers/AccountController.js'
 import { CoreHelperUtil } from '../src/utils/CoreHelperUtil.js'
 import { ChainController } from '../src/controllers/ChainController.js'
+import type { CaipNetwork, CaipNetworkId } from '@reown/appkit-common'
 
 // -- Hooks ------------------------------------------------------------
-export function useAppKitNetwork() {
+export function useAppKitNetwork(): {
+  caipNetwork: CaipNetwork | undefined
+  chainId: number | string | undefined
+  caipNetworkId: CaipNetworkId | undefined
+} {
   const { activeCaipNetwork } = useSnapshot(ChainController.state)
 
   return {
     caipNetwork: activeCaipNetwork,
-    chainId: activeCaipNetwork?.chainId
+    chainId: activeCaipNetwork?.id,
+    caipNetworkId: activeCaipNetwork?.caipNetworkId
   }
 }
+
 export function useAppKitAccount() {
   const { status } = useSnapshot(AccountController.state)
   const { activeCaipAddress } = useSnapshot(ChainController.state)
diff --git a/packages/core/exports/vue.ts b/packages/core/exports/vue.ts
new file mode 100644
index 0000000000..48abacff6e
--- /dev/null
+++ b/packages/core/exports/vue.ts
@@ -0,0 +1,58 @@
+import { AccountController } from '../src/controllers/AccountController.js'
+import { CoreHelperUtil } from '../src/utils/CoreHelperUtil.js'
+import { ChainController } from '../src/controllers/ChainController.js'
+import type { CaipNetwork, CaipNetworkId } from '@reown/appkit-common'
+import { ref } from 'valtio/vanilla'
+import { onUnmounted } from 'vue'
+
+// -- Hooks ------------------------------------------------------------
+export function useAppKitNetwork(): {
+  caipNetwork: CaipNetwork | undefined
+  chainId: number | string | undefined
+  caipNetworkId: CaipNetworkId | undefined
+} {
+  const state = ref({
+    activeCaipNetwork: ChainController.state.activeCaipNetwork
+  })
+
+  const unsubscribe = ChainController.subscribeKey('activeCaipNetwork', val => {
+    state.activeCaipNetwork = val
+  })
+
+  onUnmounted(() => {
+    unsubscribe?.()
+  })
+
+  return {
+    caipNetwork: state.activeCaipNetwork,
+    chainId: state.activeCaipNetwork?.id,
+    caipNetworkId: state.activeCaipNetwork?.caipNetworkId
+  }
+}
+
+export function useAppKitAccount() {
+  const state = ref({
+    activeCaipAddress: ChainController.state.activeCaipAddress,
+    status: AccountController.state.status
+  })
+
+  const unsubscribe = ChainController.subscribeKey('activeCaipAddress', val => {
+    state.activeCaipAddress = val
+  })
+
+  const unsubscribeStatus = AccountController.subscribeKey('status', val => {
+    state.status = val
+  })
+
+  onUnmounted(() => {
+    unsubscribe?.()
+    unsubscribeStatus?.()
+  })
+
+  return {
+    caipAddress: state.activeCaipAddress,
+    address: CoreHelperUtil.getPlainAddress(state.activeCaipAddress),
+    isConnected: Boolean(state.activeCaipAddress),
+    status: state.status
+  }
+}
diff --git a/packages/core/package.json b/packages/core/package.json
index bf0916618b..ae9f5403fc 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -26,18 +26,35 @@
       "types": "./dist/types/exports/react.d.ts",
       "import": "./dist/esm/exports/react.js",
       "default": "./dist/esm/exports/react.js"
+    },
+    "./vue": {
+      "types": "./dist/types/exports/vue.d.ts",
+      "import": "./dist/esm/exports/vue.js",
+      "default": "./dist/esm/exports/vue.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "react": [
+        "./dist/types/exports/react.d.ts"
+      ],
+      "vue": [
+        "./dist/types/exports/vue.d.ts"
+      ]
     }
   },
   "dependencies": {
     "@reown/appkit-common": "workspace:*",
     "@reown/appkit-wallet": "workspace:*",
     "@walletconnect/universal-provider": "2.17.0",
-    "valtio": "1.11.2"
+    "valtio": "1.11.2",
+    "viem": "2.x"
   },
+  "peerDependencies": {},
   "devDependencies": {
     "vitest": "2.0.5",
     "@vitest/coverage-v8": "2.0.5",
-    "viem": "2.21.4"
+    "vue": "3.x"
   },
   "author": "Reown <support@reown.com> (https://reown.com)",
   "license": "Apache-2.0",
diff --git a/packages/core/src/controllers/AccountController.ts b/packages/core/src/controllers/AccountController.ts
index 485564760c..4ace12b837 100644
--- a/packages/core/src/controllers/AccountController.ts
+++ b/packages/core/src/controllers/AccountController.ts
@@ -222,7 +222,7 @@ export const AccountController = {
   },
 
   async fetchTokenBalance() {
-    const chainId = ChainController.state.activeCaipNetwork?.id
+    const chainId = ChainController.state.activeCaipNetwork?.caipNetworkId
     const chain = ChainController.state.activeCaipNetwork?.chainNamespace
     const caipAddress = ChainController.state.activeCaipAddress
     const address = caipAddress ? CoreHelperUtil.getPlainAddress(caipAddress) : undefined
diff --git a/packages/core/src/controllers/ApiController.ts b/packages/core/src/controllers/ApiController.ts
index d05c955744..11a4f9346a 100644
--- a/packages/core/src/controllers/ApiController.ts
+++ b/packages/core/src/controllers/ApiController.ts
@@ -107,7 +107,7 @@ export const ApiController = {
   async fetchNetworkImages() {
     const requestedCaipNetworks = ChainController.getAllRequestedCaipNetworks()
 
-    const ids = requestedCaipNetworks?.map(({ imageId }) => imageId).filter(Boolean)
+    const ids = requestedCaipNetworks?.map(({ assets }) => assets?.imageId).filter(Boolean)
     if (ids) {
       await Promise.allSettled((ids as string[]).map(id => ApiController._fetchNetworkImage(id)))
     }
@@ -159,7 +159,7 @@ export const ApiController = {
         headers: ApiController._getApiHeaders(),
         params: {
           page: '1',
-          chains: ChainController.state.activeCaipNetwork?.id,
+          chains: ChainController.state.activeCaipNetwork?.caipNetworkId,
           entries: recommendedEntries,
           include: includeWalletIds?.join(','),
           exclude: exclude?.join(',')
@@ -194,7 +194,7 @@ export const ApiController = {
       params: {
         page: String(page),
         entries,
-        chains: ChainController.state.activeCaipNetwork?.id,
+        chains: ChainController.state.activeCaipNetwork?.caipNetworkId,
         include: includeWalletIds?.join(','),
         exclude: exclude.join(',')
       }
@@ -220,7 +220,7 @@ export const ApiController = {
       params: {
         page: '1',
         entries: String(ids.length),
-        chains: ChainController.state.activeCaipNetwork?.id,
+        chains: ChainController.state.activeCaipNetwork?.caipNetworkId,
         include: ids?.join(',')
       }
     })
@@ -244,7 +244,7 @@ export const ApiController = {
         page: '1',
         entries: '100',
         search: search?.trim(),
-        chains: ChainController.state.activeCaipNetwork?.id,
+        chains: ChainController.state.activeCaipNetwork?.caipNetworkId,
         include: includeWalletIds?.join(','),
         exclude: excludeWalletIds?.join(',')
       }
diff --git a/packages/core/src/controllers/ChainController.ts b/packages/core/src/controllers/ChainController.ts
index 543dd46c29..a6f3b8d358 100644
--- a/packages/core/src/controllers/ChainController.ts
+++ b/packages/core/src/controllers/ChainController.ts
@@ -73,6 +73,12 @@ const state = proxy<ChainControllerState>({
 export const ChainController = {
   state,
 
+  subscribe(callback: (value: ChainControllerState) => void) {
+    return sub(state, () => {
+      callback(state)
+    })
+  },
+
   subscribeKey<K extends ChainControllerStateKey>(
     key: K,
     callback: (value: ChainControllerState[K]) => void
@@ -224,10 +230,13 @@ export const ChainController = {
     if (caipNetwork?.id) {
       state.activeCaipAddress = newAdapter?.accountState?.caipAddress
       state.activeCaipNetwork = caipNetwork
-      SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID, caipNetwork?.id)
+      SafeLocalStorage.setItem(
+        SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID,
+        caipNetwork?.caipNetworkId
+      )
       PublicStateController.set({
         activeChain: chain,
-        selectedNetworkId: caipNetwork?.id
+        selectedNetworkId: caipNetwork?.caipNetworkId
       })
     }
   },
@@ -248,9 +257,9 @@ export const ChainController = {
 
     PublicStateController.set({
       activeChain: state.activeChain,
-      selectedNetworkId: state.activeCaipNetwork?.id
+      selectedNetworkId: state.activeCaipNetwork?.caipNetworkId
     })
-    SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID, caipNetwork.id)
+    SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID, caipNetwork.caipNetworkId)
 
     const isSupported = this.checkIfSupportedNetwork(caipNetwork.chainNamespace)
 
@@ -272,7 +281,7 @@ export const ChainController = {
       EventsController.sendEvent({
         type: 'track',
         event: 'SWITCH_NETWORK',
-        properties: { network: network.id }
+        properties: { network: network.caipNetworkId }
       })
     }
   },
@@ -424,6 +433,14 @@ export const ChainController = {
     return approvedCaipNetworkIds
   },
 
+  getActiveCaipNetwork() {
+    return state.activeCaipNetwork
+  },
+
+  getActiveCaipAddress() {
+    return state.activeCaipAddress
+  },
+
   getApprovedCaipNetworkIds(namespace: ChainNamespace): CaipNetworkId[] {
     const adapter = state.chains.get(namespace)
     const approvedCaipNetworkIds = adapter?.networkState?.approvedCaipNetworkIds || []
@@ -457,7 +474,7 @@ export const ChainController = {
   },
 
   checkIfSmartAccountEnabled() {
-    const networkId = NetworkUtil.caipNetworkIdToNumber(state.activeCaipNetwork?.id)
+    const networkId = NetworkUtil.caipNetworkIdToNumber(state.activeCaipNetwork?.caipNetworkId)
     const activeChain = this.state.activeChain
 
     if (!activeChain || !networkId) {
@@ -474,7 +491,7 @@ export const ChainController = {
 
   getActiveNetworkTokenAddress() {
     const namespace = this.state.activeCaipNetwork?.chainNamespace || 'eip155'
-    const chainId = this.state.activeCaipNetwork?.chainId || 1
+    const chainId = this.state.activeCaipNetwork?.id || 1
     const address = ConstantsUtil.NATIVE_TOKEN_ADDRESS[namespace]
 
     return `${namespace}:${chainId}:${address}`
diff --git a/packages/core/src/controllers/ConnectionController.ts b/packages/core/src/controllers/ConnectionController.ts
index 39a7db5059..6251c86d33 100644
--- a/packages/core/src/controllers/ConnectionController.ts
+++ b/packages/core/src/controllers/ConnectionController.ts
@@ -154,7 +154,10 @@ export const ConnectionController = {
     EventsController.sendEvent({
       type: 'track',
       event: 'SET_PREFERRED_ACCOUNT_TYPE',
-      properties: { accountType, network: ChainController.state.activeCaipNetwork?.id || '' }
+      properties: {
+        accountType,
+        network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
+      }
     })
   },
 
diff --git a/packages/core/src/controllers/EnsController.ts b/packages/core/src/controllers/EnsController.ts
index 62bff8ad5c..96d7ea8e79 100644
--- a/packages/core/src/controllers/EnsController.ts
+++ b/packages/core/src/controllers/EnsController.ts
@@ -6,7 +6,6 @@ import { AccountController } from './AccountController.js'
 import { ConnectorController } from './ConnectorController.js'
 import { RouterController } from './RouterController.js'
 import { ConnectionController } from './ConnectionController.js'
-import { NetworkUtil } from '@reown/appkit-common'
 import { EnsUtil } from '../utils/EnsUtil.js'
 import { ChainController } from './ChainController.js'
 
@@ -129,7 +128,7 @@ export const EnsController = {
       })
 
       const signature = await ConnectionController.signMessage(message)
-      const networkId = NetworkUtil.caipNetworkIdToNumber(network.id)
+      const networkId = network.id
 
       if (!networkId) {
         throw new Error('Network not found')
diff --git a/packages/core/src/controllers/SendController.ts b/packages/core/src/controllers/SendController.ts
index 3fa0efc19f..1b26fe5bee 100644
--- a/packages/core/src/controllers/SendController.ts
+++ b/packages/core/src/controllers/SendController.ts
@@ -118,7 +118,7 @@ export const SendController = {
             W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: this.state.token.address,
           amount: this.state.sendTokenAmount,
-          network: ChainController.state.activeCaipNetwork?.id || ''
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
         }
       })
       this.sendERC20Token({
@@ -142,7 +142,7 @@ export const SendController = {
             W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: this.state.token?.symbol,
           amount: this.state.sendTokenAmount,
-          network: ChainController.state.activeCaipNetwork?.id || ''
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
         }
       })
       this.sendNativeToken({
@@ -186,7 +186,7 @@ export const SendController = {
             W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
-          network: ChainController.state.activeCaipNetwork?.id || ''
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
         }
       })
       this.resetSend()
@@ -200,7 +200,7 @@ export const SendController = {
             W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
-          network: ChainController.state.activeCaipNetwork?.id || ''
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || ''
         }
       })
       SnackController.showError('Something went wrong')
diff --git a/packages/core/src/controllers/SwapController.ts b/packages/core/src/controllers/SwapController.ts
index da21705a14..e60d39f6c6 100644
--- a/packages/core/src/controllers/SwapController.ts
+++ b/packages/core/src/controllers/SwapController.ts
@@ -437,7 +437,9 @@ export const SwapController = {
     balances.forEach(token => {
       state.tokensPriceMap[token.address] = token.price || 0
     })
-    state.myTokensWithBalance = balances.filter(token => token.address.startsWith(caipNetwork.id))
+    state.myTokensWithBalance = balances.filter(token =>
+      token.address.startsWith(caipNetwork.caipNetworkId)
+    )
     state.networkBalanceInUSD = networkToken
       ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString()
       : '0'
@@ -764,7 +766,7 @@ export const SwapController = {
         type: 'track',
         event: 'SWAP_SUCCESS',
         properties: {
-          network: ChainController.state.activeCaipNetwork?.id || '',
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
@@ -790,7 +792,7 @@ export const SwapController = {
         type: 'track',
         event: 'SWAP_ERROR',
         properties: {
-          network: ChainController.state.activeCaipNetwork?.id || '',
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
diff --git a/packages/core/src/controllers/TransactionsController.ts b/packages/core/src/controllers/TransactionsController.ts
index 58d1224cfe..56db602157 100644
--- a/packages/core/src/controllers/TransactionsController.ts
+++ b/packages/core/src/controllers/TransactionsController.ts
@@ -63,7 +63,7 @@ export const TransactionsController = {
         onramp,
         // Coinbase transaction history state updates require the latest data
         cache: onramp === 'coinbase' ? 'no-cache' : undefined,
-        chainId: ChainController.state.activeCaipNetwork?.id
+        chainId: ChainController.state.activeCaipNetwork?.caipNetworkId
       })
 
       const nonSpamTransactions = this.filterSpamTransactions(response.data)
@@ -144,7 +144,7 @@ export const TransactionsController = {
   },
 
   filterByConnectedChain(transactions: Transaction[]) {
-    const chainId = ChainController.state.activeCaipNetwork?.id
+    const chainId = ChainController.state.activeCaipNetwork?.caipNetworkId
     const filteredTransactions = transactions.filter(
       transaction => transaction.metadata.chain === chainId
     )
diff --git a/packages/core/src/utils/AssetUtil.ts b/packages/core/src/utils/AssetUtil.ts
index 52243af47d..40b2ab286a 100644
--- a/packages/core/src/utils/AssetUtil.ts
+++ b/packages/core/src/utils/AssetUtil.ts
@@ -44,12 +44,12 @@ export const AssetUtil = {
   },
 
   getNetworkImage(network?: CaipNetwork) {
-    if (network?.imageUrl) {
-      return network?.imageUrl
+    if (network?.assets?.imageUrl) {
+      return network?.assets?.imageUrl
     }
 
-    if (network?.imageId) {
-      return AssetController.state.networkImages[network.imageId]
+    if (network?.assets?.imageId) {
+      return AssetController.state.networkImages[network.assets.imageId]
     }
 
     return undefined
diff --git a/packages/core/src/utils/CoreHelperUtil.ts b/packages/core/src/utils/CoreHelperUtil.ts
index cab2dfefd7..3b0d98a54b 100644
--- a/packages/core/src/utils/CoreHelperUtil.ts
+++ b/packages/core/src/utils/CoreHelperUtil.ts
@@ -19,7 +19,7 @@ export const CoreHelperUtil = {
   },
 
   checkCaipNetwork(network: CaipNetwork | undefined, networkName = '') {
-    return network?.id.toLocaleLowerCase().includes(networkName.toLowerCase())
+    return network?.caipNetworkId.toLocaleLowerCase().includes(networkName.toLowerCase())
   },
 
   isAndroid() {
diff --git a/packages/core/src/utils/StorageUtil.ts b/packages/core/src/utils/StorageUtil.ts
index 1c26bc154c..22c86dfa3f 100644
--- a/packages/core/src/utils/StorageUtil.ts
+++ b/packages/core/src/utils/StorageUtil.ts
@@ -113,7 +113,9 @@ export const StorageUtil = {
       SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID
     )
     const allRequestedCaipNetworks = ChainController.getAllRequestedCaipNetworks()
-    const storedCaipNetwork = allRequestedCaipNetworks?.find(c => c.id === storedCaipNetworkId)
+    const storedCaipNetwork = allRequestedCaipNetworks?.find(
+      c => c.caipNetworkId === storedCaipNetworkId
+    )
 
     return storedCaipNetwork
   }
diff --git a/packages/core/src/utils/SwapApiUtil.ts b/packages/core/src/utils/SwapApiUtil.ts
index 733f667c7e..a1adc57ff6 100644
--- a/packages/core/src/utils/SwapApiUtil.ts
+++ b/packages/core/src/utils/SwapApiUtil.ts
@@ -24,7 +24,7 @@ export const SwapApiUtil = {
   async getTokenList() {
     const caipNetwork = ChainController.state.activeCaipNetwork
     const response = await BlockchainApiController.fetchSwapTokens({
-      chainId: caipNetwork?.id,
+      chainId: caipNetwork?.caipNetworkId,
       projectId: OptionsController.state.projectId
     })
     const tokens =
@@ -71,7 +71,7 @@ export const SwapApiUtil = {
         default:
           return await BlockchainApiController.fetchGasPrice({
             projectId,
-            chainId: caipNetwork.id
+            chainId: caipNetwork.caipNetworkId
           })
       }
     } catch {
@@ -115,7 +115,11 @@ export const SwapApiUtil = {
       return []
     }
 
-    const response = await BlockchainApiController.getBalance(address, caipNetwork.id, forceUpdate)
+    const response = await BlockchainApiController.getBalance(
+      address,
+      caipNetwork.caipNetworkId,
+      forceUpdate
+    )
     const balances = response.balances.filter(balance => balance.quantity.decimals !== '0')
 
     AccountController.setTokenBalance(balances, ChainController.state.activeChain)
diff --git a/packages/core/tests/controllers/ApiController.test.ts b/packages/core/tests/controllers/ApiController.test.ts
index 9b6d0d40bd..87bb11dbdf 100644
--- a/packages/core/tests/controllers/ApiController.test.ts
+++ b/packages/core/tests/controllers/ApiController.test.ts
@@ -7,7 +7,7 @@ import {
   OptionsController
 } from '../../exports/index.js'
 import { api } from '../../src/controllers/ApiController.js'
-import { ConstantsUtil } from '@reown/appkit-common'
+import { ConstantsUtil, type CaipNetwork } from '@reown/appkit-common'
 
 // -- Constants ----------------------------------------------------------------
 const chain = ConstantsUtil.CHAIN.EVM
@@ -120,34 +120,61 @@ describe('ApiController', () => {
     ChainController.setRequestedCaipNetworks(
       [
         {
-          id: 'eip155:1',
+          caipNetworkId: 'eip155:1',
+          id: 1,
           name: 'Ethereum Mainnet',
-          imageId: '12341',
+          assets: {
+            imageId: '12341',
+            imageUrl: ''
+          },
           chainNamespace: chain,
-          chainId: '1',
-          currency: 'ETH',
-          explorerUrl: 'https://explorer.ethereum.org',
-          rpcUrl: 'https://rpc.ethereum.org'
-        },
+          nativeCurrency: {
+            name: 'Ethereum',
+            decimals: 18,
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            }
+          }
+        } as CaipNetwork,
         {
-          id: 'eip155:4',
+          caipNetworkId: 'eip155:4',
+          id: 4,
           name: 'Ethereum Rinkeby',
-          imageId: '12342',
+          assets: {
+            imageId: '12342',
+            imageUrl: ''
+          },
           chainNamespace: chain,
-          chainId: '4',
-          currency: 'ETH',
-          explorerUrl: 'https://explorer.ethereum.org',
-          rpcUrl: 'https://rpc.ethereum.org'
-        },
+          nativeCurrency: {
+            name: 'Ethereum',
+            decimals: 18,
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            }
+          }
+        } as CaipNetwork,
         {
-          id: 'eip155:42',
+          caipNetworkId: 'eip155:42',
+          id: 42,
           name: 'Ethereum Kovan',
           chainNamespace: chain,
-          chainId: '42',
-          currency: 'ETH',
-          explorerUrl: 'https://explorer.ethereum.org',
-          rpcUrl: 'https://rpc.ethereum.org'
-        }
+          nativeCurrency: {
+            name: 'Ethereum',
+            decimals: 18,
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            }
+          }
+        } as CaipNetwork
       ],
       chain
     )
@@ -162,33 +189,60 @@ describe('ApiController', () => {
     ChainController.setRequestedCaipNetworks(
       [
         {
-          id: 'eip155:1',
+          caipNetworkId: 'eip155:1',
+          id: 1,
           name: 'Ethereum Mainnet',
-          imageId: '12341',
+          assets: {
+            imageId: '12341',
+            imageUrl: ''
+          },
           chainNamespace: chain,
-          chainId: '1',
-          currency: 'ETH',
-          explorerUrl: 'https://explorer.ethereum.org',
-          rpcUrl: 'https://rpc.ethereum.org'
+          nativeCurrency: {
+            name: 'Ethereum',
+            decimals: 18,
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            }
+          }
         },
         {
-          id: 'eip155:4',
+          caipNetworkId: 'eip155:4',
+          id: 4,
           name: 'Ethereum Rinkeby',
-          imageId: '12342',
+          assets: {
+            imageId: '12342',
+            imageUrl: ''
+          },
           chainNamespace: chain,
-          chainId: '4',
-          currency: 'ETH',
-          explorerUrl: 'https://explorer.ethereum.org',
-          rpcUrl: 'https://rpc.ethereum.org'
+          nativeCurrency: {
+            name: 'Ethereum',
+            decimals: 18,
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            }
+          }
         },
         {
-          id: 'eip155:42',
+          caipNetworkId: 'eip155:42',
+          id: 42,
           name: 'Ethereum Kovan',
           chainNamespace: chain,
-          chainId: '42',
-          currency: 'ETH',
-          explorerUrl: 'https://explorer.ethereum.org',
-          rpcUrl: 'https://rpc.ethereum.org'
+          nativeCurrency: {
+            name: 'Ethereum',
+            decimals: 18,
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            }
+          }
         }
       ],
       chain
@@ -243,17 +297,20 @@ describe('ApiController', () => {
     const featuredWalletIds = ['12341', '12342']
     const data = [
       {
-        id: '12341',
+        caipNetworkId: '12341',
+        id: 12341,
         name: 'MetaMask',
         image_id: '12341'
       },
       {
-        id: '12342',
+        caipNetworkId: '12342',
+        id: 12342,
         name: 'RandomWallet',
         image_id: '12342'
       },
       {
-        id: '12343',
+        caipNetworkId: '12343',
+        id: 12343,
         name: 'RandomWallet'
       }
     ]
@@ -294,17 +351,20 @@ describe('ApiController', () => {
     const featuredWalletIds = ['12344']
     const data = [
       {
-        id: '12341',
+        caipNetworkId: '12341',
+        id: 12341,
         name: 'MetaMask',
         image_id: '12341'
       },
       {
-        id: '12342',
+        caipNetworkId: '12342',
+        id: 12342,
         name: 'RandomWallet',
         image_id: '12342'
       },
       {
-        id: '12343',
+        caipNetworkId: '12343',
+        id: 12343,
         name: 'RandomWallet'
       }
     ]
@@ -365,12 +425,14 @@ describe('ApiController', () => {
     const featuredWalletIds = ['12344']
     const data = [
       {
-        id: '12341',
+        caipNetworkId: '12341',
+        id: 12341,
         name: 'MetaMask',
         image_id: '12341'
       },
       {
-        id: '12342',
+        caipNetworkId: '12342',
+        id: 12342,
         name: 'RandomWallet',
         image_id: '12342'
       }
@@ -408,12 +470,14 @@ describe('ApiController', () => {
     const filteredWallet = [{ name: 'Rainbow', rdns: 'me.rainbow' }]
     const data = [
       {
-        id: '12345',
+        caipNetworkId: '12345',
+        id: 12345,
         name: 'MetaMask',
         rdns: 'io.metamask'
       },
       {
-        id: '12346',
+        caipNetworkId: '12346',
+        id: 12346,
         name: 'Phantom',
         rdns: 'app.phantom'
       }
@@ -450,7 +514,8 @@ describe('ApiController', () => {
     const excludeWalletIds = ['12343']
     const data = [
       {
-        id: '12341',
+        caipNetworkId: '12341',
+        id: 12341,
         name: 'MetaMask',
         image_id: '12341'
       }
@@ -485,7 +550,8 @@ describe('ApiController', () => {
     const excludeWalletIds = ['12343']
     let data = [
       {
-        id: '12341',
+        caipNetworkId: '12341',
+        id: 12341,
         name: 'MetaMask',
         image_id: '12341'
       }
@@ -547,7 +613,8 @@ describe('ApiController', () => {
 
     data = [
       {
-        id: '12341',
+        caipNetworkId: '12341',
+        id: 12341,
         name: 'Safe Wallet',
         image_id: '12341'
       }
diff --git a/packages/core/tests/controllers/ChainController.test.ts b/packages/core/tests/controllers/ChainController.test.ts
index 7d9c3503ce..8a3d8dfd48 100644
--- a/packages/core/tests/controllers/ChainController.test.ts
+++ b/packages/core/tests/controllers/ChainController.test.ts
@@ -16,52 +16,76 @@ const approvedCaipNetworkIds = ['eip155:1', 'eip155:4'] as CaipNetworkId[]
 
 const requestedCaipNetworks = [
   {
-    id: 'eip155:1',
+    id: 1,
+    caipNetworkId: 'eip155:1',
     name: 'Ethereum',
     chainNamespace: ConstantsUtil.CHAIN.EVM,
-    chainId: 1,
-    currency: 'ETH',
-    explorerUrl: 'https://etherscan.io',
-    rpcUrl: 'https://rpc.infura.com/v1/'
+    nativeCurrency: {
+      name: 'Ethereum',
+      symbol: 'ETH',
+      decimals: 18
+    },
+    rpcUrls: {
+      default: { http: ['https://rpc.infura.com/v1/'] }
+    },
+    blockExplorers: {
+      default: { name: 'Etherscan', url: 'https://etherscan.io' }
+    }
   },
   {
-    id: 'eip155:42161',
+    id: 42161,
+    caipNetworkId: 'eip155:42161',
     name: 'Arbitrum One',
     chainNamespace: ConstantsUtil.CHAIN.EVM,
-    chainId: 42161,
-    currency: 'ETH',
-    explorerUrl: 'https://etherscan.io',
-    rpcUrl: 'https://rpc.infura.com/v1/'
+    nativeCurrency: {
+      name: 'Arbitrum',
+      symbol: 'ARB',
+      decimals: 18
+    },
+    rpcUrls: {
+      default: { http: ['https://rpc.infura.com/v1/'] }
+    },
+    blockExplorers: {
+      default: { name: 'Arbitrum Explorer', url: 'https://explorer.arbitrum.io' }
+    }
   },
   {
-    id: 'eip155:43114',
+    id: 43114,
+    caipNetworkId: 'eip155:43114',
     name: 'Avalanche C-Chain',
     chainNamespace: ConstantsUtil.CHAIN.EVM,
-    chainId: 43114,
-    currency: 'ETH',
-    explorerUrl: 'https://etherscan.io',
-    rpcUrl: 'https://rpc.infura.com/v1/'
+    nativeCurrency: {
+      name: 'Avalanche',
+      symbol: 'AVAX',
+      decimals: 18
+    },
+    rpcUrls: {
+      default: { http: ['https://rpc.infura.com/v1/'] }
+    },
+    blockExplorers: {
+      default: { name: 'Avalanche C-Chain', url: 'https://cchain.explorer.avax.network' }
+    }
   }
 ] as CaipNetwork[]
 
 const caipNetwork = {
-  id: 'eip155:1',
+  id: 1,
   name: 'Ethereum',
   chainNamespace: ConstantsUtil.CHAIN.EVM,
-  chainId: 1,
-  currency: 'ETH',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: 'https://rpc.infura.com/v1/'
+  caipNetworkId: 'eip155:1',
+  nativeCurrency: { name: 'Ethereum', symbol: 'ETH', decimals: 18 },
+  rpcUrls: { default: { http: ['https://rpc.infura.com/v1/'] } },
+  blockExplorers: { default: { name: 'Etherscan', url: 'https://etherscan.io' } }
 } as const
 
 const solanaCaipNetwork = {
-  id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  caipNetworkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
   name: 'Solana',
   chainNamespace: ConstantsUtil.CHAIN.SOLANA,
-  chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-  currency: 'SOL',
-  explorerUrl: 'https://solscan.io',
-  rpcUrl: 'https://rpc.infura.com/v1/'
+  nativeCurrency: { name: 'Solana', symbol: 'SOL', decimals: 9 },
+  rpcUrls: { default: { http: ['https://rpc.infura.com/v1/'] } },
+  blockExplorers: { default: { name: 'Solscan', url: 'https://solscan.io' } }
 } as const
 
 const connectionControllerClient: ConnectionControllerClient = {
@@ -141,7 +165,15 @@ describe('ChainController', () => {
   })
 
   it('should update state correctly on setCaipNetwork()', () => {
-    ChainController.setActiveCaipNetwork(caipNetwork)
+    ChainController.setActiveCaipNetwork({
+      id: 1,
+      chainNamespace: ConstantsUtil.CHAIN.EVM,
+      caipNetworkId: 'eip155:1',
+      name: 'Ethereum',
+      nativeCurrency: { name: 'Ethereum', symbol: 'ETH', decimals: 18 },
+      rpcUrls: { default: { http: ['https://rpc.infura.com/v1/'] } },
+      blockExplorers: { default: { name: 'Etherscan', url: 'https://etherscan.io' } }
+    })
     expect(ChainController.state.activeCaipNetwork).toEqual(caipNetwork)
   })
 
@@ -154,13 +186,13 @@ describe('ChainController', () => {
     ChainController.setSmartAccountEnabledNetworks([2], chainNamespace)
     expect(ChainController.checkIfSmartAccountEnabled()).toEqual(false)
     ChainController.setActiveCaipNetwork({
-      id: 'eip155:2',
-      name: 'Ethereum',
+      id: 2,
       chainNamespace: ConstantsUtil.CHAIN.EVM,
-      chainId: 2,
-      currency: 'ETH',
-      explorerUrl: 'https://etherscan.io',
-      rpcUrl: 'https://rpc.infura.com/v1/'
+      caipNetworkId: 'eip155:2',
+      name: 'Ethereum',
+      nativeCurrency: { name: 'Ethereum', symbol: 'ETH', decimals: 18 },
+      rpcUrls: { default: { http: ['https://rpc.infura.com/v1/'] } },
+      blockExplorers: { default: { name: 'Etherscan', url: 'https://etherscan.io' } }
     })
   })
 
diff --git a/packages/core/tests/controllers/EnsController.test.ts b/packages/core/tests/controllers/EnsController.test.ts
index 1b7303ed76..7d42755d64 100644
--- a/packages/core/tests/controllers/EnsController.test.ts
+++ b/packages/core/tests/controllers/EnsController.test.ts
@@ -136,13 +136,20 @@ describe('EnsController', () => {
     const result = await EnsController.getNamesForAddress('0x123')
     expect(result).toEqual([])
     ChainController.setActiveCaipNetwork({
-      id: 'eip155:1',
+      id: 1,
+      caipNetworkId: 'eip155:1',
       chainNamespace: ConstantsUtil.CHAIN.EVM,
-      chainId: 1,
       name: 'Ethereum',
-      currency: 'ETH',
-      explorerUrl: 'https://etherscan.io',
-      rpcUrl: 'https://rpc.infura.com/v1/'
+      nativeCurrency: {
+        name: 'Ethereum',
+        decimals: 18,
+        symbol: 'ETH'
+      },
+      rpcUrls: {
+        default: {
+          http: ['']
+        }
+      }
     })
     const resultWithNetwork = await EnsController.getNamesForAddress('0x123')
     expect(resultWithNetwork).toEqual([TEST_NAME])
@@ -154,13 +161,20 @@ describe('EnsController', () => {
   it('should register name', async () => {
     // Setup
     ChainController.setActiveCaipNetwork({
-      id: 'eip155:137',
+      id: 137,
+      caipNetworkId: 'eip155:137',
       chainNamespace: ConstantsUtil.CHAIN.EVM,
-      chainId: 137,
-      currency: 'ETH',
-      explorerUrl: 'https://etherscan.io',
-      rpcUrl: 'https://rpc.infura.com/v1/',
-      name: 'Polygon'
+      name: 'Polygon',
+      nativeCurrency: {
+        name: 'Polygon',
+        decimals: 18,
+        symbol: 'MATIC'
+      },
+      rpcUrls: {
+        default: {
+          http: ['']
+        }
+      }
     })
     AccountController.setCaipAddress('eip155:1:0x123', chain)
     const getAuthConnectorSpy = vi.spyOn(ConnectorController, 'getAuthConnector').mockReturnValue({
diff --git a/packages/core/tests/controllers/SwapController.test.ts b/packages/core/tests/controllers/SwapController.test.ts
index fc3ebdb97d..dae47c23e3 100644
--- a/packages/core/tests/controllers/SwapController.test.ts
+++ b/packages/core/tests/controllers/SwapController.test.ts
@@ -23,13 +23,20 @@ import { ConstantsUtil } from '@reown/appkit-common'
 
 // - Mocks ---------------------------------------------------------------------
 const caipNetwork = {
-  id: 'eip155:137',
+  id: 137,
+  caipNetworkId: 'eip155:137',
   name: 'Polygon',
   chainNamespace: ConstantsUtil.CHAIN.EVM,
-  chainId: 137,
-  currency: 'ETH',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: 'https://rpc.infura.com/v1/'
+  nativeCurrency: {
+    name: 'Polygon',
+    decimals: 18,
+    symbol: 'MATIC'
+  },
+  rpcUrls: {
+    default: {
+      http: ['']
+    }
+  }
 } as CaipNetwork
 const approvedCaipNetworkIds = ['eip155:1', 'eip155:137'] as CaipNetworkId[]
 const client: NetworkControllerClient = {
diff --git a/packages/core/tests/controllers/TransactionsController.test.ts b/packages/core/tests/controllers/TransactionsController.test.ts
index 9b235cedc7..c5650e5fb1 100644
--- a/packages/core/tests/controllers/TransactionsController.test.ts
+++ b/packages/core/tests/controllers/TransactionsController.test.ts
@@ -289,7 +289,8 @@ describe('TransactionsController', () => {
 
     vi.spyOn(ChainController, 'state', 'get').mockReturnValue({
       activeCaipNetwork: {
-        id: 'eip155:1'
+        id: 1,
+        caipNetworkId: 'eip155:1'
       }
     } as any)
 
diff --git a/packages/core/tests/hooks/react.test.ts b/packages/core/tests/hooks/react.test.ts
index 95d0ec622b..439b98e3e1 100644
--- a/packages/core/tests/hooks/react.test.ts
+++ b/packages/core/tests/hooks/react.test.ts
@@ -17,14 +17,24 @@ describe('useAppKitNetwork', () => {
 
   it('should return the correct network state', () => {
     const mockNetwork: CaipNetwork = {
-      id: 'eip155:1',
+      id: 1,
       name: 'Ethereum',
-      imageId: 'ethereum',
-      rpcUrl: 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID',
-      chainId: 1,
+      assets: {
+        imageId: 'ethereum',
+        imageUrl: ''
+      },
+      caipNetworkId: 'eip155:1',
       chainNamespace: 'eip155',
-      explorerUrl: 'https://etherscan.io',
-      currency: 'ETH'
+      nativeCurrency: {
+        name: 'Ethereum',
+        decimals: 18,
+        symbol: 'ETH'
+      },
+      rpcUrls: {
+        default: {
+          http: ['']
+        }
+      }
     }
 
     // Mock the useSnapshot hook
diff --git a/packages/core/tests/utils/AssetUtil.test.ts b/packages/core/tests/utils/AssetUtil.test.ts
index cd6909a5fe..0b14d7aaea 100644
--- a/packages/core/tests/utils/AssetUtil.test.ts
+++ b/packages/core/tests/utils/AssetUtil.test.ts
@@ -15,12 +15,16 @@ const connectorWithImageUrl: Partial<Connector> = {
   imageId: 'walletconnect'
 }
 const network: Partial<CaipNetwork> = {
-  imageUrl: undefined,
-  imageId: 'ethereum'
+  assets: {
+    imageUrl: undefined,
+    imageId: 'ethereum'
+  }
 }
-const networkWithImageUrl: Partial<Connector> = {
-  imageUrl: 'ethereum-logo-src',
-  imageId: 'ethereum'
+const networkWithImageUrl: Partial<CaipNetwork> = {
+  assets: {
+    imageUrl: 'ethereum-logo-src',
+    imageId: 'ethereum'
+  }
 }
 const wallet: Partial<WcWallet> = {
   image_url: undefined,
diff --git a/packages/core/tests/utils/SwapApiUtil.test.ts b/packages/core/tests/utils/SwapApiUtil.test.ts
index 0eb91cc1d4..b76d577d61 100644
--- a/packages/core/tests/utils/SwapApiUtil.test.ts
+++ b/packages/core/tests/utils/SwapApiUtil.test.ts
@@ -16,23 +16,37 @@ vi.mock('../../src/controllers/AccountController')
 vi.mock('../../src/controllers/ChainController')
 
 const mockSolanaNetwork = {
-  id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  caipNetworkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
   chainNamespace: 'solana',
-  chainId: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
   name: 'Solana',
-  explorerUrl: 'https://explorer.solana.com',
-  rpcUrl: 'https://api.mainnet-beta.solana.com',
-  currency: 'SOL'
+  nativeCurrency: {
+    name: 'Solana',
+    decimals: 9,
+    symbol: 'SOL'
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://api.mainnet-beta.solana.com']
+    }
+  }
 } as const
 
 const mockEthereumNetwork = {
-  id: 'eip155:1',
+  id: '1',
   chainNamespace: 'eip155',
-  chainId: '1',
+  caipNetworkId: 'eip155:1',
   name: 'Ethereum',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID',
-  currency: 'ETH'
+  nativeCurrency: {
+    name: 'Ethereum',
+    decimals: 18,
+    symbol: 'ETH'
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://mainnet.infura.io/v3/YOUR-PROJECT-ID']
+    }
+  }
 } as const
 
 describe('SwapApiUtil', () => {
@@ -104,13 +118,20 @@ describe('SwapApiUtil', () => {
     })
     it('should return null if there is an error', async () => {
       ChainController.state.activeCaipNetwork = {
-        id: 'eip155:1',
+        id: 1,
         chainNamespace: 'eip155',
-        chainId: '1',
+        caipNetworkId: 'eip155:1',
         name: 'Ethereum',
-        currency: 'ETH',
-        explorerUrl: 'https://etherscan.io',
-        rpcUrl: 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID'
+        nativeCurrency: {
+          name: 'Ethereum',
+          decimals: 18,
+          symbol: 'ETH'
+        },
+        rpcUrls: {
+          default: {
+            http: ['https://mainnet.infura.io/v3/YOUR-PROJECT-ID']
+          }
+        }
       }
       BlockchainApiController.fetchGasPrice = vi.fn().mockRejectedValue(new Error('API Error'))
 
diff --git a/packages/scaffold-ui/src/modal/w3m-account-button/index.ts b/packages/scaffold-ui/src/modal/w3m-account-button/index.ts
index 4d6d4d807c..cd4a78d87b 100644
--- a/packages/scaffold-ui/src/modal/w3m-account-button/index.ts
+++ b/packages/scaffold-ui/src/modal/w3m-account-button/index.ts
@@ -49,7 +49,7 @@ export class W3mAccountButton extends LitElement {
     this.unsubscribe.push(
       ...[
         AssetController.subscribeNetworkImages(() => {
-          this.networkImage = this.network?.imageId
+          this.networkImage = this.network?.assets?.imageId
             ? AssetUtil.getNetworkImage(this.network)
             : undefined
         }),
@@ -60,7 +60,7 @@ export class W3mAccountButton extends LitElement {
         AccountController.subscribeKey('profileImage', val => (this.profileImage = val)),
         ChainController.subscribeKey('activeCaipNetwork', val => {
           this.network = val
-          this.networkImage = val?.imageId ? AssetUtil.getNetworkImage(val) : undefined
+          this.networkImage = val?.assets?.imageId ? AssetUtil.getNetworkImage(val) : undefined
           this.isSupported = val?.chainNamespace
             ? ChainController.checkIfSupportedNetwork(val?.chainNamespace)
             : true
diff --git a/packages/scaffold-ui/src/modal/w3m-modal/index.ts b/packages/scaffold-ui/src/modal/w3m-modal/index.ts
index 44d733f416..b0b281ef66 100644
--- a/packages/scaffold-ui/src/modal/w3m-modal/index.ts
+++ b/packages/scaffold-ui/src/modal/w3m-modal/index.ts
@@ -230,8 +230,8 @@ export class W3mModal extends LitElement {
       return
     }
 
-    const prevCaipNetworkId = this.caipNetwork?.id?.toString()
-    const nextNetworkId = nextCaipNetwork?.id?.toString()
+    const prevCaipNetworkId = this.caipNetwork?.caipNetworkId?.toString()
+    const nextNetworkId = nextCaipNetwork?.caipNetworkId?.toString()
 
     if (prevCaipNetworkId && nextNetworkId && prevCaipNetworkId !== nextNetworkId) {
       if (this.isSiweEnabled) {
diff --git a/packages/scaffold-ui/src/modal/w3m-network-button/index.ts b/packages/scaffold-ui/src/modal/w3m-network-button/index.ts
index 3cf43a86ba..53f0f7009d 100644
--- a/packages/scaffold-ui/src/modal/w3m-network-button/index.ts
+++ b/packages/scaffold-ui/src/modal/w3m-network-button/index.ts
@@ -40,7 +40,7 @@ export class W3mNetworkButton extends LitElement {
     this.unsubscribe.push(
       ...[
         AssetController.subscribeNetworkImages(() => {
-          this.networkImage = this.network?.imageId
+          this.networkImage = this.network?.assets?.imageId
             ? AssetUtil.getNetworkImage(this.network)
             : undefined
         }),
@@ -49,7 +49,7 @@ export class W3mNetworkButton extends LitElement {
         }),
         ChainController.subscribeKey('activeCaipNetwork', val => {
           this.network = val
-          this.networkImage = val?.imageId ? AssetUtil.getNetworkImage(val) : undefined
+          this.networkImage = val?.assets?.imageId ? AssetUtil.getNetworkImage(val) : undefined
           this.isSupported = val?.chainNamespace
             ? ChainController.checkIfSupportedNetwork(val.chainNamespace)
             : true
diff --git a/packages/scaffold-ui/src/partials/w3m-account-wallet-features-widget/index.ts b/packages/scaffold-ui/src/partials/w3m-account-wallet-features-widget/index.ts
index 49b29068be..6b9922a0e1 100644
--- a/packages/scaffold-ui/src/partials/w3m-account-wallet-features-widget/index.ts
+++ b/packages/scaffold-ui/src/partials/w3m-account-wallet-features-widget/index.ts
@@ -226,7 +226,10 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
   }
 
   private onSwapClick() {
-    if (this.network?.id && !CoreConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(this.network?.id)) {
+    if (
+      this.network?.caipNetworkId &&
+      !CoreConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(this.network?.caipNetworkId)
+    ) {
       RouterController.push('UnsupportedChain', {
         swapUnsupportedChain: true
       })
@@ -235,7 +238,7 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
         type: 'track',
         event: 'OPEN_SWAP',
         properties: {
-          network: this.network?.id || '',
+          network: this.network?.caipNetworkId || '',
           isSmartAccount:
             AccountController.state.preferredAccountType ===
             W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
@@ -254,7 +257,7 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
       type: 'track',
       event: 'OPEN_SEND',
       properties: {
-        network: this.network?.id || '',
+        network: this.network?.caipNetworkId || '',
         isSmartAccount:
           AccountController.state.preferredAccountType ===
           W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
diff --git a/packages/scaffold-ui/src/partials/w3m-activity-list/index.ts b/packages/scaffold-ui/src/partials/w3m-activity-list/index.ts
index cb58ee6a72..2fcac28de4 100644
--- a/packages/scaffold-ui/src/partials/w3m-activity-list/index.ts
+++ b/packages/scaffold-ui/src/partials/w3m-activity-list/index.ts
@@ -93,7 +93,7 @@ export class W3mActivityList extends LitElement {
 
   // -- Private ------------------------------------------- //
   private updateTransactionView() {
-    const currentNetwork = ChainController.state.activeCaipNetwork?.id
+    const currentNetwork = ChainController.state.activeCaipNetwork?.caipNetworkId
     const lastNetworkInView = TransactionsController.state.lastNetworkInView
 
     if (lastNetworkInView !== currentNetwork) {
diff --git a/packages/scaffold-ui/src/partials/w3m-onramp-provider-item/index.ts b/packages/scaffold-ui/src/partials/w3m-onramp-provider-item/index.ts
index 9ccba7b9b5..fda69f9171 100644
--- a/packages/scaffold-ui/src/partials/w3m-onramp-provider-item/index.ts
+++ b/packages/scaffold-ui/src/partials/w3m-onramp-provider-item/index.ts
@@ -53,7 +53,9 @@ export class W3mOnRampProviderItem extends LitElement {
   // -- Private ------------------------------------------- //
   private networksTemplate() {
     const requestedCaipNetworks = ChainController.getAllRequestedCaipNetworks()
-    const slicedNetworks = requestedCaipNetworks?.filter(network => network?.imageId)?.slice(0, 5)
+    const slicedNetworks = requestedCaipNetworks
+      ?.filter(network => network?.assets?.imageId)
+      ?.slice(0, 5)
 
     return html`
       <wui-flex class="networks">
diff --git a/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts b/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts
index 8f54754f82..b8f3f32a27 100644
--- a/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts
@@ -82,7 +82,7 @@ export class W3mAccountSettingsView extends LitElement {
       throw new Error('w3m-account-settings-view: No account provided')
     }
 
-    const networkImage = this.networkImages[this.network?.imageId ?? '']
+    const networkImage = this.networkImages[this.network?.assets?.imageId ?? '']
 
     return html`
       <wui-flex
diff --git a/packages/scaffold-ui/src/views/w3m-networks-view/index.ts b/packages/scaffold-ui/src/views/w3m-networks-view/index.ts
index 0abfc39e16..92056b3f7e 100644
--- a/packages/scaffold-ui/src/views/w3m-networks-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-networks-view/index.ts
@@ -142,7 +142,7 @@ export class W3mNetworksView extends LitElement {
       return false
     }
 
-    return !approvedCaipNetworkIds?.includes(network.id)
+    return !approvedCaipNetworkIds?.includes(network.caipNetworkId)
   }
 
   private onSwitchNetwork(network: CaipNetwork) {
diff --git a/packages/scaffold-ui/src/views/w3m-swap-view/index.ts b/packages/scaffold-ui/src/views/w3m-swap-view/index.ts
index e43fc1f4cb..6554bb2f59 100644
--- a/packages/scaffold-ui/src/views/w3m-swap-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-swap-view/index.ts
@@ -27,7 +27,7 @@ export class W3mSwapView extends LitElement {
 
   @state() private detailsOpen = false
 
-  @state() private caipNetworkId = ChainController.state.activeCaipNetwork?.id
+  @state() private caipNetworkId = ChainController.state.activeCaipNetwork?.caipNetworkId
 
   @state() private initialized = SwapController.state.initialized
 
@@ -59,8 +59,8 @@ export class W3mSwapView extends LitElement {
   public constructor() {
     super()
     ChainController.subscribeKey('activeCaipNetwork', newCaipNetwork => {
-      if (this.caipNetworkId !== newCaipNetwork?.id) {
-        this.caipNetworkId = newCaipNetwork?.id
+      if (this.caipNetworkId !== newCaipNetwork?.caipNetworkId) {
+        this.caipNetworkId = newCaipNetwork?.caipNetworkId
         SwapController.resetState()
         SwapController.initializeState()
       }
diff --git a/packages/scaffold-ui/src/views/w3m-switch-address-view/index.ts b/packages/scaffold-ui/src/views/w3m-switch-address-view/index.ts
index 00e020b2d1..9ee72bb870 100644
--- a/packages/scaffold-ui/src/views/w3m-switch-address-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-switch-address-view/index.ts
@@ -45,14 +45,16 @@ export class W3mSwitchAddressView extends LitElement {
   public override connectedCallback() {
     super.connectedCallback()
     this.allAccounts.forEach(account => {
-      BlockchainApiController.getBalance(account.address, this.caipNetwork?.id).then(response => {
-        let total = this.balances[account.address] || 0
-        if (response.balances.length > 0) {
-          total = response.balances.reduce((acc, balance) => acc + (balance?.value || 0), 0)
+      BlockchainApiController.getBalance(account.address, this.caipNetwork?.caipNetworkId).then(
+        response => {
+          let total = this.balances[account.address] || 0
+          if (response.balances.length > 0) {
+            total = response.balances.reduce((acc, balance) => acc + (balance?.value || 0), 0)
+          }
+          this.balances[account.address] = total
+          this.requestUpdate()
         }
-        this.balances[account.address] = total
-        this.requestUpdate()
-      })
+      )
     })
   }
 
@@ -142,7 +144,7 @@ export class W3mSwitchAddressView extends LitElement {
   private onSwitchAddress(address: string) {
     const caipNetwork = ChainController.state.activeCaipNetwork
     const activeChainNamespace = caipNetwork?.chainNamespace
-    const caipAddress = `${activeChainNamespace}:${caipNetwork?.chainId}:${address}` as CaipAddress
+    const caipAddress = `${activeChainNamespace}:${caipNetwork?.id}:${address}` as CaipAddress
     AccountController.setCaipAddress(caipAddress, activeChainNamespace)
     ModalController.close()
   }
diff --git a/packages/scaffold-ui/src/views/w3m-unsupported-chain-view/index.ts b/packages/scaffold-ui/src/views/w3m-unsupported-chain-view/index.ts
index 48f280e163..4b3c568f0b 100644
--- a/packages/scaffold-ui/src/views/w3m-unsupported-chain-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-unsupported-chain-view/index.ts
@@ -91,7 +91,9 @@ export class W3mUnsupportedChainView extends LitElement {
     )
 
     const filteredNetworks = this.swapUnsupportedChain
-      ? sortedNetworks.filter(network => ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(network.id))
+      ? sortedNetworks.filter(network =>
+          ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(network.caipNetworkId)
+        )
       : sortedNetworks
 
     return filteredNetworks.map(
@@ -133,8 +135,8 @@ export class W3mUnsupportedChainView extends LitElement {
     const caipNetwork = ChainController.state.activeCaipNetwork
     const routerData = RouterController.state.data
 
-    if (caipAddress && caipNetwork?.id !== network.id) {
-      if (approvedCaipNetworkIds?.includes(network.id)) {
+    if (caipAddress && caipNetwork?.caipNetworkId !== network.caipNetworkId) {
+      if (approvedCaipNetworkIds?.includes(network.caipNetworkId)) {
         await ChainController.switchActiveNetwork(network)
       } else if (supportsAllNetworks) {
         RouterController.push('SwitchNetwork', { ...routerData, network })
diff --git a/packages/scaffold-ui/src/views/w3m-wallet-receive-view/index.ts b/packages/scaffold-ui/src/views/w3m-wallet-receive-view/index.ts
index 4b0b10d11f..39290edf00 100644
--- a/packages/scaffold-ui/src/views/w3m-wallet-receive-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-wallet-receive-view/index.ts
@@ -124,7 +124,7 @@ export class W3mWalletReceiveView extends LitElement {
       ></wui-compatible-network>`
     }
     const slicedNetworks = requestedCaipNetworks
-      ?.filter(network => (caipNetwork?.id === network.id ? network?.imageId : null))
+      ?.filter(network => network?.assets?.imageId)
       ?.slice(0, 5)
     const imagesArray = slicedNetworks.map(AssetUtil.getNetworkImage).filter(Boolean) as string[]
 
diff --git a/packages/scaffold-ui/src/views/w3m-wallet-send-select-token-view/index.ts b/packages/scaffold-ui/src/views/w3m-wallet-send-select-token-view/index.ts
index 4bfe72bbfa..9c67404507 100644
--- a/packages/scaffold-ui/src/views/w3m-wallet-send-select-token-view/index.ts
+++ b/packages/scaffold-ui/src/views/w3m-wallet-send-select-token-view/index.ts
@@ -71,7 +71,7 @@ export class W3mSendSelectTokenView extends LitElement {
 
   private templateTokens() {
     this.tokens = this.tokenBalance?.filter(
-      token => token.chainId === ChainController.state.activeCaipNetwork?.id
+      token => token.chainId === ChainController.state.activeCaipNetwork?.caipNetworkId
     )
     if (this.search) {
       this.filteredTokens = this.tokenBalance?.filter(token =>
diff --git a/packages/siwe/scaffold/views/w3m-connecting-siwe-view/index.ts b/packages/siwe/scaffold/views/w3m-connecting-siwe-view/index.ts
index c75fa1896c..65a2fa9d29 100644
--- a/packages/siwe/scaffold/views/w3m-connecting-siwe-view/index.ts
+++ b/packages/siwe/scaffold/views/w3m-connecting-siwe-view/index.ts
@@ -82,7 +82,7 @@ export class W3mConnectingSiweView extends LitElement {
       event: 'CLICK_SIGN_SIWE_MESSAGE',
       type: 'track',
       properties: {
-        network: ChainController.state.activeCaipNetwork?.id || '',
+        network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
         isSmartAccount:
           AccountController.state.preferredAccountType ===
           W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
@@ -96,7 +96,7 @@ export class W3mConnectingSiweView extends LitElement {
         event: 'SIWE_AUTH_SUCCESS',
         type: 'track',
         properties: {
-          network: ChainController.state.activeCaipNetwork?.id || '',
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
           isSmartAccount:
             AccountController.state.preferredAccountType ===
             W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
@@ -119,7 +119,7 @@ export class W3mConnectingSiweView extends LitElement {
         event: 'SIWE_AUTH_ERROR',
         type: 'track',
         properties: {
-          network: ChainController.state.activeCaipNetwork?.id || '',
+          network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
           isSmartAccount
         }
       })
@@ -142,7 +142,7 @@ export class W3mConnectingSiweView extends LitElement {
       event: 'CLICK_CANCEL_SIWE',
       type: 'track',
       properties: {
-        network: ChainController.state.activeCaipNetwork?.id || '',
+        network: ChainController.state.activeCaipNetwork?.caipNetworkId || '',
         isSmartAccount:
           AccountController.state.preferredAccountType ===
           W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
diff --git a/packages/siwe/src/client.ts b/packages/siwe/src/client.ts
index 31c3f338d7..0f028a946e 100644
--- a/packages/siwe/src/client.ts
+++ b/packages/siwe/src/client.ts
@@ -16,7 +16,7 @@ import {
   ModalController,
   CoreHelperUtil
 } from '@reown/appkit-core'
-import { NetworkUtil, type CaipAddress } from '@reown/appkit-common'
+import { type CaipAddress } from '@reown/appkit-common'
 import { ConstantsUtil } from '../core/utils/ConstantsUtil.js'
 
 // -- Client -------------------------------------------------------------------- //
@@ -106,7 +106,7 @@ export class AppKitSIWEClient {
       throw new Error('A chainId is required to create a SIWE message.')
     }
 
-    const chainId = NetworkUtil.caipNetworkIdToNumber(caipNetwork.id)
+    const chainId = caipNetwork.id
 
     if (!chainId) {
       throw new Error('A chainId is required to create a SIWE message.')
diff --git a/packages/solana/exports/chains.ts b/packages/solana/exports/chains.ts
deleted file mode 100644
index ffee02ad6f..0000000000
--- a/packages/solana/exports/chains.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { solana, solanaDevnet, solanaTestnet } from '@reown/appkit/networks'
diff --git a/packages/ui/src/composites/wui-list-account/index.ts b/packages/ui/src/composites/wui-list-account/index.ts
index 1a46c8e7e3..753143d4bc 100644
--- a/packages/ui/src/composites/wui-list-account/index.ts
+++ b/packages/ui/src/composites/wui-list-account/index.ts
@@ -47,15 +47,17 @@ export class WuiListAccount extends LitElement {
 
   public override connectedCallback() {
     super.connectedCallback()
-    BlockchainApiController.getBalance(this.accountAddress, this.caipNetwork?.id).then(response => {
-      let total = this.balance
-      if (response.balances.length > 0) {
-        total = response.balances.reduce((acc, balance) => acc + (balance?.value || 0), 0)
+    BlockchainApiController.getBalance(this.accountAddress, this.caipNetwork?.caipNetworkId).then(
+      response => {
+        let total = this.balance
+        if (response.balances.length > 0) {
+          total = response.balances.reduce((acc, balance) => acc + (balance?.value || 0), 0)
+        }
+        this.balance = total
+        this.fetchingBalance = false
+        this.requestUpdate()
       }
-      this.balance = total
-      this.fetchingBalance = false
-      this.requestUpdate()
-    })
+    )
   }
 
   // -- Render -------------------------------------------- //
diff --git a/packages/wagmi/package.json b/packages/wagmi/package.json
index 5f6e78bf99..a0e0949a62 100644
--- a/packages/wagmi/package.json
+++ b/packages/wagmi/package.json
@@ -65,7 +65,7 @@
     "@wagmi/core": "2.13.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "viem": "2.21.4",
+    "viem": "2.x",
     "vue": "3.4.3",
     "wagmi": "2.12.9",
     "vitest": "2.0.5"
@@ -75,7 +75,7 @@
     "@wagmi/core": ">=2.0.0",
     "react": ">=17",
     "react-dom": ">=17",
-    "viem": ">=2.0.0",
+    "viem": "2.x",
     "vue": ">=3",
     "wagmi": ">=2.0.0"
   },
diff --git a/packages/wagmi/tests/mocks/adapter.mock.ts b/packages/wagmi/tests/mocks/adapter.mock.ts
index 7b84cce5c9..fb504d71de 100644
--- a/packages/wagmi/tests/mocks/adapter.mock.ts
+++ b/packages/wagmi/tests/mocks/adapter.mock.ts
@@ -1,38 +1,27 @@
 import { WagmiAdapter } from '@reown/appkit-adapter-wagmi'
-import { mainnet as wagmiMainnet } from 'viem/chains'
 import { createConfig, http } from 'wagmi'
 import { mock } from 'wagmi/connectors'
+import { mainnet } from '@reown/appkit/networks'
 
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'
 import { AppKit, type SdkVersion } from '@reown/appkit'
-import type { CaipNetwork } from '@reown/appkit-common'
-
-export const mainnet: CaipNetwork = {
-  id: 'eip155:1',
-  chainId: 1,
-  name: 'Ethereum',
-  currency: 'ETH',
-  explorerUrl: 'https://etherscan.io',
-  rpcUrl: 'https://rpc.walletconnect.org/v1/?chainId=eip155:1&projectId=PROJECT_ID',
-  chainNamespace: 'eip155'
-}
 
 const privateKey = generatePrivateKey()
 export const mockAccount = privateKeyToAccount(privateKey)
 
 export const wagmiConfigMock = createConfig({
-  chains: [wagmiMainnet],
+  chains: [mainnet],
   connectors: [mock({ accounts: [mockAccount.address] })],
   transports: {
-    [wagmiMainnet.id]: http()
+    [mainnet.id]: http()
   }
 })
 
 export const wagmiAdapterMock = new WagmiAdapter({
-  chains: [wagmiMainnet],
+  chains: [mainnet],
   connectors: [mock({ accounts: [mockAccount.address] })],
   transports: {
-    [wagmiMainnet.id]: http()
+    [mainnet.id]: http()
   },
   networks: [mainnet],
   projectId: '1234'
@@ -40,7 +29,7 @@ export const wagmiAdapterMock = new WagmiAdapter({
 
 const mockAppKitData = {
   adapters: [wagmiAdapterMock],
-  networks: [mainnet],
+  networks: wagmiAdapterMock.caipNetworks,
   defaultNetwork: mainnet,
   metadata: {
     description: 'Desc',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 85712b0e53..761bdc1bb2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1140,6 +1140,9 @@ importers:
       valtio:
         specifier: 1.11.2
         version: 1.11.2(@types/react@18.2.0)(react@18.2.0)
+      viem:
+        specifier: 2.x
+        version: 2.21.4(bufferutil@4.0.8)(typescript@5.3.3)(utf-8-validate@5.0.10)(zod@3.22.4)
     devDependencies:
       '@types/react':
         specifier: 18.2.0
@@ -1163,7 +1166,7 @@ importers:
         specifier: 2.0.5
         version: 2.0.5(@types/node@20.11.5)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.33.0)
       vue:
-        specifier: 3.4.3
+        specifier: 3.x
         version: 3.4.3(typescript@5.3.3)
 
   packages/appkit-utils:
@@ -1230,7 +1233,7 @@ importers:
         specifier: '>=5'
         version: 5.3.3
       viem:
-        specifier: 2.21.4
+        specifier: 2.x
         version: 2.21.4(bufferutil@4.0.8)(typescript@5.3.3)(utf-8-validate@5.0.10)(zod@3.22.4)
       vite:
         specifier: 5.2.11
@@ -1251,6 +1254,9 @@ importers:
       dayjs:
         specifier: 1.11.10
         version: 1.11.10
+      viem:
+        specifier: 2.x
+        version: 2.21.4(bufferutil@4.0.8)(typescript@5.3.3)(utf-8-validate@5.0.10)(zod@3.22.4)
     devDependencies:
       '@vitest/coverage-v8':
         specifier: 2.0.5
@@ -1273,16 +1279,19 @@ importers:
       valtio:
         specifier: 1.11.2
         version: 1.11.2(@types/react@18.2.62)(react@18.2.0)
+      viem:
+        specifier: 2.x
+        version: 2.21.4(bufferutil@4.0.8)(typescript@5.3.3)(utf-8-validate@5.0.10)(zod@3.22.4)
     devDependencies:
       '@vitest/coverage-v8':
         specifier: 2.0.5
         version: 2.0.5(vitest@2.0.5(@types/node@20.11.5)(jsdom@24.1.0)(terser@5.33.0))
-      viem:
-        specifier: 2.21.4
-        version: 2.21.4(bufferutil@4.0.8)(typescript@5.3.3)(utf-8-validate@5.0.10)(zod@3.22.4)
       vitest:
         specifier: 2.0.5
         version: 2.0.5(@types/node@20.11.5)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.33.0)
+      vue:
+        specifier: 3.x
+        version: 3.4.3(typescript@5.3.3)
 
   packages/ethers:
     dependencies:
@@ -1606,7 +1615,7 @@ importers:
         specifier: 18.2.0
         version: 18.2.0(react@18.2.0)
       viem:
-        specifier: 2.21.4
+        specifier: 2.x
         version: 2.21.4(bufferutil@4.0.8)(typescript@5.3.3)(utf-8-validate@5.0.10)(zod@3.22.4)
       vitest:
         specifier: 2.0.5