diff --git a/sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/manual-install-chrome.mdx b/sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/manual-install-chrome.mdx
similarity index 100%
rename from sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/manual-install-chrome.mdx
rename to sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/manual-install-chrome.mdx
diff --git a/sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/manual-install-edge.mdx b/sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/manual-install-edge.mdx
similarity index 100%
rename from sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/manual-install-edge.mdx
rename to sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/manual-install-edge.mdx
diff --git a/sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/packing-extension-chrome.mdx b/sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/packing-extension-chrome.mdx
similarity index 100%
rename from sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/packing-extension-chrome.mdx
rename to sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/packing-extension-chrome.mdx
diff --git a/sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/packing-extension-edge.mdx b/sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/packing-extension-edge.mdx
similarity index 100%
rename from sites/labs/src/content/docs/cheerpj-jnlp-runner/03-getting-started/packing-extension-edge.mdx
rename to sites/labs/src/content/docs/cheerpj-jnlp-runner/04-guides/packing-extension-edge.mdx
diff --git a/sites/labs/src/content/docs/cheerpj-jnlp-runner/index.mdx b/sites/labs/src/content/docs/cheerpj-jnlp-runner/index.mdx
index 113e6546..222b2031 100644
--- a/sites/labs/src/content/docs/cheerpj-jnlp-runner/index.mdx
+++ b/sites/labs/src/content/docs/cheerpj-jnlp-runner/index.mdx
@@ -1,105 +1,84 @@
 ---
 title: CheerpJ JNLP Runner
+shortTitle: Overview
 description: Run Java Web Start applications without a local Java Desktop installation
-fullWidthLayout: true
 ---
 
-import { DISCORD_URL } from "@/consts";
 import LinkButton from "@leaningtech/astro-theme/components/LinkButton.astro";
-import {
-	Hero,
-	Card,
-	sparkleIcon,
-	networkIcon,
-	lockIcon,
-	browserIcon,
-	layersIcon,
-	rocketIcon,
-} from "@leaningtech/cheerpj-jnlp-page";
-
-<Hero />
-
-<section class="w-full max-w-prose mx-auto text-lg leading-normal px-2 py-16 text-pretty">
-	<h2 class="text-3xl font-semibold text-primary-500 mb-4">
-		What is CheerpJ JNLP Runner?
-	</h2>
-	<p>
-		The CheerpJ JNLP Runner browser extension, available for Chrome and Edge,
-		can run Java Web Start (JWS) applications without a local Java Desktop
-		installation. This browser extension, based on the CheerpJ technology, is
-		designed to replace the local Java Desktop installation, and run Java Web
-		Start applications within the browser, without Java.
-	</p>
-</section>
-
-<section
-	class="w-full max-w-screen-2xl mx-auto px-4 sm:px-8 space-y-4 flex flex-wrap items-center justify-center p-10"
-	id="features"
->
-	<Card
-		title="No Java installations"
-		iconSrc={sparkleIcon}
-		iconAlt="Sparkles doodle"
-		description="CheerpJ JNLP Runner is a browser extension that saves you from installing an outdated, insecure desktop Java installation."
-	/>
-	<Card
-		title="Modern Browsers"
-		iconSrc={networkIcon}
-		iconAlt="Globe doodle representing network"
-		description="Our extension is available for Chrome and Edge. Ready to cover your JWS needs in the most trusted browsers."
-	/>
-	<Card
-		title="Sandboxed"
-		iconSrc={lockIcon}
-		iconAlt="Lock doodle"
-		description="Our technology works within the browser security boundaries making it highly reliable and safe."
-	/>
-	<Card
-		title="Private and secure"
-		iconSrc={browserIcon /* TODO: better icon */}
-		iconAlt="Bill doodle"
-		description="The extension runs fully client-side (i.e. it does not contact any server), and does not collect any data or analytics at all. All your data, as well as your application, are kept within the boundaries of your browser.			"
-	/>
-	<Card
-		title="Wide range of utilities"
-		iconSrc={layersIcon}
-		iconAlt="Layers doodle"
-		description="CheerpJ JNLP Runner covers all your Java needs, including Swing/AWT, filesystem support, audio, clipboard, networking and more."
-	/>
-	<Card
-		title="Easy to use"
-		iconSrc={rocketIcon}
-		iconAlt="Rocket doodle"
-		description="Using our browser extension could not be easier. Just install, launch your JNLP app as usual, and the extension will automatically start working."
+import ShowcaseList from "@leaningtech/astro-theme/components/ShowcaseList.astro";
+import { DISCORD_URL } from "@/consts.ts";
+
+<div class="not-prose flex gap-2 mb-2">
+	<img
+		src="https://img.shields.io/badge/version-3.0-orange"
+		alt="Version 3.0"
 	/>
