From 10addd4756d352baf178edb78a7ba12f00febde8 Mon Sep 17 00:00:00 2001
From: Fabian <copy@copy.sh>
Date: Thu, 31 Dec 2020 19:14:34 -0600
Subject: [PATCH] Improved design, new profiles

---
 debug.html          |  75 ++--
 index.html          | 135 ++++---
 src/browser/main.js | 902 +++++++++++++++-----------------------------
 tests/full/run.js   |   8 +-
 v86.css             |  37 +-
 5 files changed, 462 insertions(+), 695 deletions(-)

diff --git a/debug.html b/debug.html
index 37efd0e1..c23bd5ed 100644
--- a/debug.html
+++ b/debug.html
@@ -38,13 +38,12 @@
         <input type="button" value="Linux 2.6 (Buildroot)" id="start_linux26">
         <input type="button" value="Linux 3.18 (Buildroot)" id="start_linux3">
         <input type="button" value="Linux 4.16 (Buildroot)" id="start_linux4">
+        <input type="button" value="Linux 5.6 (Buildroot)" id="start_buildroot">
         <input type="button" value="Tiny Core" id="start_tinycore">
         <input type="button" value="OpenWRT" id="start_openwrt">
         <br>
         <input type="button" value="Arch Linux" id="start_archlinux">
         <input type="button" value="Arch Linux (boot)" id="start_archlinux-9p-cool">
-        <input type="button" value="Debian" id="start_debian">
-        <input type="button" value="Alpine" id="start_alpine">
         <input type="button" value="Damn Small Linux" id="start_dsl">
         <br>
 
@@ -55,8 +54,10 @@
         <br>
 
         <input type="button" value="Haiku" id="start_haiku">
+        <input type="button" value="Haiku (boot)" id="start_haiku-boot">
         <input type="button" value="Minix" id="start_minix">
         <input type="button" value="SerenityOS" id="start_serenity">
+        <input type="button" value="QNX" id="start_qnx">
         <input type="button" value="9front" id="start_9front">
         <input type="button" value="Plan 9" id="start_plan9">
         <br>
@@ -79,64 +80,76 @@
 
         <table>
             <tr>
-                <td width="250">CD image</td>
+                <td width="350"><label for="cd_image">CD image</label></td>
                 <td>
-                    <!--
-                    <select>
-                        <option>None</option>
-                        <option>Local file</option>
-                        <option>External Server</option>
-                    </select>-->
                     <input type="file" id="cd_image">
                 </td>
             </tr>
 
             <tr>
-                <td>Floppy disk image</td>
+                <td><label for="floppy_image">Floppy disk image</label></td>
                 <td> <input type="file" id="floppy_image"><br></td>
             </tr>
 
             <tr>
-                <td>Hard drive disk image</td>
+                <td><label for="hd_image">Hard drive disk image</label></td>
                 <td><input type="file" id="hd_image"><br></td>
             </tr>
 
             <tr>
-                <td>Multiboot kernel image</td>
+                <td><label for="multiboot_image">Multiboot kernel image (experimental)</label></td>
                 <td><input type="file" id="multiboot_image"><br></td>
             </tr>
 
             <tr>
-                <td colspan="2"><hr></td>
+                <td colspan="2"><small>Disk images are not uploaded to the server</small><hr></td>
             </tr>
 
             <tr>
-                <td>Memory size</td>
+                <td><label for="memory_size">Memory size</label></td>
                 <td>
                     <input id="memory_size" type="number" value="128" min="16" max="2048" step="16"> MB<br>
                 </td>
             </tr>
 
             <tr>
-                <td>Video Memory size</td>
+                <td><label for="video_memory_size">Video Memory size</label></td>
                 <td>
                     <input id="video_memory_size" type="number" value="8" min="1" max="128" step="1"> MB<br>
                 </td>
             </tr>
 
+            <tr>
+                <td><label for="networking_proxy">Networking proxy (leave blank to disable)</label></td>
+                <td>
+                    <input id="networking_proxy" type="text" value="wss://relay.widgetry.org/">
+                </td>
+            </tr>
+
             <tr>
                 <td colspan="2"><hr></td>
             </tr>
 
-            <!--
             <tr>
-                <td>Execution Cap </td>
-                <td> <input type="number" value="100" min="5" max="100" step="5"> %<br> </td>
+                <td><label for="disable_audio">Disable audio</label></td>
+                <td>
+                    <input id="disable_audio" type="checkbox"><br>
+                </td>
             </tr>
-            -->
 
             <tr>
-                <td>Boot order</td>
+                <td><label for="enable_acpi">Enable ACPI (experimental)</label></td>
+                <td>
+                    <input id="enable_acpi" type="checkbox"><br>
+                </td>
+            </tr>
+
+            <tr>
+                <td colspan="2"><hr></td>
+            </tr>
+
+            <tr>
+                <td><label for="boot_order">Boot order</label></td>
                 <td>
                     <select id="boot_order">
                         <option value="213">CD / Floppy / Hard Disk</option>
@@ -152,15 +165,6 @@
 
         <br>
         <button id="start_emulation">Start Emulation</button>
-        <!--
-        <br>
-        <div id="setup_error">Error: Video size must be at least over 9000</div>
-        -->
-        <!--
-        <br>
-        <br>
-        Link to this configuration: <a href="" id="config_link">http://copy.sh/v86/?a=b&amp;c=d</a>
-        -->
         <br>
         <br>
     </div>
@@ -185,7 +189,7 @@
         <input type="button" value="Get cdrom image" id="get_cdrom_image">
         <input type="button" value="Save State" id="save_state">
         <input type="button" value="Load State" id="load_state"> <input type="file" style="display: none" id="load_state_input">
-        <input type="button" value="Memory Dump (raw)" id="memory_dump">
+        <input type="button" value="Memory Dump" id="memory_dump">
         <input type="button" value="Disable mouse" id="toggle_mouse">
         <input type="button" value="Lock mouse" id="lock_mouse">
         <input type="button" value="Go fullscreen" id="fullscreen">
@@ -210,10 +214,7 @@
     </div>
 
     <pre style="margin: 0" id="log_levels"></pre>
-    <pre style="margin: 3px 0px 0px 0px" id="debug_infos"></pre>
-
     <pre style="display: none" id="loading"></pre>
-
     <br>
 </div>
 
@@ -226,6 +227,7 @@
     </div>
 </div>
 
+
 <div id="runtime_infos" style="display: none">
     Running: <span id="running_time">0s</span> <br>
     Speed: <span id="speed">0</span> mIPS<br>
@@ -260,7 +262,6 @@
     BPP: <span id="info_bpp">-</span><br>
     <br>
     Mouse: <span id="info_mouse_enabled">No</span><br>
-    <!-- Keyboard: <span id="info_keyboard_enabled">-</span><br> -->
 </div>
 
 <div id="filesystem_panel" style="display: none">
@@ -278,11 +279,11 @@
 <div id="debug_panel" style="display: none">
 </div>
 
-<br style="clear:both"><br>
+<br style="clear: both"><br>
 
-<textarea readonly id="log" style="display:none"></textarea>
+<textarea readonly id="log" style="display: none"></textarea>
 
