diff --git a/Makefile b/Makefile
index 2adc0579..7db03afe 100644
--- a/Makefile
+++ b/Makefile
@@ -16,4 +16,5 @@ gen:
 
 gen-all:
 	make gen cat=computing-network
-	make gen cat=layer-2
\ No newline at end of file
+	make gen cat=layer-2
+	make gen cat=hardware
\ No newline at end of file
diff --git a/src/projects/computing-network/alaya/index.yaml b/src/projects/computing-network/alaya/index.yaml
index 4474e4ea..36796d5d 100644
--- a/src/projects/computing-network/alaya/index.yaml
+++ b/src/projects/computing-network/alaya/index.yaml
@@ -7,6 +7,7 @@ description: >-
 ecosystem: Ethereum
 product_readiness: live, 2022
 links:
+  web: https://alaya.network/en
   github: https://github.com/AlayaNetwork
 team:
   anonymous: true
diff --git a/src/projects/computing-network/aleph-zero/index.yaml b/src/projects/computing-network/aleph-zero/index.yaml
index 29c4c0d5..4c986b11 100644
--- a/src/projects/computing-network/aleph-zero/index.yaml
+++ b/src/projects/computing-network/aleph-zero/index.yaml
@@ -5,6 +5,7 @@ description: Privacy-enhancing public blockchain with instant finality.
 ecosystem: Aleph
 product_readiness: mainnet
 links:
+  web: https://alephzero.org
   github: https://github.com/aleph-zero-foundation
 team:
   anonymous: false
diff --git a/src/projects/computing-network/arpa/index.yaml b/src/projects/computing-network/arpa/index.yaml
index 441599e9..c147ae7a 100644
--- a/src/projects/computing-network/arpa/index.yaml
+++ b/src/projects/computing-network/arpa/index.yaml
@@ -8,6 +8,7 @@ description: >-
 ecosystem: multichain
 product_readiness: mainnet, Q2 2023
 links:
+  web: https://www.arpanetwork.io/en-US
   github: https://github.com/ARPA-Network
 team:
   anonymous: true
diff --git a/src/projects/computing-network/findora/index.yaml b/src/projects/computing-network/findora/index.yaml
index 6643691f..b3b28e03 100644
--- a/src/projects/computing-network/findora/index.yaml
+++ b/src/projects/computing-network/findora/index.yaml
@@ -5,6 +5,7 @@ description: a decentralized, privacy-preserving smart contract platform.
 ecosystem: multichain
 product_readiness: mainnet
 links:
+  web: https://findora.org
   github: https://github.com/findoranetwork
 team:
   anonymous: false
diff --git a/src/projects/computing-network/nillion/index.yaml b/src/projects/computing-network/nillion/index.yaml
index fd6514c7..5436061a 100644
--- a/src/projects/computing-network/nillion/index.yaml
+++ b/src/projects/computing-network/nillion/index.yaml
@@ -5,6 +5,7 @@ description: The Secure Processing Layer of Web3.
 ecosystem: multichain
 product_readiness: live
 links:
+  web: https://www.nillion.com
   docs: https://docsend.com/view/7bkgvzagr6ifhwrc
 team:
   anonymous: false
diff --git a/src/projects/computing-network/phala-network/index.yaml b/src/projects/computing-network/phala-network/index.yaml
index 8179d18f..10c2d217 100644
--- a/src/projects/computing-network/phala-network/index.yaml
+++ b/src/projects/computing-network/phala-network/index.yaml
@@ -5,6 +5,7 @@ description: Privacy-Enhanced Permissionless Computing Protocol.
 ecosystem: Khala on Kusama
 product_readiness: testnet, 2020
 links:
+  web: https://www.phala.network/en/
   github: https://github.com/Phala-Network
 team:
   anonymous: false
diff --git a/src/projects/computing-network/phoenix/index.yaml b/src/projects/computing-network/phoenix/index.yaml
index df57318e..aa1c65a5 100644
--- a/src/projects/computing-network/phoenix/index.yaml
+++ b/src/projects/computing-network/phoenix/index.yaml
@@ -5,6 +5,7 @@ description: blockchain infrastructure empowering intelligence web3 applications
 ecosystem: multichain
 product_readiness: testnet
 links:
+  web: https://phoenix.global
   github: https://github.com/phoenixglobal
 team:
   anonymous: true
