diff --git a/examples/vue3/src/main.ts b/examples/vue3/src/main.ts
index ef463a49..71463dfb 100644
--- a/examples/vue3/src/main.ts
+++ b/examples/vue3/src/main.ts
@@ -6,19 +6,30 @@ import { quirksPlugin } from '@quirks/vue';
 
 const app = createApp(App);
 
-import {
-  bitsong,
-  bitsongAssetList,
-  osmosis,
-  osmosisAssetList,
-} from '@nabla-studio/chain-registry';
+import { osmosis, osmosisAssetList } from '@nabla-studio/chain-registry';
 import type { Config } from '@quirks/store';
-import { keplrExtension, keplrMobile, leapExtension } from '@quirks/wallets';
+import {
+  cosmostationMobile,
+  keplrExtension,
+  keplrMobile,
+  leapExtension,
+  okxExtension,
+  stationExtension,
+  xdefiExtension,
+} from '@quirks/wallets';
 
 const config: Config = {
-  wallets: [keplrExtension, leapExtension, keplrMobile],
-  chains: [osmosis, bitsong],
-  assetsLists: [osmosisAssetList, bitsongAssetList],
+  wallets: [
+    keplrExtension,
+    leapExtension,
+    keplrMobile,
+    xdefiExtension,
+    stationExtension,
+    okxExtension,
+    cosmostationMobile,
+  ],
+  chains: [osmosis],
+  assetsLists: [osmosisAssetList],
   walletConnectOptions: {
     providerOpts: {
       logger: 'info',
diff --git a/examples/vue3/src/views/HomeView.vue b/examples/vue3/src/views/HomeView.vue
index 26e56f78..a9a08c43 100644
--- a/examples/vue3/src/views/HomeView.vue
+++ b/examples/vue3/src/views/HomeView.vue
@@ -16,10 +16,6 @@ const { connect, disconnect, connected, status, walletName } = useConnect();
 const { pairingURI } = useWalletConnect();
 
 const open = async (chainName: string) => {
-  const suggestChains = (await import('@quirks/store')).suggestChains;
-  await suggestChains(chainName, [
-    { chain: bitsong, assetList: bitsongAssetList, name: 'bitsong' },
-  ]);
   await connect(chainName);
 };
 
@@ -68,7 +64,7 @@ const send = async () => {
       <div v-for="wallet in wallets" :key="wallet.options.wallet_name">
         <button @click="open(wallet.options.wallet_name)">
           <img
-            :src="wallet.logoLight"
+            :src="wallet.logoLight ?? wallet.logoDark"
             :alt="wallet.options.pretty_name"
             height="48px"
             width="48px"
diff --git a/packages/wallet-registry/src/types/wallet.ts b/packages/wallet-registry/src/types/wallet.ts
index 032928eb..41462b89 100644
--- a/packages/wallet-registry/src/types/wallet.ts
+++ b/packages/wallet-registry/src/types/wallet.ts
@@ -15,6 +15,7 @@ export interface CosmosWallet {
   website?: string;
   git_repo?: string;
   supported_chains: string[];
+  connection_type?: 'browser_extension' | 'wallet_connect';
   features?: ('suggest_chain' | 'get_supported_chains' | 'icns')[];
   platforms: {
     device: 'mobile' | 'tablet' | 'desktop' | 'other';
diff --git a/packages/wallet-registry/src/wallets/cosmostationextension.ts b/packages/wallet-registry/src/wallets/cosmostationextension.ts
index fe8c9976..86d9b1c4 100644
--- a/packages/wallet-registry/src/wallets/cosmostationextension.ts
+++ b/packages/wallet-registry/src/wallets/cosmostationextension.ts
@@ -4,6 +4,7 @@ export const cosmostationextension: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'cosmostationextention',
   pretty_name: 'Cosmostation',
+  connection_type: 'browser_extension',
   website: 'https://www.cosmostation.io/',
   git_repo: 'https://github.com/cosmostation/cosmostation-chrome-extension',
   supported_chains: [
diff --git a/packages/wallet-registry/src/wallets/cosmostationmobile.ts b/packages/wallet-registry/src/wallets/cosmostationmobile.ts
index 9ad09205..ac0565fe 100644
--- a/packages/wallet-registry/src/wallets/cosmostationmobile.ts
+++ b/packages/wallet-registry/src/wallets/cosmostationmobile.ts
@@ -3,7 +3,8 @@ import type { CosmosWallet } from '../types';
 export const cosmostationmobile: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'cosmostation',
-  pretty_name: 'Cosmostation',
+  pretty_name: 'Cosmostation Mobile',
+  connection_type: 'wallet_connect',
   website: 'https://www.cosmostation.io/',
   git_repo: 'https://github.com/cosmostation/cosmostation-android',
   supported_chains: [
@@ -89,12 +90,22 @@ export const cosmostationmobile: CosmosWallet = {
       layout: 'logomark',
     },
   ],
+  wallet_connect: {
+    deeplink: {
+      path: {
+        android: 'wc',
+        ios: 'wc',
+      },
+    },
+  },
   mobile: {
     ios: {
       bundle_identifier: 'io.wannabit.cosmostation',
+      schema: 'cosmostation',
     },
     android: {
       package_name: 'wannabit.io.cosmostaion',
+      schema: 'cosmostation',
     },
   },
 };
diff --git a/packages/wallet-registry/src/wallets/index.ts b/packages/wallet-registry/src/wallets/index.ts
index 058f5522..bcfe0f9c 100644
--- a/packages/wallet-registry/src/wallets/index.ts
+++ b/packages/wallet-registry/src/wallets/index.ts
@@ -1,5 +1,6 @@
 export * from './xdefiextension';
 export * from './trustwalletmobile';
+export * from './okxextension';
 export * from './leapmobile';
 export * from './leapextension';
 export * from './keplrmobile';
diff --git a/packages/wallet-registry/src/wallets/keplrextension.ts b/packages/wallet-registry/src/wallets/keplrextension.ts
index 82cc2c8b..bb6a7d38 100644
--- a/packages/wallet-registry/src/wallets/keplrextension.ts
+++ b/packages/wallet-registry/src/wallets/keplrextension.ts
@@ -4,6 +4,7 @@ export const keplrextension: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'keplrextension',
   pretty_name: 'Keplr',
+  connection_type: 'browser_extension',
   website: 'https://www.keplr.app/',
   git_repo: 'https://github.com/chainapsis/keplr-wallet',
   supported_chains: [
diff --git a/packages/wallet-registry/src/wallets/keplrmobile.ts b/packages/wallet-registry/src/wallets/keplrmobile.ts
index a5234967..8cd3108a 100644
--- a/packages/wallet-registry/src/wallets/keplrmobile.ts
+++ b/packages/wallet-registry/src/wallets/keplrmobile.ts
@@ -3,7 +3,8 @@ import type { CosmosWallet } from '../types';
 export const keplrmobile: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'keplrmobile',
-  pretty_name: 'Keplr',
+  pretty_name: 'Keplr Mobile',
+  connection_type: 'wallet_connect',
   website: 'https://www.keplr.app/',
   git_repo: 'https://github.com/chainapsis/keplr-wallet',
   supported_chains: [
diff --git a/packages/wallet-registry/src/wallets/leapextension.ts b/packages/wallet-registry/src/wallets/leapextension.ts
index 7e9f663d..2eadffe5 100644
--- a/packages/wallet-registry/src/wallets/leapextension.ts
+++ b/packages/wallet-registry/src/wallets/leapextension.ts
@@ -3,7 +3,8 @@ import type { CosmosWallet } from '../types';
 export const leapextension: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'leapextension',
-  pretty_name: 'Leap Cosmos Wallet',
+  pretty_name: 'Leap',
+  connection_type: 'browser_extension',
   website: 'https://www.leapwallet.io/',
   git_repo: '',
   supported_chains: [
diff --git a/packages/wallet-registry/src/wallets/leapmobile.ts b/packages/wallet-registry/src/wallets/leapmobile.ts
index 6664eaef..80f8a92c 100644
--- a/packages/wallet-registry/src/wallets/leapmobile.ts
+++ b/packages/wallet-registry/src/wallets/leapmobile.ts
@@ -3,7 +3,8 @@ import type { CosmosWallet } from '../types';
 export const leapmobile: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'leapmobile',
-  pretty_name: 'Leap cosmos',
+  pretty_name: 'Leap Mobile',
+  connection_type: 'wallet_connect',
   website: 'https://leapwallet.io',
   git_repo: '',
   supported_chains: [
diff --git a/packages/wallet-registry/src/wallets/okxextension.ts b/packages/wallet-registry/src/wallets/okxextension.ts
new file mode 100644
index 00000000..6e731585
--- /dev/null
+++ b/packages/wallet-registry/src/wallets/okxextension.ts
@@ -0,0 +1,39 @@
+import type { CosmosWallet } from '../types';
+
+export const okxextension: CosmosWallet = {
+  $schema: '../../wallet.schema.json',
+  wallet_name: 'okxextension',
+  pretty_name: 'OKX',
+  connection_type: 'browser_extension',
+  website: 'https://www.okx.com/',
+  git_repo: 'https://github.com/okx',
+  supported_chains: ['cosmoshub', 'osmosis'],
+  features: [],
+  platforms: [
+    {
+      device: 'desktop',
+      type: 'extension',
+      platform: 'chrome',
+      install_link:
+        'https://chrome.google.com/webstore/detail/okx-wallet/mcohilncbfahbmgdjkbpemcciiolgcge',
+    },
+    {
+      device: 'desktop',
+      type: 'extension',
+      platform: 'firefox',
+      install_link:
+        'https://addons.mozilla.org/zh-CN/firefox/addon/okexwallet/',
+    },
+  ],
+  images: [
+    {
+      png: 'https://raw.githubusercontent.com/cosmos/wallet-registry/main/wallets/okxextension/images/logo.png',
+      theme: {
+        primary_color_hex: '#000000',
+        circle: false,
+        dark_mode: true,
+      },
+      layout: 'logomark',
+    },
+  ],
+};
diff --git a/packages/wallet-registry/src/wallets/trustwalletmobile.ts b/packages/wallet-registry/src/wallets/trustwalletmobile.ts
index 6130a179..d8876330 100644
--- a/packages/wallet-registry/src/wallets/trustwalletmobile.ts
+++ b/packages/wallet-registry/src/wallets/trustwalletmobile.ts
@@ -4,6 +4,7 @@ export const trustwalletmobile: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'trustwalletmobile',
   pretty_name: 'Trust Wallet',
+  connection_type: 'wallet_connect',
   website: 'https://www.trustwallet.com',
   git_repo: 'https://github.com/trustwallet',
   supported_chains: [
diff --git a/packages/wallet-registry/src/wallets/xdefiextension.ts b/packages/wallet-registry/src/wallets/xdefiextension.ts
index cf27580a..eceb0a53 100644
--- a/packages/wallet-registry/src/wallets/xdefiextension.ts
+++ b/packages/wallet-registry/src/wallets/xdefiextension.ts
@@ -4,6 +4,7 @@ export const xdefiextension: CosmosWallet = {
   $schema: '../../wallet.schema.json',
   wallet_name: 'xdefiextension',
   pretty_name: 'xDefi',
+  connection_type: 'browser_extension',
   website: 'https://www.xdefi.io/',
   git_repo: '',
   supported_chains: [
diff --git a/packages/wallet-registry/wallet-registry b/packages/wallet-registry/wallet-registry
index 46a7e9b1..29526bac 160000
--- a/packages/wallet-registry/wallet-registry
+++ b/packages/wallet-registry/wallet-registry
@@ -1 +1 @@
-Subproject commit 46a7e9b1abff15c3dfa1086a905e0b8def3bf3b6
+Subproject commit 29526bacda2edee46bc3f1380150a412c4c24429
diff --git a/packages/wallets/src/cosmostation-mobile/index.ts b/packages/wallets/src/cosmostation-mobile/index.ts
new file mode 100644
index 00000000..f9abe9ae
--- /dev/null
+++ b/packages/wallets/src/cosmostation-mobile/index.ts
@@ -0,0 +1,6 @@
+import { WCWallet } from '@quirks/core';
+import { cosmostationWalletMobileConnectOptions } from './registry';
+
+const cosmostationMobile = new WCWallet(cosmostationWalletMobileConnectOptions);
+
+export { cosmostationMobile };
diff --git a/packages/wallets/src/cosmostation-mobile/registry.ts b/packages/wallets/src/cosmostation-mobile/registry.ts
new file mode 100644
index 00000000..0fb4033f
--- /dev/null
+++ b/packages/wallets/src/cosmostation-mobile/registry.ts
@@ -0,0 +1,10 @@
+import { WalletConnectionTypes, type WalletOptions } from '@quirks/core';
+import { cosmostationmobile } from '@nabla-studio/wallet-registry';
+
+export const cosmostationWalletMobileConnectOptions: WalletOptions = {
+  ...cosmostationmobile,
+  connectionType: WalletConnectionTypes.WALLET_CONNECT,
+  events: {
+    keystorechange: 'accountsChanged',
+  },
+};
diff --git a/packages/wallets/src/index.ts b/packages/wallets/src/index.ts
index 664d7e17..643a1b5a 100644
--- a/packages/wallets/src/index.ts
+++ b/packages/wallets/src/index.ts
@@ -3,8 +3,10 @@ export * from './leap';
 export * from './cosmostation';
 export * from './xdefi';
 export * from './station';
+export * from './okx';
 export * from './wallet-connect';
 export * from './keplr-mobile';
 export * from './leap-mobile';
+export * from './cosmostation-mobile';
 export * from './utils';
 export * from './types';
diff --git a/packages/wallets/src/keplr/extension.ts b/packages/wallets/src/keplr/extension.ts
index 85e74ef2..80a7d567 100644
--- a/packages/wallets/src/keplr/extension.ts
+++ b/packages/wallets/src/keplr/extension.ts
@@ -21,7 +21,9 @@ import type { Keplr } from '@keplr-wallet/types';
 import Long from 'long';
 import { getChainInfo } from '../utils';
 
-export class KeplrWalletExtension extends ExtensionWallet<Keplr> {
+export class KeplrWalletExtension<
+  T extends Keplr = Keplr,
+> extends ExtensionWallet<T> {
   constructor(options: WalletOptions) {
     super(options);
   }
diff --git a/packages/wallets/src/okx/extension.ts b/packages/wallets/src/okx/extension.ts
new file mode 100644
index 00000000..5142f559
--- /dev/null
+++ b/packages/wallets/src/okx/extension.ts
@@ -0,0 +1,11 @@
+import { assertIsDefined } from '@quirks/core';
+import { KeplrWalletExtension } from '../keplr/extension';
+import { OKX } from './types';
+
+export class OKXWalletExtension extends KeplrWalletExtension<OKX> {
+  override async disable(): Promise<void> {
+    assertIsDefined(this.client);
+
+    return this.client.disconnect();
+  }
+}
diff --git a/packages/wallets/src/okx/index.ts b/packages/wallets/src/okx/index.ts
new file mode 100644
index 00000000..806c01fd
--- /dev/null
+++ b/packages/wallets/src/okx/index.ts
@@ -0,0 +1,6 @@
+import { OKXWalletExtension } from './extension';
+import { okxExtensionOptions } from './registry';
+
+const okxExtension = new OKXWalletExtension(okxExtensionOptions);
+
+export { okxExtension };
diff --git a/packages/wallets/src/okx/registry.ts b/packages/wallets/src/okx/registry.ts
new file mode 100644
index 00000000..9b9a0328
--- /dev/null
+++ b/packages/wallets/src/okx/registry.ts
@@ -0,0 +1,11 @@
+import { WalletConnectionTypes, type WalletOptions } from '@quirks/core';
+import { okxextension } from '@nabla-studio/wallet-registry';
+
+export const okxExtensionOptions: WalletOptions = {
+  ...okxextension,
+  connectionType: WalletConnectionTypes.EXTENSION,
+  windowKey: 'okxwallet.keplr',
+  events: {
+    keystorechange: 'okxwallet_keystorechange',
+  },
+};
diff --git a/packages/wallets/src/okx/types.ts b/packages/wallets/src/okx/types.ts
new file mode 100644
index 00000000..ab48be6c
--- /dev/null
+++ b/packages/wallets/src/okx/types.ts
@@ -0,0 +1,5 @@
+import type { Keplr } from '@keplr-wallet/types';
+
+export interface OKX extends Keplr {
+  disconnect: () => Promise<void>;
+}