-<textarea spellcheck="false" cols="40" rows="12" id="serial" style="display:none">
+<textarea spellcheck="false" cols="40" rows="12" id="serial" style="display: none">
 </textarea>
 
 <div id="terminal"></div>
diff --git a/index.html b/index.html
index 2123c59a..90b1db47 100644
--- a/index.html
+++ b/index.html
@@ -3,97 +3,133 @@
 
 <title>Virtual x86</title>
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
+<meta name="description" content="Run KolibriOS, Linux or Windows 98 in your browser">
 
 <script src="build/v86_all.js"></script>
 <link rel="stylesheet" href="v86.css">
 
 <div>
     <div id="boot_options">
-        <h4>Quickstart</h4>
-        <input type="button" value="ReactOS (32 MB)" id="start_reactos">
-        - Restored from snapshot<br>
-        <input type="button" value="Windows 95 (6.7 MB)" id="start_windows95">
-        - Restored from snapshot<br>
-        <input type="button" value="FreeBSD 10.2 (13.0 MB)" id="start_freebsd">
-        - Restored from snapshot<br>
-        <input type="button" value="Oberon (16.0 MB)" id="start_oberon">
-        - Native Oberon 2.3.6<br>
-        <input type="button" value="Windows 98 (12.0 MB)" id="start_windows98">
-        - Including Minesweeper, additional sectors are loaded as needed<br>
-        <input type="button" value="Arch Linux (10.1 MB)" id="start_archlinux">
-        - A complete Arch Linux restored from a snapshot, additional files are loaded as needed<br>
-        <input type="button" value="KolibriOS (1.4 MB)" id="start_kolibrios">
-        - Graphical OS, takes about 60 seconds to boot<br>
-        <input type="button" value="Linux 2.6 (5.4 MB)" id="start_linux26">
-        - With busybox, Lua interpreter and test cases, takes about 20 seconds to boot<br>
-        <input type="button" value="Linux 3.18 (8.3 MB)" id="start_linux3">
-        - With internet access, telnet, ping, wget and links. Takes about 60 seconds to boot. Run <code>udhcpc</code> for networking. Exchange files through <code>/mnt/</code>.<br>
-        <input type="button" value="Windows 1.01 (1.4 MB)" id="start_windows1">
-        - Takes 1 second to boot<br>
-        <input type="button" value="MS-DOS 6.22 (3.4 MB)" id="start_msdos">
-        - Takes 10 seconds to boot. With Enhanced Tools, QBasic and everything from the FreeDOS image<br>
-        <input type="button" value="FreeDOS (0.7 MB)" id="start_freedos">
-        - With nasm, vim, debug.com, some games and demos, takes 1 second to boot<br>
-        <input type="button" value="OpenBSD (1.4 MB)" id="start_openbsd">
-        - Random boot floppy, takes about 60 seconds<br>
-        <input type="button" value="Solar OS (1.4 MB)" id="start_solos">
-        - Simple graphical OS<br>
-        <input type="button" value="Bootchess (0.2 MB)" id="start_bootchess">
-        - A tiny chess program written in the boot sector
+        <h4>Select profile</h4>
+        <table id="oses">
+            <tr id="start_archlinux"><td><a href="?profile=archlinux">Arch Linux</a> <small>12 MB</small></td><td>
+            A complete Arch Linux restored from a snapshot, additional files are loaded as needed</td></tr>
+            <tr id="start_dsl"><td><a href="?profile=dsl">Damn Small Linux</a> <small>50 MB</small></td><td>
+            Graphical Linux with 2.4 kernel, Firefox 2.0 and more. Takes 1 minute to boot.</td></tr>
+            <tr id="start_buildroot"><td><a href="?profile=buildroot">Buildroot Linux</a> <small>5.0 MB</small></td><td>
+            Minimal Linux with busybox, Lua, tests, internet access, ping, telnet and curl. Exchange files through <code>/mnt/</code>.</td></tr>
+
+            <tr id="start_reactos"><td><a href="?profile=reactos">ReactOS</a> <small>18 MB</small></td><td>
+            Windows-compatible OS. Restored from snapshot</td></tr>
+            <tr id="start_windows98"><td><a href="?profile=windows98">Windows 98</a> <small>9.7 MB</small></td><td>
+            Including Minesweeper and Internet Explorer with internet access. Additional sectors are loaded as needed.</td></tr>
+            <tr id="start_windows95"><td><a href="?profile=windows95">Windows 95</a> <small>4.6 MB</small></td><td>
+            Restored from snapshot</td></tr>
+            <tr id="start_windows1"><td><a href="?profile=windows1">Windows 1.01</a> <small>0.6 MB</small></td><td>
+            Takes 1 second to boot</td></tr>
+            <tr id="start_msdos"><td><a href="?profile=msdos">MS-DOS 6.22</a> <small>4.4 MB</small></td><td>
+            With Enhanced Tools, QBasic, vim, games and demos.</td></tr>
+            <tr id="start_freedos"><td><a href="?profile=freedos">FreeDOS</a> <small>0.5 MB</small></td><td>
+            With nasm, vim, debug.com, Rogue, some games and demos.</td></tr>
+
+            <tr id="start_freebsd"><td><a href="?profile=freebsd">FreeBSD</a> <small>17 MB</small></td><td>
+            FreeBSD 12.0 base install. Restored from snapshot.</td></tr>
+            <tr id="start_openbsd"><td><a href="?profile=openbsd">OpenBSD</a> <small>12 MB</small></td><td>
+            OpenBSD 6.6 base install. Restored from snapshot.</td></tr>
+            <tr id="start_9front"><td><a href="?profile=9front">9front</a> <small>4.4 MB</small></td><td>
+            A Plan 9 fork.</td></tr>
+            <tr id="start_haiku"><td><a href="?profile=haiku">Haiku</a> <small>46 MB</small></td><td>
+            Restored from snapshot. Includes network support.</td></tr>
+
+            <tr id="start_oberon"><td><a href="?profile=oberon">Oberon</a> <small>1.2 MB</small></td><td>
+            Native Oberon 2.3.6</td></tr>
+            <tr id="start_kolibrios"><td><a href="?profile=kolibrios">KolibriOS</a> <small>1.4 MB</small></td><td>
+            Fast graphical OS written in Assembly</td></tr>
+            <tr id="start_qnx"><td><a href="?profile=qnx">QNX</a> <small>1.3 MB</small></td><td>
+            QNX 4.05 Demo disk (no networking)</td></tr>
+            <tr id="start_solos"><td><a href="?profile=solos">Solar OS</a> <small>0.3 MB</small></td><td>
+            Simple graphical OS</td></tr>
+            <tr id="start_bootchess"><td><a href="?profile=bootchess">Bootchess</a> <small>0.1 MB</small></td><td>
+            A tiny chess program written in the boot sector</td></tr>
+        </table>
 
-        <br>
         <hr>
         <h4>Setup</h4>
         <table>
             <tr>
-                <td width="350">CD image</td>
+                <td width="350"><label for="cd_image">CD image</label></td>
                 <td>
                     <input type="file" id="cd_image">
                 </td>
             </tr>
 
             <tr>