diff --git a/src/projects/computing-network/platon-network/index.yaml b/src/projects/computing-network/platon-network/index.yaml
index b63872cb..4883e234 100644
--- a/src/projects/computing-network/platon-network/index.yaml
+++ b/src/projects/computing-network/platon-network/index.yaml
@@ -8,6 +8,7 @@ description: >-
 ecosystem: Alaya
 product_readiness: live
 links:
+  web: https://www.platon.network/en
   github: https://github.com/PlatONnetwork
 team:
   anonymous: false
diff --git a/src/projects/computing-network/privasea/index.yaml b/src/projects/computing-network/privasea/index.yaml
index 592480ae..63b36cc6 100644
--- a/src/projects/computing-network/privasea/index.yaml
+++ b/src/projects/computing-network/privasea/index.yaml
@@ -7,7 +7,8 @@ description: >-
   processed.
 ecosystem: multipurpose
 product_readiness: '-'
-links: {}
+links:
+  web: https://www.privasea.tech
 team:
   anonymous: false
   company:
diff --git a/src/projects/computing-network/src.json b/src/projects/computing-network/src.json
index b03d9dcc..17a56e24 100644
--- a/src/projects/computing-network/src.json
+++ b/src/projects/computing-network/src.json
@@ -1,94 +1,104 @@
 {
-    "data": {
-      "Image": "https://github.com/Msiusko/web3privacy/blob/main/static-assets/Computing%20network.png?raw=true",
-      "Projects": [
-        {
-          "Project": "Phala Network",
-          "Description": "Privacy-Enhanced Permissionless Computing Protocol.",
-          "GitHub": "https://github.com/Phala-Network",
-          "ProductReadiness": "testnet, 2020",
-          "Ecosystem": "Khala on Kusama",
-          "Team": "Public",
-          "TeamLink": "https://www.phala.network/en/aboutUs/"
-        },
-        {
-          "Project": "Aleph Zero",
-          "Description": "Privacy-enhancing public blockchain with instant finality.",
-          "GitHub": "https://github.com/aleph-zero-foundation",
-          "ProductReadiness": "mainnet",
-          "Ecosystem": "Aleph",
-          "Team": "Public",
-          "TeamLink": "https://alephzero.org/the-team"
-        },
-        {
-          "Project": "Findora",
-          "Description": "a decentralized, privacy-preserving smart contract platform.",
-          "GitHub": "https://github.com/findoranetwork",
-          "ProductReadiness": "mainnet",
-          "Ecosystem": "multichain",
-          "Team": "Public",
-          "TeamLink": "https://findora.org/team/"
-        },
-        {
-          "Project": "ARPA",
-          "Description": "Threshold BLS network can serve as the infrastructure of verifiable random number generator (RNG), secure wallet, cross-chain bridge, decentralized custody etc.",
-          "GitHub": "https://github.com/ARPA-Network",
-          "ProductReadiness": "mainnet, Q2 2023",
-          "Ecosystem": "multichain",
-          "Team": "anon"
-        },
-        {
-          "Project": "Phoenix",
-          "Description": "blockchain infrastructure empowering intelligence web3 applications.",
-          "GitHub": "https://github.com/phoenixglobal",
-          "ProductReadiness": "testnet",
-          "Ecosystem": "multichain",
-          "Team": "anon"
-        },
-        {
-          "Project": "Privasea",
-          "Description": "Using secure Multi-Party sharing we protect data ownership and privacy, and facilitate secure sharing between different parties so data still can be processed.",
-          "GitHub": "-",
-          "ProductReadiness": "-",
-          "Ecosystem": "multipurpose",
-          "Team": "Public",
-          "TeamLink": "https://www.privasea.tech/about"
-        },
-        {
-          "Project": "Alaya",
-          "Description": "Alaya is a business sandbox and testing field for the next-generation of financial infrastructure of PlatON.",
-          "GitHub": "https://github.com/AlayaNetwork",
-          "ProductReadiness": "live, 2022",
-          "Ecosystem": "Ethereum",
-          "Team": "anon"
-        },
-        {
-          "Project": "Nillion",
-          "Description": "The Secure Processing Layer of Web3.",
-          "Docs": "https://docsend.com/view/7bkgvzagr6ifhwrc",
-          "ProductReadiness": "live",
-          "Ecosystem": "multichain",
-          "Team": "Public",
-          "TeamLink": "https://www.linkedin.com/search/results/people/?currentCompany=%5B%2280922042%22%5D&origin=COMPANY_PAGE_CANNED_SEARCH&sid=*cU"
-        },
-        {
-          "Project": "ZkCloud",
-          "Description": "Decentralized, Private Computing.",
-          "GitHub": "-",
-          "ProductReadiness": "testnet",
-          "Ecosystem": "Aleo",
-          "Team": "Public",
-          "TeamLink": "https://www.linkedin.com/search/results/people/?currentCompany=%5B%2242785598%22%5D&origin=COMPANY_PAGE_CANNED_SEARCH&sid=6tr"
-        },
-        {
-          "Project": "PlatOn Network",
-          "Description": "Combining blockchain and privacy-preserving computation technologies, PlatON is building a decentralized and collaborative AI network and global brain to drive the democratization of AI for safe artificial general intelligence.",
-          "GitHub": "https://github.com/PlatONnetwork",
-          "ProductReadiness": "live",
-          "Ecosystem": "Alaya",
-          "Team": "Public",
-          "TeamLink": "https://www.linkedin.com/search/results/people/?currentCompany=%5B%2214399632%22%5D&origin=COMPANY_PAGE_CANNED_SEARCH&sid=PCz"
-        }
-      ]
-    }
-  }  
\ No newline at end of file
+  "data": {
+    "Image": "https://github.com/Msiusko/web3privacy/blob/main/static-assets/Computing%20network.png?raw=true",
+    "Projects": [
+      {
+        "Project": "Phala Network",
+        "ProjectLink": "https://www.phala.network/en/",
+        "Description": "Privacy-Enhanced Permissionless Computing Protocol.",
+        "GitHub": "https://github.com/Phala-Network",
+        "ProductReadiness": "testnet, 2020",
+        "Ecosystem": "Khala on Kusama",
+        "Team": "Public",
+        "TeamLink": "https://www.phala.network/en/aboutUs/"
+      },
+      {
+        "Project": "Aleph Zero",
+        "ProjectLink": "https://alephzero.org",
+        "Description": "Privacy-enhancing public blockchain with instant finality.",
+        "GitHub": "https://github.com/aleph-zero-foundation",
+        "ProductReadiness": "mainnet",
+        "Ecosystem": "Aleph",
+        "Team": "Public",
+        "TeamLink": "https://alephzero.org/the-team"
+      },
+      {
+        "Project": "Findora",
+        "ProjectLink": "https://findora.org",
+        "Description": "a decentralized, privacy-preserving smart contract platform.",
+        "GitHub": "https://github.com/findoranetwork",
+        "ProductReadiness": "mainnet",
+        "Ecosystem": "multichain",
+        "Team": "Public",
+        "TeamLink": "https://findora.org/team/"
+      },
+      {
+        "Project": "ARPA",
+        "ProjectLink": "https://www.arpanetwork.io/en-US",
+        "Description": "Threshold BLS network can serve as the infrastructure of verifiable random number generator (RNG), secure wallet, cross-chain bridge, decentralized custody etc.",
+        "GitHub": "https://github.com/ARPA-Network",
+        "ProductReadiness": "mainnet, Q2 2023",
+        "Ecosystem": "multichain",
+        "Team": "anon"
+      },
+      {
+        "Project": "Phoenix",
+        "ProjectLink": "https://phoenix.global",
+        "Description": "blockchain infrastructure empowering intelligence web3 applications.",
+        "GitHub": "https://github.com/phoenixglobal",
+        "ProductReadiness": "testnet",
+        "Ecosystem": "multichain",
+        "Team": "anon"
+      },
+      {
+        "Project": "Privasea",
+        "ProjectLink": "https://www.privasea.tech",
+        "Description": "Using secure Multi-Party sharing we protect data ownership and privacy, and facilitate secure sharing between different parties so data still can be processed.",
+        "GitHub": "-",
+        "ProductReadiness": "-",
+        "Ecosystem": "multipurpose",
+        "Team": "Public",
+        "TeamLink": "https://www.privasea.tech/about"
+      },
+      {
+        "Project": "Alaya",
+        "ProjectLink": "https://alaya.network/en",
+        "Description": "Alaya is a business sandbox and testing field for the next-generation of financial infrastructure of PlatON.",
+        "GitHub": "https://github.com/AlayaNetwork",
+        "ProductReadiness": "live, 2022",
+        "Ecosystem": "Ethereum",
+        "Team": "anon"
+      },
+      {
+        "Project": "Nillion",
+        "ProjectLink": "https://www.nillion.com",
+        "Description": "The Secure Processing Layer of Web3.",
+        "Docs": "https://docsend.com/view/7bkgvzagr6ifhwrc",
+        "ProductReadiness": "live",
+        "Ecosystem": "multichain",
+        "Team": "Public",
+        "TeamLink": "https://www.linkedin.com/search/results/people/?currentCompany=%5B%2280922042%22%5D&origin=COMPANY_PAGE_CANNED_SEARCH&sid=*cU"
+      },
+      {
+        "Project": "ZkCloud",
+        "ProjectLink": "https://aleo.academy/ecosystem/aleo-toolkit/zkcloud/",
+        "Description": "Decentralized, Private Computing.",
+        "GitHub": "-",
+        "ProductReadiness": "testnet",
+        "Ecosystem": "Aleo",
+        "Team": "Public",
+        "TeamLink": "https://www.linkedin.com/search/results/people/?currentCompany=%5B%2242785598%22%5D&origin=COMPANY_PAGE_CANNED_SEARCH&sid=6tr"
+      },
+      {
+        "Project": "PlatOn Network",
+        "ProjectLink": "https://www.platon.network/en",
+        "Description": "Combining blockchain and privacy-preserving computation technologies, PlatON is building a decentralized and collaborative AI network and global brain to drive the democratization of AI for safe artificial general intelligence.",
+        "GitHub": "https://github.com/PlatONnetwork",
+        "ProductReadiness": "live",
+        "Ecosystem": "Alaya",
+        "Team": "Public",
+        "TeamLink": "https://www.linkedin.com/search/results/people/?currentCompany=%5B%2214399632%22%5D&origin=COMPANY_PAGE_CANNED_SEARCH&sid=PCz"
+      }
+    ]
+  }
+}
diff --git a/src/projects/computing-network/zkcloud/index.yaml b/src/projects/computing-network/zkcloud/index.yaml
index 0866b161..7ffb2015 100644
--- a/src/projects/computing-network/zkcloud/index.yaml
+++ b/src/projects/computing-network/zkcloud/index.yaml
@@ -4,7 +4,8 @@ categories:
 description: Decentralized, Private Computing.
 ecosystem: Aleo
 product_readiness: testnet
