diff --git a/package.json b/package.json
index 5bb3296..d3e4727 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.7.2",
-    "@leaphy-robotics/playwright-arduino": "^1.0.4",
+    "@leaphy-robotics/playwright-arduino": "1.0.5",
     "@playwright/test": "^1.43.1",
     "@sentry/vite-plugin": "^2.16.1",
     "@sveltejs/vite-plugin-svelte": "^3.0.2",
@@ -21,7 +21,7 @@
     "@types/node": "^20.11.30",
     "@types/w3c-web-serial": "^1.0.6",
     "@types/wicg-file-system-access": "^2023.10.5",
-    "svelte": "5.0.0-next.121",
+    "svelte": "5.0.0-next.134",
     "svelte-check": "3.7.1",
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
@@ -32,7 +32,8 @@
     "@blockly/field-bitmap": "^4.0.16",
     "@blockly/workspace-backpack": "^5.3.7",
     "@floating-ui/dom": "^1.6.3",
-    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/free-brands-svg-icons": "^6.6.0",
+    "@fortawesome/free-solid-svg-icons": "6.6.0",
     "@leaphy-robotics/avrdude-webassembly": "^1.6.1",
     "@leaphy-robotics/dfu-util-wasm": "^1.0.2",
     "@leaphy-robotics/leaphy-blocks": "3.2.1",
diff --git a/src/app.css b/src/app.css
index 98caf97..d9427d3 100644
--- a/src/app.css
+++ b/src/app.css
@@ -26,7 +26,7 @@ body[data-color-scheme="light"] {
     --accent: #32a5a9;
     --on-accent: #fff;
     --text-muted: #d3d3d3;
-    --warning: #ffb818;
+    --warning: #ffcc00;
 }
 body[data-color-scheme="dark"] {
     --background: #24242b;
@@ -42,6 +42,7 @@ body[data-color-scheme="dark"] {
     --accent: #32a5a9;
     --on-accent: #fff;
     --text-muted: #535361;
+	--warning: #ffcc00;
 }
 
 body {
diff --git a/src/assets/default-program.json b/src/assets/default-program.json
new file mode 100644
index 0000000..966140a
--- /dev/null
+++ b/src/assets/default-program.json
@@ -0,0 +1,14 @@
+{
+	"blocks": {
+		"languageVersion": 0,
+		"blocks": [
+			{
+				"type": "leaphy_start",
+				"id": "rzE0Ve:6bHB~8aIqyj-U",
+				"deletable": false,
+				"x": 500,
+				"y": 10
+			}
+		]
+	}
+}
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index 6e48143..e74407d 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -124,5 +124,11 @@
 	"EXPLAIN_BLOCK": "Explain Block ✨",
 	"META_ATTRIBUTION": "Built with Meta Llama 3",
 	"AI_RATE_LIMITED": "The explanation robot is a little too busy right now, please try again later.",
-	"CHOOSING_ROBOT": "Choose your board"
+	"CHOOSING_ROBOT": "Choose your board",
+	"INVALID_ROBOT": "The selected robot {robot} does not work with the automatically detected {board}!",
+	"INCOMPATIBLE_PROJECT": "Incompatible",
+	"CONTINUE": "Continue",
+	"UNKNOWN_BOARD": "Unknown",
+	"CLEAR_PROJECT": "Clear project",
+	"CLEAR_PROJECT_DESC": "Selecting this robot will clear your project, are you sure?"
 }
diff --git a/src/assets/translations/nl.json b/src/assets/translations/nl.json
index 96c3cde..3551bcb 100644
--- a/src/assets/translations/nl.json
+++ b/src/assets/translations/nl.json
@@ -124,5 +124,11 @@
 	"EXPLAIN_BLOCK": "Leg blok uit ✨",
 	"META_ATTRIBUTION": "Gemaakt met Meta Llama 3",
 	"AI_RATE_LIMITED": "De uitleg robot is op dit moment erg druk, probeer het later nog eens.",
-	"CHOOSING_ROBOT": "Kies je arduino"
+	"CHOOSING_ROBOT": "Kies je arduino",
+	"INVALID_ROBOT": "De geselecteerde robot {robot} werkt niet met de automatisch gedetecteerde {board}!",
+	"INCOMPATIBLE_PROJECT": "Ongeschikt",
+	"CONTINUE": "Ga door",
+	"UNKNOWN_BOARD": "Onbekend",
+	"CLEAR_PROJECT": "Wis project",
+	"CLEAR_PROJECT_DESC": "Door deze robot te selecteren wis je je project, weet je het zeker?"
 }
diff --git a/src/lib/components/core/header/Header.svelte b/src/lib/components/core/header/Header.svelte
index 7211590..9ce53de 100644
--- a/src/lib/components/core/header/Header.svelte
+++ b/src/lib/components/core/header/Header.svelte
@@ -3,12 +3,13 @@ import { _, locale } from "svelte-i18n";
 
 import block from "$assets/block.svg";
 import leaphyLogo from "$assets/leaphy-logo.svg";
+import Connect from "$components/core/popups/popups/Connect.svelte";
 import Button from "$components/ui/Button.svelte";
 import ContextItem from "$components/ui/ContextItem.svelte";
 import Select from "$components/ui/Select.svelte";
 import { loadWorkspaceFromString } from "$domain/blockly/blockly";
 import { FileHandle } from "$domain/handles";