-                <td>Floppy disk image</td>
+                <td><label for="floppy_image">Floppy disk image</label></td>
                 <td> <input type="file" id="floppy_image"><br></td>
             </tr>
 
             <tr>
-                <td>Hard drive disk image</td>
+                <td><label for="hd_image">Hard drive disk image</label></td>
                 <td><input type="file" id="hd_image"><br></td>
             </tr>
 
             <!--
             <tr>
-                <td>Multiboot kernel image (experimental)</td>
+                <td><label for="multiboot_image">Multiboot kernel image (experimental)</td>
                 <td><input type="file" id="multiboot_image"><br></td>
             </tr>
             -->
 
 
             <tr>
-                <td colspan="2"><small><small>Disk images are not uploaded to the server</small></small><hr></td>
+                <td colspan="2"><small>Disk images are not uploaded to the server</small><hr></td>
             </tr>
 
             <tr>
-                <td>Memory size</td>
+                <td><label for="memory_size">Memory size</label></td>
                 <td>
                     <input id="memory_size" type="number" value="128" min="16" max="2048" step="16"> MB<br>
                 </td>
             </tr>
 
             <tr>
-                <td>Video Memory size</td>
+                <td><label for="video_memory_size">Video Memory size</label></td>
                 <td>
                     <input id="video_memory_size" type="number" value="8" min="1" max="128" step="1"> MB<br>
                 </td>
             </tr>
 
+            <tr>
+                <td><label for="networking_proxy">Networking proxy (leave blank to disable)</label></td>
+                <td>
+                    <input id="networking_proxy" type="text" value="wss://relay.widgetry.org/">
+                </td>
+            </tr>
+
             <tr>
                 <td colspan="2"><hr></td>
             </tr>
 
             <tr>
-                <td>Boot order</td>
+                <td><label for="disable_audio">Disable audio</label></td>
+                <td>
+                    <input id="disable_audio" type="checkbox"><br>
+                </td>
+            </tr>
+
+            <tr>
+                <td><label for="enable_acpi">Enable ACPI (experimental)</label></td>
+                <td>
+                    <input id="enable_acpi" type="checkbox"><br>
+                </td>
+            </tr>
+
+            <tr>
+                <td colspan="2"><hr></td>
+            </tr>
+
+            <tr>
+                <td><label for="boot_order">Boot order</label></td>
                 <td>
                     <select id="boot_order">
                         <option value="213">CD / Floppy / Hard Disk</option>
@@ -152,7 +188,6 @@
     <pre style="display: none" id="loading"></pre>
 </div>
 
-
 <div id="screen_container" style="display: none">
     <div id="screen"></div>
     <canvas id="vga"></canvas>
@@ -196,13 +231,12 @@
     BPP: <span id="info_bpp">-</span><br>
     <br>
     Mouse: <span id="info_mouse_enabled">No</span><br>
-    <!-- Keyboard: <span id="info_keyboard_enabled">-</span><br> -->
 
-    <div id="description" style="display: none"></div>
+    <div id="description" style="display: none"><br></div>
 </div>
 
 <div id="filesystem_panel" style="display: none">
-    <label title="Files will appear in / of the 9p filesystem">
+    <label>
         Send files to emulator<br>
         <input type="file" id="filesystem_send_file" multiple>
     </label>
@@ -213,16 +247,11 @@
     </label>
 </div>
 
-<br style="clear:both"><br>
-
-<textarea cols="40" rows="12" id="serial" style="display: none">This is the serial console. Whatever you type or paste here will be sent to COM1.
-
-In Linux it can be accessed with `cat /dev/ttyS0`
-</textarea>
+<br style="clear: both"><br>
 
 <div id="terminal"></div>
 
-<br style="clear:both">
+<br style="clear: both">
 <code>Version: <a href="https://github.com/copy/v86/commits/b40c8ad2">b40c8ad2</a> (Apr 23, 2020 01:04)</code>
 
 <hr>
@@ -233,7 +262,3 @@ In Linux it can be accessed with `cat /dev/ttyS0`
 <a href="https://github.com/copy/v86">Project on Github</a>
 &mdash;
 <a href="https://github.com/copy/v86#compatibility">Compatibility</a>
-&mdash;
-<a href="./screenshots/">Screenshots</a>
-
-
diff --git a/src/browser/main.js b/src/browser/main.js
index e96848e1..cbe28591 100644
--- a/src/browser/main.js
+++ b/src/browser/main.js
@@ -6,7 +6,7 @@
     var ON_LOCALHOST = !location.hostname.endsWith("copy.sh");
 
     /** @const */