-links: {}
+links:
+  web: https://aleo.academy/ecosystem/aleo-toolkit/zkcloud/
 team:
   anonymous: false
   company:
diff --git a/src/projects/hardware/avado/index.yaml b/src/projects/hardware/avado/index.yaml
new file mode 100644
index 00000000..f978b52c
--- /dev/null
+++ b/src/projects/hardware/avado/index.yaml
@@ -0,0 +1,16 @@
+name: Avado
+categories:
+  - hardware
+description: >-
+  A plug-and-play hardware device that connects users to many different kinds of
+  blockchains. Their node-running software makes it easy and efficient for users
+  to help power multiple networks at once, and earn crypto in the process
+ecosystem: multichain
+product_readiness: live
+links:
+  web: https://www.mysterium.network/avado
+  github: https://github.com/mysteriumnetwork/AVADO-DNP-Mysterium-Server
+team:
+  anonymous: false
+  company:
+    link: https://www.mysterium.network/team
diff --git a/src/projects/hardware/axiatel/index.yaml b/src/projects/hardware/axiatel/index.yaml
new file mode 100644
index 00000000..1170d0c0
--- /dev/null
+++ b/src/projects/hardware/axiatel/index.yaml
@@ -0,0 +1,10 @@
+name: AXIAtel
+categories:
+  - hardware
+description: a privacy first mobile service for everyone
+ecosystem: multichain
+product_readiness: live
+links:
+  web: https://axiatel.co
+team:
+  anonymous: true
diff --git a/src/projects/hardware/dappnode/index.yaml b/src/projects/hardware/dappnode/index.yaml
new file mode 100644
index 00000000..c5f42af2
--- /dev/null
+++ b/src/projects/hardware/dappnode/index.yaml
@@ -0,0 +1,15 @@
+name: DappNode
+categories:
+  - hardware
+description: >-
+  Easy to use hardware and software solution for running Ethereum and other kind
+  of nodes, staking, IPFS, etc.
+ecosystem: multichain
+product_readiness: live
+links:
+  web: https://dappnode.io/
+  github: https://github.com/dappnode
+team:
+  anonymous: false
+  company:
+    link: https://dappnode.com/pages/about
diff --git a/src/projects/hardware/deeper-network/index.yaml b/src/projects/hardware/deeper-network/index.yaml
new file mode 100644
index 00000000..0a244b1b
--- /dev/null
+++ b/src/projects/hardware/deeper-network/index.yaml
@@ -0,0 +1,12 @@
+name: Deeper Network
+categories:
+  - hardware
+description: Web 3.0 infrastructure of the users, by the users, for the users.
+ecosystem: '-'
+product_readiness: live, 2019
+links:
+  web: https://www.deeper.network
+  docs: >-
+    https://cdn.shopify.com/s/files/1/0256/1038/7504/files/deeper_network_whitepaper__2023_03_21.pdf?v=1680260637
+team:
+  anonymous: true
diff --git a/src/projects/hardware/foundation/index.yaml b/src/projects/hardware/foundation/index.yaml
new file mode 100644
index 00000000..12980c70
--- /dev/null
+++ b/src/projects/hardware/foundation/index.yaml
@@ -0,0 +1,15 @@
+name: Foundation
+categories:
+  - hardware
+description: >-
+  The new standard for Bitcoin self custody. Introducing Passport hardware
+  wallet and Envoy mobile app
+ecosystem: Bitcoin
+product_readiness: live
+links:
+  web: https://foundationdevices.com
+  github: https://github.com/Foundation-Devices
+team:
+  anonymous: false
+  company:
+    link: https://foundationdevices.com/about/
diff --git a/src/projects/hardware/motherbored/index.yaml b/src/projects/hardware/motherbored/index.yaml
new file mode 100644
index 00000000..e2dced74
--- /dev/null
+++ b/src/projects/hardware/motherbored/index.yaml
@@ -0,0 +1,11 @@
+name: Motherbored
+categories:
+  - hardware
+description: '#dVPN hardware (node + SM card)'
+ecosystem: Solana
+product_readiness: live
+links:
+  web: https://store.motherbored.limited
+  github: https://github.com/boringprotocol/motherbored
+team:
+  anonymous: true
diff --git a/src/projects/hardware/privacy-infrastructure-solutions/index.yaml b/src/projects/hardware/privacy-infrastructure-solutions/index.yaml
new file mode 100644
index 00000000..a97e1078
--- /dev/null
+++ b/src/projects/hardware/privacy-infrastructure-solutions/index.yaml
@@ -0,0 +1,15 @@
+name: Privacy Infrastructure Solutions
+categories:
+  - hardware
+description: >-
+  Cloud and data center acceleration solution for Privacy Enhancing
+  Technologies.
+ecosystem: multichain
+product_readiness: live
+links:
+  web: https://www.chain-reaction.io
+  docs: https://www.chain-reaction.io/resource-hub/
+team:
+  anonymous: false
+  company:
+    link: https://www.chain-reaction.io/about/
diff --git a/src/projects/hardware/ronindojo-tanto/index.yaml b/src/projects/hardware/ronindojo-tanto/index.yaml
new file mode 100644
index 00000000..f19e0fa4
--- /dev/null
+++ b/src/projects/hardware/ronindojo-tanto/index.yaml
@@ -0,0 +1,11 @@
+name: RoninDojo Tanto
+categories:
+  - hardware
+description: Fully validating Bitcoin full node. Served over a Tor hidden service.
+ecosystem: Bitcoin
+product_readiness: live
+links:
+  web: https://samouraiwallet.com/ronin
+  docs: https://docs.samourai.io/
+team:
+  anonymous: true
diff --git a/src/projects/hardware/src.json b/src/projects/hardware/src.json
new file mode 100644
index 00000000..27de6bad
--- /dev/null
+++ b/src/projects/hardware/src.json
@@ -0,0 +1,84 @@
+{
+    "data": {
+      "Image": "https://github.com/Msiusko/web3privacy/blob/main/static-assets/Hardware.png?raw=true",
+      "Projects": [
+        {
+          "Project": "Deeper Network",
+          "ProjectLink": "https://www.deeper.network",
+          "Description": "Web 3.0 infrastructure of the users, by the users, for the users.",
+          "Docs": "https://cdn.shopify.com/s/files/1/0256/1038/7504/files/deeper_network_whitepaper__2023_03_21.pdf?v=1680260637",
+          "ProductReadiness": "live, 2019",
+          "Ecosystem": "-",
+          "Team": "anon"
+        },
+        {
+          "Project": "Motherbored",
+          "ProjectLink": "https://store.motherbored.limited",
+          "Description": "#dVPN hardware (node + SM card)",
+          "GitHub": "https://github.com/boringprotocol/motherbored",
+          "ProductReadiness": "live",
+          "Ecosystem": "Solana",
+          "Team": "anon"
+        },
+        {
+          "Project": "RoninDojo Tanto",
+          "ProjectLink": "https://samouraiwallet.com/ronin",
+          "Description": "Fully validating Bitcoin full node. Served over a Tor hidden service.",
+          "Docs": "https://docs.samourai.io/",
+          "ProductReadiness": "live",
+          "Ecosystem": "Bitcoin",
+          "Team": "anon"
+        },
+        {
+          "Project": "DappNode",
+          "ProjectLink": "https://dappnode.io/",
+          "Description": "Easy to use hardware and software solution for running Ethereum and other kind of nodes, staking, IPFS, etc.",
+          "GitHub": "https://github.com/dappnode",
+          "ProductReadiness": "live",
+          "Ecosystem": "multichain",
+          "Team": "Public",
+          "TeamLink": "https://dappnode.com/pages/about"
+        },
+        {
+          "Project": "Avado",
+          "ProjectLink": "https://www.mysterium.network/avado",
+          "Description": "A plug-and-play hardware device that connects users to many different kinds of blockchains. Their node-running software makes it easy and efficient for users to help power multiple networks at once, and earn crypto in the process",
+          "GitHub": "https://github.com/mysteriumnetwork/AVADO-DNP-Mysterium-Server",
+          "ProductReadiness": "live",
+          "Ecosystem": "multichain",
+          "Team": "Public",
+          "TeamLink": "https://www.mysterium.network/team"
+        },
+        {
+          "Project": "Foundation",
+          "ProjectLink": "https://foundationdevices.com",
+          "Description": "The new standard for Bitcoin self custody. Introducing Passport hardware wallet and Envoy mobile app",
+          "GitHub": "https://github.com/Foundation-Devices",
+          "ProductReadiness": "live",
+          "Ecosystem": "Bitcoin",
+          "Team": "Public",
+          "TeamLink": "https://foundationdevices.com/about/"
+        },
+        {
+          "Project": "Privacy Infrastructure Solutions",
+          "ProjectLink": "https://www.chain-reaction.io",
+          "Description": "Cloud and data center acceleration solution for Privacy Enhancing Technologies.",
+          "Docs": "https://www.chain-reaction.io/resource-hub/",
+          "ProductReadiness": "live",
+          "Ecosystem": "multichain",
+          "Team": "Public",
+          "TeamLink": "https://www.chain-reaction.io/about/"
+        },
+        {
+          "Project": "AXIAtel",
+          "ProjectLink": "https://axiatel.co",
+          "Description": "a privacy first mobile service for everyone",
+          "GitHub": "-",
+          "ProductReadiness": "live",
+          "Ecosystem": "multichain",
+          "Team": "anon"
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/src/projects/layer-2/obscuro/index.yaml b/src/projects/layer-2/obscuro/index.yaml
index 9a31dacf..779441f8 100644
--- a/src/projects/layer-2/obscuro/index.yaml
+++ b/src/projects/layer-2/obscuro/index.yaml
@@ -8,6 +8,7 @@ description: >-
 ecosystem: Ethereum
 product_readiness: testnet
 links:
+  web: https://obscu.ro
   docs: https://docs.obscu.ro
 team:
   anonymous: false
diff --git a/src/projects/layer-2/ola/index.yaml b/src/projects/layer-2/ola/index.yaml
index a8131dab..5631d2c3 100644
--- a/src/projects/layer-2/ola/index.yaml
+++ b/src/projects/layer-2/ola/index.yaml
@@ -5,6 +5,7 @@ description: ZK-ZKVM Bringing Programmable Privacy to Blockchains
 ecosystem: '-'
 product_readiness: '-'
 links:
+  web: https://sin7y.org
   github: https://github.com/Sin7Y
 team:
-  anonymous: true
+  anonymous: null
diff --git a/src/projects/layer-2/plebble/index.yaml b/src/projects/layer-2/plebble/index.yaml
index a88a6615..4638cd85 100644
--- a/src/projects/layer-2/plebble/index.yaml
+++ b/src/projects/layer-2/plebble/index.yaml
@@ -5,6 +5,7 @@ description: P2P Network of computers running the Plebble software (L1 & L2)
 ecosystem: TBD
 product_readiness: TBD
 links:
+  web: https://plebble.net
   github: https://github.com/root1m3/plebble
 team:
   anonymous: true
diff --git a/src/projects/layer-2/polybase/index.yaml b/src/projects/layer-2/polybase/index.yaml
index f35570e9..693e64c8 100644
--- a/src/projects/layer-2/polybase/index.yaml
+++ b/src/projects/layer-2/polybase/index.yaml
@@ -7,6 +7,7 @@ description: >-
 ecosystem: '-'
 product_readiness: '-'
 links:
+  web: https://polybase.xyz
   docs: https://polybase.xyz/docs/introduction
 team:
-  anonymous: true
+  anonymous: null
diff --git a/src/projects/layer-2/polygon-nightfall/index.yaml b/src/projects/layer-2/polygon-nightfall/index.yaml
index cdd10770..ba2739ad 100644
--- a/src/projects/layer-2/polygon-nightfall/index.yaml
+++ b/src/projects/layer-2/polygon-nightfall/index.yaml
@@ -1,10 +1,11 @@
 name: Polygon Nightfall
 categories:
   - layer-2
-description: A Privacy-Focused Rollup for Enterprises ✨️**ZK**
+description: A Privacy-Focused Rollup for Enterprises ✨️ZK
 ecosystem: Polygon
 product_readiness: mainnet, July 2022
 links:
+  web: https://polygon.technology/solutions/polygon-nightfall
   github: https://github.com/maticnetwork/nightfall-sdk/
 team:
   anonymous: false
diff --git a/src/projects/layer-2/src.json b/src/projects/layer-2/src.json
index 39df155f..ed068026 100644
--- a/src/projects/layer-2/src.json
+++ b/src/projects/layer-2/src.json
@@ -4,7 +4,8 @@
       "Projects": [
         {
           "Project": "Polygon Nightfall",
-          "Description": "A Privacy-Focused Rollup for Enterprises ✨️**ZK**",
+          "ProjectLink": "https://polygon.technology/solutions/polygon-nightfall",
+          "Description": "A Privacy-Focused Rollup for Enterprises ✨️ZK",
           "GitHub": "https://github.com/maticnetwork/nightfall-sdk/",
           "ProductReadiness": "mainnet, July 2022",
           "Ecosystem": "Polygon",
@@ -13,6 +14,7 @@
         },
         {
           "Project": "Zecrey",
+          "ProjectLink": "https://www.zecrey.com",
           "Description": "zkRollup basedLayer 2 protocol featuring privacy and scalability",
           "GitHub": "https://github.com/Zecrey-Labs",
           "ProductReadiness": "mainnet, Q2 2023",
@@ -21,6 +23,7 @@
         },
         {
           "Project": "Obscuro",
+          "ProjectLink": "https://obscu.ro",
           "Description": "Obscuro is a layer 2 solution for Ethereum that brings privacy and scale. It ensures the inputs, contract state and execution are always encrypted. No changes to dApps, just migrate and gain privacy",
           "Docs": "https://docs.obscu.ro",
           "ProductReadiness": "testnet",
@@ -30,6 +33,7 @@
         },
         {
           "Project": "ZKCHAOS",
+          "ProjectLink": "https://www.zkchaos.com",
           "Description": "ZKCHAOS is a layer2-based anonymous transaction protocol, and a fair game platform, which is built to enhance privacy for all kinds of cryptocurrency.",
           "GitHub": "-",
           "ProductReadiness": "TBD",
@@ -38,7 +42,8 @@
         },
         {
           "Project": "StarkEX",
-          "Description": "A Layer-2 scalability engine, live on Ethereum Mainnet ✨️**ZK**",
+          "ProjectLink": "https://starkware.co/starkex/",
+          "Description": "A Layer-2 scalability engine, live on Ethereum Mainnet ✨️ZK",
           "GitHub": "https://github.com/starkware-libs/starkex-resources",
           "ProductReadiness": "live",
           "Ecosystem": "Ethereum",
@@ -47,6 +52,7 @@
         },
         {
           "Project": "Plebble",
+          "ProjectLink": "https://plebble.net",
           "Description": "P2P Network of computers running the Plebble software (L1 & L2)",
           "GitHub": "https://github.com/root1m3/plebble",
           "ProductReadiness": "TBD",
@@ -55,6 +61,7 @@
         },
         {
           "Project": "Tusima",
+          "ProjectLink": "https://tusima.network",
           "Description": "Privacy Financial Infrastructure For Blockchain",
           "Docs": "https://tusima.gitbook.io/tusima_en/tusima-introduction/what-is-tusima",
           "ProductReadiness": "-",
@@ -63,6 +70,7 @@
         },
         {
           "Project": "OLA",
+          "ProjectLink": "https://sin7y.org",
           "Description": "ZK-ZKVM Bringing Programmable Privacy to Blockchains",
           "GitHub": "https://github.com/Sin7Y",
           "ProductReadiness": "-",
@@ -71,6 +79,7 @@
         },
         {
           "Project": "Polybase",
+          "ProjectLink": "https://polybase.xyz",
           "Description": "a public L2 blockchain with private transactions and MEV-resistance powered by zero-knowledge proofs",
           "Docs": "https://polybase.xyz/docs/introduction",
           "ProductReadiness": "-",
@@ -79,6 +88,7 @@
         },
         {
           "Project": "TrueZK",
+          "ProjectLink": "https://www.truezk.com",
           "Description": "Post-Quantum ZK Rollup as a service x private DIDs",
           "Docs": "https://docs.truezk.com",
           "ProductReadiness": "-",
@@ -87,4 +97,5 @@
         }
       ]
     }
-  }
\ No newline at end of file
+  }
+  
\ No newline at end of file
diff --git a/src/projects/layer-2/starkex/index.yaml b/src/projects/layer-2/starkex/index.yaml
index 09d2b472..60480570 100644
--- a/src/projects/layer-2/starkex/index.yaml
+++ b/src/projects/layer-2/starkex/index.yaml
@@ -1,10 +1,11 @@
 name: StarkEX
 categories:
   - layer-2
-description: A Layer-2 scalability engine, live on Ethereum Mainnet ✨️**ZK**
+description: A Layer-2 scalability engine, live on Ethereum Mainnet ✨️ZK
 ecosystem: Ethereum
 product_readiness: live
 links:
+  web: https://starkware.co/starkex/
   github: https://github.com/starkware-libs/starkex-resources
 team:
   anonymous: false
diff --git a/src/projects/layer-2/truezk/index.yaml b/src/projects/layer-2/truezk/index.yaml
index c0d24f38..9617f025 100644
--- a/src/projects/layer-2/truezk/index.yaml
+++ b/src/projects/layer-2/truezk/index.yaml
@@ -5,6 +5,7 @@ description: Post-Quantum ZK Rollup as a service x private DIDs
 ecosystem: '-'
 product_readiness: '-'
 links:
+  web: https://www.truezk.com
   docs: https://docs.truezk.com
 team:
-  anonymous: true
+  anonymous: null
diff --git a/src/projects/layer-2/tusima/index.yaml b/src/projects/layer-2/tusima/index.yaml
index 4e650ff2..87822277 100644
--- a/src/projects/layer-2/tusima/index.yaml
+++ b/src/projects/layer-2/tusima/index.yaml
@@ -5,6 +5,7 @@ description: Privacy Financial Infrastructure For Blockchain
 ecosystem: '-'
 product_readiness: '-'
 links:
+  web: https://tusima.network
   docs: https://tusima.gitbook.io/tusima_en/tusima-introduction/what-is-tusima
 team:
-  anonymous: true
+  anonymous: null
diff --git a/src/projects/layer-2/zecrey/index.yaml b/src/projects/layer-2/zecrey/index.yaml
index 11847605..4ef4cfb2 100644
--- a/src/projects/layer-2/zecrey/index.yaml
+++ b/src/projects/layer-2/zecrey/index.yaml
@@ -5,6 +5,7 @@ description: zkRollup basedLayer 2 protocol featuring privacy and scalability
 ecosystem: multichain
 product_readiness: mainnet, Q2 2023
 links:
+  web: https://www.zecrey.com
   github: https://github.com/Zecrey-Labs
 team:
   anonymous: true
diff --git a/src/projects/layer-2/zkchaos/index.yaml b/src/projects/layer-2/zkchaos/index.yaml
index b4d700ce..74d850ab 100644
--- a/src/projects/layer-2/zkchaos/index.yaml
+++ b/src/projects/layer-2/zkchaos/index.yaml
@@ -6,6 +6,7 @@ description: >-
   platform, which is built to enhance privacy for all kinds of cryptocurrency.
 ecosystem: TBD
 product_readiness: TBD
-links: {}
+links:
+  web: https://www.zkchaos.com
 team:
-  anonymous: true
+  anonymous: null
diff --git a/utils/gen.js b/utils/gen.js
index 03b33725..f35a22fb 100644
--- a/utils/gen.js
+++ b/utils/gen.js
@@ -43,11 +43,12 @@ async function genCat(cat) {
       ecosystem: p.Ecosystem,
       product_readiness: p.ProductReadiness,
       links: {
+        web: p.ProjectLink,
         github: p.GitHub && p.GitHub !== '-' ? p.GitHub : undefined,
         docs: p.Docs && p.Docs !== '-' ? p.Docs : undefined,
       },
       team: {
-        anonymous: p.Team !== "Public"
+        anonymous: p.Team === "anon" ? true : (p.Team === 'Public' ? false : null)
       },
     };
     if (p.TeamLink && p.TeamLink !== '') {