-</section>
-<section class="px-4 sm:px-8 py-16 space-y-4 m-auto mb-10 flex col-span-1 items-center justify-center rounded-lg">
-	<div>
-		<h3 class="font-semibold sm:text-3xl md:text-4xl">Community</h3>
-		<p class="pt-4 text-stone-400 leading-7">
-			We have an amazing community of developers and users. <br />
-			Join us today to stay up to date with the latest news, to share your
-			experience with our technologies or to report any bugs.
-		</p>
-		<div class="mt-4 flex flex-wrap gap-4 pt-5">
-			<LinkButton
-				href="https://github.com/leaningtech/cheerpj-jnlp-runner"
-				label="Report a bug"
-				type="primary"
-				iconRight="mdi:github"
-			/>
-			<LinkButton
-				href={DISCORD_URL}
-				label="Join the community"
-				type="discord"
-				iconRight="ic:baseline-discord"
-			/>
-			<LinkButton
-				href="/docs/cheerpj-jnlp-runner/getting-started"
-				label="Documentation"
-				type="secondary"
-				iconRight="iconoir:google-docs"
-			/>
-		</div>
-	</div>
-</section>
+	<a href="https://discord.leaningtech.com/">
+		<img
+			src="https://img.shields.io/discord/988743885121548329?color=%237289DA&logo=discord&logoColor=ffffff"
+			alt="Discord server"
+		/>
+	</a>
+	<a href="https://github.com/leaningtech/cheerpj-meta/issues">
+		<img
+			src="https://img.shields.io/github/issues/leaningtech/cheerpj-meta.svg?logo=github"
+			alt="GitHub issues"
+		/>
+	</a>
+</div>
+
+CheerpJ JNLP Runner is a browser extension that enables you to **run Java Web Start applications directly in modern browsers**, without the need for a Java plugin or a Java installation. Designed for individual users and organizations, it requires no technical knowledge or setup.
+
+<div class="flex flex-wrap gap-3"> 
+  <LinkButton
+    type="primary"
+    href="https://chromewebstore.google.com/detail/cheerpj-jnlp-runner/achnhggjjhnadfapkmgallnbmemdojdi"
+    label="Add to Chrome"
+    iconLeft="openmoji:chrome"
+  />
+
+<LinkButton
+	type="primary"
+	href="https://microsoftedge.microsoft.com/addons/detail/cheerpj-jnlp-runner/dpleickbpchmkpkmicanfolmianepfhe"
+	label="Add to Microsoft Edge"
+	iconLeft="openmoji:edge"
+/>
+</div>
+
+Are you a developer? If you are interested in a more advanced usage, explore CheerpJ Core, the technology behind the CheerpJ JNLP Runner. Check out our [product website](https://cheerpj.com/) and the [CheerpJ documentation](https://cheerpj.com/docs/overview) to learn more.
+
+## Features
+
+- Runs Java Web Start applications without modifying the code or installing Java.
+- Compatible with Chrome and Edge.
+- Easy to use, no technical knowledge required.
+- Group Policy Object (GPO) support for enterprise environments.
+
+## Getting Started
+
+To get started with CheerpJ JNLP Runner, you need to install the extension from the Chrome Web Store or the Edge Add-ons store. For step-by-step instructions, see our [Chrome Installation] and [Edge Installation] pages.
+
+Once installed, you can run Java Applets on any website. Visit our [using the extension for the first time] page for more information.
+
+## Community
+
+We have an amazing community of developers and users.
+Join us today to stay up to date with the latest news, to share your experience with our technologies or to report any bugs.
+
+<LinkButton
+	type="discord"
+	href={DISCORD_URL}
+	iconLeft="fa-brands:discord"
+	label="Join our Discord server"
+/>
+
+<LinkButton
+	type="secondary"
+	href="https://twitter.com/leaningtech"
+	iconLeft="fa-brands:twitter"
+	label="Follow us on Twitter"
+/>
+
+[Chrome Installation]: /docs/cheerpj-jnlp-runner/getting-started/install-chrome
+[Edge Installation]: /docs/cheerpj-jnlp-runner/getting-started/install-edge
+[using the extension for the first time]: /docs/cheerpj-jnlp-runner/getting-started/using-first-time