-    var HOST = ON_LOCALHOST ? "" : "//i.copy.sh/";
+    var HOST = ON_LOCALHOST ? "images/" : "//k.copy.sh/";
 
     function dump_file(ab, name)
     {
@@ -61,6 +61,8 @@
     function set_title(text)
     {
         document.title = text + " - Virtual x86" +  (DEBUG ? " - debug" : "");
+        const description = document.querySelector("meta[name=description]");
+        description && (description.content = "Running " + text);
     }
 
     function format_timestamp(time)
@@ -100,6 +102,13 @@
         var el = $("loading");
         el.style.display = "block";
 
+        if(e.file_name.endsWith(".wasm"))
+        {
+            const parts = e.file_name.split("/");
+            el.textContent = "Fetching " + parts[parts.length - 1] + " ...";
+            return;
+        }
+
         if(e.file_index === e.file_count - 1 && e.loaded >= e.total - 2048)
         {
             // last file is (almost) loaded
@@ -212,24 +221,33 @@
                 name: "Arch Linux",
                 memory_size: 512 * 1024 * 1024,
                 vga_memory_size: 8 * 1024 * 1024,
-
                 state: {
-                    "url": HOST + "images/v86state.bin",
+                    "url": HOST + "arch_state.bin.zst",
                 },
-
                 filesystem: {
-                    "basefs": {
-                        "url": HOST + "images/fs.json",
-                        "size": 10232633,
-                    },
-                    "baseurl": HOST + "images/arch/",
+                    "baseurl": HOST + "arch/",
                 },
             },
+            {
+                id: "haiku",
+                memory_size: 512 * 1024 * 1024,
+                hda: {
+                    url: HOST + "haiku.img",
+                    async: true,
+                    use_parts: !ON_LOCALHOST,
+                    size: 1 * 1024 * 1024 * 1024,
+                },
+                state: {
+                    url: HOST + "haiku_state.bin.zst",
+                },
+                name: "Haiku",
+            },
             {
                 id: "msdos",
                 hda: {
-                    "url": HOST + "images/msdos.img",
+                    "url": HOST + "msdos.img",
                     "size": 8 * 1024 * 1024,
+                    "async": false,
                 },
                 boot_order: 0x132,
                 name: "MS-DOS",
@@ -237,710 +255,374 @@
             {
                 id: "freedos",
                 fda: {
-                    "url": HOST + "images/freedos722.img",
+                    "url": HOST + "freedos722.img",
                     "size": 737280,
+                    "async": false,
                 },
                 name: "FreeDOS",
             },
             {
                 id: "oberon",
                 hda: {
-                    "url": HOST + "images/oberon.img",
-                    "async": false,
+                    "url": HOST + "oberon.img",
                     "size": 24 * 1024 * 1024,
+                    "async": false,
                 },
                 name: "Oberon",
             },
             {
                 id: "windows1",
                 fda: {
-                    "url": HOST + "images/windows101.img",
+                    "url": HOST + "windows101.img",
                     "size": 1474560,
+                    "async": false,
                 },
                 name: "Windows",
             },
-            {
-                id: "debian",
-                state: {
-                    "url": "images/debian-state-base.bin",
-                },
-                name: "Debian",
-                memory_size: 512 * 1024 * 1024,
-                vga_memory_size: 8 * 1024 * 1024,
-                filesystem: {
-                    "basefs": {
-                        "url": HOST + "images/debian-base-fs.json",
-                    },
-                    "baseurl": HOST + "images/debian-9p-rootfs-flat/",
-                },
-            },
-            {
-                id: "debian-boot",
-                name: "Debian",
-                memory_size: 512 * 1024 * 1024,
-                bzimage_initrd_from_filesystem: true,
-                cmdline: "rw init=/bin/systemd root=host9p console=ttyS0 spectre_v2=off pti=off",
-                vga_memory_size: 8 * 1024 * 1024,
-                filesystem: {
-                    "basefs": {
-                        "url": HOST + "images/debian-base-fs.json",
-                    },
-                    "baseurl": HOST + "images/debian-9p-rootfs-flat/",
-                },
-            },
             {
                 id: "linux26",
                 cdrom: {
-                    "url": HOST + "images/linux.iso",
-                    "size": 5666816,
+                    "url": HOST + "linux.iso",
+                    "size": 6547456,
+                    "async": false,
                 },
                 name: "Linux",
             },
             {
                 id: "linux3",
                 cdrom: {
-                    "url": HOST + "images/linux3.iso",
+                    "url": HOST + "linux3.iso",
                     "size": 8624128,
+                    "async": false,
                 },
                 name: "Linux",
-                filesystem: {},
             },
             {
                 id: "linux4",
                 cdrom: {
-                    "url": HOST + "images/linux4.iso",
+                    "url": HOST + "linux4.iso",
+                    "size": 7731200,
+                    "async": false,
                 },
                 name: "Linux",
                 filesystem: {},
             },
+            {
+                id: "buildroot",
+                bzimage: {
+                    url: HOST + "buildroot-bzimage.bin",
+                    size: 5166352,
+                    async: false,
+                },
+                name: "Buildroot Linux",
+                filesystem: {},
+                memory_size: 128 * 1024 * 1024,
+                cmdline: "tsc=reliable mitigations=off random.trust_cpu=on",
+            },
+            {
+                id: "dsl",
+                memory_size: 256 * 1024 * 1024,
+                cdrom: {
+                    url: HOST + "dsl-4.11.rc2.iso",
+                    size: 52824064,
+                    async: false,
+                },
+                name: "Damn Small Linux",
+                homepage: "http://www.damnsmalllinux.org/",
+            },
+            {
+                id: "minix",
+                name: "Minix",
+                memory_size: 256 * 1024 * 1024,
+                cdrom: {
+                    url: HOST + "minix-3.3.0.iso",
+                    size: 605581312,
+                    async: true,
+                    use_parts: !ON_LOCALHOST,
+                },
+            },
             {
                 id: "kolibrios",
-                // https://kolibrios.org/en/
                 fda: {
                     "url": ON_LOCALHOST ?
-                            "images/kolibri.img" :
+                            HOST+  "kolibri.img" :
                             "//builds.kolibrios.org/eng/data/data/kolibri.img",
                     "size": 1474560,
+                    "async": false,
                 },
                 name: "KolibriOS",
+                homepage: "https://kolibrios.org/en/",
             },
             {
                 id: "kolibrios-fallback",
                 fda: {
-                    "url": HOST + "images/kolibri.img",
+                    "url": HOST + "kolibri.img",
                     "size": 1474560,
+                    "async": false,
                 },
                 name: "KolibriOS",
             },
             {
                 id: "openbsd",
                 hda: {
-                    "url": HOST + "images/internal/openbsd/openbsd.img",
+                    "url": HOST + "openbsd.img",
                     async: true,
+                    use_parts: !ON_LOCALHOST,
+                    size: 1073741824,
                 },
+                state: {
+                    url: HOST + "openbsd_state.bin.zst",
+                },
+                memory_size: 256 * 1024 * 1024,
                 name: "OpenBSD",
             },
+            {
+                id: "openbsd-boot",
+                hda: {
+                    url: HOST + "openbsd.img",
+                    async: true,
+                    use_parts: !ON_LOCALHOST,
+                    size: 1073741824,
+                },
+                memory_size: 256 * 1024 * 1024,
+                name: "OpenBSD",
+                //acpi: true, // doesn't seem to work
+            },
             {
                 id: "solos",
                 fda: {
-                    // http://oby.ro/os/
-                    "url": HOST + "images/os8.dsk",
+                    "url": HOST + "os8.img",
+                    "async": false,
                     "size": 1474560,
                 },
                 name: "Sol OS",
-            },
-            {
-                id: "dexos",
-                cdrom: {
-                    // https://dex-os.github.io/
-                    "url": HOST + "images/DexOSv6.iso",
-                    "size": 1837056,
-                },
-                name: "DexOS",
+                homepage: "http://oby.ro/os/",
             },
             {
                 id: "bootchess",
                 fda: {
-                    // http://www.pouet.net/prod.php?which=64962
-                    "url": HOST + "images/bootchess.img",
+                    "url": HOST + "bootchess.img",
+                    "async": false,
+                    "size": 1474560,
                 },
                 name: "Bootchess",
+                homepage: "http://www.pouet.net/prod.php?which=64962",
             },
             {
                 id: "windows98",
-                memory_size: 64 * 1024 * 1024,
+                memory_size: 128 * 1024 * 1024,
                 hda: {
-                    "url": HOST + "images/windows98.img",
+                    "url": HOST + "windows98.img",
                     "async": true,
+                    use_parts: !ON_LOCALHOST,
                     "size": 300 * 1024 * 1024,
                 },
                 name: "Windows 98",
                 state: {
-                    "url": HOST + "images/windows98_state.bin",
-                    "size": 75705744,
+                    "url": HOST + "windows98_state.bin.zst",
                 },
+                preserve_mac_from_state_image: true,
+            },
+            {
+                id: "windows98-boot",
+                memory_size: 128 * 1024 * 1024,
+                hda: {
+                    "url": HOST + "windows98.img",
+                    "async": true,
+                    use_parts: !ON_LOCALHOST,
+                    "size": 300 * 1024 * 1024,
+                },
+                name: "Windows 98",
             },
             {
                 id: "windows95",
                 memory_size: 32 * 1024 * 1024,
                 hda: {
-                    "url": HOST + "images/W95.IMG",
+                    "url": HOST + "w95.img",
                     "size": 242049024,
                     "async": true,
+                    use_parts: !ON_LOCALHOST,
                 },
                 name: "Windows 95",
                 state: {
-                    "url": HOST + "images/windows95_state.bin",
-                    "size": 42151316,
+                    "url": HOST + "windows95_state.bin.zst",
                 },
             },
-            {
-                id: "freebsd",
-                memory_size: 128 * 1024 * 1024,
-                state: {
-                    "url": HOST + "images/freebsd_state.bin",
-                    "size": 142815292,
-                },
-                hda: {
-                    "url": HOST + "images/freebsd3.img",
-                    "size": 17179869184,
-                    "async": true,
-                },
-                name: "FreeBSD",
-            },
-            {
-                id: "reactos",
-                memory_size: 256 * 1024 * 1024,
-                cdrom: {
-                    "url": HOST + "images/ReactOS-0.4.4-live.iso",
-                    "async": true,
-                },
-                state: {
-                    "url": HOST + "images/reactos_state.bin",
-                    "size": 276971224,
-                },
-                name: "ReactOS",
-                description: 'Running <a href="https://reactos.org/">ReactOS</a>',
-            },
-        ];
-
-        DEBUG &&
-        oses.push(
-            {
-                id: "archlinux-hd",
-                name: "Arch Linux",
-                memory_size: 128 * 1024 * 1024,
-                vga_memory_size: 8 * 1024 * 1024,
-                hda: {
-                    "url": HOST + "images/internal/packer/output-qemu/archlinux",
-                    "size": 8 * 1024 * 1024 * 1024,
-                    "async": true,
-                },
-            },
-            {
-                id: "archlinux-9p",
-                name: "Arch Linux",
-                memory_size: 128 * 1024 * 1024,
-                vga_memory_size: 8 * 1024 * 1024,
-
-                hda: {
-                    "url": HOST + "images/internal/packer/output-qemu/archlinux",
-                    "size": 2 * 1024 * 1024 * 1024,
-                    "async": true,
-                },
-
-                filesystem: {
-                    "basefs": {
-                        "url": HOST + "images/fs.json",
-                        "size": 10232633,
-                    },
-                    "baseurl": HOST + "images/arch/",
-                },
-            },
-            {
-                id: "archlinux-9p-cool",
-                name: "Arch Linux",
-                memory_size: 512 * 1024 * 1024,
-                vga_memory_size: 8 * 1024 * 1024,
-                bzimage_initrd_from_filesystem: true,
-                //cmdline: "rw init=/bin/systemd root=host9p console=ttyS0 spectre_v2=off pti=off",
-                // quiet
-                cmdline: "rw apm=off vga=0x344 video=vesafb:ypan,vremap:8 root=host9p rootfstype=9p rootflags=trans=virtio,cache=loose mitigations=off audit=0 init=/usr/bin/openrc-init net.ifnames=0 biosdevname=0",
-                //cmdline: "rw apm=off vga=0x344 video=vesafb:ypan,vremap:8 root=host9p rootfstype=9p rootflags=trans=virtio,cache=loose mitigations=off audit=0 init=/lib/systemd/systemd quiet",
-                filesystem: {
-                    "basefs": {
-                        "url": HOST + "images/fs.json",
-                        "size": 10232633,
-                    },
-                    "baseurl": HOST + "images/arch/",
-                },
-            },
-            {
-                id: "freebsd-boot",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    "url": HOST + "images/internal/freebsd/freebsd.img",
-                    "async": true,
-                },
-                name: "FreeBSD",
-            },
-            {
-                id: "freebsd-cdrom",
-                memory_size: 128 * 1024 * 1024,
-                cdrom: {
-                    "url": HOST + "images/internal/freebsd/FreeBSD-12.0-RELEASE-i386-disc1.iso",
-                    "async": true,
-                },
-                name: "FreeBSD",
-            },
-            {
-                id: "reactos-boot",
-                memory_size: 256 * 1024 * 1024,
-                cdrom: {
-                    "url": HOST + "images/ReactOS-0.4.11-Live.iso",
-                    "async": true,
-                },
-                name: "ReactOS",
-                description: 'Running <a href="https://reactos.org/">ReactOS</a>',
-            },
-            {
-                id: "serenity",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    url: "images/experimental/serenity.img",
-                    async: true
-                },
-                name: "Serenity",
-            },
-            {
-                id: "9front",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    url: "images/experimental/9front-7408.1d345066125a.386.iso",
-                    async: true
-                },
-                acpi: true,
-                name: "9front",
-            },
-            {
-                id: "plan9",
-                memory_size: 256 * 1024 * 1024,
-                hda: {
-                    url: "images/experimental/qemu-advent-2014/plan9/plan9.img",
-                    async: true
-                },
-                name: "Plan9",
-            },
-            {
-                id: "windows30",
-                memory_size: 64 * 1024 * 1024,
-                //cdrom: {
-                //    "url": "images/experimental/os/Win30.iso",
-                //    "async": false,
-                //},
-                hda: {
-                    "url": "images/experimental/os/Windows 3.0.img",
-                    "async": true,
-                },
-                name: "Windows 3.0",
-            },
-            {
-                id: "windows31",
-                memory_size: 64 * 1024 * 1024,
-                hda: {
-                    "url": "images/experimental/os/windows31.img",
-                    "async": true,
-                },
-                name: "Windows 3.1",
-            },
-            {
-                id: "windows98-boot",
-                memory_size: 64 * 1024 * 1024,
-                hda: {
-                    "url": HOST + "images/windows98.img",
-                    "async": true,
-                    "size": 300 * 1024 * 1024,
-                },
-                name: "Windows 98",
-            },
             {
                 id: "windows95-boot",
                 memory_size: 32 * 1024 * 1024,
                 hda: {
-                    "url": HOST + "images/W95.IMG",
+                    "url": HOST + "w95.img",
                     "size": 242049024,
                     "async": true,
+                    use_parts: !ON_LOCALHOST,
                 },
                 name: "Windows 95",
             },
             {
-                id: "windowsme",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    "url": "images/experimental/os/windows/Windows Me/windowsme.img",
-                    "async": true,
-                },
-                name: "Windows ME",
-            },
-            {
-                id: "windowsme2",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    "url": "images/experimental/os/winme.img",
-                    "async": true,
-                },
-                name: "Windows ME",
-            },
-            {
-                id: "windows2000",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    "url": "images/experimental/os/windows/windows_2000_server/win2000.img",
-                    "async": true,
-                },
-                name: "Windows 2000",
-            },
-            {
-                id: "ubuntu10",
-                memory_size: 128 * 1024 * 1024,
+                id: "windows30",
+                memory_size: 64 * 1024 * 1024,
                 cdrom: {
-                    "url": "images/experimental/os/ubuntu-10.04.4-desktop-i386.iso",
-                    "async": true,
+                    "url": HOST + "Win30.iso",
+                    "async": false,
                 },
-                name: "Ubuntu 10.04",
+                name: "Windows 3.0",
             },
             {
-                id: "hirens",
-                memory_size: 128 * 1024 * 1024,
-                cdrom: {
-                    "url": "images/experimental/hirens.bootcd.15.2.iso",
-                    "async": true,
-                },
-                name: "Hirens",
-            },
-            {
-                id: "haiku",
-                memory_size: 512 * 1024 * 1024,
+                id: "freebsd",
+                memory_size: 256 * 1024 * 1024,
                 hda: {
-                    // doesn't work (probably SSE):
-                    //url: HOST + "images/experimental/haiku-master-hrev54088-2020-04-28-x86_gcc2h-anyboot.iso",
-                    // works:
-                    url: HOST + "images/experimental/haiku-master-hrev53609-x86_gcc2h-anyboot.iso",
-                    // works:
-                    //url: HOST + "images/experimental/os/haiku-r1beta1-x86_gcc2_hybrid-anyboot.iso",
-                    async: true,
-                },
-                name: "Haiku",
-            },
-            {
-                id: "haiku-state",
-                memory_size: 512 * 1024 * 1024,
-                hda: {
-                    url: "images/experimental/os/haiku-r1beta1-x86_gcc2_hybrid-anyboot.iso",
-                    async: true,
+                    "url": HOST + "freebsd.img",
+                    "size": 2147483648,
+                    "async": true,
+                    use_parts: !ON_LOCALHOST,
                 },
                 state: {
-                    url: "images/experimental/os/haiku-state.bin",
+                    "url": HOST + "freebsd_state.bin.zst",
                 },
-                name: "Haiku",
+                name: "FreeBSD",
             },
             {
-                id: "haiku-cdrom",
+                id: "freebsd-boot",
+                memory_size: 256 * 1024 * 1024,
+                hda: {
+                    "url": HOST + "freebsd.img",
+                    "size": 2147483648,
+                    "async": true,
+                    use_parts: !ON_LOCALHOST,
+                },
+                name: "FreeBSD",
+            },
+            {
+                id: "reactos-livecd",
+                memory_size: 256 * 1024 * 1024,
+                hda: {
+                    "url": HOST + "reactos-livecd-0.4.15-dev-73-g03c09c9-x86-gcc-lin-dbg.iso",
+                    "size": 250609664,
+                    "async": true,
+                    use_parts: !ON_LOCALHOST,
+                },
+                name: "ReactOS",
+                homepage: "https://reactos.org/",
+            },
+            {
+                id: "reactos",
                 memory_size: 512 * 1024 * 1024,
-                cdrom: {
-                    url: "images/experimental/os/haiku-r1beta1-x86_gcc2_hybrid-anyboot.iso",
-                    async: true,
-                },
-                name: "Haiku",
-            },
-            {
-                id: "dsl",
-                memory_size: 128 * 1024 * 1024,
-                // http://www.damnsmalllinux.org/
-                cdrom: {
-                    url: "images/experimental/os/dsl-4.11.rc2.iso",
-                    async: true,
-                },
-                name: "Damn Small Linux",
-            },
-            {
-                id: "dsl-state",
-                memory_size: 128 * 1024 * 1024,
-                cdrom: {
-                    url: "images/experimental/os/dsl-4.11.rc2.iso",
-                    async: true,
+                hda: {
+                    "url": HOST + "reactos.img",
+                    "size": 500 * 1024 * 1024,
+                    "async": true,
+                    use_parts: !ON_LOCALHOST,
                 },
                 state: {
-                    url: "images/experimental/os/dsl-state.bin",
+                    "url": HOST + "reactos_state.bin.zst",
                 },
-                name: "Damn Small Linux",
+                preserve_mac_from_state_image: true,
+                name: "ReactOS",
+                homepage: "https://reactos.org/",
             },
             {
-                id: "minix2",
-                name: "Minix 2",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    url: "images/experimental/os/minix2hd.img",
-                    async: true,
-                },
-            },
-            {
-                id: "minix",
-                name: "Minix",
-                memory_size: 128 * 1024 * 1024,
-                cdrom: {
-                    url: "images/minix-3.3.0.iso",
-                    async: true,
-                },
-            },
-            {
-                id: "alpine",
-                name: "Alpine",
-                bzimage_initrd_from_filesystem: true,
-                cmdline: "rw root=host9p rootfstype=9p rootflags=trans=virtio mitigations=off audit=0 console=ttyS0 nosmp",
-                memory_size: 128 * 1024 * 1024,
-                filesystem: {
-                    baseurl: "images/alpine-9p-rootfs-flat",
-                    basefs: "images/alpine-base-fs.json",
-                },
-            },
-            {
-                id: "redox",
-                name: "Redox",
+                id: "reactos-boot",
                 memory_size: 512 * 1024 * 1024,
-                // requires 64-bit
-                cdrom: { url: "images/experimental/redox_0.5.0_livedisk.iso" }
-            },
-            {
-                id: "helenos",
-                memory_size: 128 * 1024 * 1024,
-                // http://www.helenos.org/
-                cdrom: {
-                    "url": "images/experimental/os/HelenOS-0.5.0-ia32.iso",
-                    "async": false,
-                },
-                name: "HelenOS",
-            },
-            {
-                id: "beos",
-                name: "BeOS",
-                memory_size: 64 * 1024 * 1024,
-                vga_memory_size: 8 * 1024 * 1024,
-                boot_order: 0x132,
-                cdrom: {
-                    url: "images/experimental/os/beos-4.5-demo-i386-powerpc.iso",
-                    async: true,
-                },
-            },
-            {
-                id: "fdgame",
-                memory_size: 64 * 1024 * 1024,
-                cdrom: {
-                    "url": "images/experimental/os/fdgame135_HD.iso",
-                    "async": true,
-                },
-                name: "FreeDOS games",
-            },
-            {
-                id: "freedos_cd",
-                memory_size: 64 * 1024 * 1024,
-                cdrom: {
-                    "url": "images/experimental/os/FD12CD.iso",
-                    "async": false,
-                },
-                name: "FreeDOS CD",
-            },
-            {
-                id: "freedos_installed",
-                memory_size: 64 * 1024 * 1024,
                 hda: {
-                    "url": "images/experimental/os/freedos-installed.img",
-                    "async": false,
-                },
-                name: "FreeDOS Installed",
-            },
-            {
-                id: "netbsd",
-                memory_size: 64 * 1024 * 1024,
-                cdrom: {
-                    //"url": "images/experimental/os/netbsd-boot.iso",
-                    "url": "images/experimental/NetBSD-9.0-boot.iso",
+                    "url": HOST + "reactos.img",
+                    "size": 500 * 1024 * 1024,
                     "async": true,
+                    use_parts: !ON_LOCALHOST,
                 },
-                name: "NetBSD",
+                name: "ReactOS",
+                homepage: "https://reactos.org/",
             },
             {
-                id: "android",
+                id: "skift",
                 memory_size: 128 * 1024 * 1024,
                 cdrom: {
-                    "url": "images/experimental/os/android-x86-1.6-r2.iso",
-                    "size": 54661120,
-                    "async": true,
-                },
-                name: "Android",
-            },
-            {
-                id: "ubuntu5",
-                memory_size: 128 * 1024 * 1024,
-                cdrom: {
-                    "url": "images/experimental/os/ubuntu-5.10-live-i386.iso",
-                    "size": 657975296,
-                    "async": true,
-                },
-                name: "Ubuntu 5.10",
-            },
-            {
-                id: "ubuntu6",
-                memory_size: 128 * 1024 * 1024,
-                cdrom: {
-                    "url": "images/experimental/os/ubuntu-6.10.iso",
-                    "async": true,
-                },
-                name: "Ubuntu 6.10",
-            },
-            {
-                id: "qbasic",
-                memory_size: 128 * 1024 * 1024,
-                fda: {
-                    "url": "images/experimental/os/qbasic.img",
+                    "url": HOST + "skift-20200910.iso",
+                    "size": 64452608,
                     "async": false,
                 },
-                name: "FreeDOS + qbasic",
-            },
-            {
-                id: "os2_3",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    "url": "images/experimental/os/os2/3/disk.img",
-                    "async": true,
-                },
-                name: "OS/2 3",
-            },
-            {
-                id: "os2_4",
-                memory_size: 128 * 1024 * 1024,
-                hda: {
-                    "url": "images/experimental/os/os2_4.img",
-                    "async": true,
-                },
-                boot_order: 0x132,
-                name: "OS/2 4",
-            },
-            {
-                id: "mikeos",
-                memory_size: 32 * 1024 * 1024,
-                name: "MikeOS",
-                // qemu advent
-                fda: {
-                    "url": "images/experimental/os/mikeos.flp",
-                    "size": 1024 * 1440,
-                    "async": false,
-                },
-            },
-            {
-                id: "syllable",
-                memory_size: 128 * 1024 * 1024,
-                name: "Syllable",
-                // qemu advent
-                hda: {
-                    "url": "images/experimental/os/Syllable.bin",
-                    "async": true,
-                },
-            },
-            {
-                id: "freegem",
-                memory_size: 128 * 1024 * 1024,
-                name: "FreeGEM",
-                // qemu advent
-                hda: {
-                    "url": "images/experimental/os/freegem.bin",
-                    "async": true,
-                },
-            },
-            {
-                id: "tinycore",
-                // http://www.tinycorelinux.net/
-                cdrom: {
-                    "url": "images/experimental/os/TinyCore-current.iso",
-                    "async": false,
-                },
-                name: "Tinycore",
-            },
-            {
-                id: "tinycore8",
-                cdrom: {
-                    "url": "images/experimental/os/TinyCore-8.0.iso",
-                    "async": false,
-                },
-                name: "Tinycore 8",
-            },
-            {
-                id: "core9",
-                cdrom: {
-                    "url": "images/experimental/os/Core-9.0.iso",
-                    "async": false,
-                },
-                name: "Core 9",
-            },
-            {
-                id: "core8",
-                cdrom: {
-                    "url": "images/experimental/os/Core-8.0.iso",
-                    "async": false,
-                },
-                name: "Core 8",
-            },
-            {
-                id: "core7",
-                cdrom: {
-                    "url": "images/experimental/os/Core-7.2.iso",
-                    "async": false,
-                },
-                name: "Core 7",
-            },
-            {
-                id: "core6",
-                cdrom: {
-                    "url": "images/experimental/os/Core-6.4.1.iso",
-                    "async": false,
-                },
-                name: "Core 6",
-            },
-            {
-                id: "core5",
-                cdrom: {
-                    "url": "images/experimental/os/Core-5.4.iso",
-                    "async": false,
-                },
-                name: "Core 5",
-            },
-            {
-                id: "core4",
-                cdrom: {
-                    "url": "images/experimental/os/Core-4.7.7.iso",
-                    "async": false,
-                },
-                name: "Core 4",
+                name: "Skift",
+                homepage: "https://skiftos.org/",
             },
             {
                 id: "openwrt",
                 memory_size: 128 * 1024 * 1024,
                 hda: {
-                    "url": "images/openwrt-18.06.4-x86-legacy-combined-ext4.img",
-                    "async": true,
+                    "url": HOST + "openwrt-18.06.1-x86-legacy-combined-squashfs.img",
+                    "size": 19846474,
+                    "async": false,
                 },
                 name: "OpenWrt",
             },
             {
-                id: "genode",
-                memory_size: 1 * 1024 * 1024 * 1024,
-                cdrom: {
-                    "url": "images/experimental/qemu-advent-2016/genode/Genode_on_seL4.iso",
-                    "async": true,
+                id: "qnx",
+                memory_size: 128 * 1024 * 1024,
+                fda: {
+                    url: HOST + "qnx-demo-network-4.05.img",
+                    size: 1474560,
+                    async: false
                 },
-                name: "Genode on seL4",
+                name: "QNX 4.05",
             },
-        );
+            {
+                id: "9front",
+                memory_size: 128 * 1024 * 1024,
+                hda: {
+                    url: HOST + "9front-7781.38dcaeaa222c.386.iso",
+                    size: 496388096,
+                    async: true,
+                    use_parts: !ON_LOCALHOST,
+                },
+                state: {
+                    "url": HOST + "9front_state.bin.zst",
+                },
+                acpi: true,
+                name: "9front",
+            },
+            {
+                id: "9front-boot",
+                memory_size: 128 * 1024 * 1024,
+                hda: {
+                    url: HOST + "9front-7781.38dcaeaa222c.386.iso",
+                    size: 496388096,
+                    async: true,
+                    use_parts: !ON_LOCALHOST,
+                },
+                acpi: true,
+                name: "9front",
+            },
+            {
+                id: "mobius",
+                memory_size: 64 * 1024 * 1024,
+                fda: {
+                    "url": HOST + "mobius-fd-release5.img",
+                    "size": 1474560,
+                    "async": false,
+                },
+                name: "Mobius",
+            },
+            {
+                id: "android",
+                memory_size: 512 * 1024 * 1024,
+                cdrom: {
+                    "url": HOST + "android-x86-1.6-r2.iso",
+                    "size": 54661120,
+                    "async": true,
+                    use_parts: !ON_LOCALHOST,
+                },
+                name: "Android",
+            },
+            {
+                id: "tinycore",
+                memory_size: 256 * 1024 * 1024,
+                hda: {
+                    "url": HOST + "TinyCore-11.0.iso",
+                    "async": false,
+                },
+                name: "Tinycore",
+                homepage: "http://www.tinycorelinux.net/",
+            },
+        ];
 
         if(DEBUG)
         {
@@ -981,6 +663,14 @@
         var query_args = get_query_arguments();
         var profile = query_args["profile"];
 
+        if(!profile && !DEBUG)
+        {
+            const link = document.createElement("link");
+            link.rel = "prefetch";
+            link.href = "build/v86.wasm";
+            document.head.appendChild(link);
+        }
+
         if(query_args["use_bochs_bios"])
         {
             settings.use_bochs_bios = true;
@@ -1000,8 +690,9 @@
 
             if(element)
             {
-                element.onclick = function(infos, element)
+                element.onclick = function(infos, element, e)
                 {
+                    e.preventDefault();
                     set_profile(infos.id);
                     element.blur();
 
@@ -1081,10 +772,15 @@
                 settings.boot_order = infos.boot_order;
             }
 
-            if(!DEBUG && infos.description)
+            if(!DEBUG && infos.homepage)
             {
                 $("description").style.display = "block";
-                $("description").innerHTML = "<br>" + infos.description;
+                const link = document.createElement("a");
+                link.href = infos.homepage;
+                link.textContent = infos.name;
+                link.target = "_blank";
+                $("description").appendChild(document.createTextNode("Running "));
+                $("description").appendChild(link);
             }
 
             start_emulation(settings, done);
@@ -1220,6 +916,10 @@
             }
         }
 
+        const networking_proxy = $("networking_proxy").value;
+        const disable_audio = $("disable_audio").checked;
+        const enable_acpi = settings.acpi === undefined ? $("enable_acpi").checked : settings.acpi;
+
         /** @const */
         var BIOSPATH = "bios/";
 
@@ -1257,8 +957,7 @@
 
             "boot_order": settings.boot_order || parseInt($("boot_order").value, 16) || 0,
 
-            "network_relay_url": "wss://relay.widgetry.org/",
-            //"network_relay_url": "ws://localhost:8001/",
+            "network_relay_url": ON_LOCALHOST ? "ws://localhost:8080/" : networking_proxy,
 
             "bios": bios,
             "vga_bios": vga_bios,
@@ -1273,9 +972,10 @@
             "cmdline": settings.cmdline,
             "bzimage_initrd_from_filesystem": settings.bzimage_initrd_from_filesystem,
 
-            "acpi": settings.acpi,
+            "acpi": enable_acpi,
             "initial_state": settings.initial_state,
             "filesystem": settings.filesystem || {},
+            "disable_speaker": disable_audio,
             "preserve_mac_from_state_image": settings.preserve_mac_from_state_image,
 
             "autostart": true,
@@ -1288,27 +988,43 @@
             if(DEBUG)
             {
                 debug_start(emulator);
+            }
 
-                if(emulator.v86.cpu.wm.exports["profiler_is_enabled"]())
-                {
-                    const CLEAR_STATS = false;
+            if(emulator.v86.cpu.wm.exports["profiler_is_enabled"]())
+            {
+                const CLEAR_STATS = false;
 
-                    var panel = document.createElement("pre");
-                    document.body.appendChild(panel);
+                var panel = document.createElement("pre");
+                document.body.appendChild(panel);
 
-                    setInterval(function()
+                setInterval(function()
+                    {
+                        if(!emulator.is_running())
                         {
-                            if(!emulator.is_running())
-                            {
-                                return;
-                            }
+                            return;
+                        }
 
-                            const text = print_stats.stats_to_string(emulator.v86.cpu);
-                            panel.textContent = text;
+                        const text = print_stats.stats_to_string(emulator.v86.cpu);
+                        panel.textContent = text;
 
-                            CLEAR_STATS && emulator.v86.cpu.clear_opstats();
-                        }, CLEAR_STATS ? 5000 : 1000);
-                }
+                        CLEAR_STATS && emulator.v86.cpu.clear_opstats();
+                    }, CLEAR_STATS ? 5000 : 1000);
+            }
+
+            if(settings.id === "dsl")
+            {
+                setTimeout(() => {
+                    // hack: Start automatically
+                    emulator.keyboard_send_text("\n");
+                }, 3000);
+            }
+            else if(settings.id == "android")
+            {
+                setTimeout(() => {
+                    // hack: select vesa mode and start automatically
+                    emulator.keyboard_send_scancodes([0xe050, 0xe050 | 0x80]);
+                    emulator.keyboard_send_text("\n");
+                }, 3000);
             }
 
             init_ui(settings, emulator);
