diff --git a/groups/index.json b/groups/index.json
index c6cdc32..15790e5 100644
--- a/groups/index.json
+++ b/groups/index.json
@@ -1 +1 @@
-[{"id":1,"name":"BTC","tokenIdList":[11,12,13,14,15,21,22,23,24,25],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]},{"tokenId":21,"vaultIds":[3,4]},{"tokenId":22,"vaultIds":[3]},{"tokenId":23,"vaultIds":[3]},{"tokenId":24,"vaultIds":[3]},{"tokenId":25,"vaultIds":[3]}]},{"id":2,"name":"ETH","tokenIdList":[3,21,22,23,24,25,12,13,14,15],"tokensWithVaults":[{"tokenId":3,"vaultIds":[1]},{"tokenId":21,"vaultIds":[3,4]},{"tokenId":22,"vaultIds":[3]},{"tokenId":23,"vaultIds":[3]},{"tokenId":24,"vaultIds":[3]},{"tokenId":25,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":3,"name":"ETH L2","tokenIdList":[22,23,21,25,24,15,14,13,12,11],"tokensWithVaults":[{"tokenId":22,"vaultIds":[3]},{"tokenId":23,"vaultIds":[3]},{"tokenId":21,"vaultIds":[3,4]},{"tokenId":25,"vaultIds":[3]},{"tokenId":24,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]},{"tokenId":14,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":11,"vaultIds":[3]}]},{"id":4,"name":"L1 Networks","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":5,"name":"LP tokens","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":6,"name":"Governance tokens","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":7,"name":"Memes","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":8,"name":"Stablecoins","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":9,"name":"Others","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]}]
\ No newline at end of file
+[{"id":1,"name":"BTC","tokenIdList":[11,12,13,14,15,21,22,23,24,25],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]},{"tokenId":21,"vaultIds":[3,4]},{"tokenId":22,"vaultIds":[3]},{"tokenId":23,"vaultIds":[3]},{"tokenId":24,"vaultIds":[3]},{"tokenId":25,"vaultIds":[3]}]},{"id":2,"name":"ETH","tokenIdList":[3,1,21,22,23,24,25,12,13,14,15],"tokensWithVaults":[{"tokenId":3,"vaultIds":[1]},{"tokenId":1,"vaultIds":[5]},{"tokenId":21,"vaultIds":[3,4]},{"tokenId":22,"vaultIds":[3]},{"tokenId":23,"vaultIds":[3]},{"tokenId":24,"vaultIds":[3]},{"tokenId":25,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":3,"name":"ETH L2","tokenIdList":[22,2,23,21,25,24,15,14,13,12,11],"tokensWithVaults":[{"tokenId":22,"vaultIds":[3]},{"tokenId":2,"vaultIds":[6]},{"tokenId":23,"vaultIds":[3]},{"tokenId":21,"vaultIds":[3,4]},{"tokenId":25,"vaultIds":[3]},{"tokenId":24,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]},{"tokenId":14,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":11,"vaultIds":[3]}]},{"id":4,"name":"L1 Networks","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":5,"name":"LP tokens","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":6,"name":"Governance tokens","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":7,"name":"Memes","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":8,"name":"Stablecoins","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]},{"id":9,"name":"Others","tokenIdList":[11,12,13,14,15],"tokensWithVaults":[{"tokenId":11,"vaultIds":[3]},{"tokenId":12,"vaultIds":[3]},{"tokenId":13,"vaultIds":[3]},{"tokenId":14,"vaultIds":[3]},{"tokenId":15,"vaultIds":[3,4]}]}]
\ No newline at end of file
diff --git a/src/groups.ts b/src/groups.ts
index d68c321..0d93652 100644
--- a/src/groups.ts
+++ b/src/groups.ts
@@ -17,12 +17,12 @@ const GROUPS: Group[] = [
 	{
 		id: 2,
 		name: "ETH",
-		tokenIdList: [3, 21, 22, 23, 24, 25, 12, 13, 14, 15],
+		tokenIdList: [3, 1, 21, 22, 23, 24, 25, 12, 13, 14, 15],
 	},
 	{
 		id: 3,
 		name: "ETH L2",
-		tokenIdList: [22, 23, 21, 25, 24, 15, 14, 13, 12, 11],
+		tokenIdList: [22, 2, 23, 21, 25, 24, 15, 14, 13, 12, 11],
 	},
 	{
 		id: 4,
diff --git a/src/vaults.ts b/src/vaults.ts
index 6a91559..b6930e9 100644
--- a/src/vaults.ts
+++ b/src/vaults.ts
@@ -36,6 +36,14 @@ export const VAULTS: Vault[] = [
 		id: 4,
 		tokenIdList: [15, 21],
 	},
+	{
+		id: 5,
+		tokenIdList: [1],
+	},
+	{
+		id: 6,
+		tokenIdList: [2],
+	},
 ];
 
 const VAULTS_EXTENDED: VaultExtended[] = VAULTS.map((x) => {
diff --git a/vaults/index.json b/vaults/index.json
index f449a5f..c1e09f6 100644
--- a/vaults/index.json
+++ b/vaults/index.json
@@ -1 +1 @@
-[{"id":1,"tokenIdList":[3],"address":"0x7dCBc948D57BC757391832B809490941473817eD","withdrawalApproverAddress":"0x90eA4C583aE79f1DABD8A46Fe5AF20952B61B706","tokens":[{"id":3,"address":"0x748017AEA3d1075df4Fd1e1e743780526757b379","cid":2,"name":"Token1","decimals":18}],"chain":{"cid":2,"ecosystemName":"evm","name":"sepolia","displayName":"Sepolia","id":11155111}},{"id":2,"tokenIdList":[4],"address":"H7C5br4xbRa8C3CrKAYb3iiwoQzmwWwWDeyg7JV31ZNa","withdrawalApproverAddress":"B6vVuf2Q1TGp1PnoyiyHiLGYZBXRBuj9M82TnPTcvTbg","tokens":[{"id":4,"address":"mZf5RyCosgCz93YBWzLf7876ThhviA5J5c9LdQgX5Kc","cid":6,"name":"Token2","decimals":18}],"chain":{"cid":6,"ecosystemName":"solana","name":"solana devnet","displayName":"Solana Devnet"}},{"id":3,"tokenIdList":[11,12,13,14,15,21,22,23,24,25],"tokens":[{"id":11,"cid":2,"name":"IBTC","displayName":"InterBTC","decimals":18},{"id":12,"cid":2,"name":"eBTC","displayName":"ether.fi Staked BTC","decimals":18},{"id":13,"cid":2,"name":"WBTC","displayName":"Wrapped BTC","decimals":18},{"id":14,"cid":2,"name":"dlcBTC","decimals":18},{"id":15,"cid":2,"name":"TBTC","displayName":"tBTC","decimals":18},{"id":21,"cid":2,"name":"ETH","displayName":"Ether","decimals":18},{"id":22,"cid":2,"name":"amphrETH","displayName":"Amphor ETH","decimals":18},{"id":23,"cid":2,"name":"uniETH","displayName":"Universal ETH","decimals":18},{"id":24,"cid":2,"name":"agETH","displayName":"Kelp Gain","decimals":18},{"id":25,"cid":2,"name":"amphr2ETH","decimals":18}],"chain":{"cid":2,"ecosystemName":"evm","name":"sepolia","displayName":"Sepolia","id":11155111}},{"id":4,"tokenIdList":[15,21],"tokens":[{"id":15,"cid":2,"name":"TBTC","displayName":"tBTC","decimals":18},{"id":21,"cid":2,"name":"ETH","displayName":"Ether","decimals":18}],"chain":{"cid":2,"ecosystemName":"evm","name":"sepolia","displayName":"Sepolia","id":11155111}}]
\ No newline at end of file
+[{"id":1,"tokenIdList":[3],"address":"0x7dCBc948D57BC757391832B809490941473817eD","withdrawalApproverAddress":"0x90eA4C583aE79f1DABD8A46Fe5AF20952B61B706","tokens":[{"id":3,"address":"0x748017AEA3d1075df4Fd1e1e743780526757b379","cid":2,"name":"Token1","decimals":18}],"chain":{"cid":2,"ecosystemName":"evm","name":"sepolia","displayName":"Sepolia","id":11155111}},{"id":2,"tokenIdList":[4],"address":"H7C5br4xbRa8C3CrKAYb3iiwoQzmwWwWDeyg7JV31ZNa","withdrawalApproverAddress":"B6vVuf2Q1TGp1PnoyiyHiLGYZBXRBuj9M82TnPTcvTbg","tokens":[{"id":4,"address":"mZf5RyCosgCz93YBWzLf7876ThhviA5J5c9LdQgX5Kc","cid":6,"name":"Token2","decimals":18}],"chain":{"cid":6,"ecosystemName":"solana","name":"solana devnet","displayName":"Solana Devnet"}},{"id":3,"tokenIdList":[11,12,13,14,15,21,22,23,24,25],"tokens":[{"id":11,"cid":2,"name":"IBTC","displayName":"InterBTC","decimals":18},{"id":12,"cid":2,"name":"eBTC","displayName":"ether.fi Staked BTC","decimals":18},{"id":13,"cid":2,"name":"WBTC","displayName":"Wrapped BTC","decimals":18},{"id":14,"cid":2,"name":"dlcBTC","decimals":18},{"id":15,"cid":2,"name":"TBTC","displayName":"tBTC","decimals":18},{"id":21,"cid":2,"name":"ETH","displayName":"Ether","decimals":18},{"id":22,"cid":2,"name":"amphrETH","displayName":"Amphor ETH","decimals":18},{"id":23,"cid":2,"name":"uniETH","displayName":"Universal ETH","decimals":18},{"id":24,"cid":2,"name":"agETH","displayName":"Kelp Gain","decimals":18},{"id":25,"cid":2,"name":"amphr2ETH","decimals":18}],"chain":{"cid":2,"ecosystemName":"evm","name":"sepolia","displayName":"Sepolia","id":11155111}},{"id":4,"tokenIdList":[15,21],"tokens":[{"id":15,"cid":2,"name":"TBTC","displayName":"tBTC","decimals":18},{"id":21,"cid":2,"name":"ETH","displayName":"Ether","decimals":18}],"chain":{"cid":2,"ecosystemName":"evm","name":"sepolia","displayName":"Sepolia","id":11155111}},{"id":5,"tokenIdList":[1],"tokens":[{"id":1,"cid":1,"name":"ETH","decimals":18}],"chain":{"cid":1,"ecosystemName":"evm","name":"mainnet","displayName":"Ethereum","id":1}},{"id":6,"tokenIdList":[2],"tokens":[{"id":2,"cid":1,"name":"USDc","decimals":6}],"chain":{"cid":1,"ecosystemName":"evm","name":"mainnet","displayName":"Ethereum","id":1}}]
\ No newline at end of file