From 17f85e8ea9f10e2a7aa016d90991f9989fc57948 Mon Sep 17 00:00:00 2001
From: fran-ink <171171801+fran-ink@users.noreply.github.com>
Date: Tue, 18 Feb 2025 09:24:37 -0500
Subject: [PATCH] feat: fully migrate to new layout

---
 public/featured-apps/icons/ionic.webp         | Bin 0 -> 3778 bytes
 scripts/dl-featured-apps-img.js               |   2 +-
 src/actions/submit-your-app.ts                |   5 +-
 .../_components/AddYourAppButton.tsx          |  23 -
 .../_components/AppMainnetToggle.tsx          |  51 --
 .../_components/AppsCategoryFilter.tsx        |  65 ---
 .../dashboard/_components/AppsContent.scss    |  11 -
 .../dashboard/_components/AppsContent.tsx     | 510 ------------------
 .../dashboard/_components/AppsSideBar.tsx     |  50 --
 .../dashboard/_components/AppsTable.tsx       | 104 ----
 .../dashboard/_components/AppsTagsFilter.tsx  | 102 ----
 .../dashboard/_components/TableRowPill.tsx    |  11 -
 .../[locale]/(dashboard)/dashboard/layout.tsx |  32 --
 .../(dashboard)/dashboard/not-found.tsx       |   3 -
 .../[locale]/(dashboard)/dashboard/page.tsx   |  37 --
 src/app/[locale]/(home)/HomeShortcuts.tsx     |  87 ---
 src/app/[locale]/(home)/RedirectNewNav.tsx    |  27 -
 src/app/[locale]/(home)/bridge/page.tsx       |   5 -
 src/app/[locale]/(home)/layout.tsx            |  39 --
 src/app/[locale]/(home)/not-found.tsx         |   3 -
 src/app/[locale]/(home)/page.tsx              | 104 ----
 src/app/[locale]/(info)/layout.tsx            |  25 +-
 .../(info)/privacy/privacy-after-mainnet.tsx  |   3 +-
 .../(info)/privacy/privacy-before-mainnet.tsx |   3 +-
 .../(info)/terms/terms-after-mainnet.tsx      |   3 +-
 .../_components/AboutContent/AboutContent.tsx | 202 -------
 .../_components/AboutContent/WaitlistForm.tsx |  33 --
 .../_components/AboutContent/index.ts         |   1 -
 .../_components/BuildersDropdownContent.tsx   | 173 ------
 .../ContactContent/ContactContent.tsx         |  58 --
 .../_components/ContactUsHeaderButton.tsx     |  25 -
 .../DeveloperContent/DeveloperContent.tsx     | 264 ---------
 .../DeveloperContent/DeveloperUpdates.tsx     |  26 -
 .../_components/EventContent/EventContent.tsx | 175 ------
 .../_components/EventContent/GlossyPill.tsx   |  21 -
 .../_components/HeaderFaucetButton.tsx        |  25 -
 .../{new => }/_components/Home/HomeApps.tsx   |   2 +-
 .../{new => }/_components/Home/HomeEvent.tsx  |  10 +-
 .../_components/Home/HomeTagLine.tsx          |   2 +-
 .../{new => }/_components/Home/HomeTitle.tsx  |  10 +-
 src/app/[locale]/_components/HomeHeader.tsx   | 135 -----
 .../{new => }/_components/InkLogo.tsx         |   2 +-
 .../_components/MailButton/MailButton.tsx     |  37 --
 .../_components/MainCallToActionButton.tsx    | 166 ------
 .../_components/MainContent/Countdown.tsx     | 149 -----
 .../MainContent/FloatingButtons.tsx           |  91 ----
 .../_components/MainContent/MainContent.tsx   | 139 -----
 .../[locale]/_components/MainContent/index.ts |   2 -
 .../_components/MainPageBackground.tsx        |   2 +-
 .../{new => }/_components/MobileNav.tsx       |  28 +-
 .../[locale]/_components/MobileNavItems.tsx   | 238 --------
 .../NewsletterForm/RoutedNewsletterForm.tsx   |  65 ---
 .../StandaloneNewsletterForm.tsx              |  32 --
 .../_components/NewsletterForm/index.ts       |   2 -
 .../{new => }/_components/PageHeader.tsx      |   0
 .../apps => }/_components/RoutedLayout.tsx    |   8 +-
 .../{new => }/_components/SideNav.tsx         |  28 +-
 .../SubscribeButton/SubscribeButton.tsx       |  27 -
 src/app/[locale]/_components/WalletHeader.tsx |  22 -
 .../about/_components/AboutContent.tsx        |   3 +-
 .../_components/PartnerCard.tsx               |   0
 src/app/[locale]/{new => }/about/page.tsx     |   0
 .../{new => }/apps/[category]/page.tsx        |   0
 .../_components/AppCard.tsx                   |   0
 .../_components/AppLinks.tsx                  |   0
 .../apps/_components/AppMainnetToggle.tsx     |   0
 .../apps/_components/AppsCategoryFilter.tsx   |   2 +-
 .../apps/_components/AppsContent.tsx          |   2 +-
 .../{new => }/apps/_components/AppsGrid.tsx   |   0
 .../apps/_components/AppsTagsFilter.tsx       |   0
 .../_components/FeaturedAppPill.tsx           |   0
 .../dashboard => apps}/_components/InkApp.ts  |   0
 .../apps/_components/SubmitAppButton.css      |   0
 .../apps/_components/SubmitAppButton.tsx      |   0
 .../_components/apps-data.json                |   2 +-
 .../_components/categories.tsx                |   0
 src/app/[locale]/{new => }/apps/page.tsx      |   0
 src/app/[locale]/{new => }/bridge/page.tsx    |   3 +-
 .../builders/_components/DeveloperContent.tsx |   0
 src/app/[locale]/{new => }/builders/page.tsx  |   0
 .../_components/CommunityBrandKit.tsx         |  58 +-
 .../community/_components/CommunityEvents.tsx |   9 +-
 .../community/_components/LetsGetSocial.tsx   |  26 +-
 src/app/[locale]/community/layout.tsx         |  31 --
 src/app/[locale]/community/page.tsx           |  36 +-
 .../faucet/_components/Faucet.tsx             |   2 +-
 .../_components/FaucetRequestButton.tsx       |   0
 src/app/[locale]/{(home) => }/faucet/page.tsx |  15 +-
 .../_components/VerificationContent.tsx       |   0
 .../_components/VerificationHero.tsx          |   0
 .../{(home) => }/get-verified/page.tsx        |  23 +-
 src/app/[locale]/layout.tsx                   |  20 +-
 .../[locale]/new/apps/_components/AppCard.tsx | 113 ----
 .../new/apps/_components/AppLinks.tsx         |   1 -
 .../[locale]/new/apps/_components/InkApp.ts   |   1 -
 .../new/apps/_components/categories.tsx       |  52 --
 .../_components/CommunityBrandKit.tsx         |  52 --
 .../community/_components/CommunityEvents.tsx |   1 -
 .../community/_components/LetsGetSocial.tsx   |   1 -
 src/app/[locale]/new/community/page.tsx       |  24 -
 src/app/[locale]/new/layout.tsx               |  34 --
 .../new/verify/_components/Verifications.tsx  |   1 -
 .../new/verify/_components/VerifyContent.tsx  |   1 -
 .../_components/VerifyHaveASuggestion.tsx     |   1 -
 .../new/verify/_components/VerifyInfoCard.tsx |   1 -
 src/app/[locale]/new/verify/page.tsx          |  33 --
 src/app/[locale]/not-found.tsx                |  13 +-
 src/app/[locale]/{new => }/page.tsx           |   0
 .../smart-wallet/_components/LoginButton.tsx  |   0
 .../_components/RegisterButton.tsx            |   0
 .../smart-wallet/_components/SendUserOp.tsx   |   0
 .../_components/SmartAccountAddress.tsx       |   0
 .../smart-wallet/_components/SmartWallet.tsx  |   0
 .../smart-wallet/_components/Spinner.tsx      |   0
 .../_components/UsernameInput.tsx             |   0
 .../smart-wallet/context/UsernameContext.tsx  |   0
 .../smart-wallet/context/ZerodevContext.tsx   |   0
 .../{(home) => }/smart-wallet/lib/viem.ts     |   0
 .../{(home) => }/smart-wallet/lib/zerodev.ts  |   0
 .../{(home) => }/smart-wallet/page.tsx        |  25 +-
 .../smart-wallet/utils/constants.ts           |   0
 .../_components/BlockExplorerButton.tsx       |   0
 .../testnet-bridge/_components/Bridge.tsx     |   4 +-
 .../BridgeTransactionModal.tsx                |   0
 .../BridgeTransactionModalContext.tsx         |   0
 .../BroadcastSent-checkMark.json              |   0
 .../BridgeTransactionModal/index.ts           |   0
 .../{(home) => }/testnet-bridge/page.tsx      |  19 +-
 .../verify/_components/Verifications.tsx      |   3 +-
 src/app/[locale]/verify/layout.tsx            |  41 --
 src/app/[locale]/verify/page.tsx              |  28 +-
 .../ConnectWalletButton.tsx                   |   0
 .../ContactUsPrivacyButton.tsx                |   0
 .../CookieSettingsButton.tsx                  |   0
 src/components/EventCard.tsx                  |  99 ++++
 src/components/Footer/FooterContent.tsx       |   2 +-
 src/components/Header/HeaderConnectWallet.tsx |   2 +-
 src/components/Header/HeaderContent.tsx       |   2 +-
 .../HomeAppsToggle/HomeAppsToggle.tsx         |   6 +-
 .../MailIconButton/MailIconButton.tsx         |   0
 src/components/MobileHeader/MobileHeader.tsx  |   2 +-
 .../NewsletterForm/NewsletterForm.tsx         |   2 +-
 .../NewsletterForm/NewsletterFormContext.tsx  |   0
 .../NewsletterForm}/SuccessState.tsx          |   0
 src/components/Providers.tsx                  |   2 +-
 .../_components => components}/RelayKitUI.tsx |   0
 src/components/SocialLinksRow.tsx             |   2 +-
 src/routing.ts                                |  19 +-
 src/util/feature-flags.ts                     |   1 -
 149 files changed, 280 insertions(+), 4045 deletions(-)
 create mode 100644 public/featured-apps/icons/ionic.webp
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AddYourAppButton.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppMainnetToggle.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppsCategoryFilter.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.scss
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppsSideBar.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppsTable.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/AppsTagsFilter.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/_components/TableRowPill.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/layout.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/not-found.tsx
 delete mode 100644 src/app/[locale]/(dashboard)/dashboard/page.tsx
 delete mode 100644 src/app/[locale]/(home)/HomeShortcuts.tsx
 delete mode 100644 src/app/[locale]/(home)/RedirectNewNav.tsx
 delete mode 100644 src/app/[locale]/(home)/bridge/page.tsx
 delete mode 100644 src/app/[locale]/(home)/layout.tsx
 delete mode 100644 src/app/[locale]/(home)/not-found.tsx
 delete mode 100644 src/app/[locale]/(home)/page.tsx
 delete mode 100644 src/app/[locale]/_components/AboutContent/AboutContent.tsx
 delete mode 100644 src/app/[locale]/_components/AboutContent/WaitlistForm.tsx
 delete mode 100644 src/app/[locale]/_components/AboutContent/index.ts
 delete mode 100644 src/app/[locale]/_components/BuildersDropdownContent.tsx
 delete mode 100644 src/app/[locale]/_components/ContactContent/ContactContent.tsx
 delete mode 100644 src/app/[locale]/_components/ContactUsHeaderButton.tsx
 delete mode 100644 src/app/[locale]/_components/DeveloperContent/DeveloperContent.tsx
 delete mode 100644 src/app/[locale]/_components/DeveloperContent/DeveloperUpdates.tsx
 delete mode 100644 src/app/[locale]/_components/EventContent/EventContent.tsx
 delete mode 100644 src/app/[locale]/_components/EventContent/GlossyPill.tsx
 delete mode 100644 src/app/[locale]/_components/HeaderFaucetButton.tsx
 rename src/app/[locale]/{new => }/_components/Home/HomeApps.tsx (92%)
 rename src/app/[locale]/{new => }/_components/Home/HomeEvent.tsx (66%)
 rename src/app/[locale]/{new => }/_components/Home/HomeTagLine.tsx (94%)
 rename src/app/[locale]/{new => }/_components/Home/HomeTitle.tsx (74%)
 delete mode 100644 src/app/[locale]/_components/HomeHeader.tsx
 rename src/app/[locale]/{new => }/_components/InkLogo.tsx (93%)
 delete mode 100644 src/app/[locale]/_components/MailButton/MailButton.tsx
 delete mode 100644 src/app/[locale]/_components/MainCallToActionButton.tsx
 delete mode 100644 src/app/[locale]/_components/MainContent/Countdown.tsx
 delete mode 100644 src/app/[locale]/_components/MainContent/FloatingButtons.tsx
 delete mode 100644 src/app/[locale]/_components/MainContent/MainContent.tsx
 delete mode 100644 src/app/[locale]/_components/MainContent/index.ts
 rename src/app/[locale]/{new => }/_components/MainPageBackground.tsx (93%)
 rename src/app/[locale]/{new => }/_components/MobileNav.tsx (80%)
 delete mode 100644 src/app/[locale]/_components/MobileNavItems.tsx
 delete mode 100644 src/app/[locale]/_components/NewsletterForm/RoutedNewsletterForm.tsx
 delete mode 100644 src/app/[locale]/_components/NewsletterForm/StandaloneNewsletterForm.tsx
 delete mode 100644 src/app/[locale]/_components/NewsletterForm/index.ts
 rename src/app/[locale]/{new => }/_components/PageHeader.tsx (100%)
 rename src/app/[locale]/{new/apps => }/_components/RoutedLayout.tsx (65%)
 rename src/app/[locale]/{new => }/_components/SideNav.tsx (78%)
 delete mode 100644 src/app/[locale]/_components/SubscribeButton/SubscribeButton.tsx
 delete mode 100644 src/app/[locale]/_components/WalletHeader.tsx
 rename src/app/[locale]/{new => }/about/_components/AboutContent.tsx (98%)
 rename src/app/[locale]/{_components/AboutContent => about}/_components/PartnerCard.tsx (100%)
 rename src/app/[locale]/{new => }/about/page.tsx (100%)
 rename src/app/[locale]/{new => }/apps/[category]/page.tsx (100%)
 rename src/app/[locale]/{(dashboard)/dashboard => apps}/_components/AppCard.tsx (100%)
 rename src/app/[locale]/{(dashboard)/dashboard => apps}/_components/AppLinks.tsx (100%)
 rename src/app/[locale]/{new => }/apps/_components/AppMainnetToggle.tsx (100%)
 rename src/app/[locale]/{new => }/apps/_components/AppsCategoryFilter.tsx (97%)
 rename src/app/[locale]/{new => }/apps/_components/AppsContent.tsx (99%)
 rename src/app/[locale]/{new => }/apps/_components/AppsGrid.tsx (100%)
 rename src/app/[locale]/{new => }/apps/_components/AppsTagsFilter.tsx (100%)
 rename src/app/[locale]/{(dashboard)/dashboard => apps}/_components/FeaturedAppPill.tsx (100%)
 rename src/app/[locale]/{(dashboard)/dashboard => apps}/_components/InkApp.ts (100%)
 rename src/app/[locale]/{new => }/apps/_components/SubmitAppButton.css (100%)
 rename src/app/[locale]/{new => }/apps/_components/SubmitAppButton.tsx (100%)
 rename src/app/[locale]/{(dashboard)/dashboard => apps}/_components/apps-data.json (99%)
 rename src/app/[locale]/{(dashboard)/dashboard => apps}/_components/categories.tsx (100%)
 rename src/app/[locale]/{new => }/apps/page.tsx (100%)
 rename src/app/[locale]/{new => }/bridge/page.tsx (72%)
 rename src/app/[locale]/{new => }/builders/_components/DeveloperContent.tsx (100%)
 rename src/app/[locale]/{new => }/builders/page.tsx (100%)
 delete mode 100644 src/app/[locale]/community/layout.tsx
 rename src/app/[locale]/{(home) => }/faucet/_components/Faucet.tsx (97%)
 rename src/app/[locale]/{(home) => }/faucet/_components/FaucetRequestButton.tsx (100%)
 rename src/app/[locale]/{(home) => }/faucet/page.tsx (76%)
 rename src/app/[locale]/{(home) => }/get-verified/_components/VerificationContent.tsx (100%)
 rename src/app/[locale]/{(home) => }/get-verified/_components/VerificationHero.tsx (100%)
 rename src/app/[locale]/{(home) => }/get-verified/page.tsx (67%)
 delete mode 100644 src/app/[locale]/new/apps/_components/AppCard.tsx
 delete mode 100644 src/app/[locale]/new/apps/_components/AppLinks.tsx
 delete mode 100644 src/app/[locale]/new/apps/_components/InkApp.ts
 delete mode 100644 src/app/[locale]/new/apps/_components/categories.tsx
 delete mode 100644 src/app/[locale]/new/community/_components/CommunityBrandKit.tsx
 delete mode 100644 src/app/[locale]/new/community/_components/CommunityEvents.tsx
 delete mode 100644 src/app/[locale]/new/community/_components/LetsGetSocial.tsx
 delete mode 100644 src/app/[locale]/new/community/page.tsx
 delete mode 100644 src/app/[locale]/new/layout.tsx
 delete mode 100644 src/app/[locale]/new/verify/_components/Verifications.tsx
 delete mode 100644 src/app/[locale]/new/verify/_components/VerifyContent.tsx
 delete mode 100644 src/app/[locale]/new/verify/_components/VerifyHaveASuggestion.tsx
 delete mode 100644 src/app/[locale]/new/verify/_components/VerifyInfoCard.tsx
 delete mode 100644 src/app/[locale]/new/verify/page.tsx
 rename src/app/[locale]/{new => }/page.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/LoginButton.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/RegisterButton.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/SendUserOp.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/SmartAccountAddress.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/SmartWallet.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/Spinner.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/_components/UsernameInput.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/context/UsernameContext.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/context/ZerodevContext.tsx (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/lib/viem.ts (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/lib/zerodev.ts (100%)
 rename src/app/[locale]/{(home) => }/smart-wallet/page.tsx (67%)
 rename src/app/[locale]/{(home) => }/smart-wallet/utils/constants.ts (100%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/_components/BlockExplorerButton.tsx (100%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/_components/Bridge.tsx (98%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModal.tsx (100%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModalContext.tsx (100%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/_components/BridgeTransactionModal/BroadcastSent-checkMark.json (100%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/_components/BridgeTransactionModal/index.ts (100%)
 rename src/app/[locale]/{(home) => }/testnet-bridge/page.tsx (73%)
 delete mode 100644 src/app/[locale]/verify/layout.tsx
 rename src/{app/[locale]/_components => components}/ConnectWalletButton.tsx (100%)
 rename src/{app/[locale]/_components => components}/ContactUsPrivacyButton.tsx (100%)
 rename src/{app/[locale]/_components => components}/CookieSettingsButton.tsx (100%)
 create mode 100644 src/components/EventCard.tsx
 rename src/{app/[locale]/_components => components}/MailIconButton/MailIconButton.tsx (100%)
 rename src/{app/[locale]/_components => components}/NewsletterForm/NewsletterForm.tsx (98%)
 rename src/{app/[locale]/_components => components}/NewsletterForm/NewsletterFormContext.tsx (100%)
 rename src/{app/[locale]/_components/MainContent => components/NewsletterForm}/SuccessState.tsx (100%)
 rename src/{app/[locale]/(dashboard)/dashboard/_components => components}/RelayKitUI.tsx (100%)

diff --git a/public/featured-apps/icons/ionic.webp b/public/featured-apps/icons/ionic.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4254d574df9736cb22106c7ebf95458d52027e14
GIT binary patch
literal 3778
zcmV;z4n6TwNk&Gx4gdgGMM6+kP&gp24gdf!Q~;d;Dpmnj0X}UunMkA~BB3Rf$Vh+<
ziDhp5S9qh!zPxCuJ97WkpX2viU(W&k^Y*8l%XRz>`2o%>ggt%u)ApZqe>eRWeya8n
z{tx{#{Xg}tydGx1X1`+n<GkSgL;tb=mg`gW3G&(f#`uE$x&6BKbpQW)75MKjdh~AO
z=y%D!|7ctJF8g=^emDIO{T}xy0PoJ38m$xn{QK)8{nwGds`vnY;(IoJ-HZW$N@e`Z
z`IqxA=3mUSHSJ|1V`wI2R&8!gT>;SN;S-ECvGH1=4BdoiiG`6G8IB*F=7tX|zJ2t!
z+3MQ{LrJD{LpNavQI|=(TD$8aD`}(^4J-4n5g=ve;%E!{P)xm-1RC+C5XRVhR7@)B
zGF2UY&*Jr$%v^~XkjMZLzx}W=7HJi+MQRXUOAQyJmT0|~K<%nQyR{aXbh15HTU|V@
zetOb9oL&VdK!x~g66~`$plDjC@7Mvy`o{aiNjs|Lql%<q?I>9QmM$**^_GX%x^UW;
zopWY98KNhpD;kiR%Mlcl>WzfXMpu~I4|4+#A8L6V_`AZ2zwqg!-kuk_)=y{-CT_wR
zg2A@NpI&-m&rIO75vPTR5yF>L9XjS41#*8MpBO7tRH^R(xz|{CX`a(KjY$!YT@dHC
z;{KG&`IqpdghflkvNqdZqRE@EjT*o8T}QOPcd1pG)|(0Xzx99W|8uC;IQ5NYAD}#T
zK<S5Wn#P&!GumBJ)X*&B8`yT{&aK$SjO9CXj^`cCw-}zuo`+a*^+U2Lti=>CTq8!W
z{aEN+;{z{v4>ItdJe*(BnSV0MZW+i17k;z;(0b(%0ykkAHGk)uJXKEamNtqL>^T>B
zcmGdF^$V{B<^0R}m-8_(Y35HfYX8;$tN&O2ul-;7&;b7Uxu5_bM0|Au5)<rU`Z8FU
zEsY<gbcJw4KRd&*gy7C`A;hsI`ZlMK^MOmJsYKMDi8hdq8P@%CKaQdL^~gfCFQExd
z^I+n6pr)xB0OPgW#YA!!_Vq1{0m1LRTC{nQRqQb-JAfY>fLFTXXWm4WqBo6Y=qSvM
z4&#s0d=%^<R*S_nf#aWFEVs*mVDJZJwX$ntAsrvS1t2BsuS;kAva-1nm{qxSK7l2<
z0_e(vF91sw<`rhII;^(GyKFVzKalY(^AizU6PM~Pzqw)QOks>b4g3HJm*^9V!&a^Y
znw<ePW$KP8$H63c0T#If72Fm;w&Bo$-6?31p{)qwM~`PXQ`li1V*u%ezK0Cz;ZdRX
zK{}x;GD3d&)dr;BgjO8{xe<*Fm?zTfE8kpzai+Dnk$!*cK&EUEzI08CdGJx$7Ri-_
zz@axB)S{T?=v58}EnmNc(Mth5oFre$%^>L2<Yj}(lSoVkw6N2Wf|n;G^>Sf|I)n(E
z#m_DC?$Adx5%Tz&i5OFoo!uph9p!&x2pTR`?8L6YjaxSn6MR~nk7K-dNTw7{r1-T4
zvo-7jjRd7nyO4)})|4}@pU1&NVJ;V(iX}=>*d9BXgq&PtNqS4m$*}KX?U#CgpQ9dT
zIF~#;0#DPL-?o`Bj0q7Q0Ai62>rOXOWD3`zOw-`doTiZVno2)_1Ugx>+^Euh#XAH4
z$7{qc06bk5f;8hW!3O+$a7HZrexL2K-3ZHpa)fJoqJh95n2r79ur~ct*x@_R_7WTb
z9ohVJuHoKxGCT7!`r$A>%80b-bU=;4D*^8d*|r3noBWh;tQT4GmkNA<?Gx%>QFbK3
zvSu+)nA{<hhN>7Lco8J$<k<0yo!B7-ZkPp;A$3uHtT+U+!4BRzoCtpUXYn09Us)x1
zV@`=bg|luQ0O+ssxsuaNBE?JA34lwP>5&BQU7WTODu%%JdUl6iV=#9=H@;0~l3V*n
zJG=*-${&1Uh-F%2mcKdp{I4TUmDW-HS_2t$V<(sKsIyeVsWt^$eGZ;;=I`lJ(;qT^
zHD3N3Ro^y$#3z(h{8HL~3t~<8m0GzdTdma&HW=fzY|p5`M2_x7We=T+vUY|cK^E*i
zn1u&V6Sl;6@Wxu9_^4heVy9SL;qKj=TonK}WPan#YCmp%HV}*ky@jFiAMU7+cSKS|
zFi!nf#4VR?q%N+S8NAVT2nS`(KxFoUb!fDd;ob`2$k;Bhk_r&)PaEg6ei*P4rwp}W
z_YJ(ghGu{-PXeD4JFF^EgMFdoLF3sBsu$}^shcdgP#=sADr3Mu2AN8+rM%oXaj)U)
zj!tn#o;~TAipK1#K22+>&?m#`DOq5nD|23aCZ%L3MoA63@uX#t5*c%JO91s`%JEpt
zsEsOY7q6gw6n;dR|4c3gktL0s8>26;Z&;AWgR=3x@^N446w71WW}qM{&&ulz)T7LZ
z1Jz_!9Z0Iy218H83MA+p8O@>oipBka>}HRntlUeTC+z#-$_b$bYy&*^u+ah72r@Lz
z$aYW5-2oLEzv--ESq=)-KK6GUX#{~IO<s!%0{=h1*K?0e`m6>DY=4i?ILjB<U6N2m
zy+{BFT|J0!K?;h=Ka9#X^23p`<e@rk3+!L;dps=+6Zw<tP&ojY5oJvdL|iy8+y?(6
z1n^faUDc1sX*~tZQ!T}jEi>t7uuAvF4eLR-b10HW@Q?;`F;Uk=8%GXXrw%}?N^Xqs
z=ysjl+Q2{S&WQqo(o`41M7Cq=hY~rFrF9m0&a5-k5TGp4H@2SK|93`RSBK@uXP=ko
z0m@6zQUVvGJ1RAwxMW|*P1oS_F;QTjh_wG!Qma%)(BS=qtPUF9;X-Zw12Nve<`fy{
zcAFyaa3{Lsc5u9li2Xv;$-;6!ZBE&U+LQORL;&X0<m}5xgrZ1E#O8*ZvT`SyJ>Pl4
z2fQ4;q*ALGQQ^vXe?4q);sNvg=S*ePK}f~Rx@iwVxElxrap32zm!gL`($Z;SM0UDn
z3(Wh<vvuss!{Wsru<BCue+=*93LC?4^1!-3^#iPX<F+(FOAezC2NAw-4|x<U5<AIu
zzWn~?Z`j6<yE(T_l>1fK1r)TjA#)-(`Xf{oVc$**7dcPWsV~N8{8z74A5abxCkJ`0
zvqd5kSJv%&Kr>bV%AlK`kqNYoLwCNyup%}hcfYbI5D<D6I%f9dVKr8}9?A?Kqdiyu
z_*Wh5ZkF!724`THJ~w{)BT|!8ZHmEg{X<RFcRwXlsxuvp!<gQNEm@j{@eS;4Incou
zErlBDFZ+-X&8}vK<~T1<GSF?YePYk=;YhJ`U=!vl9H>>coxx0KpzavKn2>{LcS|1A
zQ=jFc@CkozgfV+|Fld0^khQbrnJnpRx=Y|;q~FSpim;czz=)Q?1mbzibbQWlpd>2w
z<pnpt$3E<E9k6dPmZNd|k@07qugg`3AE8dHX!TLMuj~Hc6;jViYxwm}V_n6)w7;0!
zF_z#CZ0=RO)7;5kztoXFWnG>?R*=H0^|vs-T^IxNq($afcFjyYhB_{ybq6TakewQ!
z6KI`;qSE3o?Wyxd{B6-O%FZNJ!ib-Ntp)I{1Q@7(R|5w~*Uh(reE<LeR))4r?bma9
z5BE$V#v}(IdHR_Nf_4a|aoK&39*-Dlw9%kxRgz8+jOStj_N`;J-K`-Q-|1|dzyJau
zSWB6A`<54BrahSvDdY5RvJL1Am?};3-mJI`mwn&|X5F!Z0gHbd+#R*mdTU;`Y!E3x
z9yMnk#CfjKxXdy(3{4b%QR>QBVh_B_iz4@4EG!a(_>U3VW;|EA@qh`d_<1H(LM<VH
zR8n#T{2{azEzUu#LzbQFK0y(kxFFQ=QQNeKe(x7HH-hE;=SuohATt=Oppf82nw?S2
z1LG>T?+aI#mMp#|ej--W0AqR+9M^7O^`t)=X@l<qxBw~zD?5VNf@6mSf#&AdSG=r@
zrL8n<aIuSmrGMoT+C_n`|Ia-S^Mj#K6hEYNjG1Q9+_QQai!BHnG>QS;2d8VXC@5lX
z7DEp_^eFZ!N1L+0CkcvC+E(Ntr@lWkg(Ex_3;>Vib-aa~FXQ>*pX**-l)9~cn|I|P
zwcWleN)z^j`$76LP(PFaTOOvFK;O;ebhaP{W*tYmABRwW0F0`sd6JQT!ak8f#_4zs
z<hmfZBmAc`fi#-v5^V)iyU2_Fr>7pb2GulIs33Y5#AC(`%f#Q}z`WnEz>Or_0a#H@
zYpc8fiv=+Z>&2X0$`bQDEs-@z;QwjPfE<a^c338J`1REICSZq_F#00OKXEDz!vK8Y
zZ@ukH=y(@mom0Ck&_a7<KDT(&&Wd5`S2^O+C;(qsIdU#?mfvv+qj5KaD{g}&6121a
zofbX$-VimDZ2~bPtWFI<A#>xT8{W1bdhE|#ZSLwO*kYi2MqZEyz#B(JF*N~rC<A~&
z16H*>F#W#=xmJ#Lwi%}(c*W<xi%5O9K4!S}GE~FLG2QkdNkE34mS|UX;x6rDHZlYV
zz!H^6{Rix);kS3n4KqKZa_|<CkOO>i>kuyItbjgIN!fF>P}`g~8A|9)NvJ>yHH15}
z`=JkY<?X`Eb054pJ*f(c;=s6;Pig@d%aFv$$Td2B0s`AAt_8_f`_74Zg)1JDAOc!&
zCG<8*VX%wBG}|!Ppa(hW2|Wl}&}SPepOWGpk7MK!AJ?>;wtosK%H1l$2a+|^zP}zn
zABERBaNC?uIP0J9{P$m26qC;#7_csNXitLIUdr;;acGB7T`{u174y3*JAryd8v>U;
zCp_8yI=sx2k>5ZU5J30^@{aB)fczE!3%!`hFt02?!Fwpua!dUv3=ep%wL$;NOrB#)
zwN_}f5Q(yWYpJ@<(fFTXx`QyYsxxsesE|rtr!GHVecOol5(>?`z}t5pfZBqC{~xrW
z-vc-K4HD(HMo~3qp^^}Mnulkv2(rygDXig66K0{1YDOa!q8*KmzY*L;GKrHAf}Erp
sXVM=ITTY{CbNh@ck3X>+Y*bU?ey6FFI)2+^E3aRt;s5{u0000003nt>qyPW_

literal 0
HcmV?d00001

diff --git a/scripts/dl-featured-apps-img.js b/scripts/dl-featured-apps-img.js
index 34f198f..88aeed6 100644
--- a/scripts/dl-featured-apps-img.js
+++ b/scripts/dl-featured-apps-img.js
@@ -12,7 +12,7 @@ const exceptions = ["Kraken", "Kraken Wallet"];
 const run = async () => {
   const appsDataFile = path.join(
     ROOT,
-    "src/app/[locale]/(dashboard)/dashboard/_components/apps-data.json"
+    "src/app/[locale]/apps/_components/apps-data.json"
   );
   const appsDataRaw = await fs.readFile(appsDataFile, "utf8");
   const appsData = JSON.parse(appsDataRaw);
diff --git a/src/actions/submit-your-app.ts b/src/actions/submit-your-app.ts
index 8d5941b..20aec4a 100644
--- a/src/actions/submit-your-app.ts
+++ b/src/actions/submit-your-app.ts
@@ -5,7 +5,7 @@ import { Octokit } from "@octokit/rest";
 import { WebClient } from "@slack/web-api";
 import sharp from "sharp";
 
-import { InkApp } from "@/app/[locale]/(dashboard)/dashboard/_components/InkApp";
+import { InkApp } from "@/app/[locale]/apps/_components/InkApp";
 import { env } from "@/env";
 import { validateCaptcha } from "@/lib/hcaptcha";
 import {
@@ -39,8 +39,7 @@ const slackClient = new WebClient(INK_APP_SUBMISSION_SLACK_BOT_TOKEN);
 const GITHUB_CONFIG = {
   OWNER: INK_APP_SUBMISSION_TARGET_ORG,
   REPO: INK_APP_SUBMISSION_TARGET_REPO,
-  FILE_PATH:
-    "src/app/[locale]/(dashboard)/dashboard/_components/apps-data.json",
+  FILE_PATH: "src/app/[locale]/apps/_components/apps-data.json",
   BRANCH: INK_APP_SUBMISSION_TARGET_BRANCH,
 } as const;
 
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AddYourAppButton.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AddYourAppButton.tsx
deleted file mode 100644
index 8565cc1..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AddYourAppButton.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-"use client";
-import { Button } from "@inkonchain/ink-kit";
-
-import { useAppSubmissionModalContext } from "@/components/AppSubmissionModal/AppSubmissionModalContext";
-
-export function AddYourAppButton() {
-  const { setIsOpen } = useAppSubmissionModalContext();
-
-  return (
-    <Button
-      className="whitespace-nowrap"
-      variant="primary"
-      size="md"
-      onClick={(e) => {
-        e.preventDefault();
-        setIsOpen(true);
-      }}
-    >
-      <span className="hidden lg:block">Add your app</span>
-      <span className="block lg:hidden">Add</span>
-    </Button>
-  );
-}
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppMainnetToggle.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AppMainnetToggle.tsx
deleted file mode 100644
index 849befa..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppMainnetToggle.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-"use client";
-
-import {
-  Listbox,
-  ListboxButton,
-  ListboxOption,
-  ListboxOptions,
-} from "@inkonchain/ink-kit";
-
-import { classNames } from "@/util/classes";
-
-import { InkAppNetwork } from "./InkApp";
-
-interface AppMainnetToggleProps {
-  value: InkAppNetwork;
-  onChange: (value: InkAppNetwork) => void;
-}
-
-const items = [
-  { label: "All networks", value: "Both" },
-  { label: "Mainnet", value: "Mainnet" },
-  { label: "Testnet", value: "Testnet" },
-] satisfies { label: string; value: InkAppNetwork }[];
-
-export function AppMainnetToggle({ value, onChange }: AppMainnetToggleProps) {
-  const selectedItem = items.find((item) => item.value === value) || items[0];
-
-  return (
-    <Listbox value={selectedItem} onChange={(option) => onChange(option.value)}>
-      <ListboxButton
-        variant="muted"
-        className="backdrop-blur-xl ink:text-body-3-bold w-[160px] whitespace-nowrap"
-      >
-        <span
-          className={classNames(
-            value !== "Mainnet" && "text-[var(--ink-text-default)]"
-          )}
-        >
-          {selectedItem.label}
-        </span>
-      </ListboxButton>
-      <ListboxOptions>
-        {items.map((item) => (
-          <ListboxOption key={item.value} value={item}>
-            {item.label}
-          </ListboxOption>
-        ))}
-      </ListboxOptions>
-    </Listbox>
-  );
-}
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppsCategoryFilter.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AppsCategoryFilter.tsx
deleted file mode 100644
index b6aa821..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppsCategoryFilter.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import {
-  Listbox,
-  ListboxButton,
-  ListboxOption,
-  ListboxOptions,
-} from "@inkonchain/ink-kit";
-
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { Link } from "@/routing";
-
-import { appCategories } from "./categories";
-
-interface AppsCategoryFilterProps {
-  selected: string | undefined;
-  setSelected: (value: string | undefined) => void;
-  newLayout?: boolean;
-}
-
-export const AppsCategoryFilter = ({
-  selected,
-  setSelected,
-  newLayout,
-}: AppsCategoryFilterProps) => {
-  const query = useRouterQuery();
-  const selectedItem =
-    appCategories.find((item) => item.value === selected) || appCategories[0];
-  return (
-    <Listbox
-      value={selectedItem}
-      onChange={(option) => setSelected(option.value ?? undefined)}
-    >
-      <ListboxButton
-        className="whitespace-nowrap flex items-center gap-4 ink:text-body-3-bold"
-        iconLeft={selectedItem.icon}
-        variant="muted"
-      >
-        {selectedItem.label}
-      </ListboxButton>
-      <ListboxOptions>
-        {appCategories.map((item) => (
-          <ListboxOption
-            key={item.value}
-            value={item}
-            iconLeft={item.icon}
-            asChild={newLayout}
-          >
-            {newLayout ? (
-              <Link
-                href={{
-                  pathname: `/new/apps/[category]`,
-                  params: { category: item.value || "" },
-                  query,
-                }}
-              >
-                {item.label}
-              </Link>
-            ) : (
-              item.label
-            )}
-          </ListboxOption>
-        ))}
-      </ListboxOptions>
-    </Listbox>
-  );
-};
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.scss b/src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.scss
deleted file mode 100644
index 8db90c9..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.hide-on-very-narrow-screen {
-  @media (max-height: 800px) and (min-width: 1024px) {
-    display: none !important;
-  }
-}
-
-.show-on-very-narrow-screen {
-  @media (max-height: 800px) and (min-width: 1024px) {
-    display: block !important;
-  }
-}
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.tsx
deleted file mode 100644
index da0898d..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppsContent.tsx
+++ /dev/null
@@ -1,510 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import Carousel from "react-multi-carousel";
-import { Button } from "@inkonchain/ink-kit";
-import { useSearchParams } from "next/navigation";
-
-import { ColoredText } from "@/components/ColoredText";
-import { InfiniteScrollContainer } from "@/components/InfiniteScrollContainer";
-import { SearchInput } from "@/components/SearchBar/SearchInput";
-import { useOnWindowSize } from "@/hooks/useOnWindowSize";
-import { useRouter } from "@/routing";
-import { classNames } from "@/util/classes";
-import { isMobileUserAgent } from "@/util/detection";
-
-import { AddYourAppButton } from "./AddYourAppButton";
-import { AppCard } from "./AppCard";
-import { AppMainnetToggle } from "./AppMainnetToggle";
-import { AppsCategoryFilter } from "./AppsCategoryFilter";
-import { AppsSideBar } from "./AppsSideBar";
-import { AppsTable } from "./AppsTable";
-import { AppsTagsFilter } from "./AppsTagsFilter";
-import {
-  InkAppFilters,
-  InkAppNetwork,
-  inkApps,
-  inkFeaturedApps,
-} from "./InkApp";
-import { RelayKitUI } from "./RelayKitUI";
-
-import "react-multi-carousel/lib/styles.css";
-import "./AppsContent.scss";
-
-interface AppsContentProps {
-  currentCategory?: string;
-}
-
-export function AppsContent({ currentCategory }: AppsContentProps) {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const network = getNetwork(searchParams.get("network"));
-  const category = currentCategory || searchParams.get("category");
-  const tags = searchParams.get("tags");
-
-  const [page, setPage] = useState(0);
-  const [search, setSearch] = useState<string>("");
-  const [filters, setFilters] = useState<Omit<InkAppFilters, "search">>({
-    categories: category ? category.split(",") : [],
-    tags: tags ? tags.split(",") : [],
-    network: network ? network : "Mainnet",
-  });
-
-  const filteredAppsWithoutSearchTerms = useMemo(
-    () =>
-      inkApps.filter((app) => {
-        if (
-          filters.network === "Mainnet" &&
-          app.network !== "Mainnet" &&
-          app.network !== "Both"
-        )
-          return false;
-        if (
-          filters.network === "Testnet" &&
-          app.network !== "Testnet" &&
-          app.network !== "Both"
-        )
-          return false;
-
-        if (
-          filters.categories.length > 0 &&
-          !app.category.some((category) =>
-            filters.categories.includes(category.toLowerCase())
-          )
-        )
-          return false;
-
-        if (
-          filters.tags.length > 0 &&
-          !app.tags.some((tag) => filters.tags.includes(tag))
-        )
-          return false;
-
-        return true;
-      }),
-    [filters]
-  );
-
-  const filteredApps = useMemo(
-    () =>
-      filteredAppsWithoutSearchTerms.filter((app) => {
-        const searchTerm = search.toLowerCase();
-        if (
-          searchTerm &&
-          !app.name.toLowerCase().includes(searchTerm) &&
-          !app.description.toLowerCase().includes(searchTerm) &&
-          !app.category.some((category) =>
-            category.toLowerCase().includes(searchTerm)
-          ) &&
-          !app.tags.some((tag) => tag.toLowerCase().includes(searchTerm))
-        )
-          return false;
-        return true;
-      }),
-    [filteredAppsWithoutSearchTerms, search]
-  );
-
-  const carouselRef = useRef<Carousel>(null);
-  const isMobileWindowSize = useOnWindowSize({ size: "sm" });
-  const isUnderDesktopWindowSize = useOnWindowSize({ size: "xl" });
-
-  // If some variables change and we are scrolled, we sometimes get stuck on a slide that is not visible.
-  useEffect(() => {
-    if (carouselRef.current) {
-      carouselRef.current.goToSlide(0);
-    }
-  }, [filteredApps, isMobileWindowSize]);
-  const updateSearchParams = useCallback(
-    (newParams: Record<string, string>) => {
-      const { network, category, tags, ...params } = Object.fromEntries(
-        searchParams.entries()
-      );
-      const queryParams = new URLSearchParams({
-        ...params,
-        ...newParams,
-      });
-      window.history.pushState(null, "", `/dashboard?${queryParams}`);
-    },
-    [searchParams]
-  );
-  const updateFilters = useCallback(
-    (newFilters: Partial<InkAppFilters>) => {
-      setFilters((prevFilters) => {
-        const mergedFilters = { ...prevFilters, ...newFilters };
-
-        updateSearchParams({
-          ...(mergedFilters.network && mergedFilters.network !== "Mainnet"
-            ? { network: mergedFilters.network }
-            : {}),
-          ...(mergedFilters.tags && mergedFilters.tags.length > 0
-            ? { tags: mergedFilters.tags.join(",") }
-            : {}),
-          ...(mergedFilters.categories && mergedFilters.categories.length > 0
-            ? { category: mergedFilters.categories[0] }
-            : {}),
-        });
-
-        setPage(0);
-        return mergedFilters;
-      });
-    },
-    [updateSearchParams]
-  );
-
-  const isMobile = isMobileUserAgent();
-
-  const categoryLabels: Record<string, string> = {
-    bridge: "Bridge to Ink",
-    defi: "Discover the best DeFi apps on Ink",
-    explorers: "Discover the best explorers on Ink",
-    infra: "Discover the best infrastructure on Ink",
-    social: "Discover the best social apps on Ink",
-    "on-ramps": "Discover the best on-ramps on Ink",
-    other: "Discover the best on-ramps on Ink",
-  };
-
-  const title =
-    filters.categories.length === 1
-      ? categoryLabels[filters.categories[0]]
-      : `Discover the best on Ink`;
-
-  const hasActiveFilters = (filters: InkAppFilters): boolean => {
-    return (
-      !!search ||
-      (filters.network && filters.network !== "Mainnet") ||
-      (filters.categories && filters.categories.length > 0) ||
-      (filters.tags && filters.tags.length > 0)
-    );
-  };
-
-  const appsToDisplay = useMemo(
-    () => filteredApps.slice(0, (page + 1) * 10),
-    [filteredApps, page]
-  );
-
-  return (
-    <>
-      {/* Floating section on desktop */}
-      <div
-        className={classNames(
-          "hidden xl:fixed xl:flex left-[20%] right-[20%] top-8 justify-center flex-wrap gap-4 mx-4 z-10"
-        )}
-      >
-        <div>
-          <SearchInput
-            className="max-w-md"
-            placeholder="Search"
-            disabled={isUnderDesktopWindowSize}
-            value={search}
-            onValueChange={setSearch}
-          />
-        </div>
-        <div>
-          <AppMainnetToggle
-            value={filters.network ?? "Both"}
-            onChange={(value) => {
-              updateFilters({
-                network: value,
-              });
-            }}
-          />
-        </div>
-        <div className="min-w-[240px] xl:hidden">
-          <AppsCategoryFilter
-            selected={filters.categories?.[0]}
-            setSelected={(value) => {
-              updateFilters({
-                categories: value ? [value] : [],
-              });
-            }}
-          />
-        </div>
-        <div>
-          <AppsTagsFilter
-            selected={filters.tags}
-            setSelected={(value) => {
-              updateFilters({
-                tags: value || [],
-              });
-            }}
-          />
-        </div>
-      </div>
-
-      <div className="h-full hidden lg:block shrink-0 fixed left-8 w-[240px]">
-        <div className="hide-on-very-narrow-screen">
-          <AppsSideBar
-            selected={filters.categories?.[0] ?? null}
-            setSelected={(value) => {
-              updateFilters({
-                categories: value ? [value] : [],
-              });
-            }}
-          />
-        </div>
-        <div className="hidden show-on-very-narrow-screen">
-          <AppsCategoryFilter
-            selected={filters.categories?.[0]}
-            setSelected={(value) => {
-              updateFilters({
-                categories: value ? [value] : [],
-              });
-            }}
-          />
-        </div>
-      </div>
-      <div className="hidden lg:block shrink-0 fixed left-8 bottom-10 w-[240px]">
-        <AddYourAppSection className="flex-col items-start" />
-      </div>
-      <div className="gap-4 xl:gap-8 w-full grid grid-cols-1 lg:grid-cols-[240px_minmax(0,1fr)] lg:pl-8">
-        <div className="hidden lg:block" />
-
-        <div className="flex flex-col gap-8 w-full xl:mx-auto xl:pr-8 max-w-[2000px]">
-          <div className="mx-4 min-w-[240px] flex items-center lg:hidden flex-wrap gap-2">
-            <div className="w-min">
-              <AppsCategoryFilter
-                selected={filters.categories?.[0]}
-                setSelected={(value) => {
-                  updateFilters({
-                    categories: value ? [value] : [],
-                  });
-                }}
-              />
-            </div>
-            <div>
-              <AppsTagsFilter
-                selected={filters.tags}
-                setSelected={(value) => {
-                  updateFilters({
-                    tags: value,
-                  });
-                }}
-              />
-            </div>
-          </div>
-
-          <div
-            className={classNames(
-              "flex flex-wrap justify-between gap-4 mx-4 xl:hidden"
-            )}
-          >
-            <div className="flex flex-wrap gap-2">
-              <div>
-                <SearchInput
-                  className="max-w-md"
-                  placeholder="Search"
-                  disabled={!isUnderDesktopWindowSize}
-                  value={search}
-                  onValueChange={setSearch}
-                />
-              </div>
-              <div>
-                <AppMainnetToggle
-                  value={filters.network ?? "Both"}
-                  onChange={(value) => {
-                    updateFilters({
-                      network: value,
-                    });
-                  }}
-                />
-              </div>
-              <div className="hidden lg:block">
-                <AppsTagsFilter
-                  selected={filters.tags}
-                  setSelected={(value) => {
-                    updateFilters({
-                      tags: value,
-                    });
-                  }}
-                />
-              </div>
-            </div>
-          </div>
-
-          <div
-            className={classNames(
-              "flex justify-between w-full flex-wrap gap-8",
-              hasActiveFilters(filters) && "hidden lg:flex"
-            )}
-          >
-            <div className="flex flex-col gap-2 mx-6">
-              <div className="text-body-2 text-blackMagic/50 dark:text-whiteMagic/50">
-                Dashboard
-              </div>
-              <ColoredText
-                variant="purple"
-                className="text-h2 font-medium leading-tight"
-              >
-                {title}
-              </ColoredText>
-            </div>
-          </div>
-
-          {/* Main flexbox */}
-          <div className="flex gap-8 flex-col-reverse 2xl:flex-row">
-            {/* Apps carousel & table */}
-            <div className="flex-1 flex flex-col gap-12 overflow-x-hidden">
-              {!search && (
-                <div className="flex flex-col gap-4">
-                  <div className="lg:pl-4">
-                    <Carousel
-                      ref={carouselRef}
-                      containerClass="w-full"
-                      arrows={false}
-                      ssr
-                      partialVisible
-                      responsive={{
-                        desktop: {
-                          breakpoint: { max: 6000, min: 1024 },
-                          items: 3,
-                        },
-                        tablet: {
-                          breakpoint: { max: 1280, min: 464 },
-                          items: 2,
-                          partialVisibilityGutter: 20,
-                        },
-                        tabletSmall: {
-                          breakpoint: { max: 1024, min: 640 },
-                          items: 2,
-                          partialVisibilityGutter: 20,
-                        },
-                        mobile: {
-                          breakpoint: { max: 640, min: 0 },
-                          items: 1,
-                          partialVisibilityGutter: 20,
-                        },
-                      }}
-                      deviceType={isMobile ? "mobile" : "desktop"}
-                      itemClass="px-4 lg:first:pl-0 lg:last:pr-4 xl:last:pr-0 select-none"
-                    >
-                      {inkFeaturedApps.map((app) => (
-                        <AppCard key={app.id} app={app} network={network} />
-                      ))}
-                    </Carousel>
-                  </div>
-                </div>
-              )}
-
-              <div className="flex flex-col gap-4 w-full">
-                <InfiniteScrollContainer
-                  className="flex px-4 pr-2 lg:pr-4 xl:pr-0"
-                  onLoadMore={() => setPage(page + 1)}
-                  hasMore={page < Math.floor(filteredApps.length / 10)}
-                >
-                  <AppsTable
-                    apps={appsToDisplay}
-                    noAppsFound={
-                      <NoAppsFound
-                        hasSearch={!!search}
-                        resetSearch={() => setSearch("")}
-                        hasActiveFilters={hasActiveFilters(filters)}
-                        resetFilters={() => {
-                          updateFilters({
-                            network: "Mainnet",
-                            categories: [],
-                            tags: [],
-                          });
-                        }}
-                      />
-                    }
-                    network={network}
-                  />
-                </InfiniteScrollContainer>
-              </div>
-
-              <div className="mx-6 lg:hidden">
-                <AddYourAppSection />
-              </div>
-            </div>
-
-            {/* Bridge Widget */}
-            <div
-              className={classNames(
-                "flex-grow-0 flex-shrink basis-[420px] py-6 2xl:py-0 px-4 sm:px-0",
-                hasActiveFilters(filters) &&
-                  !filters.categories.includes("bridge") &&
-                  "hidden 2xl:block"
-              )}
-            >
-              <div className="sticky top-28">
-                <RelayKitUI />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-function getNetwork(networkSearchParam: string | null): InkAppNetwork {
-  if (networkSearchParam === "Both" || networkSearchParam === "Testnet") {
-    return networkSearchParam;
-  }
-
-  return "Mainnet";
-}
-
-function AddYourAppSection({ className }: { className?: string }) {
-  return (
-    <div
-      className={classNames(
-        "flex items-center gap-6 p-6 border border-blackMagic/10 dark:border-whiteMagic/10 rounded-3xl",
-        className
-      )}
-    >
-      <div className="flex flex-col gap-4">
-        <div className="text-body font-semibold">Submit your app</div>
-        <div className="text-body-3 text-blackMagic/50 dark:text-whiteMagic/50">
-          Have an app on Ink you want to share with the world? Add your app and
-          get more Ink flowing your way.
-        </div>
-      </div>
-      <div>
-        <AddYourAppButton />
-      </div>
-    </div>
-  );
-}
-
-function NoAppsFound({
-  hasSearch,
-  hasActiveFilters,
-  resetFilters,
-  resetSearch,
-}: {
-  hasSearch: boolean;
-  hasActiveFilters: boolean;
-  resetFilters: () => void;
-  resetSearch: () => void;
-}) {
-  return (
-    <div className="flex flex-col gap-8">
-      <div className="flex flex-col items-center gap-6">
-        <div className="text-h5 font-bold text-blackMagic dark:text-whiteMagic">
-          No matches found
-        </div>
-        <div className="text-body-2 text-blackMagic/50 dark:text-whiteMagic/50 text-center">
-          {`Please change your keywords${
-            hasActiveFilters ? " or reset your filters" : ""
-          } and try again`}
-        </div>
-      </div>
-      {(hasActiveFilters || hasSearch) && (
-        <Button
-          variant="primary"
-          size="lg"
-          onClick={() => {
-            if (hasActiveFilters) {
-              resetFilters();
-            } else {
-              resetSearch();
-            }
-          }}
-        >
-          {hasActiveFilters ? "Reset Filters" : "Clear Keywords"}
-        </Button>
-      )}
-    </div>
-  );
-}
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppsSideBar.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AppsSideBar.tsx
deleted file mode 100644
index 7195cb0..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppsSideBar.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { ListItem } from "@inkonchain/ink-kit";
-
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { Link } from "@/routing";
-import { classNames } from "@/util/classes";
-
-import { appCategories } from "./categories";
-
-interface AppsSideBarProps {
-  selected: string | null;
-  setSelected: (value: string | null) => void;
-  newLayout?: boolean;
-}
-
-export const AppsSideBar = ({
-  selected,
-  setSelected,
-  newLayout,
-}: AppsSideBarProps) => {
-  const query = useRouterQuery();
-  return (
-    <div className="flex flex-col gap-1 w-full">
-      {appCategories.map((filter, index) => (
-        <ListItem
-          key={filter.value || index}
-          className={classNames(
-            selected === filter.value && "ink:bg-background-container"
-          )}
-          iconLeft={filter.icon}
-          asChild={newLayout}
-          onClick={() => setSelected(filter.value)}
-        >
-          {newLayout ? (
-            <Link
-              href={{
-                pathname: `/new/apps/[category]`,
-                params: { category: filter.value || "" },
-                query,
-              }}
-            >
-              {filter.label}
-            </Link>
-          ) : (
-            filter.label
-          )}
-        </ListItem>
-      ))}
-    </div>
-  );
-};
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppsTable.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AppsTable.tsx
deleted file mode 100644
index f645f2e..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppsTable.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { useCallback, useState } from "react";
-import Image from "next/image";
-
-import { NoisyContainer } from "@/components/Noisy";
-import { ScrollWithGradient } from "@/components/ScrollWithGradient";
-
-import { AppLinks } from "./AppLinks";
-import { InkApp, InkAppNetwork, mainUrl } from "./InkApp";
-import { TableRowPill } from "./TableRowPill";
-
-export const AppsTable: React.FC<{
-  apps: InkApp[];
-  noAppsFound: React.ReactNode;
-  network: InkAppNetwork;
-}> = ({ apps, noAppsFound, network }) => {
-  const [maskViaPercent, setMaskViaPercent] = useState(0);
-
-  const onScrollPercent = useCallback((pct: number, px: number) => {
-    setMaskViaPercent(px > 0 ? px + 16 : px);
-  }, []);
-
-  return (
-    <div className="backdrop-blur-sm bg-featuredCardPurple pb-4 rounded-2xl w-full relative">
-      {apps.length === 0 ? (
-        <div className="min-h-[300px] flex flex-col gap-4 justify-center items-center">
-          {noAppsFound}
-        </div>
-      ) : (
-        <div className="flex flex-col gap-4 w-full">
-          <ScrollWithGradient onScroll={onScrollPercent}>
-            <table className="min-w-[640px] w-full gap-2 border-separate border-spacing-x-0 border-spacing-y-px">
-              <thead>
-                <tr className="text-sm font-bold text-blackMagic/50 dark:text-whiteMagic/50 *:py-3">
-                  <th className="pl-4 text-left w-10 sticky left-0 z-10">
-                    App
-                  </th>
-                  <th />
-                  <th className="text-right px-2">Tags</th>
-                  <th className="pr-4 text-right min-w-24">Links</th>
-                </tr>
-              </thead>
-              <tbody className="text-label text-blackMagic dark:text-whiteMagic gap-2">
-                {apps.length === 0 && (
-                  <tr>
-                    <td colSpan={4}></td>
-                  </tr>
-                )}
-                {apps.map((app) => (
-                  <tr
-                    className="*:py-4 *:border-t-2 *:border-whiteMagic/10 hover:bg-whiteMagic/5 transition-colors duration-200 hover:cursor-pointer"
-                    key={app.id}
-                    onClick={() => {
-                      window.open(mainUrl(app, network), "_blank");
-                    }}
-                  >
-                    <td className="pl-4 text-left text-label font-bold sticky left-0 z-10">
-                      <NoisyContainer className="bg-dapps-icon-gradient rounded-xl overflow-hidden size-12 shrink-0">
-                        <Image
-                          src={app.imageUrl || "/apps/app-icon-placeholder.png"}
-                          alt={"dapps icon"}
-                          width={48}
-                          height={48}
-                          className="object-cover w-full h-full"
-                        />
-                      </NoisyContainer>
-                    </td>
-                    <td
-                      className="text-left [mask:linear-gradient(to_right,_var(--tw-gradient-stops))] from-0% via-0% from-transparent via-white to-white px-2"
-                      style={
-                        {
-                          "--tw-gradient-from-position": `${maskViaPercent}px`,
-                          "--tw-gradient-via-position": `${maskViaPercent}px`,
-                        } as React.CSSProperties
-                      }
-                    >
-                      <div className="flex flex-col justify-center gap-1 max-w-lg min-w-48 px-2 left-0">
-                        <div className="text-lg font-medium">{app.name}</div>
-                        <div className="text-body-3 opacity-50">
-                          {app.description}
-                        </div>
-                      </div>
-                    </td>
-                    <td>
-                      <div className="flex justify-end items-center gap-1 flex-wrap max-w-[200px]">
-                        {app.tags.map((tag) => (
-                          <TableRowPill key={tag}>{tag}</TableRowPill>
-                        ))}
-                      </div>
-                    </td>
-                    <td className="text-right pl-2 pr-4">
-                      <div className="flex gap-2 justify-end">
-                        <AppLinks links={app.links} network={network} />
-                      </div>
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </ScrollWithGradient>
-        </div>
-      )}
-    </div>
-  );
-};
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppsTagsFilter.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/AppsTagsFilter.tsx
deleted file mode 100644
index 7f56b77..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/AppsTagsFilter.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useMemo } from "react";
-import {
-  Checkbox,
-  Listbox,
-  ListboxButton,
-  ListboxOption,
-  ListboxOptions,
-} from "@inkonchain/ink-kit";
-
-import { inkTags } from "./InkApp";
-
-interface AppsTagsFilterProps {
-  selected: string[] | undefined;
-  setSelected: (value: string[] | undefined) => void;
-}
-
-function capitalizeFirstLetter(value: string) {
-  return value.charAt(0).toUpperCase() + value.slice(1);
-}
-
-const tags = inkTags
-  .map((tag) => ({
-    value: tag,
-    label: capitalizeFirstLetter(tag),
-  }))
-  .sort((a, b) => a.label.localeCompare(b.label));
-
-export const AppsTagsFilter: React.FC<AppsTagsFilterProps> = ({
-  selected,
-  setSelected,
-}) => {
-  const selectedTags = useMemo(
-    () => tags.filter((tag) => selected?.includes(tag.value)),
-    [selected]
-  );
-
-  const toggleAll = React.useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-
-      if (selectedTags.length > 0) {
-        setSelected([]);
-      } else {
-        setSelected(tags.map((t) => t.value));
-      }
-    },
-    [selectedTags, setSelected]
-  );
-
-  return (
-    <Listbox value={selected || []} onChange={setSelected} multiple>
-      <ListboxButton
-        className="whitespace-nowrap backdrop-blur-xl ink:text-body-3-bold w-[120px]"
-        variant="muted"
-      >
-        <div className="flex items-center gap-2">
-          <div>
-            {selectedTags.length === 0 ? (
-              <span>All Tags</span>
-            ) : (
-              <span className="text-[var(--ink-text-default)]">Tags</span>
-            )}
-          </div>
-          {selectedTags.length > 0 && (
-            <div className="text-xs bg-[var(--ink-text-default)] text-[var(--ink-background-light)] size-5 rounded-full flex items-center justify-center ink:text-caption-1-bold">
-              {selectedTags.length}
-            </div>
-          )}
-        </div>
-      </ListboxButton>
-      <ListboxOptions>
-        <ListboxOption
-          className="mb-1"
-          key="all"
-          value={null}
-          onClick={toggleAll}
-          iconLeft={
-            <Checkbox
-              checked={selectedTags.length === tags.length}
-              indeterminate={
-                selectedTags.length > 0 && selectedTags.length < tags.length
-                  ? true
-                  : undefined
-              }
-            />
-          }
-          iconRight={<></>}
-        >
-          Select all
-        </ListboxOption>
-        {tags.map((tag) => (
-          <ListboxOption key={tag.value} value={tag.value} iconRight={<></>}>
-            <div className="flex items-center gap-2">
-              <span>{tag.label}</span>
-            </div>
-          </ListboxOption>
-        ))}
-      </ListboxOptions>
-    </Listbox>
-  );
-};
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/TableRowPill.tsx b/src/app/[locale]/(dashboard)/dashboard/_components/TableRowPill.tsx
deleted file mode 100644
index 68695b3..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/_components/TableRowPill.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { PropsWithChildren } from "react";
-
-export const TableRowPill: React.FC<PropsWithChildren> = ({ children }) => {
-  return (
-    <div className="rounded-full p-3 py-2 transition-colors duration-200 text-sm font-bold whitespace-nowrap text-[#160F1F80] bg-[#7132F50F] dark:bg-[#FFFFFF0F] dark:text-[#FFFFFF80]">
-      {children}
-    </div>
-  );
-};
-
-TableRowPill.displayName = "TableRowPill";
diff --git a/src/app/[locale]/(dashboard)/dashboard/layout.tsx b/src/app/[locale]/(dashboard)/dashboard/layout.tsx
deleted file mode 100644
index 7ee935c..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/layout.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { InkLayout } from "@inkonchain/ink-kit";
-import { NextIntlClientProvider } from "next-intl";
-import { getMessages } from "next-intl/server";
-
-import { HeaderContent } from "@/components/Header/HeaderContent";
-import { LogoLink } from "@/components/LogoLink";
-import { ToggleThemeShortcut } from "@/components/ToggleThemeShortcut";
-import { routing } from "@/routing";
-
-export function generateStaticParams() {
-  return routing.locales.map((locale) => ({ locale }));
-}
-
-export default async function HomeLayout({
-  children,
-  params,
-}: {
-  children: React.ReactNode;
-  params: Promise<{ locale: string }>;
-}) {
-  const { locale } = await params;
-  const messages = await getMessages();
-
-  return (
-    <NextIntlClientProvider locale={locale} messages={messages}>
-      <ToggleThemeShortcut />
-      <InkLayout snug mainIcon={<LogoLink />} headerContent={<HeaderContent />}>
-        {children}
-      </InkLayout>
-    </NextIntlClientProvider>
-  );
-}
diff --git a/src/app/[locale]/(dashboard)/dashboard/not-found.tsx b/src/app/[locale]/(dashboard)/dashboard/not-found.tsx
deleted file mode 100644
index ab16a3c..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/not-found.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function NotFoundPage() {
-  return <div>This page is not available.</div>;
-}
diff --git a/src/app/[locale]/(dashboard)/dashboard/page.tsx b/src/app/[locale]/(dashboard)/dashboard/page.tsx
deleted file mode 100644
index 3c1dff0..0000000
--- a/src/app/[locale]/(dashboard)/dashboard/page.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Metadata } from "next";
-
-import { AppSubmissionModal } from "@/components/AppSubmissionModal/AppSubmissionModal";
-import { AppSubmissionModalProvider } from "@/components/AppSubmissionModal/AppSubmissionModalContext";
-import { JsonLd } from "@/components/JsonLd";
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { PageView } from "@/components/PageView";
-
-import { AppsContent } from "./_components/AppsContent";
-
-export const metadata: Metadata = {
-  title: "Ink Apps - Discover DeFi Applications on the Superchain",
-  description:
-    "Explore a curated collection of DeFi applications built on Ink, Kraken's Layer 2 blockchain. Find innovative financial tools, protocols, and services powered by the Superchain.",
-};
-
-export default function AppsPage() {
-  return (
-    <OnlyWithFeatureFlag flag="mainnet">
-      <AppSubmissionModalProvider>
-        <>
-          <JsonLd
-            schema={{
-              "@type": "CollectionPage",
-              name: "Ink Apps Directory",
-              description: "Directory of DeFi applications built on Ink",
-              url: "https://inkonchain.com/apps",
-            }}
-          />
-          <PageView />
-          <AppsContent />
-          <AppSubmissionModal />
-        </>
-      </AppSubmissionModalProvider>
-    </OnlyWithFeatureFlag>
-  );
-}
diff --git a/src/app/[locale]/(home)/HomeShortcuts.tsx b/src/app/[locale]/(home)/HomeShortcuts.tsx
deleted file mode 100644
index f0a0e96..0000000
--- a/src/app/[locale]/(home)/HomeShortcuts.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-"use client";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
-import { useCallbackOnKey } from "@/hooks/useGlobalKey";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { useRouter } from "@/routing";
-
-export const HomeShortcuts = () => {
-  const router = useRouter();
-  const query = useRouterQuery();
-  const isMainnet = useFeatureFlag("mainnet");
-
-  const scrollToHash = (hash: string) => {
-    if (typeof window === "undefined") return false;
-
-    const element =
-      hash === "#" ? document.documentElement : document.querySelector(hash);
-
-    if (!element) return false;
-
-    // If we're already at this hash, just scroll
-    if (window.location.hash === hash) {
-      element.scrollIntoView({ behavior: "smooth" });
-      return true;
-    }
-
-    // Update URL first without scrolling
-    router.push(hash as any, { scroll: false });
-
-    // Wait for next frame to ensure DOM update
-    requestAnimationFrame(() => {
-      // And then wait one more frame for safety
-      requestAnimationFrame(() => {
-        element.scrollIntoView({ behavior: "smooth" });
-      });
-    });
-
-    return true;
-  };
-
-  useCallbackOnKey({
-    key: "q",
-    handler: () => scrollToHash("#"),
-  });
-
-  useCallbackOnKey({
-    key: "a",
-    handler: () => scrollToHash("#about"),
-  });
-
-  useCallbackOnKey({
-    key: "b",
-    handler: () => {
-      router.push(
-        isMainnet
-          ? {
-              pathname: "/dashboard",
-              query: {
-                ...Object.fromEntries(new URLSearchParams(query) || {}),
-                category: "bridge",
-              },
-            }
-          : "/testnet-bridge"
-      );
-      return true;
-    },
-  });
-
-  useCallbackOnKey({
-    key: "e",
-    handler: () => scrollToHash("#event"),
-  });
-
-  useCallbackOnKey({
-    key: "h",
-    handler: () => {
-      router.push({
-        pathname: "/community",
-        query: {
-          ...Object.fromEntries(new URLSearchParams(query) || {}),
-        },
-      });
-      return true;
-    },
-  });
-
-  return null;
-};
diff --git a/src/app/[locale]/(home)/RedirectNewNav.tsx b/src/app/[locale]/(home)/RedirectNewNav.tsx
deleted file mode 100644
index 55d5a1c..0000000
--- a/src/app/[locale]/(home)/RedirectNewNav.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-import { useSearchParams } from "next/navigation";
-
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { routing, useRouter } from "@/routing";
-
-export const RedirectNewNav = () => {
-  const searchParams = useSearchParams();
-  const router = useRouter();
-  const query = useRouterQuery();
-
-  useEffect(() => {
-    if (searchParams.get("newNav")) {
-      router.replace({
-        pathname: routing.pathnames["/new"],
-        query: {
-          ...Object.fromEntries(new URLSearchParams(query) || {}),
-          newNav: "true",
-        },
-      });
-    }
-  }, [query, searchParams, router]);
-
-  return null;
-};
diff --git a/src/app/[locale]/(home)/bridge/page.tsx b/src/app/[locale]/(home)/bridge/page.tsx
deleted file mode 100644
index 7c25541..0000000
--- a/src/app/[locale]/(home)/bridge/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { redirect } from "next/navigation";
-
-export default function BridgePage() {
-  redirect("/dashboard?category=bridge");
-}
diff --git a/src/app/[locale]/(home)/layout.tsx b/src/app/[locale]/(home)/layout.tsx
deleted file mode 100644
index 0be681c..0000000
--- a/src/app/[locale]/(home)/layout.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { NextIntlClientProvider } from "next-intl";
-import { getMessages } from "next-intl/server";
-
-import { Footer } from "@/components/Footer";
-import { MainBackground } from "@/components/MainBackground/MainBackground";
-import { routing } from "@/routing";
-import { getFeatureFlags } from "@/util/feature-flags";
-
-import { HomeHeader } from "../_components/HomeHeader";
-
-export function generateStaticParams() {
-  return routing.locales.map((locale) => ({ locale }));
-}
-
-export default async function HomeLayout({
-  children,
-  params,
-}: {
-  children: React.ReactNode;
-  params: Promise<{ locale: string }>;
-}) {
-  const { locale } = await params;
-  const messages = await getMessages();
-  const featureFlags = await getFeatureFlags();
-  const morpheus = featureFlags.morpheus;
-
-  return (
-    <NextIntlClientProvider locale={locale} messages={messages}>
-      <HomeHeader />
-      <div className="flex-1 relative pt-24 sm:pt-0 sm:pb-12 pb-48 flex flex-col gap-4">
-        <div>{children}</div>
-        <div>
-          <Footer />
-        </div>
-      </div>
-      <MainBackground type={morpheus ? "3d" : "video"} />
-    </NextIntlClientProvider>
-  );
-}
diff --git a/src/app/[locale]/(home)/not-found.tsx b/src/app/[locale]/(home)/not-found.tsx
deleted file mode 100644
index ab16a3c..0000000
--- a/src/app/[locale]/(home)/not-found.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function NotFoundPage() {
-  return <div>This page is not available.</div>;
-}
diff --git a/src/app/[locale]/(home)/page.tsx b/src/app/[locale]/(home)/page.tsx
deleted file mode 100644
index 9ffd04f..0000000
--- a/src/app/[locale]/(home)/page.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { Metadata } from "next";
-
-import { AnchorIntoView } from "@/components/AnchorIntoView";
-import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
-import { JsonLd } from "@/components/JsonLd";
-import { PageView } from "@/components/PageView";
-import { containerClasses } from "@/components/styles/container";
-import { classNames } from "@/util/classes";
-
-import { AboutContent } from "../_components/AboutContent";
-import { ContactContent } from "../_components/ContactContent/ContactContent";
-import { DeveloperContent } from "../_components/DeveloperContent/DeveloperContent";
-import { EventContent } from "../_components/EventContent/EventContent";
-import { FloatingButtons, MainContent } from "../_components/MainContent";
-
-import { HomeShortcuts } from "./HomeShortcuts";
-import { RedirectNewNav } from "./RedirectNewNav";
-
-export const metadata: Metadata = {
-  metadataBase: new URL("https://inkonchain.com"),
-  title: "Ink - DeFi unleashed by Kraken, built on the Superchain",
-  description:
-    "Ink is a cutting-edge Layer 2 (L2) blockchain built on Optimism's Superchain and released by Kraken. As a natural evolution of our mission, Ink will serve as a seamless bridge to DeFi, empowering users to move onchain with confidence and ease. Join the community today.",
-  openGraph: {
-    url: "/",
-    images: [
-      {
-        url: "/goodbye-chaos-hello-ink.png",
-        width: 1200,
-        height: 630,
-        alt: "Ink Logo",
-      },
-    ],
-  },
-  twitter: {
-    card: "summary_large_image",
-    images: ["/goodbye-chaos-hello-ink.png"],
-  },
-};
-
-export default async function HomePage() {
-  return (
-    <div>
-      <JsonLd
-        schema={{
-          "@type": "Organization",
-          name: "Ink",
-          alternateName: "Kraken Ink",
-          url: "https://inkonchain.com/",
-          logo: "https://inkonchain.com/icon.svg?163528741f97f677",
-          sameAs: [
-            "https://x.com/inkonchain",
-            "https://github.com/inkonchain",
-            "https://discord.com/invite/inkonchain",
-            "https://t.me/inkonchain",
-          ],
-        }}
-      />
-      <RedirectNewNav />
-      <PageView />
-      <HomeShortcuts />
-      <div className="flex flex-col gap-12 lg:gap-28 mt-0 mb-12 lg:mb-24 pt-16 sm:pt-0">
-        <AnchorIntoView anchor="#">
-          <div
-            className={
-              containerClasses() + " mb-8 pb-8 sm:min-h-[calc(85vh)] sm:pt-16"
-            }
-          >
-            <MainContent />
-            <FloatingButtons />
-          </div>
-        </AnchorIntoView>
-
-        <AnchorIntoView anchor="/#event">
-          <div className={classNames(containerClasses(), "gap-16")}>
-            <FlyWhenIntoView>
-              <EventContent />
-            </FlyWhenIntoView>
-          </div>
-        </AnchorIntoView>
-
-        <AnchorIntoView anchor="/#about">
-          <div className={containerClasses()}>
-            <AboutContent />
-          </div>
-        </AnchorIntoView>
-
-        <AnchorIntoView anchor="/#builders">
-          <div className={classNames(containerClasses(), "gap-16")}>
-            <FlyWhenIntoView>
-              <DeveloperContent />
-            </FlyWhenIntoView>
-          </div>
-        </AnchorIntoView>
-
-        <div>
-          <div className={containerClasses()}>
-            <ContactContent />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/[locale]/(info)/layout.tsx b/src/app/[locale]/(info)/layout.tsx
index d092997..1ff9ab5 100644
--- a/src/app/[locale]/(info)/layout.tsx
+++ b/src/app/[locale]/(info)/layout.tsx
@@ -1,6 +1,4 @@
-import { Footer } from "@/components/Footer";
-import { AnimatedInkLogoIcon } from "@/components/icons/InkLogo";
-import { Link, routing } from "@/routing";
+import { routing } from "@/routing";
 
 export async function generateStaticParams() {
   return routing.locales.map((locale) => ({ locale }));
@@ -12,23 +10,8 @@ export default async function InfoLayout({
   children: React.ReactNode;
 }) {
   return (
-    <>
-      <div className="fixed inset-x-4 top-8 flex flex-col items-center z-10">
-        <Link className="flex gap-2 w-fit px-2 py-1" href="/">
-          <AnimatedInkLogoIcon />
-        </Link>
-      </div>
-
-      <div className="flex-1 relative pb-24 pt-32 container mx-auto flex flex-col gap-4">
-        <div className="flex flex-col items-center justify-center">
-          <div className="bg-whiteMagic/75 dark:bg-blackMagic/75 p-2 rounded-lg mb-8 mx-2 flex items-center justify-center max-w-4xl w-full">
-            <div className="max-w-2xl p-4">{children}</div>
-          </div>
-        </div>
-        <div>
-          <Footer />
-        </div>
-      </div>
-    </>
+    <div className="ink:bg-background-container p-2 rounded-lg pt-8 mb-8 mx-2 flex items-center justify-center max-w-4xl w-full">
+      <div className="max-w-2xl p-4">{children}</div>
+    </div>
   );
 }
diff --git a/src/app/[locale]/(info)/privacy/privacy-after-mainnet.tsx b/src/app/[locale]/(info)/privacy/privacy-after-mainnet.tsx
index 3c7727c..b9d575d 100644
--- a/src/app/[locale]/(info)/privacy/privacy-after-mainnet.tsx
+++ b/src/app/[locale]/(info)/privacy/privacy-after-mainnet.tsx
@@ -1,9 +1,8 @@
 import { ColoredText } from "@/components/ColoredText";
+import { ContactUsPrivacyButton } from "@/components/ContactUsPrivacyButton";
 import { containerClasses } from "@/components/styles/container";
 import { EXTERNAL_LINKS, Link } from "@/routing";
 
-import { ContactUsPrivacyButton } from "../../_components/ContactUsPrivacyButton";
-
 export default function PrivacyAfterMainnet() {
   return (
     <>
diff --git a/src/app/[locale]/(info)/privacy/privacy-before-mainnet.tsx b/src/app/[locale]/(info)/privacy/privacy-before-mainnet.tsx
index 19224dd..8ca4f9b 100644
--- a/src/app/[locale]/(info)/privacy/privacy-before-mainnet.tsx
+++ b/src/app/[locale]/(info)/privacy/privacy-before-mainnet.tsx
@@ -1,9 +1,8 @@
 import { ColoredText } from "@/components/ColoredText";
+import { ContactUsPrivacyButton } from "@/components/ContactUsPrivacyButton";
 import { containerClasses } from "@/components/styles/container";
 import { EXTERNAL_LINKS, Link } from "@/routing";
 
-import { ContactUsPrivacyButton } from "../../_components/ContactUsPrivacyButton";
-
 export default function PrivacyBeforeMainnet() {
   return (
     <>
diff --git a/src/app/[locale]/(info)/terms/terms-after-mainnet.tsx b/src/app/[locale]/(info)/terms/terms-after-mainnet.tsx
index 3695d32..fd6d7c0 100644
--- a/src/app/[locale]/(info)/terms/terms-after-mainnet.tsx
+++ b/src/app/[locale]/(info)/terms/terms-after-mainnet.tsx
@@ -1,9 +1,8 @@
 import { ColoredText } from "@/components/ColoredText";
+import { ContactUsPrivacyButton } from "@/components/ContactUsPrivacyButton";
 import { containerClasses } from "@/components/styles/container";
 import { EXTERNAL_LINKS, Link } from "@/routing";
 
-import { ContactUsPrivacyButton } from "../../_components/ContactUsPrivacyButton";
-
 export default function TermsAfterMainnet() {
   return (
     <>
diff --git a/src/app/[locale]/_components/AboutContent/AboutContent.tsx b/src/app/[locale]/_components/AboutContent/AboutContent.tsx
deleted file mode 100644
index 6e350d4..0000000
--- a/src/app/[locale]/_components/AboutContent/AboutContent.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-"use client";
-
-import React from "react";
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-import { BulletCard } from "@/components/BulletCard";
-import { ColoredText } from "@/components/ColoredText";
-import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
-import { AboutBulletIcon } from "@/components/icons/bullets/About";
-import { KeyboardShortcut } from "@/components/KeyboardShortcut";
-import { PillLink } from "@/components/PillLink/PillLink";
-import { SpotlightSection } from "@/components/SpotlightSection";
-import { useOnWindowSize } from "@/hooks/useOnWindowSize";
-
-import { MainCallToActionButton } from "../MainCallToActionButton";
-
-import { PartnerCard } from "./_components/PartnerCard";
-
-export const AboutContent = () => {
-  const t = useTranslations("Landing");
-
-  const isMobile = useOnWindowSize({ size: "sm" });
-
-  return (
-    <FlyWhenIntoView className="flex flex-col gap-10 lg:gap-8">
-      <SpotlightSection
-        image={
-          <Image
-            className="object-cover h-full"
-            src={isMobile ? "/mobile-defi.webp" : "/defi.webp"}
-            width={2048}
-            height={2048}
-            alt="ink"
-          />
-        }
-        imagePosition="right"
-        title={<h2>DeFi expectations</h2>}
-        description={
-          <div className="flex flex-col justify-between gap-11 sm:gap-15">
-            <div className="grid grid-rows-auto grid-cols-1 sm:grid-cols-2 gap-4">
-              <BulletCard
-                icon={
-                  <Image
-                    src="/icons/1s-block-times.svg"
-                    width={24}
-                    height={24}
-                    alt="Sub-second block times"
-                  />
-                }
-                title="Sub-second block times"
-              >
-                1s block times Day 1, sub-second blocks coming soon.
-              </BulletCard>
-              <BulletCard
-                icon={
-                  <Image
-                    src="/icons/Smol-Gas.svg"
-                    width={24}
-                    height={24}
-                    alt="smol gas"
-                  />
-                }
-                title="Smol Gas"
-              >
-                Ape more, pay less.
-              </BulletCard>
-              <BulletCard
-                icon={
-                  <Image
-                    src="/icons/Security.svg"
-                    width={24}
-                    height={24}
-                    alt="security"
-                  />
-                }
-                title="Security"
-              >
-                Sequencer-level security to protect users from malicious intents
-                and exploits.
-              </BulletCard>
-              <BulletCard
-                icon={
-                  <Image
-                    src="/icons/Interoperability.svg"
-                    width={24}
-                    height={24}
-                    alt="interoperability"
-                  />
-                }
-                title="Interoperability"
-              >
-                A commitment to the seamless flow of capital across the
-                Superchain and beyond.
-              </BulletCard>
-              <BulletCard
-                icon={
-                  <Image
-                    src="/icons/Unleashed-by-Kraken.svg"
-                    width={24}
-                    height={24}
-                    alt="Unleashed by kraken"
-                  />
-                }
-                title="Unleashed by Kraken"
-              >
-                Ink will leverage Kraken{"'"}s security and crypto expertise to
-                support builders and users alike as they move towards
-                independent financial sovereignty.
-              </BulletCard>
-              <BulletCard
-                icon={
-                  <Image
-                    src="/icons/ethereum-eth-logo.svg"
-                    width={24}
-                    height={24}
-                    alt="Scaling Ethereum"
-                  />
-                }
-                title="Scaling Ethereum"
-              >
-                Ink is dedicated to scaling Ethereum with a powerful L2 that
-                enhances performance and accessibility.
-              </BulletCard>
-            </div>
-            <div className="w-full sm:w-fit">
-              <MainCallToActionButton
-                copy={{
-                  bridgeNow: t("bridge:cta"),
-                  exploreApps: t("exploreApps:cta"),
-                }}
-              />
-            </div>
-          </div>
-        }
-        pill={
-          <PillLink href="/#about">
-            <AboutBulletIcon enforce="white" size="icon-lg" />
-            <div>
-              About <KeyboardShortcut enforce="white" letter="A" size="sm" />
-            </div>
-          </PillLink>
-        }
-      />
-
-      <FlyWhenIntoView className="flex flex-col items-center gap-6 sm:gap-16 lg:my-20 my-6 px-4">
-        <ColoredText
-          className="text-5xl sm:text-7xl lg:text-very-large text-center font-medium"
-          variant="purple"
-        >
-          <h2>
-            Unleashed by
-            <br />
-            Kraken
-          </h2>
-        </ColoredText>
-
-        <ColoredText
-          variant="purple"
-          className="text-xl sm:text-3xl text-center font-medium"
-        >
-          <h3>Unlock onchain financial sovereignty</h3>
-        </ColoredText>
-      </FlyWhenIntoView>
-
-      <div className="flex flex-col gap-4">
-        <div className="flex gap-4 flex-wrap max-w-[1200px] mx-auto">
-          <PartnerCard
-            url="https://www.optimism.io/"
-            image={
-              <Image
-                className="object-contain w-[160px] aspect-square"
-                src="/icons/op.svg"
-                width={160}
-                height={160}
-                alt="op"
-                loading="eager"
-              />
-            }
-            heading="Built on the Superchain"
-            text="Built on the OP stack, one of the most trusted, scalable, and interoperable blockchains. Selected due to their commitment to building a better decentralized future for everyone."
-          />
-          <PartnerCard
-            url="https://www.kraken.com/"
-            image={
-              <Image
-                className="object-contain h-[60px]"
-                src="/icons/kraken.svg"
-                width={512}
-                height={512}
-                alt="kraken logo"
-                loading="eager"
-              />
-            }
-            heading="From the team behind Kraken"
-            text="A market-leading exchange built on trust, experience and innovation with over 10 million users. One of the key voices in taking crypto to the world over the last 10+ years."
-          />
-        </div>
-      </div>
-    </FlyWhenIntoView>
-  );
-};
diff --git a/src/app/[locale]/_components/AboutContent/WaitlistForm.tsx b/src/app/[locale]/_components/AboutContent/WaitlistForm.tsx
deleted file mode 100644
index 95ed86f..0000000
--- a/src/app/[locale]/_components/AboutContent/WaitlistForm.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-"use client";
-
-import { useActionState } from "react";
-
-import { subscribeToGeneralWaitlist } from "@/actions/subscribe-to-braze";
-import { FormStatus } from "@/components/FormStatus";
-import { EmailIcon } from "@/components/icons/Email";
-import { InputWithSubmit } from "@/components/InputWithSubmit";
-
-export const WaitlistForm: React.FC = () => {
-  const [state, formAction] = useActionState(subscribeToGeneralWaitlist, {
-    success: false,
-    error: undefined,
-  });
-
-  return (
-    <form className="w-fit" action={formAction} data-testid="about-email-form">
-      <InputWithSubmit
-        id="email"
-        name="email"
-        variant="default"
-        icon={<EmailIcon size="icon-lg" enforce="black" />}
-        placeholder="Subscribe for Updates"
-      />
-
-      {state.error?.form && (
-        <div className="relative">
-          <FormStatus errorMessage={state.error.form} />
-        </div>
-      )}
-    </form>
-  );
-};
diff --git a/src/app/[locale]/_components/AboutContent/index.ts b/src/app/[locale]/_components/AboutContent/index.ts
deleted file mode 100644
index a2d238e..0000000
--- a/src/app/[locale]/_components/AboutContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./AboutContent";
diff --git a/src/app/[locale]/_components/BuildersDropdownContent.tsx b/src/app/[locale]/_components/BuildersDropdownContent.tsx
deleted file mode 100644
index d9de3ec..0000000
--- a/src/app/[locale]/_components/BuildersDropdownContent.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import { HTMLAttributeAnchorTarget } from "react";
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-import { ArrowRightIcon } from "@/components/icons/ArrowRight";
-import { CommunityBulletIcon } from "@/components/icons/bullets/Community";
-import { DocsBulletIcon } from "@/components/icons/bullets/Docs";
-import { FaucetBulletIcon } from "@/components/icons/bullets/Faucet";
-import { GitHubBulletIcon } from "@/components/icons/bullets/GitHub";
-import { StatusBulletIcon } from "@/components/icons/bullets/Status";
-import { TestnetBulletIcon } from "@/components/icons/bullets/Testnet";
-import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { EXTERNAL_LINKS, HrefProp, Link } from "@/routing";
-
-export const BuildersDropdownContent = () => {
-  const query = useRouterQuery();
-  const isMainnet = useFeatureFlag("mainnet");
-  const t = useTranslations("Menu");
-
-  return (
-    <div className="mt-2 bg-[#f1f2f9] dark:bg-softDarkPurple rounded-3xl shadow-lg py-5 px-5 flex">
-      <div className="flex gap-8 w-full">
-        {/* Left side - Links */}
-        <div className="flex flex-col gap-2">
-          <BuildersLink
-            icon={<DocsBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("documentation")}
-            href={EXTERNAL_LINKS.documentation}
-            target="_blank"
-          />
-          <BuildersLink
-            icon={<GitHubBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("inkkit")}
-            href={EXTERNAL_LINKS.inkKit}
-            target="_blank"
-          />
-          <BuildersLink
-            icon={<StatusBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("statusPage")}
-            href={EXTERNAL_LINKS.status}
-            target="_blank"
-          />
-          <BuildersLink
-            icon={<TestnetBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("explorer")}
-            href={
-              isMainnet
-                ? EXTERNAL_LINKS.mainnetExplorerBlockscout
-                : EXTERNAL_LINKS.testnetExplorerBlockscout
-            }
-            target="_blank"
-          />
-          <div className="ml-6">
-            {isMainnet ? (
-              <>
-                <BuildersLink
-                  icon={
-                    <Image
-                      src="/icons/blockscout.jpg"
-                      width={23}
-                      height={23}
-                      alt="Explorer"
-                      className="inline rounded-full"
-                    />
-                  }
-                  label={t("blockscout")}
-                  href={EXTERNAL_LINKS.mainnetExplorerBlockscout}
-                  target="_blank"
-                />
-                <BuildersLink
-                  icon={
-                    <Image
-                      src="/icons/okxexplorer.jpg"
-                      width={23}
-                      height={23}
-                      alt="Explorer"
-                      className="inline rounded-full"
-                    />
-                  }
-                  label={t("okx")}
-                  href={EXTERNAL_LINKS.mainnetExplorerOkx}
-                  target="_blank"
-                />
-              </>
-            ) : (
-              <>
-                <BuildersLink
-                  icon={
-                    <TestnetBulletIcon className="shrink-0" size="icon-lg" />
-                  }
-                  label={t("blockscout")}
-                  href={EXTERNAL_LINKS.testnetExplorerBlockscout}
-                  target="_blank"
-                />
-                <BuildersLink
-                  icon={
-                    <TestnetBulletIcon className="shrink-0" size="icon-lg" />
-                  }
-                  label={t("routescan")}
-                  href={EXTERNAL_LINKS.testnetExplorerRoutescan}
-                  target="_blank"
-                />
-              </>
-            )}
-          </div>
-          <BuildersLink
-            icon={<FaucetBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("testnetFaucet")}
-            href={{
-              pathname: "/faucet",
-              query: query,
-            }}
-            target="_blank"
-          />
-          <BuildersLink
-            icon={<CommunityBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("community")}
-            href={{
-              pathname: "/community",
-              query: query,
-            }}
-          />
-          <BuildersLink
-            icon={<GitHubBulletIcon className="shrink-0" size="icon-lg" />}
-            label={t("github")}
-            href={{
-              pathname: "https://github.com/inkonchain",
-            }}
-            target="_blank"
-          />
-        </div>
-
-        {/* Right side - Image */}
-        <div className="w-[250px] h-full overflow-hidden rounded-2xl">
-          <ParallaxedHoverImage
-            src="/nav-chad.png"
-            alt="Navigation illustration"
-            width={250}
-            height={250}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-interface BuildersLinkProps {
-  icon: React.ReactNode;
-  label: React.ReactNode;
-  href: HrefProp;
-  target?: HTMLAttributeAnchorTarget;
-}
-
-const BuildersLink = ({ icon, label, href, target }: BuildersLinkProps) => {
-  return (
-    <Link
-      href={href}
-      className="flex items-center gap-4 hover:bg-blackMagic/5 hover:dark:bg-whiteMagic/10 py-2 px-6 -mx-4 rounded-4xl font-bold uppercase group"
-      target={target}
-    >
-      {icon}
-      <div className="flex items-center justify-between w-full gap-4">
-        {label}
-        <ArrowRightIcon
-          size="icon-sm"
-          className="opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 duration-200 transition-opacity"
-        />
-      </div>
-    </Link>
-  );
-};
diff --git a/src/app/[locale]/_components/ContactContent/ContactContent.tsx b/src/app/[locale]/_components/ContactContent/ContactContent.tsx
deleted file mode 100644
index 82c8487..0000000
--- a/src/app/[locale]/_components/ContactContent/ContactContent.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from "react";
-import { useTranslations } from "next-intl";
-
-import { Button } from "@/components/Button/Button";
-import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
-import { TwitterIcon } from "@/components/icons/Twitter";
-import { PurpleSpotlightSection } from "@/components/PurpleSpotlightSection";
-import { EXTERNAL_LINKS, Link } from "@/routing";
-
-import { MainCallToActionButton } from "../MainCallToActionButton";
-
-export interface ContactContentProps {}
-
-export const ContactContent: React.FC<ContactContentProps> = ({}) => {
-  const t = useTranslations("Landing");
-  return (
-    <FlyWhenIntoView className="w-full">
-      <PurpleSpotlightSection
-        title={
-          <>
-            The future isn&apos;t written,
-            <br />
-            it&apos;s waiting to be inked.
-          </>
-        }
-        callToAction={
-          <>
-            <div className="w-full sm:w-fit">
-              <MainCallToActionButton
-                variant="spotlight"
-                copy={{
-                  bridgeNow: t("bridge:cta"),
-                  exploreApps: t("exploreApps:cta"),
-                }}
-              />
-            </div>
-            <Link
-              href={EXTERNAL_LINKS.twitter}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="w-full sm:w-fit"
-            >
-              <Button
-                variant="spotlight"
-                size="lg"
-                compact
-                icon={<TwitterIcon size="icon-lg" enforce="inherit" />}
-                className="font-bold group"
-              >
-                Follow Us
-              </Button>
-            </Link>
-          </>
-        }
-      />
-    </FlyWhenIntoView>
-  );
-};
diff --git a/src/app/[locale]/_components/ContactUsHeaderButton.tsx b/src/app/[locale]/_components/ContactUsHeaderButton.tsx
deleted file mode 100644
index a8238ef..0000000
--- a/src/app/[locale]/_components/ContactUsHeaderButton.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-"use client";
-import React from "react";
-import { useTranslations } from "next-intl";
-
-import { ArrowOnHover } from "@/components/ArrowOnHover";
-import { useContactUsModalContext } from "@/components/ContactUsModal/ContactUsModalContext";
-import { KeyboardShortcut } from "@/components/KeyboardShortcut";
-
-export interface ContactUsHeaderButtonProps {
-  className: string;
-}
-
-export const ContactUsHeaderButton: React.FC<ContactUsHeaderButtonProps> = ({
-  className,
-}) => {
-  const t = useTranslations("Menu");
-  const { setIsOpen } = useContactUsModalContext();
-  return (
-    <button className={className} onClick={() => setIsOpen(true)}>
-      {t("contact")}
-      <ArrowOnHover />
-      <KeyboardShortcut letter="C" opacity="light" size="sm" />
-    </button>
-  );
-};
diff --git a/src/app/[locale]/_components/DeveloperContent/DeveloperContent.tsx b/src/app/[locale]/_components/DeveloperContent/DeveloperContent.tsx
deleted file mode 100644
index aa25e59..0000000
--- a/src/app/[locale]/_components/DeveloperContent/DeveloperContent.tsx
+++ /dev/null
@@ -1,264 +0,0 @@
-"use client";
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-import { ButtonLink } from "@/components/Button/ButtonLink";
-import { ColoredText } from "@/components/ColoredText";
-import { ArrowRightIcon } from "@/components/icons/ArrowRight";
-import { BridgeBulletIcon } from "@/components/icons/bullets/Bridge";
-import { BuildersBulletIcon } from "@/components/icons/bullets/Builders";
-import { DocsBulletIcon } from "@/components/icons/bullets/Docs";
-import { FaucetBulletIcon } from "@/components/icons/bullets/Faucet";
-import { GitHubBulletIcon } from "@/components/icons/bullets/GitHub";
-import { StatusBulletIcon } from "@/components/icons/bullets/Status";
-import { TestnetBulletIcon } from "@/components/icons/bullets/Testnet";
-import { KeyboardShortcut } from "@/components/KeyboardShortcut";
-import { PillLink } from "@/components/PillLink/PillLink";
-import { SpotlightSection } from "@/components/SpotlightSection";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
-import { useOnWindowSize } from "@/hooks/useOnWindowSize";
-import { EXTERNAL_LINKS } from "@/routing";
-
-import { MailButton } from "../MailButton/MailButton";
-import { MainCallToActionButton } from "../MainCallToActionButton";
-import { SubscribeButton } from "../SubscribeButton/SubscribeButton";
-
-export const DeveloperContent = () => {
-  const t = useTranslations("Landing");
-  const isMainnet = useFeatureFlag("mainnet");
-
-  const isMobile = useOnWindowSize({ size: "sm" });
-
-  return (
-    <>
-      <div className="flex flex-col gap-8 relative">
-        <SpotlightSection
-          title={<h2>Write your code with Ink</h2>}
-          image={
-            <Image
-              className="object-cover h-full"
-              src={isMobile ? "/mobile-builder.webp" : "/builder.webp"}
-              width={2048}
-              height={2048}
-              alt="ink"
-            />
-          }
-          imagePosition="left"
-          description={
-            <div className="flex flex-col justify-between gap-11 leading-6">
-              <div className="gap-3 flex flex-col">
-                <p>
-                  The next chapter of DeFi will be written with Ink. Ink is the
-                  bridge between users and the builders shaping DeFi. Powered by
-                  the Superchain and fortified by over a decade of crypto
-                  expertise, this is where visionary builders turn code into
-                  financial revolutions.
-                </p>
-                <p>
-                  Our commitment to builders: Ink will provide you with a world-
-                  class development environment, complete with the tools,
-                  support, and users you need to bring your ideas to life.
-                </p>
-                <p>
-                  {isMainnet ? (
-                    <>
-                      Ink mainnet has now been unleashed! To stay updated, join
-                      below.
-                    </>
-                  ) : (
-                    <>
-                      Ink&apos;s testnet will be released soon. To stay updated,
-                      join below.
-                    </>
-                  )}
-                </p>
-              </div>
-              <div className="flex flex-col items-start justify-center gap-4">
-                <div className="flex flex-wrap gap-6 lg:gap-4">
-                  <div className="w-full sm:w-[300px]">
-                    <ButtonLink
-                      href={EXTERNAL_LINKS.documentation}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      size="lg"
-                      variant="link"
-                    >
-                      <div className="flex items-center gap-3">
-                        <DocsBulletIcon
-                          enforce="white"
-                          className="shrink-0"
-                          size="icon-lg"
-                        />
-                        <ColoredText variant="purple-light" dampen="lg">
-                          Docs
-                        </ColoredText>
-                      </div>
-                      <ArrowRightIcon enforce="white" size="icon-xl" />
-                    </ButtonLink>
-                  </div>
-                  <div className="w-full sm:w-[300px]">
-                    <ButtonLink
-                      href={EXTERNAL_LINKS.inkKit}
-                      rel="noopener noreferrer"
-                      target="_blank"
-                      size="lg"
-                      variant="link"
-                    >
-                      <div className="flex items-center gap-3">
-                        <GitHubBulletIcon
-                          enforce="white"
-                          className="shrink-0"
-                          size="icon-lg"
-                        />
-                        <ColoredText variant="purple-light" dampen="lg">
-                          Ink Kit
-                        </ColoredText>
-                      </div>
-                      <ArrowRightIcon enforce="white" size="icon-xl" />
-                    </ButtonLink>
-                  </div>
-                  <div className="w-full sm:w-[300px]">
-                    <ButtonLink
-                      href={EXTERNAL_LINKS.status}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      size="lg"
-                      variant="link"
-                    >
-                      <div className="flex items-center gap-3">
-                        <StatusBulletIcon
-                          enforce="white"
-                          className="shrink-0"
-                          size="icon-lg"
-                        />
-                        <ColoredText variant="purple-light" dampen="lg">
-                          Status
-                        </ColoredText>
-                      </div>
-                      <ArrowRightIcon enforce="white" size="icon-xl" />
-                    </ButtonLink>
-                  </div>
-                  <div className="w-full sm:w-[300px]">
-                    <ButtonLink
-                      href={
-                        isMainnet
-                          ? EXTERNAL_LINKS.mainnetExplorerBlockscout
-                          : EXTERNAL_LINKS.testnetExplorerBlockscout
-                      }
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      size="lg"
-                      variant="link"
-                    >
-                      <div className="flex items-center gap-3">
-                        <TestnetBulletIcon
-                          enforce="white"
-                          className="shrink-0"
-                          size="icon-lg"
-                        />
-                        <ColoredText variant="purple-light" dampen="lg">
-                          Explorer
-                        </ColoredText>
-                      </div>
-                      <ArrowRightIcon enforce="white" size="icon-xl" />
-                    </ButtonLink>
-                  </div>
-                  <div className="w-full sm:w-[300px]">
-                    <ButtonLink
-                      href="/faucet"
-                      rel="noopener noreferrer"
-                      size="lg"
-                      variant="link"
-                    >
-                      <div className="flex items-center gap-3">
-                        <FaucetBulletIcon
-                          enforce="white"
-                          className="shrink-0"
-                          size="icon-lg"
-                        />
-                        <ColoredText variant="purple-light" dampen="lg">
-                          Testnet Faucet
-                        </ColoredText>
-                      </div>
-                      <ArrowRightIcon enforce="white" size="icon-xl" />
-                    </ButtonLink>
-                  </div>
-                  <div className="w-full sm:w-[300px]">
-                    <ButtonLink
-                      href={EXTERNAL_LINKS.github}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      size="lg"
-                      variant="link"
-                    >
-                      <div className="flex items-center gap-3">
-                        <GitHubBulletIcon
-                          enforce="white"
-                          className="shrink-0"
-                          size="icon-lg"
-                        />
-                        <ColoredText variant="purple-light" dampen="lg">
-                          Github
-                        </ColoredText>
-                      </div>
-                      <ArrowRightIcon enforce="white" size="icon-xl" />
-                    </ButtonLink>
-                  </div>
-                  {!isMainnet && (
-                    <div className="w-full sm:w-[300px]">
-                      <ButtonLink
-                        href="/testnet-bridge"
-                        rel="noopener noreferrer"
-                        size="lg"
-                        variant="link"
-                      >
-                        <div className="flex items-center gap-3">
-                          <BridgeBulletIcon
-                            enforce="white"
-                            className="shrink-0"
-                            size="icon-lg"
-                          />
-                          <ColoredText variant="purple-light" dampen="lg">
-                            Bridge
-                          </ColoredText>
-                        </div>
-                        <ArrowRightIcon enforce="white" size="icon-xl" />
-                      </ButtonLink>
-                    </div>
-                  )}
-                </div>
-              </div>
-              <div className="flex flex-col items-start justify-center gap-4">
-                <div className="flex flex-wrap gap-6 lg:gap-4">
-                  <div className="w-full sm:w-fit">
-                    <MainCallToActionButton
-                      copy={{
-                        bridgeNow: t("bridge:cta"),
-                        exploreApps: t("exploreApps:cta"),
-                      }}
-                    />
-                  </div>
-                  <div className="w-full sm:w-fit">
-                    <SubscribeButton />
-                  </div>
-                  <div className="w-full sm:w-auto">
-                    <MailButton />
-                  </div>
-                </div>
-              </div>
-            </div>
-          }
-          pill={
-            <PillLink href="/#builders">
-              <BuildersBulletIcon enforce="white" size="icon-lg" />
-              <div>
-                Builders{" "}
-                <KeyboardShortcut enforce="white" letter="D" size="sm" />
-              </div>
-            </PillLink>
-          }
-        />
-      </div>
-    </>
-  );
-};
diff --git a/src/app/[locale]/_components/DeveloperContent/DeveloperUpdates.tsx b/src/app/[locale]/_components/DeveloperContent/DeveloperUpdates.tsx
deleted file mode 100644
index 9ea888e..0000000
--- a/src/app/[locale]/_components/DeveloperContent/DeveloperUpdates.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-"use client";
-
-import { useActionState } from "react";
-
-import { subscribeToDeveloperWaitlist } from "@/actions/subscribe-to-braze";
-import { MailIcon } from "@/components/icons/Mail";
-import { InputWithSubmit } from "@/components/InputWithSubmit";
-
-export const DeveloperUpdates = () => {
-  const [_, formAction] = useActionState(subscribeToDeveloperWaitlist, {
-    success: false,
-    error: undefined,
-  });
-
-  return (
-    <form action={formAction} data-testid="developer-email-form">
-      <InputWithSubmit
-        id="email"
-        name="email"
-        variant="transparent-on-dark"
-        placeholder="Get builder updates"
-        icon={<MailIcon size="icon-lg" enforce="blend" />}
-      />
-    </form>
-  );
-};
diff --git a/src/app/[locale]/_components/EventContent/EventContent.tsx b/src/app/[locale]/_components/EventContent/EventContent.tsx
deleted file mode 100644
index e0492e5..0000000
--- a/src/app/[locale]/_components/EventContent/EventContent.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import { PropsWithChildren } from "react";
-import { Card, CardContent, Tag } from "@inkonchain/ink-kit";
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-import { ButtonLink } from "@/components/Button/ButtonLink";
-import { ColoredText } from "@/components/ColoredText";
-import { CalendarIcon } from "@/components/icons/Calendar";
-import { DotsInCircleIcon } from "@/components/icons/DotsInCircle";
-import { LocationIcon } from "@/components/icons/Location";
-import { MailIcon } from "@/components/icons/Mail";
-import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
-import { EXTERNAL_LINKS, HrefProp } from "@/routing";
-import { classNames } from "@/util/classes";
-
-export const EventContent = () => {
-  const t = useTranslations("events.ethdenver");
-  return (
-    <div
-      className={
-        "px-6 flex flex-col md:flex-row gap-10 md:gap-6 mb-16 mt-16 sm:mt-0"
-      }
-    >
-      <div className="flex-1 flex items-center justify-center">
-        <Image src="/moose.webp" width={671} height={468} alt={"Moose"} />
-      </div>
-      <div className="flex-1 flex flex-col md:items-start items-center gap-8">
-        <div className="flex gap-4 items-center flex-wrap justify-center sm:justify-start">
-          <EventPill>Event</EventPill>
-          <div className="flex gap-4 items-center">
-            <EventPill icon={<CalendarIcon size="icon-md" />}>
-              {t("date")}
-            </EventPill>
-            <EventPill icon={<LocationIcon size="icon-md" />}>
-              {t("location")}
-            </EventPill>
-          </div>
-        </div>
-        <div className="space-y-5 max-w-[450px]">
-          <ColoredText
-            className="text-5xl lg:text-7xl text-center md:text-left font-medium"
-            variant="purple"
-          >
-            <h2>{t("title")}</h2>
-          </ColoredText>
-          <p className="text-center md:text-left text-lg">{t("description")}</p>
-        </div>
-        <div className="flex justify-start">
-          <ButtonLink
-            href={EXTERNAL_LINKS.inkdenver}
-            aria-label="Apply for House of Ink"
-            target="_blank"
-            rel="noopener noreferrer"
-            size="lg"
-            variant={"primary"}
-            compact
-            icon={
-              <MailIcon className="shrink-0" size="icon-lg" enforce="inherit" />
-            }
-          >
-            {t("cta")}
-          </ButtonLink>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export interface EventPillProps {
-  icon?: React.ReactNode;
-}
-
-export const EventPill: React.FC<EventPillProps & PropsWithChildren> = ({
-  icon = <DotsInCircleIcon size="icon-md" enforce="inherit" />,
-  children,
-}) => {
-  return (
-    <div className="text-default text-xs flex items-center justify-center gap-2 px-4 py-2 font-bold rounded-full overflow-hidden z-10 bg-event-pill-gradient dark:bg-event-pill-gradient-dark dark:text-whiteMagic backdrop-blur-[32px] shadow">
-      <span className="flex gap-2 items-center py-0.5">
-        {icon}
-        {children}
-      </span>
-    </div>
-  );
-};
-
-export interface SpecificEventCardProps {
-  title: string;
-  description: string;
-  cta: string;
-  link: HrefProp;
-  date: string;
-  location: string;
-  image: string;
-  imageAlt: string;
-  className?: string;
-  layout: "horizontal" | "vertical";
-  color?: "purple" | "purple-dark";
-}
-
-export const SpecificEventCard = ({
-  title,
-  description,
-  cta,
-  link,
-  date,
-  location,
-  image,
-  imageAlt,
-  layout = "vertical",
-  color = "purple",
-  className,
-}: SpecificEventCardProps) => {
-  return (
-    <Card
-      className={className}
-      image={
-        <CardContent.Image
-          mainLabels={
-            <>
-              <Tag variant="event">
-                <CalendarIcon size="icon-md" enforce="inherit" />
-                {date}
-              </Tag>
-              <Tag variant="event">
-                <LocationIcon size="icon-md" enforce="inherit" />
-                {location}
-              </Tag>
-            </>
-          }
-        >
-          <ParallaxedHoverImage
-            className={classNames(
-              "max-w-xl sm:max-w-full",
-              layout === "horizontal" ? "h-full" : "w-full"
-            )}
-            src={image}
-            alt={imageAlt}
-            width={1456}
-            height={816}
-          />
-        </CardContent.Image>
-      }
-      imageLocation={layout === "horizontal" ? "left" : "top"}
-      variant={color === "purple" ? "light-purple" : "secondary"}
-    >
-      <CardContent.CallToAction
-        title={title}
-        description={description}
-        button={
-          <div>
-            <ButtonLink
-              href={link}
-              aria-label="Apply for House of Ink"
-              target="_blank"
-              rel="noopener noreferrer"
-              size="lg"
-              variant={color === "purple" ? "primary" : "spotlight"}
-              compact
-              icon={
-                <MailIcon
-                  className="shrink-0"
-                  size="icon-lg"
-                  enforce="inherit"
-                />
-              }
-            >
-              {cta}
-            </ButtonLink>
-          </div>
-        }
-      />
-    </Card>
-  );
-};
diff --git a/src/app/[locale]/_components/EventContent/GlossyPill.tsx b/src/app/[locale]/_components/EventContent/GlossyPill.tsx
deleted file mode 100644
index bd33ecd..0000000
--- a/src/app/[locale]/_components/EventContent/GlossyPill.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from "react";
-
-import { IconProps } from "@/components/icons/types";
-
-export interface GlossyPillProps {
-  Icon: React.FC<IconProps>;
-  text: string;
-}
-
-export const GlossyPill = ({ Icon, text }: GlossyPillProps) => {
-  return (
-    <div className="flex items-center justify-center gap-2 rounded-full bg-glossyPill px-4 py-2 backdrop-blur-[48px]">
-      <span className="flex items-center gap-2 py-0.5 text-sm font-bold leading-[18px] text-white">
-        {<Icon size="icon-md" className="text-white/50" enforce="inherit" />}
-        {text}
-      </span>
-    </div>
-  );
-};
-
-GlossyPill.displayName = "GlossyPill";
diff --git a/src/app/[locale]/_components/HeaderFaucetButton.tsx b/src/app/[locale]/_components/HeaderFaucetButton.tsx
deleted file mode 100644
index e8449d2..0000000
--- a/src/app/[locale]/_components/HeaderFaucetButton.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import Confetti from "react-confetti";
-
-import { FaucetButton } from "@/components/FaucetButton";
-
-export const HeaderFaucetButton: React.FC = () => {
-  const [requestSuccess, setRequestSuccess] = useState<boolean | null>(null);
-
-  return (
-    <>
-      <FaucetButton onChange={setRequestSuccess} />
-      {requestSuccess && (
-        <Confetti
-          width={window.innerWidth}
-          height={window.innerHeight}
-          numberOfPieces={400}
-          gravity={0.5}
-          recycle={false}
-        />
-      )}
-    </>
-  );
-};
diff --git a/src/app/[locale]/new/_components/Home/HomeApps.tsx b/src/app/[locale]/_components/Home/HomeApps.tsx
similarity index 92%
rename from src/app/[locale]/new/_components/Home/HomeApps.tsx
rename to src/app/[locale]/_components/Home/HomeApps.tsx
index 29b17a3..254a088 100644
--- a/src/app/[locale]/new/_components/Home/HomeApps.tsx
+++ b/src/app/[locale]/_components/Home/HomeApps.tsx
@@ -19,7 +19,7 @@ export const HomeApps = () => {
           Discover apps on Ink
         </ColoredText>
         <Button asChild variant="secondary">
-          <Link href={{ pathname: "/new/apps", query }}>View all apps</Link>
+          <Link href={{ pathname: "/apps", query }}>View all apps</Link>
         </Button>
       </div>
       <AppsGrid
diff --git a/src/app/[locale]/new/_components/Home/HomeEvent.tsx b/src/app/[locale]/_components/Home/HomeEvent.tsx
similarity index 66%
rename from src/app/[locale]/new/_components/Home/HomeEvent.tsx
rename to src/app/[locale]/_components/Home/HomeEvent.tsx
index 1785cec..538b067 100644
--- a/src/app/[locale]/new/_components/Home/HomeEvent.tsx
+++ b/src/app/[locale]/_components/Home/HomeEvent.tsx
@@ -1,16 +1,14 @@
 "use client";
 import { useTranslations } from "next-intl";
 
-import {
-  SpecificEventCard,
-  SpecificEventCardProps,
-} from "@/app/[locale]/_components/EventContent/EventContent";
 import { EXTERNAL_LINKS } from "@/routing";
 
+import { EventCard, EventCardProps } from "../../../../components/EventCard";
+
 export const HomeEvent = () => {
   const t = useTranslations("events");
 
-  const ethDenverEventProps: SpecificEventCardProps = {
+  const ethDenverEventProps: EventCardProps = {
     title: t("ethdenver.cardTitle"),
     description: t("ethdenver.description"),
     cta: t("ethdenver.cta"),
@@ -21,5 +19,5 @@ export const HomeEvent = () => {
     imageAlt: "ETHDenver",
     layout: "horizontal",
   };
-  return <SpecificEventCard {...ethDenverEventProps} color="purple" />;
+  return <EventCard {...ethDenverEventProps} color="purple" />;
 };
diff --git a/src/app/[locale]/new/_components/Home/HomeTagLine.tsx b/src/app/[locale]/_components/Home/HomeTagLine.tsx
similarity index 94%
rename from src/app/[locale]/new/_components/Home/HomeTagLine.tsx
rename to src/app/[locale]/_components/Home/HomeTagLine.tsx
index 1d5e7ef..602a479 100644
--- a/src/app/[locale]/new/_components/Home/HomeTagLine.tsx
+++ b/src/app/[locale]/_components/Home/HomeTagLine.tsx
@@ -18,7 +18,7 @@ export const HomeTagLine = () => {
         buttons={
           <>
             <Button asChild size="lg" iconLeft={<InkIcon.Bridge />}>
-              <Link href="/new/bridge">Bridge now</Link>
+              <Link href="/bridge">Bridge now</Link>
             </Button>
             <Button
               asChild
diff --git a/src/app/[locale]/new/_components/Home/HomeTitle.tsx b/src/app/[locale]/_components/Home/HomeTitle.tsx
similarity index 74%
rename from src/app/[locale]/new/_components/Home/HomeTitle.tsx
rename to src/app/[locale]/_components/Home/HomeTitle.tsx
index d2f9a40..ee555db 100644
--- a/src/app/[locale]/new/_components/Home/HomeTitle.tsx
+++ b/src/app/[locale]/_components/Home/HomeTitle.tsx
@@ -1,5 +1,6 @@
 "use client";
 import { Button } from "@inkonchain/ink-kit";
+import Image from "next/image";
 
 import { ColoredText } from "@/components/ColoredText";
 import { useRouterQuery } from "@/hooks/useRouterQuery";
@@ -14,7 +15,12 @@ export const HomeTitle = () => {
       <PageHeader
         pre={
           <div className="flex items-center justify-center ink:gap-1">
-            <img src="/icons/1s-block-times.svg" width={20} height={20} />
+            <Image
+              alt="a lighting bolt in a circle"
+              src="/icons/1s-block-times.svg"
+              width={20}
+              height={20}
+            />
             <div>Kraken&apos;s L2 now live on Superchain!</div>
           </div>
         }
@@ -26,7 +32,7 @@ export const HomeTitle = () => {
         }
         cta={
           <Button variant="primary" size="lg">
-            <Link href={{ pathname: "/new/apps", query }}>Explore Apps</Link>
+            <Link href={{ pathname: "/apps", query }}>Explore Apps</Link>
           </Button>
         }
         size="home"
diff --git a/src/app/[locale]/_components/HomeHeader.tsx b/src/app/[locale]/_components/HomeHeader.tsx
deleted file mode 100644
index ee93f86..0000000
--- a/src/app/[locale]/_components/HomeHeader.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-"use client";
-
-import React, { useRef } from "react";
-import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
-import { useTranslations } from "next-intl";
-
-import { ArrowOnHover } from "@/components/ArrowOnHover";
-import { Header } from "@/components/Header";
-import { KeyboardShortcut } from "@/components/KeyboardShortcut";
-import { PillContainer } from "@/components/PillContainer";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { Link } from "@/routing";
-
-import { BuildersDropdownContent } from "./BuildersDropdownContent";
-import { ContactUsHeaderButton } from "./ContactUsHeaderButton";
-import { MobileNavItems } from "./MobileNavItems";
-
-export const HomeHeader = () => {
-  const searchParams = useRouterQuery();
-  const isMainnet = useFeatureFlag("mainnet");
-  const linkClasses =
-    "px-2.5 py-2 group text-center flex items-center gap-1 dark:opacity-75 rounded-4xl uppercase";
-  const t = useTranslations("Menu");
-
-  return (
-    <Header mobileChildren={<MobileNavItems />}>
-      <PillContainer className="PillContainer hidden mx-auto w-fit font-bold sm:flex items-center justify-center px-3 py-1 shadow-none">
-        <Link
-          className={`${linkClasses} `}
-          href={{ pathname: "/", hash: "about", query: searchParams }}
-        >
-          {t("about")}
-          <ArrowOnHover />
-          <KeyboardShortcut letter="A" opacity="light" size="sm" />
-        </Link>
-        <Link
-          className={`${linkClasses} `}
-          href={
-            isMainnet
-              ? {
-                  pathname: "/dashboard",
-                  query: {
-                    ...Object.fromEntries(
-                      new URLSearchParams(searchParams) || {}
-                    ),
-                    category: "bridge",
-                  },
-                }
-              : { pathname: "/testnet-bridge", query: searchParams }
-          }
-        >
-          {t("bridge")}
-          <ArrowOnHover />
-          <KeyboardShortcut letter="B" opacity="light" size="sm" />
-        </Link>
-        <BuildersLinkWithPopover
-          linkClasses={linkClasses}
-          searchParams={searchParams}
-        />
-
-        <Link
-          className={`${linkClasses}`}
-          href={{
-            pathname: "/community",
-            query: searchParams,
-          }}
-        >
-          {t("community")}
-          <ArrowOnHover />
-          <KeyboardShortcut letter="H" opacity="light" size="sm" />
-        </Link>
-        <ContactUsHeaderButton className={linkClasses} />
-      </PillContainer>
-    </Header>
-  );
-};
-
-const BuildersLinkWithPopover: React.FC<{
-  linkClasses: string;
-  searchParams: string;
-}> = ({ linkClasses, searchParams }) => {
-  const t = useTranslations("Menu");
-  const ref = useRef<HTMLButtonElement | null>(null);
-
-  const togglePopover = (button: HTMLButtonElement) => {
-    if (button) {
-      const active = document.activeElement;
-      button.click();
-      button.blur();
-      if (active instanceof HTMLElement) {
-        active.focus();
-      }
-    }
-  };
-
-  return (
-    <Popover>
-      {({ open }) => (
-        <>
-          <Link
-            className={`${linkClasses} group/builders`}
-            href={{
-              pathname: "/",
-              hash: "builders",
-              query: searchParams,
-            }}
-            onMouseEnter={(e: React.MouseEvent<HTMLElement>) => {
-              if (!open && ref.current) {
-                togglePopover(ref.current);
-              }
-            }}
-          >
-            {t("builders")}
-            <PopoverButton ref={ref} className="group flex">
-              <ArrowOnHover iconClassName="rotate-90" />
-            </PopoverButton>
-            <KeyboardShortcut letter="D" opacity="light" size="sm" />
-          </Link>
-          <PopoverPanel
-            className="z-50"
-            anchor={{ to: "top", gap: 8 }}
-            onMouseLeave={() => {
-              if (open && ref.current) {
-                togglePopover(ref.current);
-              }
-            }}
-          >
-            <BuildersDropdownContent />
-          </PopoverPanel>
-        </>
-      )}
-    </Popover>
-  );
-};
diff --git a/src/app/[locale]/new/_components/InkLogo.tsx b/src/app/[locale]/_components/InkLogo.tsx
similarity index 93%
rename from src/app/[locale]/new/_components/InkLogo.tsx
rename to src/app/[locale]/_components/InkLogo.tsx
index 9062640..3cbdf55 100644
--- a/src/app/[locale]/new/_components/InkLogo.tsx
+++ b/src/app/[locale]/_components/InkLogo.tsx
@@ -17,7 +17,7 @@ export const InkLogo: React.FC = () => {
   return (
     <Link
       href={{
-        pathname: routing.pathnames["/new"],
+        pathname: routing.pathnames["/"],
         query,
       }}
       onClick={closeMobileNavigation}
diff --git a/src/app/[locale]/_components/MailButton/MailButton.tsx b/src/app/[locale]/_components/MailButton/MailButton.tsx
deleted file mode 100644
index 0d641a5..0000000
--- a/src/app/[locale]/_components/MailButton/MailButton.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-"use client";
-
-import { Button } from "@inkonchain/ink-kit";
-
-import { useContactUsModalContext } from "@/components/ContactUsModal/ContactUsModalContext";
-import { MailIcon } from "@/components/icons/Mail";
-
-export const MailButton = () => {
-  const { setIsOpen } = useContactUsModalContext();
-
-  return (
-    <div className="flex justify-center w-full">
-      <Button
-        onClick={() => setIsOpen(true)}
-        aria-label="mail"
-        size="lg"
-        variant="primary"
-        className="w-full sm:hidden duration-300 transition-[box-shadow] hover:shadow-krakenPurple/50 hover:shadow-large-pop"
-        iconLeft={
-          <MailIcon className="shrink-0" size="icon-lg" enforce="white" />
-        }
-      >
-        Contact Us
-      </Button>
-      <Button
-        onClick={() => setIsOpen(true)}
-        aria-label="mail"
-        size="lg"
-        variant="primary"
-        className="hidden sm:flex duration-300 transition-[box-shadow] hover:shadow-krakenPurple/50 hover:shadow-large-pop"
-        rounded="full"
-      >
-        <MailIcon className="shrink-0" size="icon-lg" enforce="white" />
-      </Button>
-    </div>
-  );
-};
diff --git a/src/app/[locale]/_components/MainCallToActionButton.tsx b/src/app/[locale]/_components/MainCallToActionButton.tsx
deleted file mode 100644
index 28a4ea1..0000000
--- a/src/app/[locale]/_components/MainCallToActionButton.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-"use client";
-import React from "react";
-import { Button, ButtonProps } from "@inkonchain/ink-kit";
-
-import { ButtonLink as LegacyButtonLink } from "@/components/Button/ButtonLink";
-import { AppsIcon } from "@/components/icons/Apps";
-import { BridgeIcon } from "@/components/icons/Bridge";
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { Link } from "@/routing";
-import { classNames } from "@/util/classes";
-
-export interface MainCallToActionButtonProps {
-  variant?: ButtonProps["variant"] | "spotlight";
-  copy: {
-    bridgeNow: string;
-    exploreApps: string;
-  };
-  /** For some reason, the only button that should have a larger width is the main "hero" call to action button */
-  isMainCallToAction?: boolean;
-}
-
-export const MainCallToActionButton: React.FC<MainCallToActionButtonProps> = (
-  props
-) => {
-  return (
-    <OnlyWithFeatureFlag
-      flag="newNav"
-      otherwise={<BridgeNowMainCallToActionButton {...props} />}
-    >
-      <ExploreAppsMainCallToActionButton {...props} />
-    </OnlyWithFeatureFlag>
-  );
-};
-
-const BridgeNowMainCallToActionButton: React.FC<
-  MainCallToActionButtonProps
-> = ({ variant = "primary", copy, isMainCallToAction = false }) => {
-  const query = useRouterQuery();
-  if (variant === "spotlight") {
-    /** TODO: Remove this if the button component is updated to have this variant */
-    return (
-      <LegacyButtonLink
-        href={{
-          pathname: "/dashboard",
-          query: {
-            ...Object.fromEntries(new URLSearchParams(query) || {}),
-            category: "bridge",
-          },
-        }}
-        size="lg"
-        variant={variant}
-        className={classNames("group justify-center items-center", {
-          "px-20": isMainCallToAction,
-        })}
-        icon={
-          <BridgeIcon className="shrink-0" size="icon-lg" enforce="inherit" />
-        }
-      >
-        <span className="inline-flex items-center gap-1 whitespace-nowrap">
-          {copy.bridgeNow}
-        </span>
-      </LegacyButtonLink>
-    );
-  }
-
-  return (
-    <Button
-      asChild
-      size="lg"
-      variant={variant}
-      className={classNames(
-        "group justify-center items-center duration-300 transition-[box-shadow] hover:shadow-krakenPurple/50 hover:shadow-large-pop",
-        {
-          "px-20": isMainCallToAction,
-        }
-      )}
-      iconLeft={
-        <BridgeIcon
-          className="shrink-0"
-          size="icon-lg"
-          enforce={variant !== "primary" ? "inherit" : "white"}
-        />
-      }
-    >
-      <Link
-        href={{
-          pathname: "/dashboard",
-          query: {
-            ...Object.fromEntries(new URLSearchParams(query) || {}),
-            category: "bridge",
-          },
-        }}
-      >
-        <span className="inline-flex items-center gap-1 whitespace-nowrap">
-          {copy.bridgeNow}
-        </span>
-      </Link>
-    </Button>
-  );
-};
-
-const ExploreAppsMainCallToActionButton: React.FC<
-  MainCallToActionButtonProps
-> = ({ variant = "primary", copy, isMainCallToAction = false }) => {
-  const query = useRouterQuery();
-  if (variant === "spotlight") {
-    /** TODO: Remove this if the button component is updated to have this variant */
-    return (
-      <LegacyButtonLink
-        href={{
-          pathname: "/new/apps",
-          query: {
-            ...Object.fromEntries(new URLSearchParams(query) || {}),
-          },
-        }}
-        size="lg"
-        variant={variant}
-        className={classNames("group justify-center items-center", {
-          "px-20": isMainCallToAction,
-        })}
-        icon={
-          <AppsIcon className="shrink-0" size="icon-lg" enforce="inherit" />
-        }
-      >
-        <span className="inline-flex items-center gap-1 whitespace-nowrap">
-          {copy.exploreApps}
-        </span>
-      </LegacyButtonLink>
-    );
-  }
-
-  return (
-    <Button
-      asChild
-      size="lg"
-      variant={variant}
-      className={classNames(
-        "group justify-center items-center duration-300 transition-[box-shadow] hover:shadow-krakenPurple/50 hover:shadow-large-pop",
-        {
-          "px-20": isMainCallToAction,
-        }
-      )}
-      iconLeft={
-        <AppsIcon
-          className="shrink-0"
-          size="icon-lg"
-          enforce={variant !== "primary" ? "inherit" : "white"}
-        />
-      }
-    >
-      <Link
-        href={{
-          pathname: "/new/apps",
-          query: {
-            ...Object.fromEntries(new URLSearchParams(query) || {}),
-          },
-        }}
-      >
-        <span className="inline-flex items-center gap-1 whitespace-nowrap">
-          {copy.exploreApps}
-        </span>
-      </Link>
-    </Button>
-  );
-};
diff --git a/src/app/[locale]/_components/MainContent/Countdown.tsx b/src/app/[locale]/_components/MainContent/Countdown.tsx
deleted file mode 100644
index a9604a7..0000000
--- a/src/app/[locale]/_components/MainContent/Countdown.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-"use client";
-import React, { useState } from "react";
-import { AnimatePresence, motion } from "framer-motion";
-import Image from "next/image";
-import { useTheme } from "next-themes";
-
-import { ColoredText } from "@/components/ColoredText";
-import { SquareDividerIcon } from "@/components/icons/SquareDivider";
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { PillContainer } from "@/components/PillContainer";
-import { ResponsiveText } from "@/components/ResponsiveText";
-import { useOnInterval } from "@/hooks/useOnInterval";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { EXTERNAL_LINKS, Link } from "@/routing";
-import { largeMovementTransition } from "@/util/transitions";
-
-type TimeChunks = [number, number, number, number];
-
-const RELEASE_DATE = new Date("2024-11-11T04:20:00Z").getTime();
-function getRemainingTime(): TimeChunks {
-  const now = Date.now();
-  const seconds = Math.floor(RELEASE_DATE - now) / 1000;
-
-  const days = Math.floor(seconds / (60 * 60 * 24));
-  const hours = Math.floor((seconds % (60 * 60 * 24)) / (60 * 60));
-  const minutes = Math.floor((seconds % (60 * 60)) / 60);
-  const secondsRemaining = Math.floor(seconds % 60);
-
-  return [days, hours, minutes, secondsRemaining];
-}
-
-export interface CountdownProps {}
-
-export const Countdown: React.FC<CountdownProps> = ({}) => {
-  const { resolvedTheme } = useTheme();
-  const query = useRouterQuery();
-  const queryWithCategory = query
-    ? `${query}&category=bridge`
-    : "category=bridge";
-
-  let [currentTime, setCurrentTime] =
-    useState<[number, number, number, number]>();
-  useOnInterval(() => setCurrentTime(getRemainingTime()), 350);
-
-  return (
-    <AnimatePresence initial={false} mode="popLayout">
-      {currentTime ? (
-        <motion.div
-          className="w-fit flex flex-col gap-1"
-          key="countdown"
-          transition={largeMovementTransition}
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-        >
-          <PillContainer className="flex gap-3 sm:gap-3 items-center justify-center px-2 pr-4 z-20">
-            {resolvedTheme === "light" ? (
-              <Image
-                src="/testnet-dark.png"
-                width={24}
-                height={24}
-                alt="testnet-dark"
-              />
-            ) : (
-              <Image src="/testnet.png" width={24} height={24} alt="testnet" />
-            )}
-            <OnlyWithFeatureFlag
-              flag="mainnet"
-              otherwise={
-                <>
-                  <ColoredText variant="reverse-purple">
-                    <div className="text-sm text-center font-bold hover:text-krakenPurple">
-                      <Link
-                        href={EXTERNAL_LINKS.documentation}
-                        target="_blank"
-                        className="border-b border-krakenPurple"
-                      >
-                        Testnet live early!
-                      </Link>
-                    </div>
-                  </ColoredText>
-                  <div className="flex gap-2 sm:gap-3 items-center">
-                    <TimeChunk value={0} label="day" />
-                    <SquareDividerIcon />
-                    <TimeChunk value={0} label="hour" />
-                    <SquareDividerIcon />
-                    <TimeChunk value={0} label="minute" />
-                    <SquareDividerIcon />
-                    <TimeChunk value={0} label="second" />
-                  </div>
-                </>
-              }
-            >
-              <span className="font-semibold flex gap-3 text-sm">
-                <span>Mainnet is live!</span>
-                <Link
-                  href={{
-                    pathname: "/dashboard",
-                    query: queryWithCategory,
-                  }}
-                  className="text-purpleMagic hover:opacity-85"
-                >
-                  Bridge to Ink
-                </Link>
-              </span>
-            </OnlyWithFeatureFlag>
-          </PillContainer>
-        </motion.div>
-      ) : (
-        <div className="py-1">
-          {/** Prevents the pill appearance from moving the layout */}
-          &nbsp;
-        </div>
-      )}
-    </AnimatePresence>
-  );
-};
-
-export interface TimeChunkProps {
-  value: number;
-  label: string;
-}
-
-export const TimeChunk: React.FC<TimeChunkProps> = ({ value, label }) => {
-  return (
-    <div className="inline-flex text-sm font-bold">
-      <span className="relative w-5 sm:w-6">
-        <AnimatePresence initial={false} mode="popLayout">
-          <motion.div
-            className="absolute inset-0 flex justify-center"
-            key={`countdown-time-${label}-${value}`}
-            initial={{ rotateX: 90 }}
-            animate={{ rotateX: 0 }}
-            exit={{ rotateX: -90, transformOrigin: "bottom" }}
-            transition={{ duration: 0.3, ease: "easeInOut" }}
-            style={{
-              transformOrigin: "top",
-            }}
-          >
-            {value < 10 ? "0" : ""}
-            {value}
-          </motion.div>
-        </AnimatePresence>
-      </span>
-      <span className="opacity-50">
-        <ResponsiveText mobile={label.substring(0, 1)} desktop={`${label}s`} />
-      </span>
-    </div>
-  );
-};
diff --git a/src/app/[locale]/_components/MainContent/FloatingButtons.tsx b/src/app/[locale]/_components/MainContent/FloatingButtons.tsx
deleted file mode 100644
index 64d2a3f..0000000
--- a/src/app/[locale]/_components/MainContent/FloatingButtons.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import Image from "next/image";
-
-import { LanguageSwitcher } from "@/components/LocaleSwitcher";
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { PillContainer } from "@/components/PillContainer";
-import { ThemeToggle } from "@/components/ThemeToggle";
-import { EXTERNAL_LINKS, Link } from "@/routing";
-
-import { Disappearing } from "../../../../components/Disappearing";
-
-import { Countdown } from "./Countdown";
-
-export const FloatingButtons = async ({
-  showCountdown = true,
-  disableDisappearing = false,
-  showSuperchain = true,
-}: {
-  showCountdown?: boolean;
-  disableDisappearing?: boolean;
-  showSuperchain?: boolean;
-}) => {
-  const scrollProps = {
-    scrollMin: 300,
-    scrollMax: 600,
-  };
-  return (
-    <>
-      <Disappearing
-        {...scrollProps}
-        className="hidden pointer-events-none xl:flex xl:pointer-events-auto absolute bottom-6 left-4 z-10 mix-blend-difference"
-        disabled={disableDisappearing}
-      >
-        <PillContainer className="flex gap-4 px-2">
-          <OnlyWithFeatureFlag flag="language">
-            <LanguageSwitcher />
-          </OnlyWithFeatureFlag>
-          <ThemeToggle />
-        </PillContainer>
-      </Disappearing>
-      {showSuperchain && (
-        <Disappearing
-          {...scrollProps}
-          className="hidden pointer-events-none xl:flex xl:pointer-events-auto absolute bottom-8 right-8 items-center gap-6"
-          disabled={disableDisappearing}
-        >
-          <div className="flex flex-col justify-end">
-            <Link
-              href={EXTERNAL_LINKS.superchain}
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              <Image
-                src="/superchain.svg"
-                width={140}
-                height={34}
-                alt="built on the superchain"
-                className="dark:invert"
-              />
-            </Link>
-          </div>
-        </Disappearing>
-      )}
-
-      <Disappearing
-        {...scrollProps}
-        className="absolute bottom-8 left-0 right-0 hidden sm:flex flex-col gap-6 items-center justify-center"
-        disabled={disableDisappearing}
-      >
-        {showSuperchain && (
-          <div className="flex flex-col gap-6 items-center">
-            <Link
-              className="xl:hidden"
-              href={EXTERNAL_LINKS.superchain}
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              <Image
-                src="/superchain-centered.svg"
-                width={140}
-                height={34}
-                alt="built on the superchain"
-                className="dark:invert"
-              />
-            </Link>
-          </div>
-        )}
-        {showCountdown && <Countdown />}
-      </Disappearing>
-    </>
-  );
-};
diff --git a/src/app/[locale]/_components/MainContent/MainContent.tsx b/src/app/[locale]/_components/MainContent/MainContent.tsx
deleted file mode 100644
index d455110..0000000
--- a/src/app/[locale]/_components/MainContent/MainContent.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-"use client";
-import React from "react";
-import { Button } from "@inkonchain/ink-kit";
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-import { BigScalableTitle } from "@/components/BigScallableTitle";
-import { ColoredText } from "@/components/ColoredText";
-import { HeroSection } from "@/components/HeroSection";
-import { DotsIcon } from "@/components/icons/Dots";
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { PillContainer } from "@/components/PillContainer";
-import { RotatingText } from "@/components/RotatingText";
-import { SocialLinksRow } from "@/components/SocialLinksRow";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { EXTERNAL_LINKS, Link } from "@/routing";
-
-import { MainCallToActionButton } from "../MainCallToActionButton";
-
-import { Countdown } from "./Countdown";
-
-export const MainContent: React.FC<{
-  disableRotating?: boolean;
-}> = ({ disableRotating }) => {
-  const t = useTranslations("Landing");
-  const query = useRouterQuery();
-
-  return (
-    <HeroSection>
-      <BigScalableTitle
-        title={<h1>{t("mainContentTagLine")}</h1>}
-        subtitle={
-          <TagLineWithHighlight
-            text={t("mainContentSubTagLine")}
-            disableRotating={disableRotating}
-          />
-        }
-        variant="reverse-purple"
-      />
-      <div className="flex flex-col items-center gap-5 sm:gap-6">
-        <div className="flex gap-4 flex-col md:flex-row">
-          <OnlyWithFeatureFlag
-            flag="newNav"
-            otherwise={
-              <>
-                <MainCallToActionButton
-                  copy={{
-                    bridgeNow: t("bridge:cta"),
-                    exploreApps: t("exploreApps:cta"),
-                  }}
-                  isMainCallToAction
-                />
-
-                <Button
-                  className="bg-blackMagic hover:shadow-blue-glow backdrop-blur-2xl hover:bg-blackMagic/80 dark:hover:bg-blackMagic/40 transition-all duration-300 text-white px-20"
-                  iconLeft={<DotsIcon size="icon-lg" enforce="inherit" />}
-                  size="lg"
-                  asChild
-                >
-                  <Link
-                    href={{
-                      pathname: "/dashboard",
-                      query,
-                    }}
-                  >
-                    {t("exploreApps:cta")}
-                  </Link>
-                </Button>
-              </>
-            }
-          >
-            <MainCallToActionButton
-              copy={{
-                bridgeNow: t("bridge:cta"),
-                exploreApps: t("exploreApps:cta"),
-              }}
-              isMainCallToAction
-            />
-          </OnlyWithFeatureFlag>
-        </div>
-        <SocialLinksRow faded={true} />
-      </div>
-
-      <div className="flex flex-col gap-6 items-center sm:hidden">
-        <Link
-          className="xl:hidden"
-          href={EXTERNAL_LINKS.superchain}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <Image
-            src="/superchain-centered.svg"
-            width={140}
-            height={34}
-            alt="built on the superchain"
-            className="dark:invert"
-          />
-        </Link>
-      </div>
-
-      <div className="sm:hidden">
-        <Countdown />
-      </div>
-    </HeroSection>
-  );
-};
-
-const TagLineWithHighlight: React.FC<{
-  text?: string;
-  disableRotating?: boolean;
-}> = ({ text, disableRotating }) => {
-  const [first, second] = text?.split("|") || [];
-  const sections = second?.split(",") || [];
-  return (
-    <div className="flex items-baseline gap-2 text-rotating-pill sm:text-h3 flex-wrap justify-center font-medium">
-      {/** Height should match the height of the PillContainer+Rotating text for the text to be aligned. */}
-      <ColoredText
-        className="whitespace-normal flex justify-center"
-        variant="purple"
-        dampen="md"
-      >
-        {first}
-      </ColoredText>
-      {!disableRotating && (
-        <PillContainer className="text-krakenPurple dark:text-gradientPurple text-center flex items-center justify-center">
-          <RotatingText
-            sections={sections.map((s, i) => {
-              return i === sections.length - 1 ? (
-                <ColoredText variant="reverse-purple">{s}</ColoredText>
-              ) : (
-                s
-              );
-            })}
-          />
-        </PillContainer>
-      )}
-    </div>
-  );
-};
diff --git a/src/app/[locale]/_components/MainContent/index.ts b/src/app/[locale]/_components/MainContent/index.ts
deleted file mode 100644
index f0c681a..0000000
--- a/src/app/[locale]/_components/MainContent/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./FloatingButtons";
-export * from "./MainContent";
diff --git a/src/app/[locale]/new/_components/MainPageBackground.tsx b/src/app/[locale]/_components/MainPageBackground.tsx
similarity index 93%
rename from src/app/[locale]/new/_components/MainPageBackground.tsx
rename to src/app/[locale]/_components/MainPageBackground.tsx
index 536a824..f5f4c01 100644
--- a/src/app/[locale]/new/_components/MainPageBackground.tsx
+++ b/src/app/[locale]/_components/MainPageBackground.tsx
@@ -10,7 +10,7 @@ export const MainPageBackground: React.FC = () => {
 
   return null;
 
-  if (path === "/new") {
+  if (path === "/") {
     return <MainBackground type="static" />;
   }
 
diff --git a/src/app/[locale]/new/_components/MobileNav.tsx b/src/app/[locale]/_components/MobileNav.tsx
similarity index 80%
rename from src/app/[locale]/new/_components/MobileNav.tsx
rename to src/app/[locale]/_components/MobileNav.tsx
index f438597..4647ae8 100644
--- a/src/app/[locale]/new/_components/MobileNav.tsx
+++ b/src/app/[locale]/_components/MobileNav.tsx
@@ -23,12 +23,12 @@ export function MobileNav() {
     <InkLayoutMobileNav
       links={[
         {
-          href: "/new",
+          href: "/",
           asChild: true,
           icon: <InkIcon.Home />,
           children: (
             <Link
-              href={{ pathname: "/new", query }}
+              href={{ pathname: "/", query }}
               onClick={closeMobileNavigation}
               prefetch
             >
@@ -37,12 +37,12 @@ export function MobileNav() {
           ),
         },
         {
-          href: "/new/apps",
+          href: "/apps",
           asChild: true,
           icon: <InkIcon.Apps />,
           children: (
             <Link
-              href={{ pathname: "/new/apps", query }}
+              href={{ pathname: "/apps", query }}
               onClick={closeMobileNavigation}
               prefetch
             >
@@ -51,12 +51,12 @@ export function MobileNav() {
           ),
         },
         {
-          href: "/new/bridge",
+          href: "/bridge",
           asChild: true,
           icon: <InkIcon.Bridge />,
           children: (
             <Link
-              href={{ pathname: "/new/bridge", query }}
+              href={{ pathname: "/bridge", query }}
               onClick={closeMobileNavigation}
               prefetch
             >
@@ -67,12 +67,12 @@ export function MobileNav() {
         ...(hasVerifyPage
           ? [
               {
-                href: "/new/verify",
+                href: "/verify",
                 asChild: true,
                 icon: <InkIcon.CheckFill />,
                 children: (
                   <Link
-                    href={{ pathname: "/new/verify", query }}
+                    href={{ pathname: "/verify", query }}
                     onClick={closeMobileNavigation}
                     prefetch
                   >
@@ -83,12 +83,12 @@ export function MobileNav() {
             ]
           : []),
         {
-          href: "/new/build",
+          href: "/build",
           asChild: true,
           icon: <InkIcon.Code />,
           children: (
             <Link
-              href={{ pathname: "/new/builders", query }}
+              href={{ pathname: "/builders", query }}
               onClick={closeMobileNavigation}
               prefetch
             >
@@ -97,12 +97,12 @@ export function MobileNav() {
           ),
         },
         {
-          href: "/new/community",
+          href: "/community",
           asChild: true,
           icon: <InkIcon.Users />,
           children: (
             <Link
-              href={{ pathname: "/new/community", query }}
+              href={{ pathname: "/community", query }}
               onClick={closeMobileNavigation}
               prefetch
             >
@@ -111,12 +111,12 @@ export function MobileNav() {
           ),
         },
         {
-          href: "/new/about",
+          href: "/about",
           asChild: true,
           icon: <InkIcon.Info />,
           children: (
             <Link
-              href={{ pathname: "/new/about", query }}
+              href={{ pathname: "/about", query }}
               onClick={closeMobileNavigation}
               prefetch
             >
diff --git a/src/app/[locale]/_components/MobileNavItems.tsx b/src/app/[locale]/_components/MobileNavItems.tsx
deleted file mode 100644
index 7112fd1..0000000
--- a/src/app/[locale]/_components/MobileNavItems.tsx
+++ /dev/null
@@ -1,238 +0,0 @@
-"use client";
-
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-import { useContactUsModalContext } from "@/components/ContactUsModal/ContactUsModalContext";
-import { ArrowRightIcon } from "@/components/icons/ArrowRight";
-import { AboutBulletIcon } from "@/components/icons/bullets/About";
-import { BridgeBulletIcon } from "@/components/icons/bullets/Bridge";
-import { BuildersBulletIcon } from "@/components/icons/bullets/Builders";
-import { CommunityBulletIcon } from "@/components/icons/bullets/Community";
-import { ContactBulletIcon } from "@/components/icons/bullets/Contact";
-import { DocsBulletIcon } from "@/components/icons/bullets/Docs";
-import { FaucetBulletIcon } from "@/components/icons/bullets/Faucet";
-import { GitHubBulletIcon } from "@/components/icons/bullets/GitHub";
-import { StatusBulletIcon } from "@/components/icons/bullets/Status";
-import { TestnetBulletIcon } from "@/components/icons/bullets/Testnet";
-import { useMobileMenuContext } from "@/components/MobileMenu/MobileMenuContext";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
-import { useRouterQuery } from "@/hooks/useRouterQuery";
-import { EXTERNAL_LINKS, Link } from "@/routing";
-
-export const MobileNavItems = () => {
-  const { setIsOpen } = useMobileMenuContext();
-  const { setIsOpen: setIsContactUsModalOpen } = useContactUsModalContext();
-  const query = useRouterQuery();
-  const isMainnet = useFeatureFlag("mainnet");
-  const t = useTranslations("Menu");
-
-  const linkClasses = "flex items-center gap-4 flex-1 uppercase";
-
-  return (
-    <div className="max-h-[100vh] overflow-y-auto">
-      <MobileNavRow>
-        <Link
-          className={linkClasses}
-          href={{ pathname: "/", hash: "about", query: query }}
-          onClick={() => setIsOpen(false)}
-        >
-          <MobileNavContent>
-            <AboutBulletIcon size="icon-lg" />
-            {t("about")}
-          </MobileNavContent>
-        </Link>
-      </MobileNavRow>
-      <MobileNavRow>
-        <Link
-          className={linkClasses}
-          href={{
-            pathname: "/dashboard",
-            query: {
-              ...Object.fromEntries(new URLSearchParams(query) || {}),
-              category: "bridge",
-            },
-          }}
-          onClick={() => setIsOpen(false)}
-        >
-          <MobileNavContent>
-            <BridgeBulletIcon size="icon-lg" />
-            {t("bridge")}
-          </MobileNavContent>
-        </Link>
-      </MobileNavRow>
-      <MobileNavRow>
-        <Link
-          className={linkClasses}
-          href={{ pathname: "/", hash: "builders", query: query }}
-          onClick={() => setIsOpen(false)}
-        >
-          <MobileNavContent>
-            <BuildersBulletIcon size="icon-lg" />
-            {t("builders")}
-          </MobileNavContent>
-        </Link>
-      </MobileNavRow>
-      <div className="ml-10">
-        <MobileNavRow>
-          <Link
-            className={linkClasses}
-            href={EXTERNAL_LINKS.documentation}
-            target="_blank"
-            onClick={() => setIsOpen(false)}
-          >
-            <MobileNavContent>
-              <DocsBulletIcon size="icon-lg" />
-              {t("documentation")}
-            </MobileNavContent>
-          </Link>
-        </MobileNavRow>
-        <MobileNavRow>
-          <Link
-            className={linkClasses}
-            href={EXTERNAL_LINKS.inkKit}
-            target="_blank"
-            onClick={() => setIsOpen(false)}
-          >
-            <MobileNavContent>
-              <GitHubBulletIcon size="icon-lg" />
-              {t("inkkit")}
-            </MobileNavContent>
-          </Link>
-        </MobileNavRow>
-        <MobileNavRow>
-          <Link
-            className={linkClasses}
-            href={{ pathname: "/faucet", query: query }}
-            onClick={() => setIsOpen(false)}
-          >
-            <MobileNavContent>
-              <FaucetBulletIcon size="icon-lg" />
-              {t("testnetFaucet")}
-            </MobileNavContent>
-          </Link>
-        </MobileNavRow>
-        <MobileNavRow>
-          <Link
-            className={linkClasses}
-            href={EXTERNAL_LINKS.status}
-            target="_blank"
-            onClick={() => setIsOpen(false)}
-          >
-            <MobileNavContent>
-              <StatusBulletIcon size="icon-lg" />
-              {t("statusPage")}
-            </MobileNavContent>
-          </Link>
-        </MobileNavRow>
-        <MobileNavRow>
-          <Link
-            className={linkClasses}
-            href={
-              isMainnet
-                ? EXTERNAL_LINKS.mainnetExplorerBlockscout
-                : EXTERNAL_LINKS.testnetExplorerBlockscout
-            }
-            target="_blank"
-            onClick={() => setIsOpen(false)}
-          >
-            <MobileNavContent>
-              <TestnetBulletIcon size="icon-lg" />
-              {t("explorer")}
-            </MobileNavContent>
-          </Link>
-        </MobileNavRow>
-        <div className="ml-10">
-          <MobileNavRow>
-            <Link
-              className={linkClasses}
-              href={
-                isMainnet
-                  ? EXTERNAL_LINKS.mainnetExplorerBlockscout
-                  : EXTERNAL_LINKS.testnetExplorerBlockscout
-              }
-              target="_blank"
-              onClick={() => setIsOpen(false)}
-            >
-              <MobileNavContent>
-                <Image
-                  src="/icons/blockscout.jpg"
-                  width={23}
-                  height={23}
-                  alt="Explorer"
-                  className="rounded-full"
-                />
-                {t("blockscout")}
-              </MobileNavContent>
-            </Link>
-          </MobileNavRow>
-          <MobileNavRow>
-            <Link
-              className={linkClasses}
-              href={
-                isMainnet
-                  ? EXTERNAL_LINKS.mainnetExplorerOkx
-                  : EXTERNAL_LINKS.testnetExplorerOkx
-              }
-              target="_blank"
-              onClick={() => setIsOpen(false)}
-            >
-              <MobileNavContent>
-                <Image
-                  src="/icons/okxexplorer.jpg"
-                  width={23}
-                  height={23}
-                  alt="Explorer"
-                  className="rounded-full"
-                />
-                {t("okx")}
-              </MobileNavContent>
-            </Link>
-          </MobileNavRow>
-        </div>
-      </div>
-
-      <MobileNavRow>
-        <Link
-          className={linkClasses}
-          href={{ pathname: "/community", query: query }}
-          onClick={() => setIsOpen(false)}
-        >
-          <MobileNavContent>
-            <CommunityBulletIcon size="icon-lg" />
-            {t("community")}
-          </MobileNavContent>
-        </Link>
-      </MobileNavRow>
-      <MobileNavRow>
-        <button
-          className={linkClasses}
-          onClick={() => {
-            setIsContactUsModalOpen(true);
-            setIsOpen(false);
-          }}
-        >
-          <MobileNavContent>
-            <div className="flex items-center gap-4">
-              <ContactBulletIcon size="icon-lg" />
-              {t("contact")}
-            </div>
-          </MobileNavContent>
-        </button>
-      </MobileNavRow>
-    </div>
-  );
-};
-
-const MobileNavRow = ({ children }: { children: React.ReactNode }) => (
-  <div className="flex items-center justify-between w-full pl-6 my-4 -mx-4 rounded-4xl font-bold uppercase text-blackMagic hover:text-blackMagic/50 dark:text-whiteMagic dark:hover:text-whiteMagic/50">
-    {children}
-  </div>
-);
-
-const MobileNavContent = ({ children }: { children: React.ReactNode }) => (
-  <>
-    <div className="flex items-center gap-4 flex-1">{children}</div>
-    <ArrowRightIcon size="icon-md" />
-  </>
-);
diff --git a/src/app/[locale]/_components/NewsletterForm/RoutedNewsletterForm.tsx b/src/app/[locale]/_components/NewsletterForm/RoutedNewsletterForm.tsx
deleted file mode 100644
index d60a2df..0000000
--- a/src/app/[locale]/_components/NewsletterForm/RoutedNewsletterForm.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-
-import { useCallbackOnKey } from "@/hooks/useGlobalKey";
-import { usePrevious } from "@/hooks/usePrevious";
-import { usePathname, useRouter } from "@/routing";
-
-import { NewsletterForm } from "./NewsletterForm";
-import { useNewsletterFormContext } from "./NewsletterFormContext";
-
-export interface RoutedNewsletterFormProps {
-  copy: {
-    ctaLabel: string;
-  };
-}
-
-export const RoutedNewsletterForm: React.FC<RoutedNewsletterFormProps> = ({
-  copy,
-}) => {
-  const { isFormOpen, setIsFormOpen } = useNewsletterFormContext();
-  const router = useRouter();
-
-  const pathname = usePathname();
-  const lastPathName = usePrevious(pathname);
-
-  useEffect(() => {
-    if (pathname !== lastPathName) {
-      setIsFormOpen(false);
-    }
-  }, [pathname, lastPathName, setIsFormOpen]);
-
-  useCallbackOnKey({
-    key: "s",
-    handler: () => {
-      if (pathname !== "/") {
-        router.push("/");
-        // When the route changes, sometimes the state gets reset for some reason.
-        // `isFormOpen` stays "false", but the `AnimatePresence` still plays, which leaves us into a weird state.
-        // This workarounds seems to fix it consistently by delaying the state update.
-        setTimeout(() => setIsFormOpen(true), 500);
-      } else {
-        setIsFormOpen(true);
-      }
-      return true;
-    },
-  });
-  useCallbackOnKey({
-    key: "Escape",
-    isDisabled: !isFormOpen,
-    handler: () => {
-      setIsFormOpen(false);
-      return true;
-    },
-  });
-
-  return (
-    <NewsletterForm
-      copy={copy}
-      isOpen={isFormOpen}
-      setIsOpen={setIsFormOpen}
-      hasShortcut
-    />
-  );
-};
diff --git a/src/app/[locale]/_components/NewsletterForm/StandaloneNewsletterForm.tsx b/src/app/[locale]/_components/NewsletterForm/StandaloneNewsletterForm.tsx
deleted file mode 100644
index 934e8c9..0000000
--- a/src/app/[locale]/_components/NewsletterForm/StandaloneNewsletterForm.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-"use client";
-
-import { useState } from "react";
-
-import { useCallbackOnKey } from "@/hooks/useGlobalKey";
-
-import { NewsletterForm } from "./NewsletterForm";
-
-export interface StandaloneNewsletterFormProps {
-  copy: {
-    ctaLabel: string;
-  };
-}
-
-export const StandaloneNewsletterForm: React.FC<
-  StandaloneNewsletterFormProps
-> = ({ copy }) => {
-  const [isFormOpen, setIsFormOpen] = useState<boolean>(false);
-
-  useCallbackOnKey({
-    key: "Escape",
-    isDisabled: !isFormOpen,
-    handler: () => {
-      setIsFormOpen(false);
-      return true;
-    },
-  });
-
-  return (
-    <NewsletterForm copy={copy} isOpen={isFormOpen} setIsOpen={setIsFormOpen} />
-  );
-};
diff --git a/src/app/[locale]/_components/NewsletterForm/index.ts b/src/app/[locale]/_components/NewsletterForm/index.ts
deleted file mode 100644
index 88097c8..0000000
--- a/src/app/[locale]/_components/NewsletterForm/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./RoutedNewsletterForm";
-export * from "./StandaloneNewsletterForm";
diff --git a/src/app/[locale]/new/_components/PageHeader.tsx b/src/app/[locale]/_components/PageHeader.tsx
similarity index 100%
rename from src/app/[locale]/new/_components/PageHeader.tsx
rename to src/app/[locale]/_components/PageHeader.tsx
diff --git a/src/app/[locale]/new/apps/_components/RoutedLayout.tsx b/src/app/[locale]/_components/RoutedLayout.tsx
similarity index 65%
rename from src/app/[locale]/new/apps/_components/RoutedLayout.tsx
rename to src/app/[locale]/_components/RoutedLayout.tsx
index af6f986..1548098 100644
--- a/src/app/[locale]/new/apps/_components/RoutedLayout.tsx
+++ b/src/app/[locale]/_components/RoutedLayout.tsx
@@ -3,11 +3,11 @@
 import { Suspense } from "react";
 import { InkLayout } from "@inkonchain/ink-kit";
 
-import { ConnectWalletButton } from "@/app/[locale]/_components/ConnectWalletButton";
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 
-import { InkLogo, InkLogoImage } from "../../_components/InkLogo";
-import { MobileNav } from "../../_components/MobileNav";
-import { SideNav } from "../../_components/SideNav";
+import { InkLogo, InkLogoImage } from "./InkLogo";
+import { MobileNav } from "./MobileNav";
+import { SideNav } from "./SideNav";
 
 export function RoutedLayout({ children }: { children: React.ReactNode }) {
   return (
diff --git a/src/app/[locale]/new/_components/SideNav.tsx b/src/app/[locale]/_components/SideNav.tsx
similarity index 78%
rename from src/app/[locale]/new/_components/SideNav.tsx
rename to src/app/[locale]/_components/SideNav.tsx
index f1489e3..a61df56 100644
--- a/src/app/[locale]/new/_components/SideNav.tsx
+++ b/src/app/[locale]/_components/SideNav.tsx
@@ -23,23 +23,23 @@ export const SideNav = () => {
         {
           asChild: true,
           children: (
-            <SideNavLink href="/new" exactHref>
+            <SideNavLink href="/" exactHref>
               Home
             </SideNavLink>
           ),
-          href: "/new",
+          href: "/",
           icon: <InkIcon.Home size="icon-lg" enforce="inherit" />,
         },
         {
           asChild: true,
-          children: <SideNavLink href="/new/apps">Apps</SideNavLink>,
-          href: "/new/apps",
+          children: <SideNavLink href="/apps">Apps</SideNavLink>,
+          href: "/apps",
           icon: <InkIcon.Apps size="icon-lg" enforce="inherit" />,
         },
         {
           asChild: true,
-          children: <SideNavLink href="/new/bridge">Bridge</SideNavLink>,
-          href: "/new/bridge",
+          children: <SideNavLink href="/bridge">Bridge</SideNavLink>,
+          href: "/bridge",
           icon: <InkIcon.Bridge size="icon-lg" enforce="inherit" />,
         },
 
@@ -47,28 +47,28 @@ export const SideNav = () => {
           ? [
               {
                 asChild: true,
-                children: <SideNavLink href="/new/verify">Verify</SideNavLink>,
-                href: "/new/verify",
+                children: <SideNavLink href="/verify">Verify</SideNavLink>,
+                href: "/verify",
                 icon: <InkIcon.CheckFill size="icon-lg" enforce="inherit" />,
               },
             ]
           : []),
         {
           asChild: true,
-          children: <SideNavLink href="/new/builders">Build</SideNavLink>,
-          href: "/new/builders",
+          children: <SideNavLink href="/builders">Build</SideNavLink>,
+          href: "/builders",
           icon: <InkIcon.Code size="icon-lg" enforce="inherit" />,
         },
         {
           asChild: true,
-          children: <SideNavLink href="/new/community">Community</SideNavLink>,
-          href: "/new/community",
+          children: <SideNavLink href="/community">Community</SideNavLink>,
+          href: "/community",
           icon: <InkIcon.Users size="icon-lg" enforce="inherit" />,
         },
         {
           asChild: true,
-          children: <SideNavLink href="/new/about">About</SideNavLink>,
-          href: "/new/about",
+          children: <SideNavLink href="/about">About</SideNavLink>,
+          href: "/about",
           icon: <InkIcon.Info size="icon-lg" enforce="inherit" />,
         },
       ]}
diff --git a/src/app/[locale]/_components/SubscribeButton/SubscribeButton.tsx b/src/app/[locale]/_components/SubscribeButton/SubscribeButton.tsx
deleted file mode 100644
index 56f5174..0000000
--- a/src/app/[locale]/_components/SubscribeButton/SubscribeButton.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-"use client";
-
-import { Button } from "@inkonchain/ink-kit";
-import { useTranslations } from "next-intl";
-
-import { BellIcon } from "@/components/icons/Bell";
-import { useNewsletterModalContext } from "@/components/NewsletterModal/NewsletterModalContext";
-
-export const SubscribeButton = () => {
-  const t = useTranslations("Landing");
-  const { setIsOpen } = useNewsletterModalContext();
-
-  return (
-    <Button
-      onClick={() => setIsOpen(true)}
-      className="w-full items-center justify-center duration-300 transition-[box-shadow] hover:shadow-krakenPurple/50 hover:shadow-large-pop"
-      aria-label="contact"
-      size="lg"
-      variant="primary"
-      iconLeft={
-        <BellIcon className="shrink-0" size="icon-lg" enforce="white" />
-      }
-    >
-      {t("subscribe:cta")}
-    </Button>
-  );
-};
diff --git a/src/app/[locale]/_components/WalletHeader.tsx b/src/app/[locale]/_components/WalletHeader.tsx
deleted file mode 100644
index f791f9a..0000000
--- a/src/app/[locale]/_components/WalletHeader.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-"use client";
-
-import { BridgeButton } from "@/components/BridgeButton";
-import { ColoredText } from "@/components/ColoredText";
-import { WalletConnector } from "@/components/WalletConnector";
-
-import { HeaderFaucetButton } from "./HeaderFaucetButton";
-
-export const WalletHeader = () => {
-  return (
-    <>
-      <div className="absolute top-32 left-0 right-0 flex items-center justify-center mx-auto gap-8 z-[5]">
-        <ColoredText className="text-3xl select-none" variant="purple">
-          EXPERIMENTAL:
-        </ColoredText>
-        <HeaderFaucetButton />
-        <WalletConnector />
-        <BridgeButton />
-      </div>
-    </>
-  );
-};
diff --git a/src/app/[locale]/new/about/_components/AboutContent.tsx b/src/app/[locale]/about/_components/AboutContent.tsx
similarity index 98%
rename from src/app/[locale]/new/about/_components/AboutContent.tsx
rename to src/app/[locale]/about/_components/AboutContent.tsx
index a23d8f1..01377bf 100644
--- a/src/app/[locale]/new/about/_components/AboutContent.tsx
+++ b/src/app/[locale]/about/_components/AboutContent.tsx
@@ -4,13 +4,14 @@ import { CardContent } from "@inkonchain/ink-kit";
 import Image from "next/image";
 import { useTranslations } from "next-intl";
 
-import { PartnerCard } from "@/app/[locale]/_components/AboutContent/_components/PartnerCard";
 import { ColoredText } from "@/components/ColoredText";
 import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
 import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
 import { useOnWindowSize } from "@/hooks/useOnWindowSize";
 import { EXTERNAL_LINKS } from "@/routing";
 
+import { PartnerCard } from "./PartnerCard";
+
 export function AboutContent() {
   const isMobile = useOnWindowSize({ size: "sm" });
   const t = useTranslations("Landing");
diff --git a/src/app/[locale]/_components/AboutContent/_components/PartnerCard.tsx b/src/app/[locale]/about/_components/PartnerCard.tsx
similarity index 100%
rename from src/app/[locale]/_components/AboutContent/_components/PartnerCard.tsx
rename to src/app/[locale]/about/_components/PartnerCard.tsx
diff --git a/src/app/[locale]/new/about/page.tsx b/src/app/[locale]/about/page.tsx
similarity index 100%
rename from src/app/[locale]/new/about/page.tsx
rename to src/app/[locale]/about/page.tsx
diff --git a/src/app/[locale]/new/apps/[category]/page.tsx b/src/app/[locale]/apps/[category]/page.tsx
similarity index 100%
rename from src/app/[locale]/new/apps/[category]/page.tsx
rename to src/app/[locale]/apps/[category]/page.tsx
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppCard.tsx b/src/app/[locale]/apps/_components/AppCard.tsx
similarity index 100%
rename from src/app/[locale]/(dashboard)/dashboard/_components/AppCard.tsx
rename to src/app/[locale]/apps/_components/AppCard.tsx
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/AppLinks.tsx b/src/app/[locale]/apps/_components/AppLinks.tsx
similarity index 100%
rename from src/app/[locale]/(dashboard)/dashboard/_components/AppLinks.tsx
rename to src/app/[locale]/apps/_components/AppLinks.tsx
diff --git a/src/app/[locale]/new/apps/_components/AppMainnetToggle.tsx b/src/app/[locale]/apps/_components/AppMainnetToggle.tsx
similarity index 100%
rename from src/app/[locale]/new/apps/_components/AppMainnetToggle.tsx
rename to src/app/[locale]/apps/_components/AppMainnetToggle.tsx
diff --git a/src/app/[locale]/new/apps/_components/AppsCategoryFilter.tsx b/src/app/[locale]/apps/_components/AppsCategoryFilter.tsx
similarity index 97%
rename from src/app/[locale]/new/apps/_components/AppsCategoryFilter.tsx
rename to src/app/[locale]/apps/_components/AppsCategoryFilter.tsx
index ce35c30..67242f1 100644
--- a/src/app/[locale]/new/apps/_components/AppsCategoryFilter.tsx
+++ b/src/app/[locale]/apps/_components/AppsCategoryFilter.tsx
@@ -32,7 +32,7 @@ export const AppsCategoryFilter = ({
           <Link
             className="whitespace-nowrap"
             href={{
-              pathname: `/new/apps/[category]`,
+              pathname: `/apps/[category]`,
               params: { category: item.value || "" },
               query,
             }}
diff --git a/src/app/[locale]/new/apps/_components/AppsContent.tsx b/src/app/[locale]/apps/_components/AppsContent.tsx
similarity index 99%
rename from src/app/[locale]/new/apps/_components/AppsContent.tsx
rename to src/app/[locale]/apps/_components/AppsContent.tsx
index 7139db3..9d41da3 100644
--- a/src/app/[locale]/new/apps/_components/AppsContent.tsx
+++ b/src/app/[locale]/apps/_components/AppsContent.tsx
@@ -106,7 +106,7 @@ export function AppsContent({ currentCategory }: AppsContentProps) {
       window.history.pushState(
         null,
         "",
-        `/new/apps${newCategory ? `/${newCategory}` : ""}?${queryParams}`
+        `/apps${newCategory ? `/${newCategory}` : ""}?${queryParams}`
       );
     },
     [searchParams]
diff --git a/src/app/[locale]/new/apps/_components/AppsGrid.tsx b/src/app/[locale]/apps/_components/AppsGrid.tsx
similarity index 100%
rename from src/app/[locale]/new/apps/_components/AppsGrid.tsx
rename to src/app/[locale]/apps/_components/AppsGrid.tsx
diff --git a/src/app/[locale]/new/apps/_components/AppsTagsFilter.tsx b/src/app/[locale]/apps/_components/AppsTagsFilter.tsx
similarity index 100%
rename from src/app/[locale]/new/apps/_components/AppsTagsFilter.tsx
rename to src/app/[locale]/apps/_components/AppsTagsFilter.tsx
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/FeaturedAppPill.tsx b/src/app/[locale]/apps/_components/FeaturedAppPill.tsx
similarity index 100%
rename from src/app/[locale]/(dashboard)/dashboard/_components/FeaturedAppPill.tsx
rename to src/app/[locale]/apps/_components/FeaturedAppPill.tsx
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/InkApp.ts b/src/app/[locale]/apps/_components/InkApp.ts
similarity index 100%
rename from src/app/[locale]/(dashboard)/dashboard/_components/InkApp.ts
rename to src/app/[locale]/apps/_components/InkApp.ts
diff --git a/src/app/[locale]/new/apps/_components/SubmitAppButton.css b/src/app/[locale]/apps/_components/SubmitAppButton.css
similarity index 100%
rename from src/app/[locale]/new/apps/_components/SubmitAppButton.css
rename to src/app/[locale]/apps/_components/SubmitAppButton.css
diff --git a/src/app/[locale]/new/apps/_components/SubmitAppButton.tsx b/src/app/[locale]/apps/_components/SubmitAppButton.tsx
similarity index 100%
rename from src/app/[locale]/new/apps/_components/SubmitAppButton.tsx
rename to src/app/[locale]/apps/_components/SubmitAppButton.tsx
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/apps-data.json b/src/app/[locale]/apps/_components/apps-data.json
similarity index 99%
rename from src/app/[locale]/(dashboard)/dashboard/_components/apps-data.json
rename to src/app/[locale]/apps/_components/apps-data.json
index c64dcf5..56bb253 100644
--- a/src/app/[locale]/(dashboard)/dashboard/_components/apps-data.json
+++ b/src/app/[locale]/apps/_components/apps-data.json
@@ -524,7 +524,7 @@
       "id": "ionic",
       "name": "Ionic",
       "description": "Absolute capital efficiency for the OP Superchain DeFi ecosystem. All assets - One intuitive UI.",
-      "imageUrl": "https://pbs.twimg.com/profile_images/1678497382328070149/IVEwmLxj_400x400.jpg",
+      "imageUrl": "/featured-apps/icons/ionic.webp",
       "category": [
         "DeFi"
       ],
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/categories.tsx b/src/app/[locale]/apps/_components/categories.tsx
similarity index 100%
rename from src/app/[locale]/(dashboard)/dashboard/_components/categories.tsx
rename to src/app/[locale]/apps/_components/categories.tsx
diff --git a/src/app/[locale]/new/apps/page.tsx b/src/app/[locale]/apps/page.tsx
similarity index 100%
rename from src/app/[locale]/new/apps/page.tsx
rename to src/app/[locale]/apps/page.tsx
diff --git a/src/app/[locale]/new/bridge/page.tsx b/src/app/[locale]/bridge/page.tsx
similarity index 72%
rename from src/app/[locale]/new/bridge/page.tsx
rename to src/app/[locale]/bridge/page.tsx
index 1f2982e..f793826 100644
--- a/src/app/[locale]/new/bridge/page.tsx
+++ b/src/app/[locale]/bridge/page.tsx
@@ -1,7 +1,6 @@
+import { RelayKitUI } from "@/components/RelayKitUI";
 import { newLayoutContainerClasses } from "@/components/styles/container";
 
-import { RelayKitUI } from "../../(dashboard)/dashboard/_components/RelayKitUI";
-
 export default function VerifyPage() {
   return (
     <div className={newLayoutContainerClasses()}>
diff --git a/src/app/[locale]/new/builders/_components/DeveloperContent.tsx b/src/app/[locale]/builders/_components/DeveloperContent.tsx
similarity index 100%
rename from src/app/[locale]/new/builders/_components/DeveloperContent.tsx
rename to src/app/[locale]/builders/_components/DeveloperContent.tsx
diff --git a/src/app/[locale]/new/builders/page.tsx b/src/app/[locale]/builders/page.tsx
similarity index 100%
rename from src/app/[locale]/new/builders/page.tsx
rename to src/app/[locale]/builders/page.tsx
diff --git a/src/app/[locale]/community/_components/CommunityBrandKit.tsx b/src/app/[locale]/community/_components/CommunityBrandKit.tsx
index 3ba3a32..fd29a2a 100644
--- a/src/app/[locale]/community/_components/CommunityBrandKit.tsx
+++ b/src/app/[locale]/community/_components/CommunityBrandKit.tsx
@@ -1,37 +1,40 @@
 "use client";
-import { Button } from "@inkonchain/ink-kit";
+import { Button, Card, CardContent } from "@inkonchain/ink-kit";
 import { useTranslations } from "next-intl";
 
 import { ColoredText } from "@/components/ColoredText";
 import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
 import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
 import { EXTERNAL_LINKS, Link } from "@/routing";
-import { classNames } from "@/util/classes";
 
 export const CommunityBrandKit = () => {
-  const newNav = useFeatureFlag("newNav");
   const t = useTranslations("Community");
 
   return (
     <FlyWhenIntoView>
-      <div
-        className={classNames(
-          "flex flex-col-reverse lg:flex-row items-center justify-between lg:gap-6 bg-featuredCardPurple relative rounded-spotlight-mobile overflow-hidden",
-          newNav ? "" : "mx-4"
-        )}
+      <Card
+        size="noPadding"
+        imageLocation="right"
+        image={
+          <CardContent.Image>
+            <ParallaxedHoverImage
+              src="/brand-kit.png"
+              alt="Brand Kit"
+              className="object-cover"
+              width={700}
+              height={395}
+            />
+          </CardContent.Image>
+        }
       >
-        <div className="flex flex-col gap-4 px-14 py-16">
-          <ColoredText
-            variant="purple"
-            className="ink:text-h2 -my-4 ink:text-text-default"
-          >
-            {t("brandKit.title")}
-          </ColoredText>
-          <div className="ink:text-body-1 ink:text-text-primary">
-            {t("brandKit.description")}
-          </div>
-          <div className="w-fit">
+        <CardContent.CallToAction
+          title={
+            <ColoredText className="ink:text-h2" variant="purple">
+              {t("brandKit.title")}
+            </ColoredText>
+          }
+          description={t("brandKit.description")}
+          button={
             <Button variant="primary" size="md" asChild>
               <Link
                 href={EXTERNAL_LINKS.brandKit}
@@ -41,18 +44,9 @@ export const CommunityBrandKit = () => {
                 {t("brandKit.cta")}
               </Link>
             </Button>
-          </div>
-        </div>
-        <div className="rounded-spotlight-mobile overflow-visible w-full h-full max-w-[700px]">
-          <ParallaxedHoverImage
-            src="/brand-kit.png"
-            alt="Brand Kit"
-            className="object-cover"
-            width={700}
-            height={395}
-          />
-        </div>
-      </div>
+          }
+        />
+      </Card>
     </FlyWhenIntoView>
   );
 };
diff --git a/src/app/[locale]/community/_components/CommunityEvents.tsx b/src/app/[locale]/community/_components/CommunityEvents.tsx
index a2cdff0..3feac29 100644
--- a/src/app/[locale]/community/_components/CommunityEvents.tsx
+++ b/src/app/[locale]/community/_components/CommunityEvents.tsx
@@ -6,17 +6,14 @@ import { useFeatureFlag } from "@/hooks/useFeatureFlag";
 import { EXTERNAL_LINKS } from "@/routing";
 import { classNames } from "@/util/classes";
 
-import {
-  SpecificEventCard,
-  SpecificEventCardProps,
-} from "../../_components/EventContent/EventContent";
+import { EventCard, EventCardProps } from "../../../../components/EventCard";
 
 export const CommunityEvents = () => {
   const featureFlag = useFeatureFlag("fakeEvents");
 
   const t = useTranslations("events");
 
-  const ethDenverEventProps: SpecificEventCardProps = {
+  const ethDenverEventProps: EventCardProps = {
     title: t("ethdenver.cardTitle"),
     description: t("ethdenver.description"),
     cta: t("ethdenver.cta"),
@@ -45,7 +42,7 @@ export const CommunityEvents = () => {
       })}
     >
       {events.map((event, index) => (
-        <SpecificEventCard
+        <EventCard
           key={index}
           {...event}
           className={classNames({
diff --git a/src/app/[locale]/community/_components/LetsGetSocial.tsx b/src/app/[locale]/community/_components/LetsGetSocial.tsx
index e190be8..ca9abee 100644
--- a/src/app/[locale]/community/_components/LetsGetSocial.tsx
+++ b/src/app/[locale]/community/_components/LetsGetSocial.tsx
@@ -5,41 +5,23 @@ import { useTranslations } from "next-intl";
 import { BigScalableTitle } from "@/components/BigScallableTitle";
 import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
 import { newLayoutSectionClasses } from "@/components/styles/container";
-import { useFeatureFlag } from "@/hooks/useFeatureFlag";
 import { EXTERNAL_LINKS, Link } from "@/routing";
-import { classNames } from "@/util/classes";
 
 export const LetsGetSocial = () => {
-  const newNav = useFeatureFlag("newNav");
   const t = useTranslations("Community");
 
   return (
-    <FlyWhenIntoView
-      className={classNames(newLayoutSectionClasses(), {
-        "items-start": newNav,
-        "items-center": !newNav,
-      })}
-    >
-      <div
-        className={classNames("flex flex-col gap-6", {
-          "items-start": newNav,
-          "items-center": !newNav,
-        })}
-      >
+    <FlyWhenIntoView className={newLayoutSectionClasses()}>
+      <div className="flex flex-col gap-6 items-start">
         <BigScalableTitle
           title={t("letsGetSocial.title")}
           subtitle={
-            <span
-              className={classNames("ink:text-body-1 ink:text-text-muted", {
-                "text-center": newNav,
-                "text-left": !newNav,
-              })}
-            >
+            <span className="ink:text-body-1 ink:text-text-muted text-center">
               {t("letsGetSocial.description")}
             </span>
           }
           ratio={2}
-          align={newNav ? "left" : "center"}
+          align="left"
         />
       </div>
       <div className="grid lg:grid-cols-4 sm:grid-cols-2 gap-6 self-center">
diff --git a/src/app/[locale]/community/layout.tsx b/src/app/[locale]/community/layout.tsx
deleted file mode 100644
index 0ed714f..0000000
--- a/src/app/[locale]/community/layout.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Footer } from "@/components/Footer";
-import { routing } from "@/routing";
-
-import { HomeHeader } from "../_components/HomeHeader";
-import { HomeShortcuts } from "../(home)/HomeShortcuts";
-
-export async function generateStaticParams() {
-  return routing.locales.map((locale) => ({ locale }));
-}
-
-export default async function InfoLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <HomeHeader />
-      <HomeShortcuts />
-
-      <div className="flex-1 relative pb-24 pt-32 container mx-auto flex flex-col gap-4">
-        <div className="flex flex-col items-center justify-center">
-          {children}
-        </div>
-        <div>
-          <Footer />
-        </div>
-      </div>
-    </>
-  );
-}
diff --git a/src/app/[locale]/community/page.tsx b/src/app/[locale]/community/page.tsx
index df8cec1..66aec2f 100644
--- a/src/app/[locale]/community/page.tsx
+++ b/src/app/[locale]/community/page.tsx
@@ -1,8 +1,8 @@
 import { useTranslations } from "next-intl";
 
-import { BigScalableTitle } from "@/components/BigScallableTitle";
-import { containerClasses } from "@/components/styles/container";
-import { classNames } from "@/util/classes";
+import { newLayoutContainerClasses } from "@/components/styles/container";
+
+import { PageHeader } from "../_components/PageHeader";
 
 import { CommunityBrandKit } from "./_components/CommunityBrandKit";
 import { CommunityEvents } from "./_components/CommunityEvents";
@@ -12,32 +12,12 @@ export default function CommunityPage() {
   const t = useTranslations("Community");
   return (
     <>
-      <div className="flex flex-col gap-12 lg:gap-28 mt-0 mb-12 lg:mb-24 pt-16">
-        <div
-          className={classNames(
-            containerClasses(),
-            " mb-8 pb-8 sm:min-h-[calc(85vh)] gap-16"
-          )}
-        >
-          <div className="flex flex-col items-center">
-            <BigScalableTitle
-              title={t("title")}
-              subtitle={
-                <span className="ink:text-body-1 ink:text-text-muted text-center max-w-lg">
-                  {t("description")}
-                </span>
-              }
-              ratio={4}
-            />
-          </div>
-
-          <div className="px-4">
-            <CommunityEvents />
-          </div>
+      <div className={newLayoutContainerClasses()}>
+        <PageHeader title={t("title")} description={t("description")} />
 
-          <LetsGetSocial />
-          <CommunityBrandKit />
-        </div>
+        <CommunityEvents />
+        <LetsGetSocial />
+        <CommunityBrandKit />
       </div>
     </>
   );
diff --git a/src/app/[locale]/(home)/faucet/_components/Faucet.tsx b/src/app/[locale]/faucet/_components/Faucet.tsx
similarity index 97%
rename from src/app/[locale]/(home)/faucet/_components/Faucet.tsx
rename to src/app/[locale]/faucet/_components/Faucet.tsx
index 4385ea9..6c01efb 100644
--- a/src/app/[locale]/(home)/faucet/_components/Faucet.tsx
+++ b/src/app/[locale]/faucet/_components/Faucet.tsx
@@ -26,7 +26,7 @@ export function Faucet() {
   }, [isConnected, connectedAddress]);
 
   return (
-    <div className="flex flex-col items-center gap-8 flex-1 sm:pt-16">
+    <div className="flex flex-col items-center gap-8 flex-1">
       <div className="flex flex-col items-center sm:justify-center sm:gap-10 gap-6 flex-1">
         <BigScalableTitle
           title={t("title")}
diff --git a/src/app/[locale]/(home)/faucet/_components/FaucetRequestButton.tsx b/src/app/[locale]/faucet/_components/FaucetRequestButton.tsx
similarity index 100%
rename from src/app/[locale]/(home)/faucet/_components/FaucetRequestButton.tsx
rename to src/app/[locale]/faucet/_components/FaucetRequestButton.tsx
diff --git a/src/app/[locale]/(home)/faucet/page.tsx b/src/app/[locale]/faucet/page.tsx
similarity index 76%
rename from src/app/[locale]/(home)/faucet/page.tsx
rename to src/app/[locale]/faucet/page.tsx
index 8113e96..3b65126 100644
--- a/src/app/[locale]/(home)/faucet/page.tsx
+++ b/src/app/[locale]/faucet/page.tsx
@@ -2,10 +2,6 @@ import { Metadata } from "next";
 
 import { JsonLd } from "@/components/JsonLd";
 import { PageView } from "@/components/PageView";
-import { containerClasses } from "@/components/styles/container";
-
-import { FloatingButtons } from "../../_components/MainContent";
-import { HomeShortcuts } from "../HomeShortcuts";
 
 import { Faucet } from "./_components/Faucet";
 
@@ -52,15 +48,8 @@ export default function FaucetPage() {
         }}
       />
       <PageView />
-      <HomeShortcuts />
-      <div className="flex flex-col gap-8 mt-0 mb-12 lg:mb-24 pt-16 sm:pt-0">
-        <div
-          className={containerClasses() + " mb-8 pb-8 sm:min-h-[calc(85vh)]"}
-        >
-          <Faucet />
-          <FloatingButtons showCountdown={false} />
-        </div>
-      </div>
+
+      <Faucet />
     </>
   );
 }
diff --git a/src/app/[locale]/(home)/get-verified/_components/VerificationContent.tsx b/src/app/[locale]/get-verified/_components/VerificationContent.tsx
similarity index 100%
rename from src/app/[locale]/(home)/get-verified/_components/VerificationContent.tsx
rename to src/app/[locale]/get-verified/_components/VerificationContent.tsx
diff --git a/src/app/[locale]/(home)/get-verified/_components/VerificationHero.tsx b/src/app/[locale]/get-verified/_components/VerificationHero.tsx
similarity index 100%
rename from src/app/[locale]/(home)/get-verified/_components/VerificationHero.tsx
rename to src/app/[locale]/get-verified/_components/VerificationHero.tsx
diff --git a/src/app/[locale]/(home)/get-verified/page.tsx b/src/app/[locale]/get-verified/page.tsx
similarity index 67%
rename from src/app/[locale]/(home)/get-verified/page.tsx
rename to src/app/[locale]/get-verified/page.tsx
index 9753f37..5d07d26 100644
--- a/src/app/[locale]/(home)/get-verified/page.tsx
+++ b/src/app/[locale]/get-verified/page.tsx
@@ -1,17 +1,13 @@
 import { Metadata } from "next";
 
-import { AnchorIntoView } from "@/components/AnchorIntoView";
 import { FeatureRequestModal } from "@/components/FeatureRequestModal/FeatureRequestModal";
 import { FeatureRequestModalProvider } from "@/components/FeatureRequestModal/FeatureRequestModalContext";
 import { JsonLd } from "@/components/JsonLd";
 import { PageView } from "@/components/PageView";
-import { containerClasses } from "@/components/styles/container";
+import { newLayoutContainerClasses } from "@/components/styles/container";
 import { VerificationModal } from "@/components/VerificationModal/VerificationModal";
 import { VerificationModalProvider } from "@/components/VerificationModal/VerificationModalContext";
 
-import { FloatingButtons } from "../../_components/MainContent";
-import { HomeShortcuts } from "../HomeShortcuts";
-
 import { VerificationContent } from "./_components/VerificationContent";
 import { VerificationHero } from "./_components/VerificationHero";
 
@@ -35,20 +31,11 @@ export default function GetVerifiedPage() {
             }}
           />
           <PageView />
-          <HomeShortcuts />
-          <div className="flex flex-col gap-8 mt-0 mb-12 lg:mb-24">
-            <div className={containerClasses() + " relative h-[85vh]"}>
-              <AnchorIntoView anchor="#">
-                <div className="pt-8 sm:pt-16">
-                  <VerificationHero />
-                </div>
-              </AnchorIntoView>
-              <FloatingButtons showCountdown={false} showSuperchain={true} />
-            </div>
 
-            <div className={containerClasses()}>
-              <VerificationContent />
-            </div>
+          <div className={newLayoutContainerClasses()}>
+            <VerificationHero />
+
+            <VerificationContent />
           </div>
           <VerificationModal iframeUrl="https://surveys.kraken.com/jfe/form/SV_b1VtoIEAznLivA2" />
           <FeatureRequestModal iframeUrl="https://surveys.kraken.com/jfe/form/SV_9QuEXbhC958nQtU" />
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index f346d57..83d4a15 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -7,6 +7,7 @@ import { getMessages } from "next-intl/server";
 import { ContactUsModal } from "@/components/ContactUsModal";
 import { ConsentLogger } from "@/components/CookieConsent/ConsentLogger";
 import { CookieConsent } from "@/components/CookieConsent/CookieConsent";
+import { Footer } from "@/components/Footer";
 import { GlobalSvgStuff } from "@/components/icons/GlobalSvgStuff";
 import { NewsletterModal } from "@/components/NewsletterModal";
 import { Providers } from "@/components/Providers";
@@ -16,6 +17,9 @@ import { COOKIE_CONSENT } from "@/integrations/consent";
 
 import { inter, plus_jakarta_sans } from "../fonts";
 
+import { MainPageBackground } from "./_components/MainPageBackground";
+import { RoutedLayout } from "./_components/RoutedLayout";
+
 const themeClassesMapping: Record<string, string> = {
   dark: "dark ink:dark-theme",
   light: "light ink:light-theme",
@@ -81,9 +85,19 @@ export default async function LocaleLayout({
         <NextIntlClientProvider locale={locale} messages={messages}>
           <Providers>
             <ToggleThemeShortcut />
-            <div className="flex flex-col relative min-h-screen">
-              {children}
-            </div>
+
+            <RoutedLayout>
+              <div className="relative pt-0 overflow-hidden flex flex-col gap-8 w-full items-center">
+                <div className="flex flex-col w-full items-center min-h-[80vh]">
+                  {children}
+                </div>
+                <div>
+                  <Footer />
+                </div>
+              </div>
+
+              <MainPageBackground />
+            </RoutedLayout>
 
             <CookieConsent />
             <ConsentLogger />
diff --git a/src/app/[locale]/new/apps/_components/AppCard.tsx b/src/app/[locale]/new/apps/_components/AppCard.tsx
deleted file mode 100644
index 66e0590..0000000
--- a/src/app/[locale]/new/apps/_components/AppCard.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useState } from "react";
-import Image from "next/image";
-
-import { FeaturedAppPill } from "@/app/[locale]/(dashboard)/dashboard/_components/FeaturedAppPill";
-import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
-import featuredApps from "@/generated/featured-apps.json";
-import { classNames } from "@/util/classes";
-
-import { AppLinks } from "../../../(dashboard)/dashboard/_components/AppLinks";
-
-import { InkApp, InkAppNetwork, mainUrl } from "./InkApp";
-
-function matchAppImageFileName(name: string): string {
-  // No whitespace, colons seems to be replaced with underscores.
-  // Check the exported Figma file and adjust to match them if necessary.
-  return name.replaceAll(/:/g, "_").replaceAll(/ /g, "");
-}
-
-export function AppCard({
-  app,
-  network,
-}: {
-  app: InkApp;
-  network: InkAppNetwork;
-}) {
-  const [originalClick, setOriginalClick] = useState<{
-    x: number;
-    y: number;
-  } | null>(null);
-
-  const featuredAppSpecificImage = featuredApps.find(
-    (f) => f.name === app.name || f.name === matchAppImageFileName(app.name)
-  );
-  return (
-    <div
-      className={classNames(
-        "flex flex-col backdrop-blur-sm overflow-hidden dark:text-whiteMagic h-full bg-featuredCardPurple rounded-app-card"
-      )}
-    >
-      <div className="flex flex-col relative w-full">
-        <button
-          className="w-full aspect-[2/1] min-h-44 rounded-app-card overflow-hidden relative"
-          onTouchStart={(e) => {
-            if (e.touches.length > 0) {
-              setOriginalClick({
-                x: e.touches[0].clientX,
-                y: e.touches[0].clientY,
-              });
-            }
-          }}
-          onTouchEnd={(e) => {
-            if (originalClick && e.touches.length > 0) {
-              const deltaX = e.touches[0].clientX - originalClick.x;
-              const deltaY = e.touches[0].clientY - originalClick.y;
-              if (Math.abs(deltaX) < 10 && Math.abs(deltaY) < 10) {
-                window.open(mainUrl(app, network), "_blank");
-              }
-            }
-          }}
-          onMouseDown={(e) => {
-            setOriginalClick({ x: e.clientX, y: e.clientY });
-          }}
-          onMouseUp={(e) => {
-            if (originalClick) {
-              const deltaX = e.clientX - originalClick.x;
-              const deltaY = e.clientY - originalClick.y;
-              if (Math.abs(deltaX) < 10 && Math.abs(deltaY) < 10) {
-                window.open(mainUrl(app, network), "_blank");
-              }
-            }
-          }}
-        >
-          <ParallaxedHoverImage
-            src={
-              featuredAppSpecificImage
-                ? featuredAppSpecificImage.url
-                : app.imageUrl
-            }
-            width={320}
-            height={160}
-            alt={app.name}
-          />
-          {app.tags.length > 0 && (
-            <div className="absolute top-6 right-6 pointer-events-none flex gap-2">
-              {app.tags.map((tag) => (
-                <FeaturedAppPill key={tag}>{tag}</FeaturedAppPill>
-              ))}
-            </div>
-          )}
-          {featuredAppSpecificImage && (
-            <div className="absolute bottom-6 left-6 pointer-events-none">
-              <Image
-                className="size-20 rounded-3xl shadow-md"
-                src={app.imageUrl || "/apps/app-icon-placeholder.png"}
-                alt={app.name}
-                width={80}
-                height={80}
-              />
-            </div>
-          )}
-        </button>
-      </div>
-
-      <div className="px-6 py-6 flex flex-col gap-4 w-full h-full">
-        <div className="tracking-tighter ink:text-h5 h-[15px]">{app.name}</div>
-        <div className="flex-1 text-body-3 opacity-80 dark:opacity-50">
-          {app.description}
-        </div>
-        <AppLinks links={app.links} network={network} />
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/[locale]/new/apps/_components/AppLinks.tsx b/src/app/[locale]/new/apps/_components/AppLinks.tsx
deleted file mode 100644
index 35f63a9..0000000
--- a/src/app/[locale]/new/apps/_components/AppLinks.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../(dashboard)/dashboard/_components/AppLinks";
diff --git a/src/app/[locale]/new/apps/_components/InkApp.ts b/src/app/[locale]/new/apps/_components/InkApp.ts
deleted file mode 100644
index 741990f..0000000
--- a/src/app/[locale]/new/apps/_components/InkApp.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../(dashboard)/dashboard/_components/InkApp";
diff --git a/src/app/[locale]/new/apps/_components/categories.tsx b/src/app/[locale]/new/apps/_components/categories.tsx
deleted file mode 100644
index fbd917a..0000000
--- a/src/app/[locale]/new/apps/_components/categories.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { InkIcon } from "@inkonchain/ink-kit";
-
-import { AppsIcon } from "@/components/icons/Apps";
-import { BankIcon } from "@/components/icons/Bank";
-import { BlocksIcon } from "@/components/icons/Blocks";
-import { BridgeIcon } from "@/components/icons/Bridge";
-import { GlobeIcon } from "@/components/icons/Globe";
-import { UsersIcon } from "@/components/icons/Users";
-
-export const appCategories = [
-  {
-    value: null,
-    label: "All categories",
-    icon: <AppsIcon className="duration-0" enforce="inherit" size="icon-lg" />,
-  },
-  {
-    value: "bridge",
-    label: "Bridge",
-    icon: (
-      <BridgeIcon className="duration-0" enforce="inherit" size="icon-lg" />
-    ),
-  },
-  {
-    value: "defi",
-    label: "DeFi",
-    icon: <BankIcon className="duration-0" enforce="inherit" size="icon-lg" />,
-  },
-  {
-    value: "explorers",
-    label: "Explorers",
-    icon: <GlobeIcon className="duration-0" enforce="inherit" size="icon-lg" />,
-  },
-  {
-    value: "infra",
-    label: "Infrastructure",
-    icon: (
-      <BlocksIcon className="duration-0" enforce="inherit" size="icon-lg" />
-    ),
-  },
-  {
-    value: "on-ramps",
-    label: "On-ramps",
-    icon: (
-      <InkIcon.Wallet className="duration-0" enforce="inherit" size="icon-lg" />
-    ),
-  },
-  {
-    value: "social",
-    label: "Social",
-    icon: <UsersIcon className="duration-0" enforce="inherit" size="icon-lg" />,
-  },
-] as const;
diff --git a/src/app/[locale]/new/community/_components/CommunityBrandKit.tsx b/src/app/[locale]/new/community/_components/CommunityBrandKit.tsx
deleted file mode 100644
index fd29a2a..0000000
--- a/src/app/[locale]/new/community/_components/CommunityBrandKit.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-"use client";
-import { Button, Card, CardContent } from "@inkonchain/ink-kit";
-import { useTranslations } from "next-intl";
-
-import { ColoredText } from "@/components/ColoredText";
-import { FlyWhenIntoView } from "@/components/FlyWhenIntoView";
-import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
-import { EXTERNAL_LINKS, Link } from "@/routing";
-
-export const CommunityBrandKit = () => {
-  const t = useTranslations("Community");
-
-  return (
-    <FlyWhenIntoView>
-      <Card
-        size="noPadding"
-        imageLocation="right"
-        image={
-          <CardContent.Image>
-            <ParallaxedHoverImage
-              src="/brand-kit.png"
-              alt="Brand Kit"
-              className="object-cover"
-              width={700}
-              height={395}
-            />
-          </CardContent.Image>
-        }
-      >
-        <CardContent.CallToAction
-          title={
-            <ColoredText className="ink:text-h2" variant="purple">
-              {t("brandKit.title")}
-            </ColoredText>
-          }
-          description={t("brandKit.description")}
-          button={
-            <Button variant="primary" size="md" asChild>
-              <Link
-                href={EXTERNAL_LINKS.brandKit}
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                {t("brandKit.cta")}
-              </Link>
-            </Button>
-          }
-        />
-      </Card>
-    </FlyWhenIntoView>
-  );
-};
diff --git a/src/app/[locale]/new/community/_components/CommunityEvents.tsx b/src/app/[locale]/new/community/_components/CommunityEvents.tsx
deleted file mode 100644
index f7cc54a..0000000
--- a/src/app/[locale]/new/community/_components/CommunityEvents.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../community/_components/CommunityEvents";
diff --git a/src/app/[locale]/new/community/_components/LetsGetSocial.tsx b/src/app/[locale]/new/community/_components/LetsGetSocial.tsx
deleted file mode 100644
index 84e6698..0000000
--- a/src/app/[locale]/new/community/_components/LetsGetSocial.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../community/_components/LetsGetSocial";
diff --git a/src/app/[locale]/new/community/page.tsx b/src/app/[locale]/new/community/page.tsx
deleted file mode 100644
index 66aec2f..0000000
--- a/src/app/[locale]/new/community/page.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useTranslations } from "next-intl";
-
-import { newLayoutContainerClasses } from "@/components/styles/container";
-
-import { PageHeader } from "../_components/PageHeader";
-
-import { CommunityBrandKit } from "./_components/CommunityBrandKit";
-import { CommunityEvents } from "./_components/CommunityEvents";
-import { LetsGetSocial } from "./_components/LetsGetSocial";
-
-export default function CommunityPage() {
-  const t = useTranslations("Community");
-  return (
-    <>
-      <div className={newLayoutContainerClasses()}>
-        <PageHeader title={t("title")} description={t("description")} />
-
-        <CommunityEvents />
-        <LetsGetSocial />
-        <CommunityBrandKit />
-      </div>
-    </>
-  );
-}
diff --git a/src/app/[locale]/new/layout.tsx b/src/app/[locale]/new/layout.tsx
deleted file mode 100644
index e1710a6..0000000
--- a/src/app/[locale]/new/layout.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from "react";
-
-import { Footer } from "@/components/Footer";
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { routing } from "@/routing";
-
-import { MainPageBackground } from "./_components/MainPageBackground";
-import { RoutedLayout } from "./apps/_components/RoutedLayout";
-
-export async function generateStaticParams() {
-  return routing.locales.map((locale) => ({ locale }));
-}
-
-export default async function InfoLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <OnlyWithFeatureFlag flag="newNav">
-      <RoutedLayout>
-        <div className="relative pt-0 overflow-hidden flex flex-col gap-8 w-full items-center">
-          <div className="flex flex-col w-full items-center min-h-[80vh]">
-            {children}
-          </div>
-          <div>
-            <Footer />
-          </div>
-        </div>
-      </RoutedLayout>
-      <MainPageBackground />
-    </OnlyWithFeatureFlag>
-  );
-}
diff --git a/src/app/[locale]/new/verify/_components/Verifications.tsx b/src/app/[locale]/new/verify/_components/Verifications.tsx
deleted file mode 100644
index 1cc3c26..0000000
--- a/src/app/[locale]/new/verify/_components/Verifications.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../verify/_components/Verifications";
diff --git a/src/app/[locale]/new/verify/_components/VerifyContent.tsx b/src/app/[locale]/new/verify/_components/VerifyContent.tsx
deleted file mode 100644
index b5d80eb..0000000
--- a/src/app/[locale]/new/verify/_components/VerifyContent.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../verify/_components/VerifyContent";
diff --git a/src/app/[locale]/new/verify/_components/VerifyHaveASuggestion.tsx b/src/app/[locale]/new/verify/_components/VerifyHaveASuggestion.tsx
deleted file mode 100644
index f4ea42a..0000000
--- a/src/app/[locale]/new/verify/_components/VerifyHaveASuggestion.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../verify/_components/VerifyHaveASuggestion";
diff --git a/src/app/[locale]/new/verify/_components/VerifyInfoCard.tsx b/src/app/[locale]/new/verify/_components/VerifyInfoCard.tsx
deleted file mode 100644
index 1efe479..0000000
--- a/src/app/[locale]/new/verify/_components/VerifyInfoCard.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../../verify/_components/VerifyInfoCard";
diff --git a/src/app/[locale]/new/verify/page.tsx b/src/app/[locale]/new/verify/page.tsx
deleted file mode 100644
index 56ed8bf..0000000
--- a/src/app/[locale]/new/verify/page.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useTranslations } from "next-intl";
-
-import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { newLayoutContainerClasses } from "@/components/styles/container";
-
-import { ConnectWalletButton } from "../../_components/ConnectWalletButton";
-import { PageHeader } from "../_components/PageHeader";
-
-import { Verifications } from "./_components/Verifications";
-import { VerifyContent } from "./_components/VerifyContent";
-import { VerifyHaveASuggestion } from "./_components/VerifyHaveASuggestion";
-
-export default function VerifyPage() {
-  const t = useTranslations("Verify");
-  return (
-    <OnlyWithFeatureFlag flag="verifyPage">
-      <div className={newLayoutContainerClasses()}>
-        <PageHeader
-          title={t("title")}
-          description={t("description")}
-          cta={
-            <div className="relative w-full">
-              <ConnectWalletButton connectLabel={t("cta")} size="lg" />
-            </div>
-          }
-        />
-        <VerifyContent />
-        <Verifications />
-        <VerifyHaveASuggestion />
-      </div>
-    </OnlyWithFeatureFlag>
-  );
-}
diff --git a/src/app/[locale]/not-found.tsx b/src/app/[locale]/not-found.tsx
index c9d52cd..ba1e4fe 100644
--- a/src/app/[locale]/not-found.tsx
+++ b/src/app/[locale]/not-found.tsx
@@ -3,10 +3,6 @@ import { useTranslations } from "next-intl";
 
 import { ButtonLink } from "@/components/Button/ButtonLink";
 import { ColoredText } from "@/components/ColoredText";
-import { Header } from "@/components/Header";
-
-import { FloatingButtons } from "./_components/MainContent";
-import { HomeShortcuts } from "./(home)/HomeShortcuts";
 
 export const metadata = {
   robots: {
@@ -19,9 +15,7 @@ export default function NotFoundPage() {
   const t = useTranslations("404");
 
   return (
-    <div className="relative overflow-hidden">
-      <HomeShortcuts />
-      <Header />
+    <div className="flex flex-1 w-full">
       <Image
         src="/404-blob.webp"
         alt={t("alt")}
@@ -29,7 +23,7 @@ export default function NotFoundPage() {
         height={1500}
         className="absolute right-0 bottom-0 w-[400px] md:w-[500px] lg:w-[700px] xl:w-[900px] translate-x-[10%] translate-y-[20%] lg:translate-y-0"
       />
-      <div className="flex flex-col h-screen mx-8 sm:mx-24 md:mx-32">
+      <div className="flex flex-col">
         <div className="flex items-center flex-1">
           <div className="flex flex-col gap-8 md:gap-9 items-center sm:items-start w-full sm:w-[500px]">
             <ColoredText
@@ -45,9 +39,6 @@ export default function NotFoundPage() {
             </div>
           </div>
         </div>
-        <div className="relative mb-12 dark">
-          <FloatingButtons showCountdown={false} />
-        </div>
       </div>
     </div>
   );
diff --git a/src/app/[locale]/new/page.tsx b/src/app/[locale]/page.tsx
similarity index 100%
rename from src/app/[locale]/new/page.tsx
rename to src/app/[locale]/page.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/LoginButton.tsx b/src/app/[locale]/smart-wallet/_components/LoginButton.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/LoginButton.tsx
rename to src/app/[locale]/smart-wallet/_components/LoginButton.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/RegisterButton.tsx b/src/app/[locale]/smart-wallet/_components/RegisterButton.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/RegisterButton.tsx
rename to src/app/[locale]/smart-wallet/_components/RegisterButton.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/SendUserOp.tsx b/src/app/[locale]/smart-wallet/_components/SendUserOp.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/SendUserOp.tsx
rename to src/app/[locale]/smart-wallet/_components/SendUserOp.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/SmartAccountAddress.tsx b/src/app/[locale]/smart-wallet/_components/SmartAccountAddress.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/SmartAccountAddress.tsx
rename to src/app/[locale]/smart-wallet/_components/SmartAccountAddress.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/SmartWallet.tsx b/src/app/[locale]/smart-wallet/_components/SmartWallet.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/SmartWallet.tsx
rename to src/app/[locale]/smart-wallet/_components/SmartWallet.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/Spinner.tsx b/src/app/[locale]/smart-wallet/_components/Spinner.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/Spinner.tsx
rename to src/app/[locale]/smart-wallet/_components/Spinner.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/_components/UsernameInput.tsx b/src/app/[locale]/smart-wallet/_components/UsernameInput.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/_components/UsernameInput.tsx
rename to src/app/[locale]/smart-wallet/_components/UsernameInput.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/context/UsernameContext.tsx b/src/app/[locale]/smart-wallet/context/UsernameContext.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/context/UsernameContext.tsx
rename to src/app/[locale]/smart-wallet/context/UsernameContext.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/context/ZerodevContext.tsx b/src/app/[locale]/smart-wallet/context/ZerodevContext.tsx
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/context/ZerodevContext.tsx
rename to src/app/[locale]/smart-wallet/context/ZerodevContext.tsx
diff --git a/src/app/[locale]/(home)/smart-wallet/lib/viem.ts b/src/app/[locale]/smart-wallet/lib/viem.ts
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/lib/viem.ts
rename to src/app/[locale]/smart-wallet/lib/viem.ts
diff --git a/src/app/[locale]/(home)/smart-wallet/lib/zerodev.ts b/src/app/[locale]/smart-wallet/lib/zerodev.ts
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/lib/zerodev.ts
rename to src/app/[locale]/smart-wallet/lib/zerodev.ts
diff --git a/src/app/[locale]/(home)/smart-wallet/page.tsx b/src/app/[locale]/smart-wallet/page.tsx
similarity index 67%
rename from src/app/[locale]/(home)/smart-wallet/page.tsx
rename to src/app/[locale]/smart-wallet/page.tsx
index d458572..e83ff9b 100644
--- a/src/app/[locale]/(home)/smart-wallet/page.tsx
+++ b/src/app/[locale]/smart-wallet/page.tsx
@@ -3,10 +3,7 @@ import { Metadata } from "next";
 import { JsonLd } from "@/components/JsonLd";
 import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
 import { PageView } from "@/components/PageView";
-import { containerClasses } from "@/components/styles/container";
-
-import { FloatingButtons } from "../../_components/MainContent";
-import { HomeShortcuts } from "../HomeShortcuts";
+import { newLayoutContainerClasses } from "@/components/styles/container";
 
 import { SmartWallet } from "./_components/SmartWallet";
 import { UsernameProvider } from "./context/UsernameContext";
@@ -35,21 +32,13 @@ export default async function SmartWalletPage() {
       />
 
       <PageView />
-      <HomeShortcuts />
-      <div className="relative">
-        <div className="flex flex-col gap-8 mt-24 sm:mt-32 mb-12 lg:mb-24">
-          <div
-            className={containerClasses() + " mb-8 pb-8 sm:min-h-[calc(85vh)]"}
-          >
-            <UsernameProvider>
-              <ZeroDevProvider>
-                <SmartWallet />
-              </ZeroDevProvider>
-            </UsernameProvider>
-          </div>
-        </div>
 
-        <FloatingButtons showCountdown={false} />
+      <div className={newLayoutContainerClasses()}>
+        <UsernameProvider>
+          <ZeroDevProvider>
+            <SmartWallet />
+          </ZeroDevProvider>
+        </UsernameProvider>
       </div>
     </OnlyWithFeatureFlag>
   );
diff --git a/src/app/[locale]/(home)/smart-wallet/utils/constants.ts b/src/app/[locale]/smart-wallet/utils/constants.ts
similarity index 100%
rename from src/app/[locale]/(home)/smart-wallet/utils/constants.ts
rename to src/app/[locale]/smart-wallet/utils/constants.ts
diff --git a/src/app/[locale]/(home)/testnet-bridge/_components/BlockExplorerButton.tsx b/src/app/[locale]/testnet-bridge/_components/BlockExplorerButton.tsx
similarity index 100%
rename from src/app/[locale]/(home)/testnet-bridge/_components/BlockExplorerButton.tsx
rename to src/app/[locale]/testnet-bridge/_components/BlockExplorerButton.tsx
diff --git a/src/app/[locale]/(home)/testnet-bridge/_components/Bridge.tsx b/src/app/[locale]/testnet-bridge/_components/Bridge.tsx
similarity index 98%
rename from src/app/[locale]/(home)/testnet-bridge/_components/Bridge.tsx
rename to src/app/[locale]/testnet-bridge/_components/Bridge.tsx
index 1cf2cf0..acb34d6 100644
--- a/src/app/[locale]/(home)/testnet-bridge/_components/Bridge.tsx
+++ b/src/app/[locale]/testnet-bridge/_components/Bridge.tsx
@@ -15,10 +15,10 @@ import {
 } from "wagmi";
 import { sepolia } from "wagmi/chains";
 
-import { ConnectWalletButton } from "@/app/[locale]/_components/ConnectWalletButton";
-import { useBridgeTransactionModal } from "@/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal";
+import { useBridgeTransactionModal } from "@/app/[locale]/testnet-bridge/_components/BridgeTransactionModal";
 import { Button } from "@/components/Button/Button";
 import { ColoredText } from "@/components/ColoredText";
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 import { Loader } from "@/components/Loader";
 import { containerClasses } from "@/components/styles/container";
 import { classNames } from "@/util/classes";
diff --git a/src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModal.tsx b/src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModal.tsx
similarity index 100%
rename from src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModal.tsx
rename to src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModal.tsx
diff --git a/src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModalContext.tsx b/src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModalContext.tsx
similarity index 100%
rename from src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModalContext.tsx
rename to src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/BridgeTransactionModalContext.tsx
diff --git a/src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/BroadcastSent-checkMark.json b/src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/BroadcastSent-checkMark.json
similarity index 100%
rename from src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/BroadcastSent-checkMark.json
rename to src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/BroadcastSent-checkMark.json
diff --git a/src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/index.ts b/src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/index.ts
similarity index 100%
rename from src/app/[locale]/(home)/testnet-bridge/_components/BridgeTransactionModal/index.ts
rename to src/app/[locale]/testnet-bridge/_components/BridgeTransactionModal/index.ts
diff --git a/src/app/[locale]/(home)/testnet-bridge/page.tsx b/src/app/[locale]/testnet-bridge/page.tsx
similarity index 73%
rename from src/app/[locale]/(home)/testnet-bridge/page.tsx
rename to src/app/[locale]/testnet-bridge/page.tsx
index 6f2f810..ef972d0 100644
--- a/src/app/[locale]/(home)/testnet-bridge/page.tsx
+++ b/src/app/[locale]/testnet-bridge/page.tsx
@@ -2,10 +2,7 @@ import { Metadata } from "next";
 
 import { JsonLd } from "@/components/JsonLd";
 import { PageView } from "@/components/PageView";
-import { containerClasses } from "@/components/styles/container";
-
-import { FloatingButtons } from "../../_components/MainContent";
-import { HomeShortcuts } from "../HomeShortcuts";
+import { newLayoutContainerClasses } from "@/components/styles/container";
 
 import { Bridge } from "./_components/Bridge";
 import {
@@ -42,17 +39,9 @@ export default function BridgePage() {
         }}
       />
       <PageView />
-      <HomeShortcuts />
-      <div className="flex flex-col gap-8 mt-0 mb-12 lg:mb-24 pt-2 sm:pt-0">
-        <div
-          className={
-            containerClasses() +
-            " mb-8 pb-8 sm:min-h-[calc(85vh)] flex flex-col justify-center items-center"
-          }
-        >
-          <Bridge />
-          <FloatingButtons showCountdown={false} />
-        </div>
+
+      <div className={newLayoutContainerClasses()}>
+        <Bridge />
       </div>
       <BridgeTransactionModal />
     </BridgeTransactionModalContextProvider>
diff --git a/src/app/[locale]/verify/_components/Verifications.tsx b/src/app/[locale]/verify/_components/Verifications.tsx
index 0906385..40eacaa 100644
--- a/src/app/[locale]/verify/_components/Verifications.tsx
+++ b/src/app/[locale]/verify/_components/Verifications.tsx
@@ -7,8 +7,7 @@ import { useTranslations } from "next-intl";
 import { useAccount } from "wagmi";
 
 import { ColoredText } from "@/components/ColoredText";
-
-import { ConnectWalletButton } from "../../_components/ConnectWalletButton";
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 
 type Perks = "Ink" | "Zora";
 type Networks = "Ink" | "BASE" | "Arbitrum" | "Mode" | "Optimism";
diff --git a/src/app/[locale]/verify/layout.tsx b/src/app/[locale]/verify/layout.tsx
deleted file mode 100644
index c3638bf..0000000
--- a/src/app/[locale]/verify/layout.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import Image from "next/image";
-
-import { Footer } from "@/components/Footer";
-import { routing } from "@/routing";
-
-import { HomeHeader } from "../_components/HomeHeader";
-import { HomeShortcuts } from "../(home)/HomeShortcuts";
-
-export async function generateStaticParams() {
-  return routing.locales.map((locale) => ({ locale }));
-}
-
-export default async function InfoLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <HomeHeader />
-      <HomeShortcuts />
-
-      <div className="absolute -top-0 -right-0 z-[-1] dark:mix-blend-hard-light max-w-[400px] max-h-[400px] xl:max-w-[800px] xl:max-h-[800px] overflow-hidden">
-        <Image
-          className="dark:mix-blend-hard-light w-full h-full ml-10 -mt-10"
-          src="/verify-blob.png"
-          alt="Verify"
-          width={800}
-          height={800}
-        />
-      </div>
-
-      <div className="flex-1 relative pb-24 pt-32 container mx-auto flex flex-col gap-4">
-        <div className="flex flex-col">{children}</div>
-        <div>
-          <Footer />
-        </div>
-      </div>
-    </>
-  );
-}
diff --git a/src/app/[locale]/verify/page.tsx b/src/app/[locale]/verify/page.tsx
index d0332b6..2f87a6c 100644
--- a/src/app/[locale]/verify/page.tsx
+++ b/src/app/[locale]/verify/page.tsx
@@ -1,21 +1,31 @@
+import { useTranslations } from "next-intl";
+
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 import { OnlyWithFeatureFlag } from "@/components/OnlyWithFeatureFlag";
-import { PageView } from "@/components/PageView";
-import { containerClasses } from "@/components/styles/container";
+import { newLayoutContainerClasses } from "@/components/styles/container";
 
-import { HomeShortcuts } from "../(home)/HomeShortcuts";
+import { PageHeader } from "../_components/PageHeader";
 
+import { Verifications } from "./_components/Verifications";
 import { VerifyContent } from "./_components/VerifyContent";
 import { VerifyHaveASuggestion } from "./_components/VerifyHaveASuggestion";
 
 export default function VerifyPage() {
+  const t = useTranslations("Verify");
   return (
     <OnlyWithFeatureFlag flag="verifyPage">
-      <PageView />
-      <HomeShortcuts />
-      <div className="flex flex-col gap-12 mt-0 mb-12 lg:mb-24 pt-16 sm:pt-0">
-        <div className={containerClasses() + " mb-8 pb-8 lg:px-16 pt-32"}>
-          <VerifyContent />
-        </div>
+      <div className={newLayoutContainerClasses()}>
+        <PageHeader
+          title={t("title")}
+          description={t("description")}
+          cta={
+            <div className="relative w-full">
+              <ConnectWalletButton connectLabel={t("cta")} size="lg" />
+            </div>
+          }
+        />
+        <VerifyContent />
+        <Verifications />
         <VerifyHaveASuggestion />
       </div>
     </OnlyWithFeatureFlag>
diff --git a/src/app/[locale]/_components/ConnectWalletButton.tsx b/src/components/ConnectWalletButton.tsx
similarity index 100%
rename from src/app/[locale]/_components/ConnectWalletButton.tsx
rename to src/components/ConnectWalletButton.tsx
diff --git a/src/app/[locale]/_components/ContactUsPrivacyButton.tsx b/src/components/ContactUsPrivacyButton.tsx
similarity index 100%
rename from src/app/[locale]/_components/ContactUsPrivacyButton.tsx
rename to src/components/ContactUsPrivacyButton.tsx
diff --git a/src/app/[locale]/_components/CookieSettingsButton.tsx b/src/components/CookieSettingsButton.tsx
similarity index 100%
rename from src/app/[locale]/_components/CookieSettingsButton.tsx
rename to src/components/CookieSettingsButton.tsx
diff --git a/src/components/EventCard.tsx b/src/components/EventCard.tsx
new file mode 100644
index 0000000..4e66335
--- /dev/null
+++ b/src/components/EventCard.tsx
@@ -0,0 +1,99 @@
+import { Card, CardContent, Tag } from "@inkonchain/ink-kit";
+
+import { ButtonLink } from "@/components/Button/ButtonLink";
+import { CalendarIcon } from "@/components/icons/Calendar";
+import { LocationIcon } from "@/components/icons/Location";
+import { MailIcon } from "@/components/icons/Mail";
+import { ParallaxedHoverImage } from "@/components/ParallaxedHoverImage";
+import { HrefProp } from "@/routing";
+import { classNames } from "@/util/classes";
+
+export interface EventCardProps {
+  title: string;
+  description: string;
+  cta: string;
+  link: HrefProp;
+  date: string;
+  location: string;
+  image: string;
+  imageAlt: string;
+  className?: string;
+  layout: "horizontal" | "vertical";
+  color?: "purple" | "purple-dark";
+}
+
+export const EventCard = ({
+  title,
+  description,
+  cta,
+  link,
+  date,
+  location,
+  image,
+  imageAlt,
+  layout = "vertical",
+  color = "purple",
+  className,
+}: EventCardProps) => {
+  return (
+    <Card
+      className={className}
+      image={
+        <CardContent.Image
+          mainLabels={
+            <>
+              <Tag variant="event">
+                <CalendarIcon size="icon-md" enforce="inherit" />
+                {date}
+              </Tag>
+              <Tag variant="event">
+                <LocationIcon size="icon-md" enforce="inherit" />
+                {location}
+              </Tag>
+            </>
+          }
+        >
+          <ParallaxedHoverImage
+            className={classNames(
+              "max-w-xl sm:max-w-full",
+              layout === "horizontal" ? "h-full" : "w-full"
+            )}
+            src={image}
+            alt={imageAlt}
+            width={1456}
+            height={816}
+          />
+        </CardContent.Image>
+      }
+      imageLocation={layout === "horizontal" ? "left" : "top"}
+      variant={color === "purple" ? "light-purple" : "secondary"}
+    >
+      <CardContent.CallToAction
+        title={title}
+        description={description}
+        button={
+          <div>
+            <ButtonLink
+              href={link}
+              aria-label="Apply for House of Ink"
+              target="_blank"
+              rel="noopener noreferrer"
+              size="lg"
+              variant={color === "purple" ? "primary" : "spotlight"}
+              compact
+              icon={
+                <MailIcon
+                  className="shrink-0"
+                  size="icon-lg"
+                  enforce="inherit"
+                />
+              }
+            >
+              {cta}
+            </ButtonLink>
+          </div>
+        }
+      />
+    </Card>
+  );
+};
diff --git a/src/components/Footer/FooterContent.tsx b/src/components/Footer/FooterContent.tsx
index b851b26..3bae454 100644
--- a/src/components/Footer/FooterContent.tsx
+++ b/src/components/Footer/FooterContent.tsx
@@ -6,7 +6,7 @@ import { TextUnderline } from "@/components/TextUnderline";
 import { EXTERNAL_LINKS, Link } from "@/routing";
 import { classNames } from "@/util/classes";
 
-import { CookieSettingsButton } from "../../app/[locale]/_components/CookieSettingsButton";
+import { CookieSettingsButton } from "../CookieSettingsButton";
 
 interface FooterContentProps {
   enforce?: "black";
diff --git a/src/components/Header/HeaderConnectWallet.tsx b/src/components/Header/HeaderConnectWallet.tsx
index ddf0b14..45963fb 100644
--- a/src/components/Header/HeaderConnectWallet.tsx
+++ b/src/components/Header/HeaderConnectWallet.tsx
@@ -2,7 +2,7 @@
 
 import { Suspense } from "react";
 
-import { ConnectWalletButton } from "@/app/[locale]/_components/ConnectWalletButton";
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 
 import { OnlyWithFeatureFlag } from "../OnlyWithFeatureFlag";
 
diff --git a/src/components/Header/HeaderContent.tsx b/src/components/Header/HeaderContent.tsx
index 56ca0eb..d67226a 100644
--- a/src/components/Header/HeaderContent.tsx
+++ b/src/components/Header/HeaderContent.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { ConnectWalletButton } from "@/app/[locale]/_components/ConnectWalletButton";
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 
 import { HomeAppsToggle } from "../HomeAppsToggle/HomeAppsToggle";
 
diff --git a/src/components/HomeAppsToggle/HomeAppsToggle.tsx b/src/components/HomeAppsToggle/HomeAppsToggle.tsx
index 02567d1..c67ab33 100644
--- a/src/components/HomeAppsToggle/HomeAppsToggle.tsx
+++ b/src/components/HomeAppsToggle/HomeAppsToggle.tsx
@@ -34,20 +34,20 @@ export const HomeAppsToggle: React.FC<{}> = () => {
               <InkIcon size="icon-lg" enforce="inherit" />
             </Link>
           ),
-          selectedByDefault: pathname !== "/dashboard",
+          selectedByDefault: pathname !== "/apps",
           value: "home",
         },
         {
           asChild: true,
           children: (
             <Link
-              href={{ pathname: "/dashboard", query }}
+              href={{ pathname: "/apps", query }}
               className={classNames("px-4 transition-all duration-200")}
             >
               <DotsIcon size="icon-lg" enforce="inherit" />
             </Link>
           ),
-          selectedByDefault: pathname === "/dashboard",
+          selectedByDefault: pathname === "/apps",
           value: "apps",
         },
       ]}
diff --git a/src/app/[locale]/_components/MailIconButton/MailIconButton.tsx b/src/components/MailIconButton/MailIconButton.tsx
similarity index 100%
rename from src/app/[locale]/_components/MailIconButton/MailIconButton.tsx
rename to src/components/MailIconButton/MailIconButton.tsx
diff --git a/src/components/MobileHeader/MobileHeader.tsx b/src/components/MobileHeader/MobileHeader.tsx
index 47d5851..fb09a65 100644
--- a/src/components/MobileHeader/MobileHeader.tsx
+++ b/src/components/MobileHeader/MobileHeader.tsx
@@ -3,7 +3,7 @@
 import React, { PropsWithChildren } from "react";
 import FocusLock from "react-focus-lock";
 
-import { ConnectWalletButton } from "@/app/[locale]/_components/ConnectWalletButton";
+import { ConnectWalletButton } from "@/components/ConnectWalletButton";
 import { MobileMenuButton } from "@/components/MobileMenu";
 import { useMobileMenuContext } from "@/components/MobileMenu/MobileMenuContext";
 import { usePathname } from "@/routing";
diff --git a/src/app/[locale]/_components/NewsletterForm/NewsletterForm.tsx b/src/components/NewsletterForm/NewsletterForm.tsx
similarity index 98%
rename from src/app/[locale]/_components/NewsletterForm/NewsletterForm.tsx
rename to src/components/NewsletterForm/NewsletterForm.tsx
index 945bbbc..31bc8e9 100644
--- a/src/app/[locale]/_components/NewsletterForm/NewsletterForm.tsx
+++ b/src/components/NewsletterForm/NewsletterForm.tsx
@@ -12,7 +12,7 @@ import { KeyboardShortcut } from "@/components/KeyboardShortcut";
 import { classNames } from "@/util/classes";
 import { largeMovementTransition } from "@/util/transitions";
 
-import { SuccessState } from "../MainContent/SuccessState";
+import { SuccessState } from "./SuccessState";
 
 export interface NewsletterFormProps {
   isOpen: boolean;
diff --git a/src/app/[locale]/_components/NewsletterForm/NewsletterFormContext.tsx b/src/components/NewsletterForm/NewsletterFormContext.tsx
similarity index 100%
rename from src/app/[locale]/_components/NewsletterForm/NewsletterFormContext.tsx
rename to src/components/NewsletterForm/NewsletterFormContext.tsx
diff --git a/src/app/[locale]/_components/MainContent/SuccessState.tsx b/src/components/NewsletterForm/SuccessState.tsx
similarity index 100%
rename from src/app/[locale]/_components/MainContent/SuccessState.tsx
rename to src/components/NewsletterForm/SuccessState.tsx
diff --git a/src/components/Providers.tsx b/src/components/Providers.tsx
index ae9738d..2d01420 100644
--- a/src/components/Providers.tsx
+++ b/src/components/Providers.tsx
@@ -2,7 +2,7 @@
 import { PropsWithChildren } from "react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
-import { NewsletterFormContextProvider } from "@/app/[locale]/_components/NewsletterForm/NewsletterFormContext";
+import { NewsletterFormContextProvider } from "@/components/NewsletterForm/NewsletterFormContext";
 import { AnalyticsProvider } from "@/contexts/AnalyticsProvider";
 import { RelayProvider } from "@/contexts/RelayProvider";
 import { ThemeProvider } from "@/contexts/ThemeProvider";
diff --git a/src/app/[locale]/(dashboard)/dashboard/_components/RelayKitUI.tsx b/src/components/RelayKitUI.tsx
similarity index 100%
rename from src/app/[locale]/(dashboard)/dashboard/_components/RelayKitUI.tsx
rename to src/components/RelayKitUI.tsx
diff --git a/src/components/SocialLinksRow.tsx b/src/components/SocialLinksRow.tsx
index 7481574..25d2d92 100644
--- a/src/components/SocialLinksRow.tsx
+++ b/src/components/SocialLinksRow.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { MailIconButton } from "@/app/[locale]/_components/MailIconButton/MailIconButton";
+import { MailIconButton } from "@/components/MailIconButton/MailIconButton";
 import { EXTERNAL_LINKS, Link } from "@/routing";
 import { classNames } from "@/util/classes";
 
diff --git a/src/routing.ts b/src/routing.ts
index 1943b63..55f5d6c 100644
--- a/src/routing.ts
+++ b/src/routing.ts
@@ -66,14 +66,15 @@ export const routing = defineRouting({
   defaultLocale,
   pathnames: {
     "#": "/#",
-    "/#about": "/#about",
-    "/#builders": "/#builders",
-    "/#get-involved": "/#get-involved",
-    "/#event": "/#event",
     "/": "/",
     "/testnet-bridge": "/testnet-bridge",
+    "/apps": "/apps",
+    "/apps/[category]": "/apps/[category]",
+    "/bridge": "/bridge",
+    "/verify": "/verify",
     "/community": "/community",
-    "/dashboard": "/dashboard",
+    "/about": "/about",
+    "/builders": "/builders",
     "/terms": "/terms",
     "/privacy": "/privacy",
     "/timeline": "/timeline",
@@ -85,14 +86,6 @@ export const routing = defineRouting({
     "/cookie": "/cookie",
     "/newsletter/resubscribe": "/newsletter/resubscribe",
     "/newsletter/unsubscribe": "/newsletter/unsubscribe",
-    "/new": "/new",
-    "/new/apps": "/new/apps",
-    "/new/apps/[category]": "/new/apps/[category]",
-    "/new/bridge": "/new/bridge",
-    "/new/verify": "/new/verify",
-    "/new/community": "/new/community",
-    "/new/about": "/new/about",
-    "/new/builders": "/new/builders",
     ...externalLinksMap,
   },
 });
diff --git a/src/util/feature-flags.ts b/src/util/feature-flags.ts
index 0790d9d..783dee9 100644
--- a/src/util/feature-flags.ts
+++ b/src/util/feature-flags.ts
@@ -12,7 +12,6 @@ export const hardcodedFeatureFlags = {
   publicRepo: false,
   fakeEvents: 0,
   verifyPage: false,
-  newNav: false,
 };
 
 export type FeatureFlagKey = keyof typeof hardcodedFeatureFlags;