diff --git a/tests/full/run.js b/tests/full/run.js
index 29361a34..e7fbced8 100755
--- a/tests/full/run.js
+++ b/tests/full/run.js
@@ -382,7 +382,7 @@ if(cluster.isMaster)
             ].join(" "),
             filesystem: {
                 basefs: "images/fs.json",
-                baseurl: "images/arch/",
+                baseurl: "images/arch-nongz/",
             },
             expected_texts: [
                 "root@localhost",
@@ -557,7 +557,7 @@ if(cluster.isMaster)
             name: "Mobius",
             skip_if_disk_image_missing: true,
             timeout: 2 * 60,
-            fda: root_path + "/images/experimental/os/mobius-fd-release5.img",
+            fda: root_path + "/images/mobius-fd-release5.img",
             expect_graphical_mode: true,
             actions: [
                 {
@@ -570,7 +570,7 @@ if(cluster.isMaster)
             name: "Tiny Core 11 CD",
             skip_if_disk_image_missing: 1,
             timeout: 5 * 60,
-            cdrom: root_path + "/images/experimental/TinyCore-11.0.iso",
+            cdrom: root_path + "/images/TinyCore-11.0.iso",
             expect_graphical_mode: true,
             expect_mouse_registered: true,
             actions: [{ on_text: "                   BIOS default device boot in", run: "\n", after: 5000 }],
@@ -579,7 +579,7 @@ if(cluster.isMaster)
             name: "Tiny Core 11 HD",
             skip_if_disk_image_missing: 1,
             timeout: 5 * 60,
-            cdrom: root_path + "/images/experimental/TinyCore-11.0.iso",
+            cdrom: root_path + "/images/TinyCore-11.0.iso",
             expect_graphical_mode: true,
             expect_mouse_registered: true,
             actions: [{ on_text: "                   BIOS default device boot in", run: "\n", after: 5000 }],
diff --git a/v86.css b/v86.css
index e3397f2d..7ce5a891 100644
--- a/v86.css
+++ b/v86.css
@@ -22,7 +22,7 @@
     float: left;
 }
 #serial {
-    margin: 0px;
+    margin: 0;
 }
 #serial:focus {
     outline: 1px solid rgb(229, 151, 0);
@@ -52,6 +52,7 @@ body {
 }
 a {
     color: wheat;
+    text-decoration: none;
 }
 .phone_keyboard {
     width: 0;
@@ -66,7 +67,7 @@ a {
     overflow: hidden;
 }
 h4 {
-    margin: 0px 0px 20px 0px;
+    margin: 0 0 9px 0;
 }
 #start_emulation {
     padding: 6px 18px;
@@ -90,13 +91,37 @@ h4 {
     margin-bottom: 10px;
     outline: 1px solid #555;
 }
-a img {
-    margin: 10px;
-}
-.screenshots a {
+#boot_options a {
     text-decoration: none;
+    font-weight: bold;
+    font-size: 16px;
+}
+#boot_options td {
+    padding: 1px 7px;
+}
+#oses small {
+    font-size: 80%;
+    color: #ccc;
+    padding-left: 5px;
+}
+#oses tr {
+    cursor: pointer;
+}
+#oses {
+    border-spacing: 0;
+}
+#oses tr:hover {
+    background-color: #311;
+}
+#oses td:nth-child(1) {
+    white-space: pre;
+    vertical-align: top;
+}
+#terminal {
+    max-width: 1024px;
 }
 
+/* the code below was copied from xterm.css */
 
 .xterm {
     font-feature-settings: "liga" 0;