-import { robots } from "$domain/robots";
+import { getSelector, robots } from "$domain/robots";
 import { Screen, Theme, screen, theme } from "$state/app.svelte";
 import {
 	audio,
@@ -77,9 +78,13 @@ async function upload() {
 }
 
 async function connect() {
-	try {
-		await port.connect(Prompt.ALWAYS);
-	} catch {}
+	if (getSelector($robot))
+		popups.open({
+			component: Connect,
+			data: {},
+			allowInteraction: false,
+		});
+	else port.connect(Prompt.ALWAYS);
 }
 
 async function newProject() {
@@ -393,15 +398,6 @@ function runPython() {
 <div class="header">
     <div class="comp">
         <img class="logo" src={leaphyLogo} alt="Leaphy" />
-        {#if $screen === Screen.WORKSPACE && $mode === Mode.ADVANCED}
-            <Select
-                options={Object.values(robots).map((device) => [
-                    device.name,
-                    device,
-                ])}
-                bind:value={$robot}
-            />
-        {/if}
         {#if $screen === Screen.WORKSPACE}
             <Button
                 name={$_("PROJECT")}
diff --git a/src/lib/components/core/popups/popups/Connect.svelte b/src/lib/components/core/popups/popups/Connect.svelte
new file mode 100644
index 0000000..37b726c
--- /dev/null
+++ b/src/lib/components/core/popups/popups/Connect.svelte
@@ -0,0 +1,110 @@
+<script lang="ts">
+import defaultProgram from "$assets/default-program.json?raw";
+import Warning from "$components/core/popups/popups/Warning.svelte";
+import Button from "$components/ui/Button.svelte";
+import ChipSelect from "$components/ui/ChipSelect.svelte";
+import ListSelect from "$components/ui/ListSelect.svelte";
+import { isCompatible } from "$domain/blockly/blockly";
+import { type RobotDevice, type Selector, getSelector } from "$domain/robots";
+import { workspace } from "$state/blockly.svelte";
+import { type PopupState, popups } from "$state/popup.svelte";
+import { Mode, Prompt, handle, mode, robot } from "$state/workspace.svelte";
+import { port } from "$state/workspace.svelte";
+import { faUsb } from "@fortawesome/free-brands-svg-icons";
+import type { WorkspaceSvg } from "blockly";
+import * as Blockly from "blockly";
+import { getContext } from "svelte";
+import { _ } from "svelte-i18n";
+import { type Writable, get } from "svelte/store";
+
+interface Props {
+	connectOverride: boolean;
+}
+
+const { connectOverride }: Props = $props();
+const { board } = port;
+
+const categories = getSelector($robot) as Selector[];
+const categoriesFilter = $derived(
+	categories.map((cat) => [cat.name, cat] as [string, Selector]),
+);
+let category = $state(
+	categories.find((cat) =>
+		cat.robots.find((robot) => $state.is(robot, $robot)),
+	),
+);
+
+const values = $derived(
+	category.robots.map((robot) => [robot.name, robot] as [string, RobotDevice]),
+);
+
+const popupState = getContext<Writable<PopupState>>("state");
+function start() {
+	window._paq.push(["trackEvent", "SelectRobot", $robot.name]);
+	popups.close($popupState.id);
+}
+
+board.subscribe((board) => {
+	if (!connectOverride || !board) return;
+
+	const robotDevice = get(robot);
+	const robotType = getSelector(robotDevice)
+		.find((category) =>
+			category.robots.find((robot) => $state.is(robot, robotDevice)),
+		)
+		.robots.find((robot) => robot.board === board.board);
+
+	if (robotType) robot.set(robotType);
+});
+
+const warning = $derived(
+	$board && $robot && $board.board !== $robot.board
+		? $_("INVALID_ROBOT", {
+				values: { robot: $robot.name, board: $board.name },
+			})
+		: undefined,
+);
+
+function checkEnabled(robot: RobotDevice): boolean {
+	if ($mode !== Mode.BLOCKS) return true;
+
+	return $workspace ? isCompatible($workspace as WorkspaceSvg, robot) : true;
+}
+
+async function disabledSelect() {
+	const value = await popups.open({
+		component: Warning,
+		data: {
+			title: "CLEAR_PROJECT",
+			message: "CLEAR_PROJECT_DESC",
+			showCancel: true,
+		},
+		allowInteraction: false,
+	});
+	if (!value) return false;
+
+	Blockly.serialization.workspaces.load(JSON.parse(defaultProgram), $workspace);
+	handle.set(undefined);
+	return true;
+}
+</script>
+
+<div class="content">
+	<Button onclick="{() => port.connect(Prompt.ALWAYS)}" mode="secondary" icon="{faUsb}" name={$port ? $board?.name || $_("UNKNOWN_BOARD") : $_("NOT_CONNECTED")} bold="{!!$port}" large />
+	{#if categories.length > 1}
+		<ChipSelect options="{categoriesFilter}" bind:value={category} />
+	{/if}
+	<ListSelect {warning} options="{values}" {checkEnabled} disabledText={$_("INCOMPATIBLE_PROJECT")} {disabledSelect} bind:value={$robot} />
+	<Button onclick="{start}" mode="primary" name={$_("CONTINUE")} center bold />
+</div>
+
+<style>
+	.content {
+		padding: 20px;
+		display: flex;
+		flex-direction: column;
+		min-width: 400px;
+		text-align: center;
+		gap: 15px;
+	}
+</style>
diff --git a/src/lib/components/start/RobotSelector.svelte b/src/lib/components/start/RobotSelector.svelte
index 52bf4db..0f8afb4 100644
--- a/src/lib/components/start/RobotSelector.svelte
+++ b/src/lib/components/start/RobotSelector.svelte
@@ -1,31 +1,22 @@
 <script lang="ts">
-import type { Robot, RobotListing } from "$domain/robots";
+import type { Robot } from "$domain/robots";
 
 interface Props {
 	robots: Robot[][];
-	secondary: boolean;
 	onselect: (robot: Robot) => void;
-	selected?: RobotListing;
 	compact?: boolean;
 }
 
-const {
-	robots,
-	secondary,
-	onselect,
-	selected,
-	compact = false,
-}: Props = $props();
+const { robots, onselect, compact = false }: Props = $props();
 </script>
 
-<div class="selector" class:secondary class:compact>
+<div class="selector" class:compact>
 	{#each robots as row}
 		<div class="row">
 			{#each row as robot}
 				<button
 					class="robot"
 					onclick={() => onselect(robot)}
-					class:selected={selected?.id === robot.id}
 				>
                     <span class="icon">
                         <img class="image" src={robot.icon} alt={robot.name}/>
@@ -52,10 +43,6 @@ const {
 		width: unset;
 	}
 
-	.secondary {
-		background: var(--background);
-	}
-
 	.row {
 		display: flex;
 		justify-content: center;
@@ -74,7 +61,6 @@ const {
 		color: var(--on-background);
 	}
 
-	.robot.selected,
 	.robot:hover {
 		scale: 1.03;
 	}
@@ -95,7 +81,6 @@ const {
 		margin-bottom: 1vh;
 	}
 
-	.robot.selected .icon,
 	.robot:hover .icon {
 		border: 3px solid var(--primary) !important;
 	}
diff --git a/src/lib/components/start/Start.svelte b/src/lib/components/start/Start.svelte
index f419a94..ea608d4 100644
--- a/src/lib/components/start/Start.svelte
+++ b/src/lib/components/start/Start.svelte
@@ -1,58 +1,68 @@
 <script lang="ts">
+import Connect from "$components/core/popups/popups/Connect.svelte";
 import RobotSelector from "$components/start/RobotSelector.svelte";
 import {
-	type Robot,
 	type RobotListing,
-	robots as allRobots,
+	getSelector,
 	robotListing,
+	robots,
 } from "$domain/robots";
 import { Screen, screen } from "$state/app.svelte";
 import { restore } from "$state/blockly.svelte";
-import { Mode, code, mode, robot, saveState } from "$state/workspace.svelte";
-import { flip } from "svelte/animate";
-import { cubicOut } from "svelte/easing";
-import { fly } from "svelte/transition";
+import { willRestore } from "$state/blockly.svelte.js";
+import { popups } from "$state/popup.svelte";
+import {
+	Mode,
+	Prompt,
+	code,
+	mode,
+	port,
+	robot,
+	saveState,
+} from "$state/workspace.svelte";
+
+async function connect() {
+	try {
+		await port.connect(Prompt.NEVER);
+	} catch {}
+}
 
-let selected = $state<RobotListing>();
-const selectors = $derived(
-	selected ? [robotListing, selected.variants] : [robotListing],
-);
-const animationOptions = {
-	easing: cubicOut,
-	duration: 300,
-};
+function onselect(type: RobotListing) {
+	robot.set(
+		robots[localStorage.getItem(`${type.saveAddress}_robot`)] ||
+			type.defaultRobot,
+	);
+	mode.set(type.mode || Mode.BLOCKS);
+	screen.set(Screen.WORKSPACE);
 
-function onselect(type: Robot) {
-	window._paq.push(["trackEvent", "SelectRobot", type.name]);
+	if ($mode !== Mode.BLOCKS)
+		code.set(
+			($willRestore && localStorage.getItem(`${type.saveAddress}_content`)) ||
+				type.defaultProgram,
+		);
+	else
+		restore.set(
+			JSON.parse(localStorage.getItem(`${type.saveAddress}_content`)),
+		);
 
-	if ("variants" in type) return (selected = type);
-	if ("mode" in type) {
-		code.set(localStorage.getItem(`session_${type.id}`) || type.defaultProgram);
-		robot.set(allRobots[type.defaultRobot]);
-		mode.set(type.mode);
-		screen.set(Screen.WORKSPACE);
-		saveState.set(true);
-		return;
-	}
+	saveState.set(true);
 
-	if (localStorage.getItem(`session_blocks_${type.id}`)) {
-		restore.set(JSON.parse(localStorage.getItem(`session_blocks_${type.id}`)));
+	if (type.mode === Mode.PYTHON) return;
+	if (getSelector(type.defaultRobot)) {
+		popups.open({
+			component: Connect,
+			data: {
+				connectOverride: !localStorage.getItem(`${type.saveAddress}_robot`),
+			},
+			allowInteraction: false,
+		});
 	}
-	robot.set(type);
-	mode.set(Mode.BLOCKS);
-	screen.set(Screen.WORKSPACE);
+	connect();
 }
 </script>
 
 <div class="start">
-    {#each selectors as robots, i (i)}
-        <div
-            in:fly={{ x: "100%", ...animationOptions }}
-            animate:flip={animationOptions}
-        >
-            <RobotSelector {onselect} {robots} {selected} secondary={i > 0} />
-        </div>
-    {/each}
+	<RobotSelector {onselect} robots="{robotListing}" />
 </div>
 
 <style>
diff --git a/src/lib/components/ui/Button.svelte b/src/lib/components/ui/Button.svelte
index f2c2f00..f541060 100644
--- a/src/lib/components/ui/Button.svelte
+++ b/src/lib/components/ui/Button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { IconDefinition } from "@fortawesome/free-solid-svg-icons";
+import type { IconDefinition } from "@fortawesome/fontawesome-common-types";
 import { type Snippet, onDestroy, onMount, setContext } from "svelte";
 import Fa from "svelte-fa";
 import { type Writable, writable } from "svelte/store";
@@ -15,6 +15,8 @@ interface Props {
 	bold?: boolean;
 	type?: "button" | "submit";
 	inline?: boolean;
+	center?: boolean;
+	large?: boolean;
 }
 
 const {
@@ -27,6 +29,8 @@ const {
 	disabled,
 	inline = false,
 	type = "button",
+	center = false,
+	large = false,
 }: Props = $props();
 
 let btn: HTMLButtonElement = $state();
@@ -56,6 +60,8 @@ function onContext() {
 	class:accent={mode === "accent"}
 	class:bold
 	class:inline
+	class:center
+	class:large
 >
 	{#if icon}
 		{#if typeof icon === "string"}
@@ -79,6 +85,10 @@ function onContext() {
 		padding: 10px 15px;
 	}
 
+	.center {
+		justify-content: center;
+	}
+
 	.inline {
 		padding: 5px 10px;
 	}
@@ -112,6 +122,10 @@ function onContext() {
 		font-size: 1.1em;
 	}
 
+	.large {
+		font-size: 1.1em;
+	}
+
 	.btn[disabled] {
 		filter: opacity(.5);
 		cursor: unset;
diff --git a/src/lib/components/ui/ChipSelect.svelte b/src/lib/components/ui/ChipSelect.svelte
new file mode 100644
index 0000000..05b1490
--- /dev/null
+++ b/src/lib/components/ui/ChipSelect.svelte
@@ -0,0 +1,92 @@
+<script lang="ts">
+interface Props {
+	options: [string, unknown][];
+	value: unknown;
+}
+let { options, value = $bindable() }: Props = $props();
+
+function onselect(newValue: unknown) {
+	value = newValue;
+}
+
+function getWidth() {
+	return 100 / options.length;
+}
+
+function getPosition() {
+	return options.findIndex(([_, v]) => $state.is(v, value));
+}
+</script>
+
+<div class="wrapper">
+	<div class="content">
+		<div class="chips">
+			{#each options as option}
+				<button onclick={() => onselect(option[1])} class="chip">{option[0]}</button>
+			{/each}
+		</div>
+		<div class="selected" style:--position="{getPosition()}" style:--width="{getWidth()}%"></div>
+	</div>
+</div>
+
+<style>
+	.wrapper {
+		display: flex;
+		background: var(--secondary);
+		border-radius: 20px;
+		padding: 3px;
+	}
+
+	.content {
+		flex: 1;
+		position: relative;
+		overflow: hidden;
+		border-radius: 20px;
+	}
+
+	.chips {
+		display: flex;
+		gap: 6px;
+	}
+
+	.chip {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		cursor: pointer;
+		padding: 10px 15px;
+		background: none;
+		z-index: 9;
+		border: none;
+		position: relative;
+	}
+	.chip:after {
+		content: "";
+		position: absolute;
+		left: 100%;
+		top: 0;
+		height: 100%;
+		width: 2px;
+		background: var(--background-tint);
+		margin: 0 2px;
+	}
+	.chip:last-child:after {
+		content: unset;
+	}
+
+	.selected {
+		position: absolute;
+		left: calc(var(--position) * var(--width) + var(--position) * 3px);
+		top: 0;
+		width: calc(var(--width) - 3px);
+		height: 100%;
+	}
+	.selected::before {
+		display: block;
+		content: "";
+		width: 100%;
+		height: 100%;
+		background: var(--background);
+	}
+</style>
diff --git a/src/lib/components/ui/ListSelect.svelte b/src/lib/components/ui/ListSelect.svelte
new file mode 100644
index 0000000..7941f31
--- /dev/null
+++ b/src/lib/components/ui/ListSelect.svelte
@@ -0,0 +1,88 @@
+<script lang="ts">
+interface Props {
+	options: [string, unknown][];
+	value: unknown;
+	warning?: undefined | string;
+	checkEnabled?: (value: unknown) => boolean;
+	disabledText?: string;
+	disabledSelect?: (value: unknown) => Promise<boolean>;
+}
+let {
+	options,
+	value = $bindable(),
+	warning,
+	checkEnabled,
+	disabledText,
+	disabledSelect,
+}: Props = $props();
+
+let reloadEnabled = $state(0);
+
+async function onselect(option: unknown, enabled: boolean) {
+	if (!enabled) {
+		if (!disabledSelect) return;
+
+		const allow = await disabledSelect(option);
+		if (!allow) return;
+
+		reloadEnabled++;
+	}
+
+	value = option;
+}
+</script>
+
+<div class="list">
+	{#if warning}
+		<div class="warning item">{warning}</div>
+	{/if}
+	{#key reloadEnabled}
+		{#each options as option}
+			{@const enabled = checkEnabled ? checkEnabled(option[1]) : true}
+			<button onclick={() => onselect(option[1], enabled)} class="item" class:selected={$state.is(value, option[1])}>
+				{option[0]}
+				{#if !enabled}
+					<span class="disabled">{disabledText}</span>
+				{/if}
+			</button>
+		{/each}
+	{/key}
+</div>
+
+<style>
+	.list {
+		display: flex;
+		flex-direction: column;
+		background: var(--secondary);
+		border-radius: 21px;
+		overflow: hidden;
+	}
+
+	.item {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		font-size: 1em;
+		border: none;
+		border-bottom: 2px solid #00000025;
+		padding: 10px 15px;
+		background: none;
+		color: var(--on-secondary);
+	}
+
+	.warning {
+		background: var(--warning);
+	}
+
+	.selected {
+		font-weight: bold;
+	}
+
+	.item:last-child {
+		border-bottom: none;
+	}
+
+	.disabled {
+		color: #DD6929;
+	}
+</style>
diff --git a/src/lib/components/workspace/blocks/Blocks.svelte b/src/lib/components/workspace/blocks/Blocks.svelte
index c85353d..db62a6b 100644
--- a/src/lib/components/workspace/blocks/Blocks.svelte
+++ b/src/lib/components/workspace/blocks/Blocks.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
 import Dropper from "$components/ui/Dropper.svelte";
-import { setLocale, setupWorkspace } from "$domain/blockly/blockly";
+import {
+	loadToolbox,
+	setLocale,
+	setupWorkspace,
+} from "$domain/blockly/blockly";
 import { dark, light } from "$domain/blockly/theme";
 import { Theme, theme } from "$state/app.svelte";
 import {
@@ -53,6 +57,12 @@ onMount(() => {
 			($workspace as WorkspaceSvg).resize();
 		}
 	});
+
+	robot.subscribe(() => {
+		($workspace as WorkspaceSvg).updateToolbox(loadToolbox($robot));
+		($workspace as WorkspaceSvg).getToolbox().selectItemByPosition(0);
+		($workspace as WorkspaceSvg).getToolbox().refreshTheme();
+	});
 });
 
 locale.subscribe((locale) => {
diff --git a/src/lib/domain/blockly/blockly.ts b/src/lib/domain/blockly/blockly.ts
index b56ac67..6fac924 100644
--- a/src/lib/domain/blockly/blockly.ts
+++ b/src/lib/domain/blockly/blockly.ts
@@ -1,5 +1,6 @@
 import * as Blockly from "blockly";
 import "@blockly/field-bitmap";
+import defaultProgram from "$assets/default-program.json?raw";
 import Explanation from "$components/core/popups/popups/Explanation.svelte";
 import Prompt from "$components/core/popups/popups/Prompt.svelte";
 import { type RobotDevice, inFilter } from "$domain/robots";
@@ -14,7 +15,12 @@ import {
 	registerExtensions,
 	translations,
 } from "@leaphy-robotics/leaphy-blocks";
-import { type Block, ContextMenuRegistry, serialization } from "blockly";
+import {
+	type Block,
+	ContextMenuRegistry,
+	type WorkspaceSvg,
+	serialization,
+} from "blockly";
 import type { Workspace } from "blockly";
 import type {
 	CategoryInfo,
@@ -77,7 +83,7 @@ Blockly.WorkspaceAudio.prototype.play = function (name, opt_volume) {
 	});
 };
 
-function loadToolbox(robot: RobotDevice): ToolboxDefinition {
+export function loadToolbox(robot: RobotDevice): ToolboxDefinition {
 	return {
 		kind: "categoryToolbox",
 		contents: toolbox
@@ -108,6 +114,39 @@ function loadToolbox(robot: RobotDevice): ToolboxDefinition {
 	};
 }
 
+export function isCompatible(workspace: WorkspaceSvg, robot: RobotDevice) {
+	let incompatible = new Set<string>();
+	let compatible = new Set<string>();
+	for (const category of toolbox) {
+		if (category.robots && !inFilter(robot, category.robots)) {
+			if (category.id === "l_lists") {
+				for (const block of blocks) {
+					if (block.style === "list_blocks") incompatible.add(block.type);
+				}
+			} else {
+				for (const block of category.groups.flat()) {
+					incompatible.add(block.type);
+				}
+			}
+		} else if (!category.custom) {
+			for (const block of category.groups.flat()) {
+				if ("robots" in block && !inFilter(robot, block.robots))
+					incompatible.add(block.type);
+				else compatible.add(block.type);
+			}
+		}
+	}
+
+	for (const block of compatible) {
+		incompatible.delete(block);
+	}
+	return !Array.from(incompatible.values()).find((block) => {
+		if (block === "text") return false;
+
+		return !!workspace.getBlocksByType(block).length;
+	});
+}
+
 export function setLocale(robot: RobotDevice, locale: string) {
 	const translation = translations[locale];
 	Blockly.setLocale(translation);
@@ -151,20 +190,7 @@ export function setupWorkspace(
 	});
 
 	Blockly.serialization.workspaces.load(
-		content || {
-			blocks: {
-				languageVersion: 0,
-				blocks: [
-					{
-						type: "leaphy_start",
-						id: "rzE0Ve:6bHB~8aIqyj-U",
-						deletable: false,
-						x: 500,
-						y: 10,
-					},
-				],
-			},
-		},
+		content || JSON.parse(defaultProgram),
 		workspace,
 	);
 
diff --git a/src/lib/domain/robots.ts b/src/lib/domain/robots.ts
index 0e349a5..4310927 100644
--- a/src/lib/domain/robots.ts
+++ b/src/lib/domain/robots.ts
@@ -14,8 +14,10 @@ import microPythonIcon from "$assets/robots/icons/l_micropython.svg";
 import nanoIcon from "$assets/robots/icons/l_nano.svg";
 import originalIcon from "$assets/robots/icons/l_original.svg";
 import unoIcon from "$assets/robots/icons/l_uno.svg";
-import { Mode } from "$state/workspace.svelte";
+import robotsGroups from "$domain/robots.groups";
+import { Mode, mode } from "$state/workspace.svelte";
 import type { ComponentType } from "svelte";
+import { get } from "svelte/store";
 import AvrDude from "../programmers/AvrDude";
 import DFU from "../programmers/DFU";
 import Pico from "../programmers/Pico";
@@ -38,28 +40,27 @@ const DEFAULT_LIBRARIES = [
 ];
 
 interface BaseRobot {
-	id: string;
 	name: string;
 	icon: string;
+	saveAddress: string;
 }
 
 export interface RobotDevice extends BaseRobot {
+	id: string;
 	type: number;
 	mapping: PinMapping;
 	programmer: Programmer;
 	libraries: string[];
 	fqbn: string;
 	background?: string;
+	board: string;
 }
 export interface RobotListing extends BaseRobot {
-	variants: RobotDevice[][];
-}
-export interface RobotMode extends BaseRobot {
-	mode: ComponentType;
-	defaultRobot: string;
-	defaultProgram: string;
+	defaultRobot: RobotDevice;
+	defaultProgram?: string;
+	mode?: (typeof Mode)[keyof typeof Mode];
 }
-export type Robot = RobotDevice | RobotListing | RobotMode;
+export type Robot = RobotDevice | RobotListing;
 
 export enum PinMapping {
 	UNO = 0,
@@ -71,234 +72,342 @@ const baseUno = {
 	mapping: PinMapping.UNO,
 	fqbn: "arduino:avr:uno",
 	programmer: new AvrDude("atmega328p"),
+	board: "l_uno",
 };
 
 const baseNano = {
 	mapping: PinMapping.NANO,
 	fqbn: "arduino:avr:nano",
 	programmer: new AvrDude("atmega328p"),
+	board: "l_nano",
 };
 
 const baseNanoESP32 = {
 	mapping: PinMapping.NANO,
 	fqbn: "arduino:esp32:nano_nora",
 	programmer: new DFU(),
+	board: "l_nano_esp32",
 };
 
 const baseNanoRP2040 = {
 	mapping: PinMapping.NANO,
 	fqbn: "arduino:mbed_nano:nanorp2040connect",
 	programmer: new Pico(),
+	board: "l_nano_rp2040",
 };
 
-export const robotListing: Robot[][] = [
+const robotDevices: RobotDevice[] = [
+	{
+		...baseUno,
+		id: "l_flitz_uno",
+		saveAddress: "l_flitz",
+		type: RobotType.L_FLITZ_UNO,
+		name: "Flitz Uno",
+		libraries: DEFAULT_LIBRARIES,
+		icon: flitzIcon,
+		background: flitzUnoBackground,
+	},
+	{
+		...baseNano,
+		id: "l_flitz_nano",
+		saveAddress: "l_flitz",
+		type: RobotType.L_FLITZ_NANO,
+		name: "Flitz Nano",
+		libraries: DEFAULT_LIBRARIES,
+		icon: flitzIcon,
+		background: flitzNanoBackground,
+	},
+	{
+		...baseUno,
+		id: "l_original_uno",
+		saveAddress: "l_original",
+		type: RobotType.L_ORIGINAL_UNO,
+		name: "Original Uno",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: originalIcon,
+		background: originalUnoBackground,
+	},
+	{
+		...baseNano,
+		id: "l_original_nano",
+		saveAddress: "l_original",
+		type: RobotType.L_ORIGINAL_NANO,
+		name: "Original Nano",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: originalIcon,
+		background: originalNanoBackground,
+	},
+	{
+		...baseNanoESP32,
+		id: "l_original_nano_esp32",
+		saveAddress: "l_original",
+		type: RobotType.L_ORIGINAL_NANO_ESP32,
+		name: "Original Nano ESP32",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+			"Painless Mesh",
+			"AsyncTCP",
+		]),
+		icon: originalIcon,
+		background: originalNanoESP32Background,
+	},
+	{
+		...baseNanoRP2040,
+		id: "l_original_nano_rp2040",
+		saveAddress: "l_original",
+		type: RobotType.L_ORIGINAL_NANO_RP2040,
+		name: "Original Nano RP2040",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: originalIcon,
+		background: originalNanoRP2040Background,
+	},
+	{
+		...baseUno,
+		id: "l_click",
+		saveAddress: "l_click",
+		type: RobotType.L_CLICK,
+		name: "Leaphy Click",
+		libraries: DEFAULT_LIBRARIES,
+		icon: clickIcon,
+	},
+	{
+		...baseNano,
+		id: "l_nano",
+		saveAddress: "l_nano",
+		type: RobotType.L_NANO,
+		name: "Arduino Nano",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: nanoIcon,
+	},
+	{
+		...baseNanoESP32,
+		id: "l_nano_esp32",
+		saveAddress: "l_nano",
+		type: RobotType.L_NANO_ESP32,
+		name: "Arduino Nano ESP32",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+			"Painless Mesh",
+			"AsyncTCP",
+		]),
+		icon: nanoIcon,
+	},
+	{
+		...baseNanoRP2040,
+		id: "l_nano_rp2040",
+		saveAddress: "l_nano",
+		type: RobotType.L_NANO_RP2040,
+		name: "Arduino Nano RP2040",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: nanoIcon,
+	},
+	{
+		...baseUno,
+		id: "l_uno",
+		saveAddress: "l_uno",
+		type: RobotType.L_UNO,
+		name: "Arduino Uno",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: unoIcon,
+	},
+	{
+		id: "l_mega",
+		type: RobotType.L_MEGA,
+		saveAddress: "l_mega",
+		mapping: PinMapping.MEGA,
+		name: "Arduino Mega",
+		programmer: new AvrDude("atmega2560"),
+		fqbn: "arduino:avr:mega",
+		libraries: DEFAULT_LIBRARIES.concat([
+			"QMC5883LCompass",
+			"Arduino_APDS9960",
+		]),
+		icon: megaIcon,
+		board: "l_mega",
+	},
+];
+
+export type Robots = {
+	[K in (typeof robotDevices)[number]["id"]]: RobotDevice;
+};
+export const robots: Robots = robotDevices.reduce((robots, robot) => {
+	robots[robot.id] = robot;
+	return robots;
+}, {} as Robots);
+
+export const robotListing: RobotListing[][] = [
 	[
 		{
+			saveAddress: "l_flitz",
 			name: "Leaphy Flitz",
-			id: "flitz_group",
 			icon: flitzIcon,
-			variants: [
-				[
-					{
-						...baseUno,
-						id: "l_flitz_uno",
-						type: RobotType.L_FLITZ_UNO,
-						name: "Flitz Uno",
-						libraries: DEFAULT_LIBRARIES,
-						icon: flitzIcon,
-						background: flitzUnoBackground,
-					},
-					{
-						...baseNano,
-						id: "l_flitz_nano",
-						type: RobotType.L_FLITZ_NANO,
-						name: "Flitz Nano",
-						libraries: DEFAULT_LIBRARIES,
-						icon: flitzIcon,
-						background: flitzNanoBackground,
-					},
-				],
-			],
+			defaultRobot: robots.l_flitz_uno,
 		},
 		{
+			saveAddress: "l_original",
 			name: "Leaphy Original",
-			id: "original_group",
 			icon: originalIcon,
-			variants: [
-				[
-					{
-						...baseUno,
-						id: "l_original_uno",
-						type: RobotType.L_ORIGINAL_UNO,
-						name: "Original Uno",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-						]),
-						icon: originalIcon,
-						background: originalUnoBackground,
-					},
-					{
-						...baseNano,
-						id: "l_original_nano",
-						type: RobotType.L_ORIGINAL_NANO,
-						name: "Original Nano",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-						]),
-						icon: originalIcon,
-						background: originalNanoBackground,
-					},
-				],
-				[
-					{
-						...baseNanoESP32,
-						id: "l_original_nano_esp32",
-						type: RobotType.L_ORIGINAL_NANO_ESP32,
-						name: "Original Nano ESP32",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-							"Painless Mesh",
-							"AsyncTCP",
-						]),
-						icon: originalIcon,
-						background: originalNanoESP32Background,
-					},
-					{
-						...baseNanoRP2040,
-						id: "l_original_nano_rp2040",
-						type: RobotType.L_ORIGINAL_NANO_RP2040,
-						name: "Original Nano RP2040",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-						]),
-						icon: originalIcon,
-						background: originalNanoRP2040Background,
-					},
-				],
-			],
+			defaultRobot: robots.l_original_uno,
 		},
 		{
-			...baseUno,
-			id: "l_click",
-			type: RobotType.L_CLICK,
+			saveAddress: "l_click",
 			name: "Leaphy Click",
-			libraries: DEFAULT_LIBRARIES,
 			icon: clickIcon,
+			defaultRobot: robots.l_click,
 		},
 	],
 	[
 		{
+			saveAddress: "l_nano",
 			name: "Arduino Nano",
-			id: "nano_group",
 			icon: nanoIcon,
-			variants: [
-				[
-					{
-						...baseNano,
-						id: "l_nano",
-						type: RobotType.L_NANO,
-						name: "Arduino Nano",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-						]),
-						icon: nanoIcon,
-					},
-				],
-				[
-					{
-						...baseNanoESP32,
-						id: "l_nano_esp32",
-						type: RobotType.L_NANO_ESP32,
-						name: "Arduino Nano ESP32",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-							"Painless Mesh",
-							"AsyncTCP",
-						]),
-						icon: nanoIcon,
-					},
-					{
-						...baseNanoRP2040,
-						id: "l_nano_rp2040",
-						type: RobotType.L_NANO_RP2040,
-						name: "Arduino Nano RP2040",
-						libraries: DEFAULT_LIBRARIES.concat([
-							"QMC5883LCompass",
-							"Arduino_APDS9960",
-						]),
-						icon: nanoIcon,
-					},
-				],
-			],
+			defaultRobot: robots.l_nano,
 		},
 		{
-			...baseUno,
-			id: "l_uno",
-			type: RobotType.L_UNO,
+			saveAddress: "l_uno",
 			name: "Arduino Uno",
-			libraries: DEFAULT_LIBRARIES.concat([
-				"QMC5883LCompass",
-				"Arduino_APDS9960",
-			]),
 			icon: unoIcon,
+			defaultRobot: robots.l_uno,
 		},
 		{
-			id: "l_mega",
-			type: RobotType.L_MEGA,
-			mapping: PinMapping.MEGA,
+			saveAddress: "l_mega",
 			name: "Arduino Mega",
-			programmer: new AvrDude("atmega2560"),
-			fqbn: "arduino:avr:mega",
-			libraries: DEFAULT_LIBRARIES.concat([
-				"QMC5883LCompass",
-				"Arduino_APDS9960",
-			]),
 			icon: megaIcon,
+			defaultRobot: robots.l_mega,
 		},
 	],
 	[
 		{
-			id: "l_cpp",
+			saveAddress: "l_c++",
 			name: "Leaphy C++",
 			icon: cppIcon,
-			mode: Mode.ADVANCED,
-			defaultRobot: "l_uno",
 			defaultProgram: defaultCPP,
+			mode: Mode.ADVANCED,
+			defaultRobot: robots.l_uno,
 		},
 		{
-			id: "l_python",
+			saveAddress: "l_micropython",
 			name: "MicroPython",
 			icon: microPythonIcon,
 			mode: Mode.PYTHON,
-			defaultRobot: "l_nano_rp2040",
 			defaultProgram: defaultPython,
+			defaultRobot: robots.l_nano_rp2040,
 		},
 	],
 ];
 
-export type Robots = {
-	[identifier: string]: RobotDevice;
-};
-export const robots = robotListing
-	.flat()
-	.flatMap((robot) => {
-		if ("type" in robot) return robot;
-		if ("mode" in robot) return [];
-		return robot.variants.flat();
-	})
-	.reduce((robots, robot) => {
-		robots[robot.id] = robot;
-		return robots;
-	}, {} as Robots);
-
 export function inFilter(robot: RobotDevice, filter: number[]) {
 	if (filter.includes(-robot.type)) return false;
 
 	return filter.includes(robot.type);
 }
+
+export interface Selector {
+	name: string;
+	robots: RobotDevice[];
+}
+
+export function getSelector(robot: RobotDevice): Selector[] {
+	const NANO_SELECTOR: Selector[] = [
+		{
+			name: "Leaphy Original",
+			robots: [
+				robots.l_original_nano,
+				robots.l_original_nano_esp32,
+				robots.l_original_nano_rp2040,
+			],
+		},
+		{
+			name: "Arduino",
+			robots: [robots.l_nano, robots.l_nano_esp32, robots.l_nano_rp2040],
+		},
+	];
+
+	if (get(mode) === Mode.ADVANCED) {
+		return [
+			{
+				name: "Leaphy",
+				robots: [
+					robots.l_flitz_uno,
+					robots.l_flitz_nano,
+					robots.l_original_uno,
+					robots.l_original_nano,
+					robots.l_original_nano_esp32,
+					robots.l_original_nano_rp2040,
+					robots.l_click,
+				],
+			},
+			{
+				name: "Arduino",
+				robots: [
+					robots.l_uno,
+					robots.l_nano,
+					robots.l_nano_esp32,
+					robots.l_nano_rp2040,
+					robots.l_mega,
+				],
+			},
+		];
+	}
+
+	if (get(mode) === Mode.PYTHON) {
+		return [
+			{
+				name: "Arduino",
+				robots: [robots.l_nano_rp2040, robots.l_nano_esp32],
+			},
+		];
+	}
+
+	if (inFilter(robot, robotsGroups.L_ARDUINO_NANO_ALL)) {
+		return NANO_SELECTOR;
+	}
+
+	if (inFilter(robot, robotsGroups.L_ORIGINAL_ALL)) {
+		const originalSelector = [...NANO_SELECTOR].map((e) => ({ ...e }));
+		originalSelector[0].robots.unshift(robots.l_original_uno);
+		originalSelector[1].robots.unshift(robots.l_uno);
+
+		return originalSelector;
+	}
+
+	if (inFilter(robot, [RobotType.L_UNO])) {
+		return [
+			{
+				name: "Uno",
+				robots: [robots.l_uno, robots.l_original_uno],
+			},
+		];
+	}
+
+	if (inFilter(robot, robotsGroups.L_FLITZ_ALL)) {
+		return [
+			{
+				name: "Leaphy Flitz",
+				robots: [robots.l_flitz_uno, robots.l_flitz_nano],
+			},
+		];
+	}
+
+	return null;
+}
diff --git a/src/lib/state/workspace.svelte.ts b/src/lib/state/workspace.svelte.ts
index 4e61844..c7d9d8a 100644
--- a/src/lib/state/workspace.svelte.ts
+++ b/src/lib/state/workspace.svelte.ts
@@ -2,7 +2,7 @@ import Advanced from "$components/workspace/advanced/Advanced.svelte";
 import Blocks from "$components/workspace/blocks/Blocks.svelte";
 import Python from "$components/workspace/python/Python.svelte";
 import type { Handle } from "$domain/handles";
-import type { RobotDevice } from "$domain/robots";
+import { type RobotDevice, robots } from "$domain/robots";
 import MockedFTDISerialPort from "@leaphy-robotics/webusb-ftdi";
 import { serialization } from "blockly";
 import type { ComponentType } from "svelte";
@@ -110,6 +110,7 @@ export const log = createLogState();
 
 function createPortState() {
 	const { subscribe, set, update } = writable<LeaphyPort>();
+	const board = writable<RobotDevice | null | undefined>();
 
 	let reserved = false;
 	let reader: ReadableStreamDefaultReader<Uint8Array>;
@@ -140,13 +141,59 @@ function createPortState() {
 		}
 	});
 
+	function detectBoard(port: SerialPort | USBDevice) {
+		const vendor =
+			"vendorId" in port ? port.vendorId : port.getInfo().usbVendorId;
+		const product =
+			"productId" in port ? port.productId : port.getInfo().usbProductId;
+
+		switch (vendor) {
+			// Official arduino vendor ID
+			case 0x2341: {
+				switch (product) {
+					case 0x0043: {
+						return robots.l_uno;
+					}
+					case 0x0070: {
+						return robots.l_nano_esp32;
+					}
+					case 0x0042: {
+						return robots.l_mega;
+					}
+					case 0x005e: {
+						return robots.l_nano_rp2040;
+					}
+				}
+				break;
+			}
+			// Darling vendor ID
+			case 0x0403: {
+				switch (product) {
+					case 0x6001: {
+						return robots.l_nano;
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+
+	function getLeaphyPort(port: SerialPort | USBDevice): LeaphyPort {
+		if ("readable" in port) return port;
+
+		if (port?.vendorId === 1027) return new MockedFTDISerialPort(port);
+
+		return new MockedCDCSerialPort(port);
+	}
+
 	return {
 		subscribe,
 		ready: new Promise<void>((resolve, reject) => {
 			onReady = resolve;
 			onFailure = reject;
 		}),
-		async requestPort(prompt: Prompt): Promise<LeaphyPort> {
+		async requestPort(prompt: Prompt): Promise<SerialPort | USBDevice> {
 			if (navigator.serial) {
 				if (prompt !== Prompt.ALWAYS) {
 					const [port] = await navigator.serial.getPorts();
@@ -163,10 +210,7 @@ function createPortState() {
 			if (navigator.usb) {
 				if (prompt !== Prompt.ALWAYS) {
 					const [device] = await navigator.usb.getDevices();
-
-					if (device?.vendorId === 1027)
-						return new MockedFTDISerialPort(device);
-					if (device) return new MockedCDCSerialPort(device);
+					if (device) return device;
 				}
 				if (prompt === Prompt.NEVER) throw new ConnectionFailedError();
 
@@ -175,8 +219,7 @@ function createPortState() {
 						vendorId: vendor,
 					})),
 				});
-				if (device?.vendorId === 1027) return new MockedFTDISerialPort(device);
-				if (device) return new MockedCDCSerialPort(device);
+				if (device) return device;
 
 				throw new ConnectionFailedError();
 			}
@@ -191,10 +234,13 @@ function createPortState() {
 				port.addEventListener("disconnect", async () => {
 					reserved = false;
 					set(undefined);
+					board.set(undefined);
 					onFailure();
 				});
 			}
-			set(port);
+			set(getLeaphyPort(port));
+			board.set(detectBoard(port));
+
 			return port;
 		},
 		reconnect() {
@@ -233,6 +279,7 @@ function createPortState() {
 			reserved = false;
 			update((port) => port);
 		},
+		board,
 	};
 }
 export const port = createPortState();
@@ -262,21 +309,36 @@ export const installed = writable<[string, string][]>([]);
 export const microPythonIO = writable<MicroPythonIO | undefined>();
 export const microPythonRun = writable<IOEventTarget | undefined>();
 
-export async function tempSave() {
+export function tempSave() {
+	let saveAddress = get(robot).saveAddress;
+	switch (get(mode)) {
+		case Mode.ADVANCED: {
+			saveAddress = "l_c++";
+			break;
+		}
+		case Mode.PYTHON: {
+			saveAddress = "l_micropython";
+			break;
+		}
+	}
+
+	const contentAddress = `${saveAddress}_content`;
+	localStorage.setItem(`${saveAddress}_robot`, get(robot).id);
+
 	switch (get(mode)) {
 		case Mode.BLOCKS: {
 			localStorage.setItem(
-				`session_blocks_${get(robot).id}`,
+				contentAddress,
 				JSON.stringify(serialization.workspaces.save(get(workspace))),
 			);
 			break;
 		}
 		case Mode.ADVANCED: {
-			localStorage.setItem("session_l_cpp", get(code));
+			localStorage.setItem(contentAddress, get(code));
 			break;
 		}
 		case Mode.PYTHON: {
-			localStorage.setItem("session_l_python", get(code));
+			localStorage.setItem(contentAddress, get(code));
 			break;
 		}
 	}
diff --git a/tests/arduino.spec.ts b/tests/arduino.spec.ts
index 045d99d..ee594ae 100644
--- a/tests/arduino.spec.ts
+++ b/tests/arduino.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test } from "@playwright/test";
-import { goToHomePage, openExample, setupArduino } from "./utils";
+import { goToHomePage, openExample, selectRobot, setupArduino } from "./utils";
 
 test.describe.configure({ mode: "serial" });
 
@@ -7,9 +7,7 @@ test.beforeEach(setupArduino);
 test.beforeEach(goToHomePage);
 
 test("Arduino - Blockly upload", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	await page.getByRole("button", { name: "Upload to robot" }).click();
@@ -26,8 +24,7 @@ test("Arduino - Blockly upload", async ({ page }) => {
 });
 
 test("Arduino - C++ upload", async ({ page }) => {
-	await page.getByText("Leaphy C++").click();
-
+	await selectRobot(page, "Leaphy C++", "Arduino Uno");
 	await page.getByRole("button", { name: "Upload to robot" }).click();
 	await expect(
 		page.getByRole("button", { name: "Go back to editor" }),
diff --git a/tests/blink_example.spec.ts b/tests/blink_example.spec.ts
index 01cfdc0..83a33b7 100644
--- a/tests/blink_example.spec.ts
+++ b/tests/blink_example.spec.ts
@@ -1,13 +1,11 @@
 import * as consumers from "node:stream/consumers";
 import { expect, test } from "@playwright/test";
-import { goToHomePage, openExample } from "./utils";
+import { goToHomePage, openExample, selectRobot } from "./utils";
 
 test.beforeEach(goToHomePage);
 
 test("Load Blink example and check code", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	await page.locator(".side").first().click(); // Open code
diff --git a/tests/browser_storage.spec.ts b/tests/browser_storage.spec.ts
index c464dd2..3204027 100644
--- a/tests/browser_storage.spec.ts
+++ b/tests/browser_storage.spec.ts
@@ -1,12 +1,10 @@
 import { expect, test } from "@playwright/test";
-import { goToHomePage, openExample } from "./utils";
+import { goToHomePage, openExample, selectRobot } from "./utils";
 
 test.beforeEach(goToHomePage);
 
 test("Saving - Backpack", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	// Put something in the backpack
@@ -46,21 +44,17 @@ test("Saving - Backpack", async ({ page }) => {
 });
 
 test("Saving - Blockly", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	await page.reload();
 
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await expect(page.getByText("repeat forever")).toBeVisible();
 });
 
 test("Saving - C++", async ({ page }) => {
-	await page.getByRole("button", { name: "Leaphy C++ Leaphy C++" }).click();
+	await selectRobot(page, "Leaphy C++", "Arduino Uno");
 	await page.getByText("setup").click();
 	await page.getByLabel("Editor content;Press Alt+F1").fill("testing");
 
@@ -69,16 +63,13 @@ test("Saving - C++", async ({ page }) => {
 
 	await page.reload();
 
-	await page.getByRole("button", { name: "Leaphy C++ Leaphy C++" }).click();
-
+	await selectRobot(page, "Leaphy C++", "Arduino Uno");
 	await expect(page.getByText("setup")).toBeHidden();
 	await expect(page.getByText("testing")).toBeVisible();
 });
 
 test("Saving - New project", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	// Start a new project, should reset to the default
diff --git a/tests/code_tests.spec.ts b/tests/code_tests.spec.ts
index f8d7f04..3436b25 100644
--- a/tests/code_tests.spec.ts
+++ b/tests/code_tests.spec.ts
@@ -1,6 +1,11 @@
 import { promises as fs } from "node:fs";
 import { type Page, expect, test } from "@playwright/test";
-import { goToHomePage, mockShowOpenFilePicker, openExample } from "./utils";
+import {
+	goToHomePage,
+	mockShowOpenFilePicker,
+	openExample,
+	selectRobot,
+} from "./utils";
 
 test.beforeEach(goToHomePage);
 
@@ -40,15 +45,11 @@ test("Code blocks - Leaphy Click", async ({ page }) => {
 });
 
 test("Code blocks - Original Uno", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await testExtension(page, ".l_original_uno");
 });
 
 test("Code blocks - Flitz Uno", async ({ page }) => {
-	await page.getByText("Leaphy Flitz").click();
-	await page.getByText("Flitz Uno").click();
-
+	await selectRobot(page, "Leaphy Flitz", "Flitz Uno");
 	await testExtension(page, ".l_flitz_uno");
 });
diff --git a/tests/language.spec.ts b/tests/language.spec.ts
index 4b0ce56..ad21b01 100644
--- a/tests/language.spec.ts
+++ b/tests/language.spec.ts
@@ -1,5 +1,5 @@
 import { type Page, expect, test } from "@playwright/test";
-import { goToHomePage, openExample } from "./utils";
+import { goToHomePage, openExample, selectRobot } from "./utils";
 
 test.beforeEach(goToHomePage);
 
@@ -10,10 +10,7 @@ test("Language", async ({ page }) => {
 	await page.getByRole("cell", { name: "Nederlands" }).click();
 	await page.getByRole("button", { name: "Mijn projecten" }).click();
 	await page.getByRole("cell", { name: "Nieuw" }).click();
-	await page.getByRole("button", { name: "Leaphy Original Leaphy" }).click();
-	await page
-		.getByRole("button", { name: "Original Nano ESP32 Original" })
-		.click();
+	await selectRobot(page, "Leaphy Original", "Original Nano ESP32", "Ga door");
 	await expect(page.getByText("Lees afstand")).toBeVisible();
 	await expect(page.getByText("Lees anapin")).toBeVisible();
 	await expect(page.getByText("Lees gas")).toBeVisible();
diff --git a/tests/load_workspace.spec.ts b/tests/load_workspace.spec.ts
index 3d18793..407124b 100644
--- a/tests/load_workspace.spec.ts
+++ b/tests/load_workspace.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test } from "@playwright/test";
-import { goToHomePage, mockShowOpenFilePicker } from "./utils";
+import { goToHomePage, mockShowOpenFilePicker, selectRobot } from "./utils";
 
 test.beforeEach(goToHomePage);
 
@@ -10,9 +10,7 @@ let test_files = [
 
 for (let [testName, file] of test_files) {
 	test(`LoadAndSave - ${testName}`, async ({ page }) => {
-		await page.getByText("Leaphy Original").click();
-		await page.getByText("Original Uno").click();
-
+		await selectRobot(page, "Leaphy Original", "Original Uno");
 		await page.getByRole("button", { name: "My projects" }).click();
 
 		// Playwright doesn't seem to support `showOpenFilePicker()` so mock it
diff --git a/tests/pins.spec.ts b/tests/pins.spec.ts
index 99c924e..1b16dc8 100644
--- a/tests/pins.spec.ts
+++ b/tests/pins.spec.ts
@@ -1,5 +1,5 @@
 import { type Page, expect, test } from "@playwright/test";
-import { goToHomePage } from "./utils";
+import { goToHomePage, selectRobot } from "./utils";
 
 test.beforeEach(goToHomePage);
 
@@ -90,8 +90,7 @@ test("Pins - Uno", async ({ page }) => {
 });
 
 test("Pins - Nano", async ({ page }) => {
-	await page.getByText("Arduino Nano").click();
-	await page.getByText("Arduino Nano ESP32").click();
+	await selectRobot(page, "Arduino Nano", "Arduino Nano ESP32");
 
 	await test_pins(page, nano_pins);
 });
diff --git a/tests/undo_redo.spec.ts b/tests/undo_redo.spec.ts
index e416979..c13f025 100644
--- a/tests/undo_redo.spec.ts
+++ b/tests/undo_redo.spec.ts
@@ -1,5 +1,5 @@
 import { type Page, expect, test } from "@playwright/test";
-import { goToHomePage, openExample } from "./utils";
+import { goToHomePage, openExample, selectRobot } from "./utils";
 
 test.beforeEach(goToHomePage);
 
@@ -11,9 +11,7 @@ async function redo(page: Page) {
 }
 
 test("Undo redo - Deletion", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	// Delete the repeat forever block
@@ -42,9 +40,7 @@ test("Undo redo - Deletion", async ({ page }) => {
 });
 
 test("Undo redo - Variable change", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	// Change a boolean
@@ -74,9 +70,7 @@ test("Undo redo - Variable change", async ({ page }) => {
 });
 
 test("Undo redo - Dragging", async ({ page }) => {
-	await page.getByText("Leaphy Original").click();
-	await page.getByText("Original Uno").click();
-
+	await selectRobot(page, "Leaphy Original", "Original Uno");
 	await openExample(page, "Blink");
 
 	await page.locator(".side").first().click(); // Open code
diff --git a/tests/utils.ts b/tests/utils.ts
index 820a568..3b3b417 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -11,6 +11,17 @@ test.beforeEach(async ({ context }) => {
 	});
 });
 
+export async function selectRobot(
+	page: Page,
+	tile: string,
+	robot: string,
+	continueName = "Continue",
+) {
+	await page.getByText(tile).click();
+	await page.getByText(robot).click();
+	await page.getByText(continueName).click();
+}
+
 export async function setupArduino({ page }: PlaywrightTestArgs) {
 	let board = await setupPlaywrightArduino(page);
 	page.once("close", (_) => {
diff --git a/yarn.lock b/yarn.lock
index 3fcf292..f40e49e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -543,17 +543,24 @@
   dependencies:
     tslib "^2.4.0"
 
-"@fortawesome/fontawesome-common-types@6.5.2":
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz#eaf2f5699f73cef198454ebc0c414e3688898179"
-  integrity sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==
+"@fortawesome/fontawesome-common-types@6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.6.0.tgz#31ab07ca6a06358c5de4d295d4711b675006163f"
+  integrity sha512-xyX0X9mc0kyz9plIyryrRbl7ngsA9jz77mCZJsUkLl+ZKs0KWObgaEBoSgQiYWAsSmjz/yjl0F++Got0Mdp4Rw==
 
-"@fortawesome/free-solid-svg-icons@^6.5.2":
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz#9b40b077b27400a5e9fcbf2d15b986c7be69e9ca"
-  integrity sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==
+"@fortawesome/free-brands-svg-icons@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.6.0.tgz#2797f2cc66d21e7e47fa64e680b8835e8d30e825"
+  integrity sha512-1MPD8lMNW/earme4OQi1IFHtmHUwAKgghXlNwWi9GO7QkTfD+IIaYpIai4m2YJEzqfEji3jFHX1DZI5pbY/biQ==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.5.2"
+    "@fortawesome/fontawesome-common-types" "6.6.0"
+
+"@fortawesome/free-solid-svg-icons@6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.6.0.tgz#061751ca43be4c4d814f0adbda8f006164ec9f3b"
+  integrity sha512-IYv/2skhEDFc2WGUcqvFJkeK39Q+HyPf5GHUrT/l2pKbtgEIv1al1TKd6qStR5OIwQdN1GZP54ci3y4mroJWjA==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.6.0"
 
 "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
@@ -616,10 +623,10 @@
   resolved "https://registry.yarnpkg.com/@leaphy-robotics/picotool-wasm/-/picotool-wasm-1.0.3.tgz#9047c984c7c261685f6e88d49c9ed54eaeb29391"
   integrity sha512-K3St0eLNVRPXPMZ+o1q/+S46zPFw8PEsTMxYQqiLdjJvbvzGgwOZVWOkqukeEUTLtmdopTxkFksPZxmI+jDyTg==
 
-"@leaphy-robotics/playwright-arduino@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@leaphy-robotics/playwright-arduino/-/playwright-arduino-1.0.4.tgz#678f1fdff9a2bb8c25ef871784f49b6e567daeec"
-  integrity sha512-jpG6URAVPetUubutUYHZeRDFRzn08G/rs/NqG9cDB48EBjPxLbukDQ5iN3T3ZSvcPwss1GLMx7D/VHTVWcllgQ==
+"@leaphy-robotics/playwright-arduino@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@leaphy-robotics/playwright-arduino/-/playwright-arduino-1.0.5.tgz#4a89da44c5a979087f65c6d8bb3d17cd93dea382"
+  integrity sha512-N4wT4M9rR0tmgsthQvDeN4JH3QalXv04hMqr4Mr88mBhsjPTtFhHUWVY4tcCYPBY4kTw3hkfnCjDKi4AzoWbgw==
   dependencies:
     serialport "^12.0.0"
 
@@ -2465,10 +2472,10 @@ svelte-preprocess@^5.1.3:
     sorcery "^0.11.0"
     strip-indent "^3.0.0"
 
-svelte@5.0.0-next.121:
-  version "5.0.0-next.121"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-5.0.0-next.121.tgz#e0dc70de1fc05ca05e964cdc41d4e3a6d092b938"
-  integrity sha512-dWxr42t8wv6iUmgKrYDG9RwQd2lf3vF2+ACYT7ziDnLeYItPM4sABmM8ptMaYL8czwtqpNzfCsxQR7ShN5PS9A==
+svelte@5.0.0-next.134:
+  version "5.0.0-next.134"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-5.0.0-next.134.tgz#42d2af5b07031953d32876cf3acedc1c200870eb"
+  integrity sha512-MgIQnY0q9rdB0NPnFgi9dJHmsINy3ar74rYcEfS3wHHNJbTtnc0AQ4HKWQEb4c2J0oNDnw8oppvz8WKSS+7P1Q==
   dependencies:
     "@ampproject/remapping" "^2.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.15"