diff --git a/welcome/Haiku-tour.css b/welcome/Haiku-tour.css
index ce2968c4..a40578c7 100644
--- a/welcome/Haiku-tour.css
+++ b/welcome/Haiku-tour.css
@@ -34,8 +34,11 @@ acronym.current-page {
 	color: #892601;
 }
 
-x-topic {
-	display:block;
+div.nav {
+	z-index: 1;
+}
+
+div.topic {
 	position: relative;
 	min-height: calc(100vh - 100px);
 	margin-bottom: 5vh;
diff --git a/welcome/ca/quicktour.html b/welcome/ca/quicktour.html
index 55f3fb72..9226371d 100644
--- a/welcome/ca/quicktour.html
+++ b/welcome/ca/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/de/quicktour.html b/welcome/de/quicktour.html
index 6b7dd802..638cf72f 100644
--- a/welcome/de/quicktour.html
+++ b/welcome/de/quicktour.html
@@ -89,7 +89,7 @@
 
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
-<tr class="index"><td>[1] <a href="#start">Starseite</a><br />
+<tr class="index"><td>[1] <a href="#start">Willkommen</a><br />
 [2] <a href="#deskbar">Die Deskbar</a><br />
 [3] <a href="#window">Fenster</a><br />
 [4] <a href="#shortcutkey">Die Befehlstaste</a><br />
@@ -115,107 +115,108 @@
 <p>Während Haiku viele Konzepte anderer Betriebssysteme teilt, gibt es einige erwähnenswerte Unterschiede. Die folgenden Seiten zeigen Haikus wichtigste Features und Eigenheiten, und sollen dabei helfen den Einstieg so einfach wie möglich zu machen.</p>
 <p>Auf jeder Seite befinden sich rechts unten Links zu "weiteren Infos", die auf zusätzliche Ressourcen verweisen, beispielsweise verwandte Themen im <a href="https://www.haiku-os.org/docs/userguide/de/contents.html" target="_blank">User Guide</a>.</p>
 
+</div>
 
-<x-topic>
-<h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
+<div class="topic">
+<h1><a id="deskbar" name="deskbar">Die Deskbar</a></h1>
 
-<p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
+<p>Die Deskbar befindet sich standardmäßig oben rechts im Eck der Arbeitsfläche. Sie ist die zentrale Anlaufstelle in Haiku: Von hier können beispielsweise Anwendungen, Applets und Einstellungsdialoge gestarted, oder zwischen laufenden Programmen gewechselt werden.</p>
 
 <!-- [screenshot of opened deskbar, annotated] -->
 <div class="shot">
 <img src="./images/quicktour/deskbar.png" alt="The Deskbar" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/de/deskbar.html" target="_blank">Deskbar</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="window" name="window">The window widgets</a></h1>
+<div class="topic">
+<h1><a id="window" name="window">Fenster</a></h1>
 
-<p>Here's a typical Haiku window with its usual widgets:</p>
+<p>Dies ist ein typisches Haiku Fenster und seine Bedienelemente:</p>
 
 <!-- [screenshot of window, annotated: Close button, Zoom button (usually maximizes the window), Double-click the tab to hide/minimize a window (find it again in the Deskbar), Move a window by grabbing it at the tab or border, Resize from the corner or by dragging a border with the right mouse button.] -->
 <div class="shot">
 <img src="./images/quicktour/window.png" alt="A window and its widgets" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/de/gui.html" target="_blank">Haikus GUI</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
+<div class="topic">
+<h1><a id="shortcutkey" name="shortcutkey">Die Befehlstaste</a></h1>
 
-<p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
-This inconsistancy is one reason for the default <span class="key">ALT</span> shortcut in Haiku.</p>
+<p>Die <span class="app">Tastaturlayout</span> Einstellungen kann vom standard Haiku-Modus <span class="key">ALT</span> zum Windows/Linux-Modus <span class="key">STRG</span> gewechselt werden. Da dieser Wechsel systemweit stattfindet, wird dann beispielsweise in der Konsole ein Progamm mit <span class="key">ALT</span> <span class="key">C</span> anstatt dem üblichen <span class="key">STRG</span> <span class="key">C</span> beendet.<br />
+Diese Inkonsistenz ist einer der Gründe für die standardmäßige Verwendung von <span class="key">ALT</span> als Befehlstaste in Haiku.</p>
 
 <!-- [screenshot: Two edit menus (copy/paste/cut) with ALT and CTRL shortcut)] -->
 <div class="shot">
 <img src="./images/quicktour/alt-ctrl.png" alt="Shortcut key: ALT vs. CTRL" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/de/keyboard-shortcuts.html" target="_blank">Tastenkombinationen und -kürzel</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
+<div class="topic">
+<h1><a id="twitcher" name="twitcher">Der Twitcher</a></h1>
 
-<p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
-Tapping the <span class="key">TAB</span> key only quickly while holding <span class="key">CTRL</span> switches to the last used application.</p>
+<p>Hält man <span class="key">STRG</span> <span class="key">TAB</span>öffnet sich de <span class="app">Twitcher</span> mit dem sich zwischen den laufenden Programmen wechseln lässt.<br />
+Drückt man <span class="key">TAB</span> nur kurz während <span class="key">STRG</span> gehalten wird, wechselt man zum zuletzt benutzen Programm.</p>
 
 <div class="shot">
 <img src="../images/quicktour/twitcher.png" alt="The Twitcher switching between apps" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/de/twitcher.html" target="_blank">Twitcher</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
+<div class="topic">
+<h1><a id="teammonitor" name="teammonitor">Der Teammonitor</a></h1>
 
-<p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
+<p>Falls eine Anwendung übel abstürzt und manchmal auch nicht aus der Liste laufender Programme der Deskbar verschwindet, kann per <span class="key">STRG</span> <span class="key">ALT</span> <span class="key">DEL</span> der <span class="app">Teammonitor</span> aufgerufen werden. Hier kann die betroffene Anwendung ausgewählt und ihre Beendung erzwungen werden.</p>
 
 <div class="shot">
 <img src="./images/quicktour/teammonitor.png" alt="The Team monitor" />
 </div>
 
-<p>A neat way to quickly get rid of an app hanging in the Deskbar is the Vulcan Death Grip.<br />
-Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+<p>Eine coolere Art so eine hängende Anwendung aus der Deskbar zu befördern, ist der sogenannte 'Vulcan Death Grip'.<br />
+Während <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> gehalten wird, klickt man auf den entsprechenden Eintrag in der Deskbar. Zack, weg isser!</p>
+<div class="further">Weitere Infos::<br />
+<a href="https://www.haiku-os.org/docs/userguide/de/teammonitor.html" target="_blank">Teammonitor</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
+<div class="topic">
+<h1><a id="move-resize" name="move-resize">Fenster-Management: Position &amp; Größe</a></h1>
 
-<p>Haiku offers a neat way to quickly move or resize windows:<br />
-Holding down <span class="key">CTRL</span> <span class="key">ALT</span> will highlight the window borders nearest to the mouse pointer.<br />
-Click and dragging with the <i>right</i> mouse button will resize the window along the highlighted border(s).<br />
-Click and drag with the <i>left</i> mouse button to move it around.</p>
+<p>Haiku bietet eine bequeme Art Fenster zu bewegen oder ihre Größe zu ändern:<br />
+Wird <span class="key">STRG</span> <span class="key">ALT</span> gehalten, färben sich die dem Mauszeiger nächstgelegenen Fensterrahmen.<br />
+Klickt und zieht man mit der <i>rechten</i> Maustaste, wird die Fenstergröße entlang der eingefärbten Seite(n) geändert.<br />
+Klickt und zieht man mit der <i>linken</i> Maustaste, wird das Fenster bewegt.</p>
 
 <div class="shot">
 <img src="./images/quicktour/move-resize.png" alt="Move with CTRL+ALT+left mouse button" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/de/gui.html#move-resize" target="_blank">Bequem Fenstergröße und -position ändern</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="stack" name="stack">Window management: Stack</a></h1>
+<div class="topic">
+<h1><a id="stack" name="stack">Fenster-Management: Stapeln (Stack)</a></h1>
 
-<p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
-While holding the <span class="key">OPT</span> key (normally that's <span class="key">WIN</span> on the keyboard), tabs change color when they overlap; drop the window to establish the stacking.<br />
-You un-stack by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>Als "Stacking" bezeichnet man das Stapeln von Fenstern; die gelben Reiter werden dabei automatisch nebeneinander angeordnet.<br />
+Beim Halten von <span class="key">OPT</span> (normalerweise <span class="key">WIN</span> auf der Tastatur), ändert sich die Farbe der Reiter, sobald sie überlappen; durch Loslassen werden die Fenster dann gestapelt.<br />
+Zum Trennen wieder <span class="key">OPT</span> halten und ein Fenster an seinem Reiter fassen und aus der Fenstergruppe ziehen.</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -223,17 +224,17 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/stack.gif" alt="Stacking windows" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="tile" name="tile">Window management: Tile</a></h1>
+<div class="topic">
+<h1><a id="tile" name="tile">Fenster-Management: Andocken (Tile)</a></h1>
 
-<p>"Tiling" means gluing windows horizontally or vertically together.<br />
-While holding <span class="key">OPT</span>, the borders that'll fuse together when you drop the window change color when brought near each other.<br />
-You un-tile by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>Unter "Tiling" versteht man das horizontale oder vertikale Andocken von Fenstern, so dass sie praktisch aneinander kleben.<br />
+Beim Halten von <span class="key">OPT</span> ändert sich die Farbe der Andockstellen der Rahmen, sobald sich zwei Fenster nahe genug gekommen sind.<br />
+Zum Trennen wieder <span class="key">OPT</span> halten und ein Fenster an seinem Reiter fassen und aus der Fenstergruppe ziehen.</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -241,183 +242,181 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/tile.gif" alt="Tiling windows" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
+<div class="topic">
+<h1><a id="workspaces" name="workspaces">Arbeitsflächen</a></h1>
 
-<p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
-Up to 32 of these workspaces can be set from the <span class="app">Screen</span> preferences.</p>
-<p>The <span class="app">Workspaces</span> desktop applet can be used to change workspaces or to drag a window from one to another.</p>
-<p>The quick keyboard shortcut to change workspaces is <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
-If you add <span class="key">SHIFT</span> to that, the active window is taken with you to that workspace.</p>
+<p>Arbeitsflächen sind virtuelle Desktops, mit eigener Auflösung, Farbtiefe und eigenem Hintergrund.<br />
+Es können bis zu 32 dieser Arbeitsflächen in den <span class="app"><acronym title="Screen">Bildschirm</acronym></span> Einstellungen konfiguriert werden.</p>
+<p>Mit dem <span class="app"><acronym title="Workspaces">Arbeitsflächen</acronym></span> Applet kann man zu anderen Arbeitsflächen springen oder Fenster von der einen auf eine andere ziehen.</p>
+<p>Um schnell auf eine andere Arbeitsfläche zu wechseln, gibt es die Tastenkombination <span class="key">STRG</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
+Hält man dabei zusätzlich <span class="key">SHIFT</span> gedrückt, wird das aktive Fenster auf die neue Arbeitsfläche mitgenommen.</p>
 
 <div class="shot">
 <img src="./images/quicktour/workspaces.png" alt="The Workspaces applet" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="replicants" name="replicants">Replicants</a></h1>
+<div class="topic">
+<h1><a id="replicants" name="replicants">Replikanten</a></h1>
 
-<p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
-Provided Deskbar's option to <span class="menu">Show replicants</span> is activated, replicants are indicated by a small handle.<br />
-You can drag &amp; drop them by the handle onto the Desktop, where they are fully functional without their parent app running.</p>
+<p>Replikanten sind kleine autarke Module von Anwendungen, die in den Desktop (und andere Programme) integriert werden können.<br />
+Sofern Deskbars Option <span class="menu">Replikanten einblenden</span>  aktiviert ist, erkennt man sie am kleinen Symbol im Eck.<br />
+An dem Symbol lassen sich Replikanten per Drag &amp; Drop auf den Desktop ziehen, wo sie voll funktionsfähig sind ohne dass die ursprüngliche Anwendung dafür laufen muss.</p>
 
 <!-- [screenshot of various Replicants] -->
 <div class="shot">
 <img src="./images/quicktour/replicant.png" alt="A weather app and its replicant" />
 </div>
 
-<p>You can move a replicant by its handle and remove it with a right-click on it and choosing <span class="menu">Remove replicant</span>.</p>
+<p>Ein Replikant lässt sich am Symbol greifen und bewegen; ein Rechtsklick darauf zeigt ein Kontextmenü mit dem Menüpunkt <span class="menu">Replikant entfernen</span>.</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replikanten</a></div>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
-<p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
-Holding the <span class="key">OPT</span> key (normally <span class="key">WIN</span> on the keyboard) prevents this as it automatically closes the parent folder.<br />
-Alternatively, you can activate <span class="menu">Single window navigation</span> from the <span class="app">Tracker</span> preferences.<br />
-<span class="menu">Show navigator</span> will add back/forward buttons.</p>
+<p>Doppelklickt man auf einen Ordner nach dem anderen, hat man schnell eine Menge Trackerfenster auf dem Bildschirm.<br />
+Bei gedrückter <span class="key">OPT</span> Taste (normal <span class="key">WIN</span> auf der Tastatur) wird das verhindert, da dann der übergeordnete Ordner automatisch geschlossen wird.<br />
+Als Alternative lässt sich in den <span class="app">Tracker-Einstellungen</span> der <span class="menu">Einzelfenster-Modus</span> aktivieren.<br />
+Aktiviert man dazu noch <span class="menu">Navigator zeigen</span>, bekommt man auch noch praktische Vor/Zurück Buttons.</p>
 
 <!-- [screenshot: Tracker preferences and Tracker window with navigator] -->
 <div class="shot">
 <img src="./images/quicktour/singlewindow.png" alt="Using Single window navigation" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
+<div class="topic">
+<h1><a id="drilldown" name="drilldown">Navigation per Untermenüs</a></h1>
 
-<p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
-Drill your way down until you find the folder or file to open.</p>
+<p>Eine praktische Alternative zum Öffnen einer tiefen Ordnerhierarchie, ist die Navigation per Untermenüs. Ein Rechtsklick auf einen Ordner oder irgendwo in einem Trackerfenster (oder dem Desktop) öffnet ein Kontextmenü. Neben den üblichen Befehlen, befindet sich da ganz oben der aktuelle Ornder als Menüpunkt, der all seine Unterordner enthält.<br />
+Man kann sich durch diese ganzen Unterordner hangeln, bis man den Ordner oder die Datei gefunden hat, die geöffnet werden soll.</p>
 
 <div class="shot">
 <img src="./images/quicktour/drilldown.png" alt="Drilling down folder hierarchies" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
+<div class="topic">
+<h1><a id="mounting" name="mounting">Datenträger einhängen</a></h1>
 
-<p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
-This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the <span class="menu">Mount</span> submenu. You find the same <span class="menu">Mount</span> menu in the Deskbar. ISO images can be mounted with a double-click.</p>
+<p>Um auf eine Festplatte, CD, USB Sticks etc. zugreifen zu können, muss der Datenträger erst eingehängt werden. Danach erscheint sein Icon auf dem Desktop.<br />
+Das Einhängen erfolgt durch einen Rechtsklick auf den Desktop oder einem bereits eingehängten Datenträger (z.B. die Boot-Platte) und Auswahl des gewünschten Datenträgers aus dem <span class="menu">Einhängen</span> Untermenü. Das gleiche <span class="menu">Einhängen</span> Menü befindet sich in der Deskbar. ISO Images können per Doppelklick eingehangen werden.</p>
 
-<div class="box-warning">Before removing a USB drive etc., you have to right-click its icon and choose <span class="menu">Unmount</span> and wait for its icon to disappear. Otherwise you may lose data not yet written to it!</div>
+<div class="box-warning">Bevor man einen USB Stick etc. abzieht, muss man auf dessen Icon rechts-klicken, <span class="menu">Aushängen</span> wählen und warten bis das Icon verschwunden ist. Andernfalls gehen Daten verloren, die noch nicht geschrieben wurden!</div>
 
 <div class="shot">
 <img src="./images/quicktour/mount.png" alt="Mounting a volume" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Einhängen von Datenträgern</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
+<div class="topic">
+<h1><a id="filesystem" name="filesystem">Dateisystem Layout</a></h1>
 
-<p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
+<p>Haiku ist zwar noch kein Mehrbenutzersystem, hat aber schon zwei Äste im Dateisystembaum:</p>
 
 <table summary="layout" border="0" cellspacing="0" cellpadding="8">
-<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>The system hierarchy contains system files and settings for all users. The package management makes most folders under /system effectively read-only. Packages contain all their files in a fixed folder hierarchy. Upon installation, a package gets "mounted" and all its files just appear to be in that hierarchy in the /system folder.<br />
-The folders there (like <i>add-ons</i>, <i>apps</i>, <i>bin</i> etc.) are just a virtual amalgamation of all the installed packages and are therefore read-only. Exceptions are <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>Die System Hierarchie enthält Systemdateien und Einstellungen für alle Benutzer. Durch das Paketmanagement erscheinen die meisten Ordner unter /system praktisch schreibgeschützt. Alle Dateien in Paketen befinden sich in einer festen Ordner Hierarchie. Bei der Installation wird ein Paket "eingehängt" und es hat nur den Anschein all seine Dateien wären in dieser Hierarchie im /system Ordner.<br />
+Die Ordner dort (wie <i>add-ons</i>, <i>apps</i>, <i>bin</i> etc.) sind nur eine virtuelle Zusammenführung all der installierten Pakete und daher nicht beschreibbar. Ausnahmen sind <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, und <i>var</i>.
 <ul>
-<li><span class="path">/system/packages/</span> is the default install location for software.</li>
-<li><span class="path">/system/documentation/</span> is used by some applications to store their manual.</li>
-</ul>
-</td></tr>
-<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>The home hierarchy is your personal folder where you keep your data and settings. The folder /boot/home/config (or shortened ~/config) mirrors the /system folder described above and is likewise virtually read-only with the same exceptions of <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<li><span class="path">/system/packages/</span> ist der standardmäßige Speicherort für Softwarepakete.</li>
+<li><span class="path">/system/documentation/</span> wird von einigen Paketen für ihre Bedienungsanleitung benutzt.</li>
+</ul></td></tr>
+<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>Die Home Hierarchie ist der persönliche Ordner des Benutzers, in dem Daten und Einstellungen gespeichert werden. Der Ordner /boot/home/config (kürzer: ~/config) spiegelt den oben beschriebenen /system Ordner und ist ebenso praktisch schreibgeschützt mit denselben Ausnahmen von <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, und <i>var</i>.
 <ul>
-<li><span class="path">~/Desktop/</span> is where the files of your Desktop live.</li>
-<li><span class="path">~/config/settings/</span> is where the system and applications store your settings.</li>
-</ul>
-</td></tr>
+<li><span class="path">~/Desktop/</span>: Hier befinden sich alle Dateien die auf dem Desktop liegen.</li>
+<li><span class="path">~/config/settings/</span>: Hier speichern Anwendungen und Haiku persönliche Einstellungen.</li>
+</ul></td></tr>
 </table>
 
-<p>The writable <i>non-packaged</i> folders mirror the hierarchy of the /system or ~/config/ hierarchy (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).<br />
-Software that doesn't come in form of a HPKG package can be installed here.</p>
+<p>Die beschreibbaren <i>non-packaged</i> Ordner spiegeln die Hierarchie von /system bzw. ~/config/ (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).<br />
+Hier kann Software installiert werden, die nicht als HPKG Paket vorliegt.</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
-<a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Dateisystem Layout</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Anwendungen</a><br />
+<a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure (Englisch)</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="queries" name="queries">Finding files with queries</a></h1>
+<div class="topic">
+<h1><a id="queries" name="queries">Dateien mit Queries suchen</a></h1>
 
-<p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
+<p>Dateien auf Haiku formatierten (BFS) Datenträgern können sehr schnell per <span class="menu">Suchen…</span> aus der Deskbar gefunden werden. Neben Datei- und Ordnernamen kann auch nach Dateityp-spezifischen Attributen gesucht werden, beispielsweise nach einen Künstler in der MP3 Sammlung.</p>
 
 <!-- [screenshot of Find window and result window of Artitst == Fairport] -->
 <div class="shot">
 <img src="./images/quicktour/query.png" alt="Finding all MP3s of an artist" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Dateitypen, Attribute, Index und Queries</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="wireless" name="wireless">Wireless connection</a></h1>
+<div class="topic">
+<h1><a id="wireless" name="wireless">Funknetzwerke</a></h1>
 
-<p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
-or by selecting your network from the <span class="app">Network</span> preferences.<br />
-When the connection is established, you'll be asked for the network's encryption and password.</p>
+<p>Mit einem WLAN Router kann man sich entweder per Rechtsklick auf das <span class="app"><acronym title="NetworkStatus">Netzwerkstatus</acronym></span> Icon im Tray der Deskbar verbinden,<br />
+oder durch Auswahl seines Netzwerks in den <span class="app"><acronym title="Network">Netzwerk</acronym></span> Einstellungen.<br />
+Steht die Verbindung, wird man nach Netzwerk-Verschlüsselung und Kennwort gefragt.</p>
 
 <!-- [screenshot of Network prefs, context menu of icon in deskbar] -->
 <div class="shot">
 <img src="./images/quicktour/wireless.png" alt="Connecting with a wireless network" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+<div class="further">Weitere Infos:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Funknetzwerke nutzen</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">Netzwerkstatus</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Netzwerk Einstellugen</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
+<div class="topic">
+<h1><a id="moresoftware" name="moresoftware">Software finden und aktualisieren</a></h1>
 
-<p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
-<span class="app">SoftwareUpdater</span> should be started from time to time to update installed software as well as Haiku itself.</p>
+<p>Mit <span class="app">HaikuDepot</span> aus Deskbars Anwendungsmenü kann man Softwarepakete suchen, installieren und deinstallieren.<br />
+<span class="app">SoftwareUpdater</span> sollte man ab und zu starten um installierte Programme und Haiku selbst zu aktualisieren.</p>
 
 <!-- [screenshot of HaikuDepot and SoftwareUpdater] -->
 <div class="shot">
 <img src="./images/quicktour/moresoftware.png" alt="Installing and updating apps" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Weitere Infos:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Paketquellen</a></div>
+</div>
 
+<div>
 <h1><a id="end" name="end">Ende</a></h1>
 
 <p>Das ist das Ende der Tour. Hoffentlich hat sie dabei geholfen sich in dem neuen Betriebssystem schnell wie zuhause zu fühlen!</p>
diff --git a/welcome/en/quicktour.html b/welcome/en/quicktour.html
index fbed38c6..c4338d0f 100644
--- a/welcome/en/quicktour.html
+++ b/welcome/en/quicktour.html
@@ -86,7 +86,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -113,8 +113,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -126,10 +127,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -141,10 +142,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -157,10 +158,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -172,10 +173,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -188,10 +189,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -205,10 +206,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -223,10 +224,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -241,10 +242,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -260,10 +261,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -279,10 +280,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -297,10 +298,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -312,10 +313,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -329,10 +330,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -360,10 +361,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -376,10 +377,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -395,10 +396,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -413,9 +414,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/es/quicktour.html b/welcome/es/quicktour.html
index 2cc38347..eb650c1f 100644
--- a/welcome/es/quicktour.html
+++ b/welcome/es/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/fi/quicktour.html b/welcome/fi/quicktour.html
index 9f53d50c..02deaaab 100644
--- a/welcome/fi/quicktour.html
+++ b/welcome/fi/quicktour.html
@@ -9,12 +9,14 @@
  *
  * Authors:
  *		Humdinger <humdingerb@gmail.com>
+ * Translators:
+ *		Jorma Karvonen
  *
 -->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<meta name="robots" content="all" />
-	<title>Haiku Quick Tour</title>
+	<title>Haiku-pikaopas</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<link rel="stylesheet" type="text/css" href="../Haiku-doc.css" />
@@ -87,134 +89,134 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
-[2] <a href="#deskbar">The Deskbar</a><br />
-[3] <a href="#window">The window widgets</a><br />
-[4] <a href="#shortcutkey">The shortcut key</a><br />
-[5] <a href="#twitcher">The Twitcher</a><br />
-[6] <a href="#teammonitor">The Team monitor</a><br />
-[7] <a href="#move-resize">Window management: Move &amp; Resize</a><br />
-[8] <a href="#stack">Window management: Stack</a><br />
-[9] <a href="#tile">Window management: Tile</a><br />
-[10] <a href="#workspaces">Workspaces</a><br />
-[11] <a href="#replicants">Replicants</a><br />
-[12] <a href="#singlewindow">Single window navigation</a><br />
-[13] <a href="#drilldown">Drill-down navigation</a><br />
-[14] <a href="#mounting">Mounting volumes</a><br />
-[15] <a href="#filesystem">Filesystem layout</a><br />
-[16] <a href="#queries">Finding files with queries</a><br />
-[17] <a href="#wireless">Wireless connection</a><br />
-[18] <a href="#moresoftware">Getting more and updating software</a><br />
-[19] <a href="#end">The end</a><br />
+[1] <a href="#start">Tervetuloa</a><br />
+[2] <a href="#deskbar">Työpöytäpalkki</a><br />
+[3] <a href="#window">Ikkunakäyttöliittymäkomponentit</a><br />
+[4] <a href="#shortcutkey">Pikanäppäin</a><br />
+[5] <a href="#twitcher">Vaihtaja</a><br />
+[6] <a href="#teammonitor">Ryhmävalvonta</a><br />
+[7] <a href="#move-resize">Ikkunahallinta: Siirrä &amp; Muuta kokoa</a><br />
+[8] <a href="#stack">Ikkunahallinta: Pino</a><br />
+[9] <a href="#tile">Ikkunahallinta: Laatoitus</a><br />
+[10] <a href="#workspaces">Työtilat</a><br />
+[11] <a href="#replicants">Kopiot</a><br />
+[12] <a href="#singlewindow">Yksittäisikkunan navigointi</a><br />
+[13] <a href="#drilldown">Porrasnavigointi</a><br />
+[14] <a href="#mounting">Taltioiden liittäminen</a><br />
+[15] <a href="#filesystem">Tiedostojärjestelmäsijoittelu</a><br />
+[16] <a href="#queries">Tiedostojen etsintä kyselyillä</a><br />
+[17] <a href="#wireless">Langaton yhteys</a><br />
+[18] <a href="#moresoftware">Kuinka saada lisää ohjelmia ja päivittää niitä</a><br />
+[19] <a href="#end">Loppu</a><br />
 </td></tr>
 </table>
 
-<h1><a id="start" name="start">Welcome to Haiku's Quick Tour</a></h1>
+<h1><a id="start" name="start">Tervetuloa Haikun pikaoppaaseen</a></h1>
 
-<p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
-<p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
+<p>Vaikka Haiku jakaa muiden käyttöjärjestemien monia ajatuksia, siinä on joillakin alueilla ainutlaatuisia ominaisuuksia, jotka on hyvä mainita. Muutamalla kalvolla opit tärkeimmistä Haiku-ominaisuuksista ja erikoisuuksista, jotka helpottavat nopeaa käyttöäsi.</p>
+<p>Jokaisen sivun pohjalla on linkkejä "lisälukemisiin", jotka osoittavat lisäresursseihin, kuten asiaan liittyviiin aiheisiin dokumentissa <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Käyttäjäopas</a>.</p>
 
+</div>
 
-<x-topic>
-<h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
+<div class="topic">
+<h1><a id="deskbar" name="deskbar">Työpöytäpalkki</a></h1>
 
-<p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
+<p>Oletuksena työpöydän oikeassa yläkulmassa on Työpöytäpalkki-käyttöliittymäkomponentti vuorovaikutukseen Haikun kanssa. Voit käynnistää siitä esimerkiksi sovelluksia, sovelmia ja asetusohjelmia ja vaihtaa suoritettavasta sovelluksesta toiseen.</p>
 
 <!-- [screenshot of opened deskbar, annotated] -->
 <div class="shot">
 <img src="./images/quicktour/deskbar.png" alt="The Deskbar" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Työpöytäpalkki</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="window" name="window">The window widgets</a></h1>
+<div class="topic">
+<h1><a id="window" name="window">Ikkunakäyttöliittymäkomponentit</a></h1>
 
-<p>Here's a typical Haiku window with its usual widgets:</p>
+<p>Tässä on tyypillinen Haiku-ikkuna käyttöliittymäkomponentteineen:</p>
 
 <!-- [screenshot of window, annotated: Close button, Zoom button (usually maximizes the window), Double-click the tab to hide/minimize a window (find it again in the Deskbar), Move a window by grabbing it at the tab or border, Resize from the corner or by dragging a border with the right mouse button.] -->
 <div class="shot">
 <img src="./images/quicktour/window.png" alt="A window and its widgets" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haikun graafinen käyttöliittymä</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
+<div class="topic">
+<h1><a id="shortcutkey" name="shortcutkey">Pikanäppäin</a></h1>
 
-<p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
-This inconsistancy is one reason for the default <span class="key">ALT</span> shortcut in Haiku.</p>
+<p><span class="app">Näppäimistöasetukset</span>-sovellus mahdollistaa vaihtamisen Haikun vakiosta <span class="key">ALT</span>-näppäimestä <span class="key">CTRL</span> (Windows/Linux-tila)-näppäimeen. Tämä on yleiskytkin, joten esimerkiksi ohjelmasta poistuminen pääteikkunassa tehdään sen jälkeen <span class="key">ALT</span> <span class="key">C</span>-näppäimillä eikä tavallisilla <span class="key">CTRL</span> <span class="key">C</span>-näppäimillä.<br />
+Tämä epäjohdonmukaisuus on yksi syy siihen, että <span class="key">ALT</span>-painike on pikanäppäin Haikussa.</p>
 
 <!-- [screenshot: Two edit menus (copy/paste/cut) with ALT and CTRL shortcut)] -->
 <div class="shot">
 <img src="./images/quicktour/alt-ctrl.png" alt="Shortcut key: ALT vs. CTRL" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Pikanäppäimet ja näppäinyhdistelmät</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
+<div class="topic">
+<h1><a id="twitcher" name="twitcher">Vaihtaja</a></h1>
 
-<p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
-Tapping the <span class="key">TAB</span> key only quickly while holding <span class="key">CTRL</span> switches to the last used application.</p>
+<p>Pitämällä alhaalla näppäimiä <span class="key">CTRL</span> <span class="key">TAB</span> kutsutaan <span class="app">Vaihtaja</span> jossa voit vaihtaa käynnissä olevien sovelluksien suoritusta.<br />
+Nopea napauttaminen <span class="key">TAB</span>-näppäimeen samalla kun pidetään alhaalla <span class="key">CTRL</span>-näppäintä vaihtaa viimeksi käytettyyn sovellukseen.</p>
 
 <div class="shot">
 <img src="../images/quicktour/twitcher.png" alt="The Twitcher switching between apps" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Vaihtaja</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
+<div class="topic">
+<h1><a id="teammonitor" name="teammonitor">Ryhmävalvonta</a></h1>
 
-<p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
+<p>Jos jotkut sovellukset kaatuvat pahasti eivätkä katoa Seuraajan käynnissä olevien sovellusten luettelosta, paina <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> <span class="app">Ryhmävalvonta</span>-sovelluksen kutsumiseksi. Siinä voit valita rivin ja nitistää väärin käyttäytyvän sovelluksen.</p>
 
 <div class="shot">
 <img src="./images/quicktour/teammonitor.png" alt="The Team monitor" />
 </div>
 
-<p>A neat way to quickly get rid of an app hanging in the Deskbar is the Vulcan Death Grip.<br />
-Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+<p>Näppärä tapa päästä eroon kaatuneesta sovelluksesta Työpöytäpalkissa on Vulcan-kuolo-ote.<br />
+Pidä alhaalla näppäimet <span class="key">VAIHTO</span> <span class="key">CTRL</span> <span class="key">ALT</span> ja napsauta virheellisesti toimivan sovelluksen riviä Työpöytäpalkissa. Puff!</p>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Ryhmävalvonta</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
+<div class="topic">
+<h1><a id="move-resize" name="move-resize">Ikkunahallinta: Siirrä &amp; Muuta kokoa</a></h1>
 
-<p>Haiku offers a neat way to quickly move or resize windows:<br />
-Holding down <span class="key">CTRL</span> <span class="key">ALT</span> will highlight the window borders nearest to the mouse pointer.<br />
-Click and dragging with the <i>right</i> mouse button will resize the window along the highlighted border(s).<br />
-Click and drag with the <i>left</i> mouse button to move it around.</p>
+<p>Haiku tarjoaa näppärän tavan ikkunoiden nopeaan siirtoon tai koon muuttamiseen:<br />
+Pitämällä alhaalla näppäimiä <span class="key">CTRL</span> <span class="key">ALT</span> korostetaan ikkunarajoja, jotka sijaitsevat lähinnä hiiren kohdistinta.<br />
+Hiiren <i>kakkospainikkeen (yleensä oikea painike)</i> napsautus ja raahaus muuttaa korostetun ikkunan rajojen kokoa.<br />Hiiren <i>ykköspainikkeen</i> napsautus ja raahaus siirtää sitä ympäriinsä.</p>
 
 <div class="shot">
 <img src="./images/quicktour/move-resize.png" alt="Move with CTRL+ALT+left mouse button" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">Nopea tapa siirtää tai muuttaa ikkunan kokoa</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="stack" name="stack">Window management: Stack</a></h1>
+<div class="topic">
+<h1><a id="stack" name="stack">Ikkunahallinta: Pino</a></h1>
 
-<p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
-While holding the <span class="key">OPT</span> key (normally that's <span class="key">WIN</span> on the keyboard), tabs change color when they overlap; drop the window to establish the stacking.<br />
-You un-stack by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>"Pinomalla" laitetaan ikkunoita toistensa päälle, mikä siirtää automaattisesti keltaisen välilehden paikkaa.<br />
+Pitämällä alhaalla <span class="key">OPT</span>-näppäintä (tavallisesti se on <span class="key">WIN</span>-näppäimistössä), välilehdet vaihtavat väriä, kun ikkuna sijoitetaan toisensa päälle; ikkunan pudottaminen saa aikaan pinoamisen.<br />
+Voit purkaa pinon <span class="key">OPT</span>-näppäimellä ja raahaamalla ikkunan pois keltaisen välilehden ryhmittämästä ryhmästä.</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -222,17 +224,17 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/stack.gif" alt="Stacking windows" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Pino &amp; Laatoitus</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="tile" name="tile">Window management: Tile</a></h1>
+<div class="topic">
+<h1><a id="tile" name="tile">Ikkunahallinta: Laatoitus</a></h1>
 
-<p>"Tiling" means gluing windows horizontally or vertically together.<br />
-While holding <span class="key">OPT</span>, the borders that'll fuse together when you drop the window change color when brought near each other.<br />
-You un-tile by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>"Laatoitus" tarkoittaa ikkunoiden liimaamista yhteen vaakasuoraan tai pystysuoraan.<br />
+Pitämällä alhaalla <span class="key">OPT</span>-näppäintä yhteen liimattavien ikkunoiden rajat vaihtavat väriä, kun ne tuodaan toistensa lähelle.<br />
+Voit purkaa laatoituksen pitämällä alhaalla <span class="key">OPT</span>-näppäimen ja raahaamalla ikkunan pois keltaisella välilehdellä merkitystä ryhmästä.</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -240,189 +242,189 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/tile.gif" alt="Tiling windows" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Pino &amp; Laatoitus</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
+<div class="topic">
+<h1><a id="workspaces" name="workspaces">Työtilat</a></h1>
 
-<p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
-Up to 32 of these workspaces can be set from the <span class="app">Screen</span> preferences.</p>
-<p>The <span class="app">Workspaces</span> desktop applet can be used to change workspaces or to drag a window from one to another.</p>
-<p>The quick keyboard shortcut to change workspaces is <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
-If you add <span class="key">SHIFT</span> to that, the active window is taken with you to that workspace.</p>
+<p>Työtilat ovat virtuaalisia työpöytiä, täysin omilla resoluutioilla, värisyvyydellä ja taustalla.<br />
+Tällaisia työtiloja voidaan asettaa enintään 32 kappaletta <span class="app">Näyttöasetukset</span>-sovelluksesta.</p>
+<p><span class="app">Työtilat</span>-sovelmaa voidaan käyttää työtilojen muuttamiseen tai raahaamiseen ikkunasta toiseen.</p>
+<p>Nopea pikanäppäin työtilojen muuttamiseen on <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
+Jos lisäät noihin <span class="key">VAIHTO</span>-näppäimen, niin aktiivinen ikkuna vie sinut tuohon työtilaan.</p>
 
 <div class="shot">
 <img src="./images/quicktour/workspaces.png" alt="The Workspaces applet" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Työtilat</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Näyttöasetukset</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="replicants" name="replicants">Replicants</a></h1>
+<div class="topic">
+<h1><a id="replicants" name="replicants">Kopiot</a></h1>
 
-<p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
-Provided Deskbar's option to <span class="menu">Show replicants</span> is activated, replicants are indicated by a small handle.<br />
-You can drag &amp; drop them by the handle onto the Desktop, where they are fully functional without their parent app running.</p>
+<p>Kopiot ovat pieniä itsensä sisältäviä sovellusten osia, jotka voidaan integroida Työpöytään (ja muihin ohjelmiin).<br />
+Jos tarjottu Työpöytäpalkin valitsin <span class="menu">Näytä kopiot</span> on aktivoitu, pieni kahva ilmaisee kopioita.<br />
+Voit raahatta &amp; pudottaa ne kahvasta Työpöydälle, missä ne ovat täysin toimivia ilman käynnissä olevaa isäntäsovellusta.</p>
 
 <!-- [screenshot of various Replicants] -->
 <div class="shot">
 <img src="./images/quicktour/replicant.png" alt="A weather app and its replicant" />
 </div>
 
-<p>You can move a replicant by its handle and remove it with a right-click on it and choosing <span class="menu">Remove replicant</span>.</p>
+<p>Voit siirtää kopiota kahvasta ja poistaa se napsauttamalla hiiren kakkospainikkeella siihen ja valitsemalla valikkorivin <span class="menu">Poista kopio</span>.</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Kopiot</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
+<div class="topic">
+<h1><a id="singlewindow" name="singlewindow">Yksittäisikkunan navigointi</a></h1>
 
-<p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
-Holding the <span class="key">OPT</span> key (normally <span class="key">WIN</span> on the keyboard) prevents this as it automatically closes the parent folder.<br />
-Alternatively, you can activate <span class="menu">Single window navigation</span> from the <span class="app">Tracker</span> preferences.<br />
-<span class="menu">Show navigator</span> will add back/forward buttons.</p>
+<p>Kaksoisnapsauttamalla kansiosta kansioon huomaat saaneesi näkyviin monia avoimia Seuraaja-ikkunoita.<br />
+Pitämällä alhaalla <span class="key">OPT</span>-näppäintä (normaalisti <span class="key">WIN</span>-näppäimistössä) estät sen, koska se sulkee automaattisesti isäntäkansion.<br />
+Vaihtoehtoisesti voit aktivoida <span class="menu">Yksittäisikkunanavigointi</span>-valikkorivin <span class="app">Seuraaja</span>-asetuksista.<br />
+<span class="menu">Näytä navigaattori</span> lisää taaksepäin/eteenpäin painikkeet.</p>
 
 <!-- [screenshot: Tracker preferences and Tracker window with navigator] -->
 <div class="shot">
 <img src="./images/quicktour/singlewindow.png" alt="Using Single window navigation" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Seuraaja</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
+<div class="topic">
+<h1><a id="drilldown" name="drilldown">Porrasnavigointi</a></h1>
 
-<p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
-Drill your way down until you find the folder or file to open.</p>
+<p>Näppärää vaihtoehtoa syvän kansiohierarkian avaamiseksi kutsutaan "porrasnavigoinniksi". Napsauttamalla hiiren kakkospainikeella (tavallisesti oikea painike) kansiota tai mitä kohtaa tahansa Seuraaja-ikkunassa (tai Työpöydällä) avaat asiayhteysvalikon. Erilaisten odotettujen komentojen lisäksi siinä on ylimmäisenä nykyisen kansion valikkorivi, joka sisältää kaikki sen alikansiot.<br />
+Askella alas valikkoa kunnes löydät haluamasi kansion tai tiedoston avattavaksi.</p>
 
 <div class="shot">
 <img src="./images/quicktour/drilldown.png" alt="Drilling down folder hierarchies" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Seuraajanavigointi</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
+<div class="topic">
+<h1><a id="mounting" name="mounting">Taltioiden liittäminen</a></h1>
 
-<p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
-This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the <span class="menu">Mount</span> submenu. You find the same <span class="menu">Mount</span> menu in the Deskbar. ISO images can be mounted with a double-click.</p>
+<p>Kiitolevyn, CD:n, USB-tikun jne. käyttämiseksi taltio on ensin liitettävä. Kun taltio on liitetty, sen kuvake ilmestyy Työpöydälle.<br />
+Tämä tehdään Työpöydällä napsauttamalla hiiren kakkospainikkeella (yleensä oikea painike) Työpöytää tai jo liitettyä taltiota (kuten käynnistyslevy) ja valitsemalla taltio <span class="menu">Liitä</span>-alivalikosta. Löydät saman <span class="menu">Liitä</span>-valikon Työpöytäpalkista. ISO-levykuvat voidaan liittää kaksoisnapsautuksella.</p>
 
-<div class="box-warning">Before removing a USB drive etc., you have to right-click its icon and choose <span class="menu">Unmount</span> and wait for its icon to disappear. Otherwise you may lose data not yet written to it!</div>
+<div class="box-warning">Ennen USB-tikun jne. poistamista sinun on napsautettava hiiren kakkospainikkeella (yleensä oikea painike) sen kuvaketta ja valittava <span class="menu">Irrota</span> ja odotettava kuvakkeen häviämistä. Muussa tapauksessa saatat kadotta tiedoja, joita ei ole vielä kirjoitettu sille!</div>
 
 <div class="shot">
 <img src="./images/quicktour/mount.png" alt="Mounting a volume" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Liitetään taltioita</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
+<div class="topic">
+<h1><a id="filesystem" name="filesystem">Tiedostojärjestelmäsijoittelu</a></h1>
 
-<p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
+<p>Vaikka Haiku ei nykyisin ole monikäyttäjäjärjestelmä, tiedostojärjestelmäpuussa on jo kaksi haaraa:</p>
 
 <table summary="layout" border="0" cellspacing="0" cellpadding="8">
-<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>The system hierarchy contains system files and settings for all users. The package management makes most folders under /system effectively read-only. Packages contain all their files in a fixed folder hierarchy. Upon installation, a package gets "mounted" and all its files just appear to be in that hierarchy in the /system folder.<br />
-The folders there (like <i>add-ons</i>, <i>apps</i>, <i>bin</i> etc.) are just a virtual amalgamation of all the installed packages and are therefore read-only. Exceptions are <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>Järjestelmähierarkia sisältää järjestelmätiedostoja ja asetuksia kaikille käyttäjille. Pakkaushallinta tekee useimmat kansiot /system-kansion alla tosiasiassa kirjoitussuojatuiksi. Pakkaukset sisisältävät kaikki niiden tiedostot kiinteässä kansiohierarkiassa. Asennuksen yhteydessä pakkaukset "liitetään" ja kaikki sen tiedostot vain näyttävät olevan tuossa hierarkiassa /system-kansiossa.<br />
+Kansiot siellä (kuten <i>add-ons</i>, <i>apps</i>, <i>bin</i> jne.) ovat vain asennettujen pakkausten virtuaalisia yhdistymisiä ja siksi kirjoitussuojattuja. Poikkeuksia ovat kansiot <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, ja <i>var</i>.
 <ul>
-<li><span class="path">/system/packages/</span> is the default install location for software.</li>
-<li><span class="path">/system/documentation/</span> is used by some applications to store their manual.</li>
+<li><span class="path">/system/packages/</span> on ohjelmien oletusasennuskansio.</li>
+<li><span class="path">/system/documentation/</span>-kansioon jotkut sovellukset tallentavat ohjekirjansa.</li>
 </ul>
 </td></tr>
-<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>The home hierarchy is your personal folder where you keep your data and settings. The folder /boot/home/config (or shortened ~/config) mirrors the /system folder described above and is likewise virtually read-only with the same exceptions of <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>Henkilökohtainen kansiosi on home-hierarkiassa, jossa säilytät tietojasi ja asetuksiasi. Kansio /boot/home/config (tai lyhennettynä ~/config) peilaa yllä kuvattua /system-kansiota ja samanlainen virtuaalinen kirjoitussuojattu kansio samoilla poikkeuksilla: <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, ja <i>var</i>.
 <ul>
-<li><span class="path">~/Desktop/</span> is where the files of your Desktop live.</li>
-<li><span class="path">~/config/settings/</span> is where the system and applications store your settings.</li>
+<li><span class="path">~/Desktop/</span>-kansiossa ovat Työpöytä-tiedostosi.</li>
+<li><span class="path">~/config/settings/</span>-kansio on asetuksiesi järjestelmä- ja sovellustallennuspaikka.</li>
 </ul>
 </td></tr>
 </table>
 
-<p>The writable <i>non-packaged</i> folders mirror the hierarchy of the /system or ~/config/ hierarchy (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).<br />
-Software that doesn't come in form of a HPKG package can be installed here.</p>
+<p>Kirjoitettavat <i>non-packaged</i>-kansiot peilaavat /system-hierarkiaa tai ~/config/-hierarkiaa (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).<br />
+Tähän voidaan asentaa ohjelmistot, jotka eivät tule HPKG-pakkausmuodossa.</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
-<a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Tiedostojärjestelmäsijoittelu</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Sovellukset</a><br />
+<a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Hakemistorakenne</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="queries" name="queries">Finding files with queries</a></h1>
+<div class="topic">
+<h1><a id="queries" name="queries">Tiedostojen etsintä kyselyillä</a></h1>
 
-<p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
+<p>Tiedostot Haiku-alustetussa (BFS)-taltiossa etsitään nopeasti Työpöytäpalkin <span class="menu">Etsi…</span>-valikolla. Tiedosto- ja kansionimien sijasta voit etsiä myös tiedostotyyppisten attribuuttien kautta, esim. artisti MP3-kokoelmassasi.</p>
 
 <!-- [screenshot of Find window and result window of Artitst == Fairport] -->
 <div class="shot">
 <img src="./images/quicktour/query.png" alt="Finding all MP3s of an artist" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Kyselyt</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Työpaja:Tiedostotyypit, attribuutit, indeksi ja kyselyt</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="wireless" name="wireless">Wireless connection</a></h1>
+<div class="topic">
+<h1><a id="wireless" name="wireless">Langaton yhteys</a></h1>
 
-<p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
-or by selecting your network from the <span class="app">Network</span> preferences.<br />
-When the connection is established, you'll be asked for the network's encryption and password.</p>
+<p>Voit yhdistää WLAN-reitittimesi joko napsauttamalla hiiren kakkospainikkeella (useimmiten oikea painike) <span class="app">Verkkotila</span>-kuvaketta Seuraajan tarjottimessa,<br />
+tai valitsemalla verkkosi <span class="app">Verkkoasetukset</span>-sovelluksesta.<br />
+Kun yhteys on muodostettu, sinulta kysytään verkon salausta ja salasanaa.</p>
 
 <!-- [screenshot of Network prefs, context menu of icon in deskbar] -->
 <div class="shot">
 <img src="./images/quicktour/wireless.png" alt="Connecting with a wireless network" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Työpaja: Langaton verkko</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">Verkkotila</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Verkkoasetukset</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
+<div class="topic">
+<h1><a id="moresoftware" name="moresoftware">Kuinka saada lisää ohjelmia ja päivittää niitä</a></h1>
 
-<p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
-<span class="app">SoftwareUpdater</span> should be started from time to time to update installed software as well as Haiku itself.</p>
+<p><span class="app">HaikuVarasto</span> Työpöytäpalkin sovellusvalikossa on paikka, josta voit etsiä, asentaa ja poistaa ohjelmapakkauksia.<br />
+<span class="app">Ohjelmistopäivittäjä</span> käynnistettäisiin aika ajoin päivittämään asennettuja ohjelmia ja itse Haikua.</p>
 
 <!-- [screenshot of HaikuDepot and SoftwareUpdater] -->
 <div class="shot">
 <img src="./images/quicktour/moresoftware.png" alt="Installing and updating apps" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
+<div class="further">Lisälukemista:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuVarasto</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">Ohjelmistopäivittäjä</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Tietovarastot</a></div>
+</div>
 
+<div>
+<h1><a id="end" name="end">Loppu</a></h1>
 
-<h1><a id="end" name="end">The end</a></h1>
-
-<p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
-<p>For more detailed information, check out the <a href="https://www.haiku-os.org/docs/welcome/welcome_en.html" target="_blank">Welcome page</a> and the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">User Guide</a>.<br />
-You can also join our <a href="https://discuss.haiku-os.org/" target="_blank">Webforum</a> and <a href="https://www.haiku-os.org/community/irc/" target="_blank">main IRC channel #haiku</a> to get help or discuss your ideas.</p>
-<p>The Haiku website has information how to <a href="https://www.haiku-os.org/community/getting-involved/" target="_blank">get involved</a> in driving Haiku forward. You can also make <a href="https://www.haiku-os.org/community/donating_to_haiku" target="_blank">financial donations</a>.</p>
+<p>Tämä on opaskiertueen loppu. Toivomme, että se auttoi sinua kotiutumaan nopeasi uuteen käyttöjärjestelmääsi!</p>
+<p>Tarkista lisätietoja varten <a href="https://www.haiku-os.org/docs/welcome/welcome_en.html" target="_blank">Tervetuloa-sivu</a> ja <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Käyttäjäopas</a>.<br />
+Voit myös liittyä <a href="https://discuss.haiku-os.org/" target="_blank">Webbifoorumille</a> ja <a href="https://www.haiku-os.org/community/irc/" target="_blank">pää-IRC-kanavalle #haiku</a> saadaksesi apua ja keskustellaksesi ajatuksistasi.</p>
+<p>Haiku-webbisivulla on tietoja siitä kuinka  <a href="https://www.haiku-os.org/community/getting-involved/" target="_blank">liitytään mukaan</a> Haikun ajamiseksi edelleen. Voit myös tehdä <a href="https://www.haiku-os.org/community/donating_to_haiku" target="_blank">taloudellisia lahjoituksia</a>.</p>
 
 <p><br /></p>
 <div class="shot">
diff --git a/welcome/fr/quicktour.html b/welcome/fr/quicktour.html
index 1507d638..bc09f24f 100644
--- a/welcome/fr/quicktour.html
+++ b/welcome/fr/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/fur/quicktour.html b/welcome/fur/quicktour.html
index 89484c0d..7ad1538f 100644
--- a/welcome/fur/quicktour.html
+++ b/welcome/fur/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/hu/quicktour.html b/welcome/hu/quicktour.html
index 33bc6dac..f9c7fbcc 100644
--- a/welcome/hu/quicktour.html
+++ b/welcome/hu/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/id/quicktour.html b/welcome/id/quicktour.html
index 8e577e37..09f0e7b6 100644
--- a/welcome/id/quicktour.html
+++ b/welcome/id/quicktour.html
@@ -89,7 +89,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -116,107 +116,107 @@
 <p>Sementara Haiku berbagi banyak ide dengan sistem operasi lain, ia memang memiliki pendekatan unik di beberapa area yang pantas untuk ditunjukkan. Hanya dalam beberapa slide, Anda akan belajar tentang fitur Haiku yang paling penting dan kekhasan yang akan membantu Anda mengawali dengan cepat.</p>
 <p>Di kanan bawah setiap halaman, terdapat tautan untuk "bacaan lebih lanjut" yang mengarah ke sumber daya tambahan, seperti topik terkait di <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
-<h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
+<div class="topic">
+<h1><a id="deskbar" name="deskbar">Deskbar</a></h1>
 
-<p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
+<p>Secara default di sudut kanan atas desktop, Deskbar adalah pusat interaksi dengan Haiku. Anda dapat memulai aplikasi, applet dan preferensi dari sana, misalnya, dan beralih di antara aplikasi yang sedang berjalan.</p>
 
 <!-- [screenshot of opened deskbar, annotated] -->
 <div class="shot">
 <img src="./images/quicktour/deskbar.png" alt="The Deskbar" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lebih lanjut:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="window" name="window">The window widgets</a></h1>
+<div class="topic">
+<h1><a id="window" name="window">Window widgets</a></h1>
 
-<p>Here's a typical Haiku window with its usual widgets:</p>
+<p>Inilah jendela khas Haiku dengan widgetnya yang lazim:</p>
 
 <!-- [screenshot of window, annotated: Close button, Zoom button (usually maximizes the window), Double-click the tab to hide/minimize a window (find it again in the Deskbar), Move a window by grabbing it at the tab or border, Resize from the corner or by dragging a border with the right mouse button.] -->
 <div class="shot">
 <img src="./images/quicktour/window.png" alt="A window and its widgets" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+<div class="further">Bacaan lanjutan:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Antarmuka Haiku</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
+<div class="topic">
+<h1><a id="shortcutkey" name="shortcutkey">Kunci jalan pintas</a></h1>
 
-<p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
-This inconsistancy is one reason for the default <span class="key">ALT</span> shortcut in Haiku.</p>
+<p>Preferensi <span class="app"> Keymap </span> memungkinkan Anda beralih dari standar Haiku <span class="key"> ALT </span> ke <span class="key"> CTRL </span> (Mode Windows / Linux). Ini adalah global switch, jadi misalnya berhenti dari sebuah program di shell kemudian akan dilakukan dengan <span class="key"> ALT </span> <span class="key"> C </span> alih-alih seperti biasa <span class="key"> CTRL </span> <span class="key"> C </span>. <br />
+Ketidakkonsistenan ini adalah salah satu alasan untuk pintasan <span class="key"> ALT </span> default di Haiku.</p>
 
 <!-- [screenshot: Two edit menus (copy/paste/cut) with ALT and CTRL shortcut)] -->
 <div class="shot">
 <img src="./images/quicktour/alt-ctrl.png" alt="Shortcut key: ALT vs. CTRL" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+<div class="further">Bacaan lebih lanjut:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Pintasan dan kombinasi tombol</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
+<div class="topic">
+<h1><a id="twitcher" name="twitcher">Twitcher</a></h1>
 
-<p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
-Tapping the <span class="key">TAB</span> key only quickly while holding <span class="key">CTRL</span> switches to the last used application.</p>
+<p>Menahan <span class="key">CTRL</span> <span class="key">TAB </span> memanggil <span class="app">Twitcher</span> tempat Anda beralih di antara aplikasi yang sedang berjalan. <br />
+Mengetuk tombol <span class="key">TAB</span> hanya dengan cepat sambil menahan <span class="key">CTRL</span> beralih ke aplikasi yang terakhir digunakan.</p>
 
 <div class="shot">
 <img src="../images/quicktour/twitcher.png" alt="The Twitcher switching between apps" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lebih lanjut:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
+<div class="topic">
+<h1><a id="teammonitor" name="teammonitor">Team monitor</a></h1>
 
-<p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
+<p>Jika beberapa aplikasi rusak parah dan mungkin tidak akan hilang dari daftar aplikasi Deskbar yang sedang berjalan, tekan<span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> untuk memanggil <span class="app">Team monitor</span>. Disini anda bisa memilih entri dan mematikan aplikasi yang bertindak diluar kewajaran.</p>
 
 <div class="shot">
 <img src="./images/quicktour/teammonitor.png" alt="The Team monitor" />
 </div>
 
-<p>A neat way to quickly get rid of an app hanging in the Deskbar is the Vulcan Death Grip.<br />
-Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
-<div class="further">Further reading:<br />
+<p>Cara rapi untuk segera menyingkirkan aplikasi yang tergantung di Deskbar adalah Vulcan Death Grip.<br />Tahan <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> dan klik entri yang menyinggung di Deskbar. Puf!</p>
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
+<div class="topic">
+<h1><a id="move-resize" name="move-resize">Manajemen jendela: Pindah &amp; Ubah ukuran</a></h1>
 
-<p>Haiku offers a neat way to quickly move or resize windows:<br />
-Holding down <span class="key">CTRL</span> <span class="key">ALT</span> will highlight the window borders nearest to the mouse pointer.<br />
-Click and dragging with the <i>right</i> mouse button will resize the window along the highlighted border(s).<br />
-Click and drag with the <i>left</i> mouse button to move it around.</p>
+<p>Haiku menawarkan cara yang rapi untuk memindahkan atau mengubah ukuran jendela dengan cepat: <br />
+Menekan <span class="key"> CTRL </span> <span class="key"> ALT </span> akan menyorot batas jendela terdekat dengan penunjuk mouse. <br />
+Klik dan seret dengan tombol mouse <i> kanan </i> akan mengubah ukuran jendela di sepanjang perbatasan yang disorot. <br />
+Klik dan seret dengan tombol mouse <i> kiri </i> untuk memindahkannya.</p>
 
 <div class="shot">
 <img src="./images/quicktour/move-resize.png" alt="Move with CTRL+ALT+left mouse button" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+<div class="further">Bacaan lanjutan:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">Jalan cepat untuk memindah dan menubah ukuran jendela</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="stack" name="stack">Window management: Stack</a></h1>
+<div class="topic">
+<h1><a id="stack" name="stack">Manajemen window: Stack</a></h1>
 
-<p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
-While holding the <span class="key">OPT</span> key (normally that's <span class="key">WIN</span> on the keyboard), tabs change color when they overlap; drop the window to establish the stacking.<br />
-You un-stack by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>"Stacking" menempatkan jendela di atas satu sama lain, secara otomatis memindahkan tab kuning ke posisinya.<br />
+Saat menahan tombol <span class="key">OPT</span> (biasanya <span class="key">WIN</span> pada keyboard), tab berubah warna ketika tumpang tindih; jatuhkan jendela untuk membuat susun. <br />
+Anda meng-unstack dengan menahan <span class="key">OPT</span> dan menyeret jendela keluar dari grupnya dengan tab kuning.</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -224,17 +224,17 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/stack.gif" alt="Stacking windows" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="tile" name="tile">Window management: Tile</a></h1>
+<div class="topic">
+<h1><a id="tile" name="tile">Management window: Tile</a></h1>
 
-<p>"Tiling" means gluing windows horizontally or vertically together.<br />
-While holding <span class="key">OPT</span>, the borders that'll fuse together when you drop the window change color when brought near each other.<br />
-You un-tile by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>"Ubin" berarti menempelkan jendela secara horizontal atau vertikal bersama-sama. <br />
+Sambil menahan <span class="key"> OPT </span>, perbatasan yang akan melebur menjadi satu ketika Anda menjatuhkan warna jendela yang berubah ketika dibawa berdekatan. <br />
+Anda menghapus ubin dengan menahan <span class="key">OPT</span> dan menyeret jendela keluar dari grupnya dengan tab kuning.</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -242,34 +242,34 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/tile.gif" alt="Tiling windows" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
+<div class="topic">
+<h1><a id="workspaces" name="workspaces">Workspace</a></h1>
 
-<p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
-Up to 32 of these workspaces can be set from the <span class="app">Screen</span> preferences.</p>
-<p>The <span class="app">Workspaces</span> desktop applet can be used to change workspaces or to drag a window from one to another.</p>
-<p>The quick keyboard shortcut to change workspaces is <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
-If you add <span class="key">SHIFT</span> to that, the active window is taken with you to that workspace.</p>
+<p>Workspaces adalah desktop virtual, lengkap dengan resolusi, kedalaman warna, dan latar belakang mereka sendiri. <br />
+Hingga 32 Workspaces ini dapat diatur dari preferensi <span class="app"> Layar </span>.</p>
+<p>Applet Desktop <span class="app"> Workspaces </span> dapat digunakan untuk mengubah Workspace atau untuk menyeret jendela dari satu ke yang lain.</p>
+<p>Pintasan keyboard cepat untuk mengubah ruang kerja adalah<span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
+Jika anda menambah <span class="key">SHIFT</span> untuk itu, jendela aktif akan membawa Anda ke ruang kerja itu.</p>
 
 <div class="shot">
 <img src="./images/quicktour/workspaces.png" alt="The Workspaces applet" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="replicants" name="replicants">Replicants</a></h1>
+<div class="topic">
+<h1><a id="replicants" name="replicants">Replicant</a></h1>
 
-<p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
+<p>Replicants adalah bagian kecil aplikasi mandiri yang dapat diintegrasikan ke dalam Desktop (dan program lain).<br />
 Provided Deskbar's option to <span class="menu">Show replicants</span> is activated, replicants are indicated by a small handle.<br />
 You can drag &amp; drop them by the handle onto the Desktop, where they are fully functional without their parent app running.</p>
 
@@ -278,147 +278,147 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 <img src="./images/quicktour/replicant.png" alt="A weather app and its replicant" />
 </div>
 
-<p>You can move a replicant by its handle and remove it with a right-click on it and choosing <span class="menu">Remove replicant</span>.</p>
+<p>Anda dapat memindahkan Replicant dengan gagangnya dan menghapusnya dengan klik kanan dan memilihnya <span class="menu"> Membuang replicant</span>.</p>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
+<div class="topic">
+<h1><a id="singlewindow" name="singlewindow">Navigasi tunggal window</a></h1>
 
-<p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
-Holding the <span class="key">OPT</span> key (normally <span class="key">WIN</span> on the keyboard) prevents this as it automatically closes the parent folder.<br />
-Alternatively, you can activate <span class="menu">Single window navigation</span> from the <span class="app">Tracker</span> preferences.<br />
-<span class="menu">Show navigator</span> will add back/forward buttons.</p>
+<p>Mengklik dua kali folder Anda ke bawah folder demi folder, Anda akan dengan cepat berakhir dengan banyak jendela Tracker terbuka. <br />
+Menahan tombol <span class="key"> OPT </span> (biasanya <span class="key"> WIN</span> di keyboard) mencegah hal ini karena secara otomatis menutup folder induk. <br />
+Atau, Anda dapat mengaktifkan <span class="menu"> Navigasi jendela tunggal </span> dari preferensi <span class="app"> Tracker </span>. <br />
+<span class="menu"> Tampilkan navigator </span> akan menambahkan tombol kembali / maju.</p>
 
 <!-- [screenshot: Tracker preferences and Tracker window with navigator] -->
 <div class="shot">
 <img src="./images/quicktour/singlewindow.png" alt="Using Single window navigation" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
+<div class="topic">
+<h1><a id="drilldown" name="drilldown">Penelusuran Drill-down</a></h1>
 
-<p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
-Drill your way down until you find the folder or file to open.</p>
+<p>Alternatif yang manis untuk membuka hierarki folder yang mendalam disebut "navigasi drill-down". Mengklik kanan folder atau di mana saja di jendela Tracker (atau Desktop) akan membuka menu konteks. Di samping berbagai perintah yang diharapkan, ada menu folder saat ini di bagian atas yang berisi semua subfoldernya. <br />
+Telusuri jalan anda hingga anda menemukan folder atau berkas untuk dibuka.</p>
 
 <div class="shot">
 <img src="./images/quicktour/drilldown.png" alt="Drilling down folder hierarchies" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
+<div class="topic">
+<h1><a id="mounting" name="mounting">Mengaitkan volume</a></h1>
 
-<p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
-This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the <span class="menu">Mount</span> submenu. You find the same <span class="menu">Mount</span> menu in the Deskbar. ISO images can be mounted with a double-click.</p>
+<p>Untuk mengakses harddisk, CD, stik USB dll, Anda harus terlebih dahulu memasang volume. Setelah dipasang, ikonnya muncul di Desktop. <br />
+Ini dilakukan dengan klik kanan pada Desktop atau volume yang sudah terpasang (seperti disk boot) dan memilih volume dari submenu <span class="menu">Mount</span>. Anda menemukan menu <span class="menu"> Mount </span> yang sama di Deskbar. Gambar ISO dapat dipasang dengan klik dua kali.</p>
 
-<div class="box-warning">Before removing a USB drive etc., you have to right-click its icon and choose <span class="menu">Unmount</span> and wait for its icon to disappear. Otherwise you may lose data not yet written to it!</div>
+<div class="box-warning">Sebelum melepas drive USB dll., Anda harus mengklik kanan ikonnya dan memilih <span class="menu">Lepas</span> dan tunggu ikonnya menghilang. Kalau tidak, Anda mungkin kehilangan data yang belum ditulis kesana!</div>
 
 <div class="shot">
 <img src="./images/quicktour/mount.png" alt="Mounting a volume" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+<div class="further">Bacaan lanjutan:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mengaitkan volume</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
+<div class="topic">
+<h1><a id="filesystem" name="filesystem">Layout filesystem</a></h1>
 
-<p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
+<p>Sementara Haiku saat ini bukan multi-user, sudah ada dua cabang di pohon sistem file:</p>
 
 <table summary="layout" border="0" cellspacing="0" cellpadding="8">
-<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>The system hierarchy contains system files and settings for all users. The package management makes most folders under /system effectively read-only. Packages contain all their files in a fixed folder hierarchy. Upon installation, a package gets "mounted" and all its files just appear to be in that hierarchy in the /system folder.<br />
-The folders there (like <i>add-ons</i>, <i>apps</i>, <i>bin</i> etc.) are just a virtual amalgamation of all the installed packages and are therefore read-only. Exceptions are <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>Hirarki sistem berisi file dan pengaturan sistem untuk semua pengguna. Manajemen paket membuat sebagian besar folder di bawah / sistem hanya baca-efektif. Paket berisi semua file mereka dalam hierarki folder tetap. Setelah instalasi, sebuah paket akan "di-mount" dan semua file-nya hanya tampak berada dalam hierarki di  folder /system .<br />
+Folder di sana (like <i>add-ons</i>, <i>apps</i>, <i>bin</i> etc.) hanyalah penggabungan virtual dari semua paket yang terinstal dan karenanya hanya-baca-saja. Dikecualikan <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, dan <i>var</i>.
 <ul>
-<li><span class="path">/system/packages/</span> is the default install location for software.</li>
-<li><span class="path">/system/documentation/</span> is used by some applications to store their manual.</li>
+<li><span class="path">/system/packages/</span>adalah lokasi pemasangan default untuk perangkat halus.</li>
+<li><span class="path">/system/documentation/</span>dipakai oleh beberapa aplikasi untuk menyimpan manual</li>
 </ul>
 </td></tr>
-<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>The home hierarchy is your personal folder where you keep your data and settings. The folder /boot/home/config (or shortened ~/config) mirrors the /system folder described above and is likewise virtually read-only with the same exceptions of <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>Hirarki rumah adalah folder pribadi Anda tempat Anda menyimpan data dan pengaturan Anda. Folder  /boot/home/config (atau disingkat ~/config) adalah cerminan dari folder /system yang digambarkan diatas dan juga hampir hanya-baca-saja dengan pengecualian yang sama dari <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, dan <i>var</i>.
 <ul>
-<li><span class="path">~/Desktop/</span> is where the files of your Desktop live.</li>
-<li><span class="path">~/config/settings/</span> is where the system and applications store your settings.</li>
+<li><span class="path">~/Desktop/</span> adalah tempat file Desktop.</li>
+<li><span class="path">~/config/settings/</span> adalah tempat sistem dan aplikasi menyimpan pengaturan Anda.</li>
 </ul>
 </td></tr>
 </table>
 
-<p>The writable <i>non-packaged</i> folders mirror the hierarchy of the /system or ~/config/ hierarchy (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).<br />
-Software that doesn't come in form of a HPKG package can be installed here.</p>
+<p>Folder yang dapat ditulis <i>non-packaged</i> mencerminkan hierarki dari /system or ~/config/ hierarchy (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).
+Perangkat lunak yang tidak datang dalam bentuk paket HPKG dapat diinstal di sini.</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
-<a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+<div class="further">Bacaan lanjutan:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Layout Filesystem</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Aplikasi</a><br />
+<a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Struktur direktori</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="queries" name="queries">Finding files with queries</a></h1>
+<div class="topic">
+<h1><a id="queries" name="queries">Mencari file dengan queri</a></h1>
 
-<p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
+<p>File pada volume yang diformat Haiku (BFS) dengan cepat dicari dengan <span class="menu"> Find ... </span> dari Deskbar. Alih-alih nama file dan folder, Anda juga dapat melihat atribut spesifik tipe file, misal. untuk seorang artis dalam koleksi MP3 Anda.</p>
 
 <!-- [screenshot of Find window and result window of Artitst == Fairport] -->
 <div class="shot">
 <img src="./images/quicktour/query.png" alt="Finding all MP3s of an artist" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+<div class="further">Bacaan lajutan:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Kueri</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Tipe file , atribut, indeks dan kueri</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="wireless" name="wireless">Wireless connection</a></h1>
+<div class="topic">
+<h1><a id="wireless" name="wireless">Koneksi nirkabel</a></h1>
 
-<p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
-or by selecting your network from the <span class="app">Network</span> preferences.<br />
-When the connection is established, you'll be asked for the network's encryption and password.</p>
+<p>Anda dapat terhubung ke router WLAN Anda dengan mengklik kanan ikon <span class="app"> NetworkStatus </span> di tray Deskbar, <br />
+atau dengan memilih jaringan Anda dari preferensi <span class="app"> Network </span>. <br />
+Saat koneksi dibuat, Anda akan diminta enkripsi dan kata sandi jaringan.</p>
 
 <!-- [screenshot of Network prefs, context menu of icon in deskbar] -->
 <div class="shot">
 <img src="./images/quicktour/wireless.png" alt="Connecting with a wireless network" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
+<div class="further">Bacaan lanjutan:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Jaringan nirkabel</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Preferensi jaringan</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
+<div class="topic">
+<h1><a id="moresoftware" name="moresoftware">Dapatkan lebih banyak dan perbarui perangkat halus</a></h1>
 
-<p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
-<span class="app">SoftwareUpdater</span> should be started from time to time to update installed software as well as Haiku itself.</p>
+<p><span class="app">HaikuDepot</span> dari menu aplikasi Deskbar adalah tempat untuk mencari, menginstal dan menghapus paket perangkat halus. <br />
+<span class="app"> SoftwareUpdater </span> harus dimulai dari waktu ke waktu untuk memperbarui perangkat halus yang diinstal serta Haiku itu sendiri.</p>
 
 <!-- [screenshot of HaikuDepot and SoftwareUpdater] -->
 <div class="shot">
 <img src="./images/quicktour/moresoftware.png" alt="Installing and updating apps" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">Bacaan Lanjutan:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">Tamat</a></h1>
 
 <p>Ini adalah akhir dari tur. Kami harap ini membantu Anda dengan cepat merasa betah dalam OS baru Anda!</p>
diff --git a/welcome/it/quicktour.html b/welcome/it/quicktour.html
index 4515a282..812704d0 100644
--- a/welcome/it/quicktour.html
+++ b/welcome/it/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/jp/bugreports.html b/welcome/jp/bugreports.html
index 52fd3d8c..06bc31e6 100644
--- a/welcome/jp/bugreports.html
+++ b/welcome/jp/bugreports.html
@@ -62,7 +62,7 @@
 <div>
 
 <table class="index" id="index" summary="index">
-<tr class="heading"><td>インデックス</td></tr>
+<tr class="heading"><td>Index</td></tr>
 <tr class="index"><td><a href="#account">Trac アカウントを取得する</a><br />
                 <a href="#report">バグレポートの作成</a><br />
                 <a href="#app">アプリケーションのバグ</a><br />
diff --git a/welcome/jp/quicktour.html b/welcome/jp/quicktour.html
index 9abd5d2b..63ebbf0a 100644
--- a/welcome/jp/quicktour.html
+++ b/welcome/jp/quicktour.html
@@ -89,7 +89,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -116,107 +116,108 @@
 <p>Haikuは、多くのアイデアをほかのOSと共有していますが、確かに注目すべき独自のアプローチをいくつか持っています。このツアーで、もっとも重要なHaikuの特徴と独自性を学びます。それは、Haikuを始めるのに役立つでしょう。</p>
 <p>各ページ右下の、"参考"リンクは、<a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">ユーザーガイド</a>中の関連するトピックなどの追加リソースを指しています。</p>
 
+</div>
 
-<x-topic>
-<h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
+<div class="topic">
+<h1><a id="deskbar" name="deskbar">Deskbar</a></h1>
 
-<p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
+<p>デフォルトではデスクトップの右上にあるDeskbarは、Haiku操作の中心となります。例えばここからアプリケーション、アプレットおよびプリファレンスの起動や実行中のアプリケーションの切り替えができます。</p>
 
 <!-- [screenshot of opened deskbar, annotated] -->
 <div class="shot">
 <img src="./images/quicktour/deskbar.png" alt="The Deskbar" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">参考:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="window" name="window">The window widgets</a></h1>
+<div class="topic">
+<h1><a id="window" name="window">ウィンドウの詳細</a></h1>
 
-<p>Here's a typical Haiku window with its usual widgets:</p>
+<p>ここに、普通のGUI部品を備えた典型的なHaikuウィンドウがあります。</p>
 
 <!-- [screenshot of window, annotated: Close button, Zoom button (usually maximizes the window), Double-click the tab to hide/minimize a window (find it again in the Deskbar), Move a window by grabbing it at the tab or border, Resize from the corner or by dragging a border with the right mouse button.] -->
 <div class="shot">
 <img src="./images/quicktour/window.png" alt="A window and its widgets" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku のグラフィカルユーザーインターフェース</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
+<div class="topic">
+<h1><a id="shortcutkey" name="shortcutkey">ショートカットキー</a></h1>
 
-<p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
-This inconsistancy is one reason for the default <span class="key">ALT</span> shortcut in Haiku.</p>
+<p><span class="app">キーマップ</span>プレファレンスで、Haiku標準の<span class="key">ALT</span>キーから<span class="key">CTRL</span> (Windows/Linuxモード)へ切り替わります。これは全体的な切り替えなので、例えばシェル中でのプログラムの終了が通常の<span class="key">CTRL</span> <span class="key">C</span>の代わりに<span class="key">ALT</span> <span class="key">C</span>で実行されます。<br />この不一致が、Haikuのデフォルトショートカットが <span class="key">ALT</span>である理由のひとつです。</p>
 
 <!-- [screenshot: Two edit menus (copy/paste/cut) with ALT and CTRL shortcut)] -->
 <div class="shot">
 <img src="./images/quicktour/alt-ctrl.png" alt="Shortcut key: ALT vs. CTRL" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">ショートカットとキーの組み合わせ</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
+<div class="topic">
+<h1><a id="twitcher" name="twitcher">Twitcher</a></h1>
 
-<p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
-Tapping the <span class="key">TAB</span> key only quickly while holding <span class="key">CTRL</span> switches to the last used application.</p>
+<p><span class="key">CTRL</span> <span class="key">TAB</span> を押すと、<span class="app">Twitcher</span>を呼び出します。そこで実行中アプリケーションを切り替えます。<br />
+<span class="key">CTRL</span>を押しながら、<span class="key">TAB</span>を素早くタップすると、最後に使ったアプリケーションと切り替えます。</p>
 
 <div class="shot">
 <img src="../images/quicktour/twitcher.png" alt="The Twitcher switching between apps" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">参考:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
+<div class="topic">
+<h1><a id="teammonitor" name="teammonitor">チームモニター</a></h1>
 
-<p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
+<p>一部のアプリケーションがひどくクラッシュして、Deskbarのアプリケーションのリストから消せなくなったら、<span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span>を押して<span class="app">チームモニター</span>を起動します。そこで項目を選んで不正なアプリケーションを強制終了できます。</p>
 
 <div class="shot">
 <img src="./images/quicktour/teammonitor.png" alt="The Team monitor" />
 </div>
 
-<p>A neat way to quickly get rid of an app hanging in the Deskbar is the Vulcan Death Grip.<br />
-Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+<p>Vulcan Death Gripは、クラッシュしたアプリケーションをDeskbar内で素早く取り除く素晴らしい方法です。<br />
+<span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span>を押しながら、Deskbar 内で問題となる項目をクリックします。Poof!
+</p>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">チームモニター</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
+<div class="topic">
+<h1><a id="move-resize" name="move-resize">ウィンドウ管理: 移動とリサイズ </a></h1>
 
-<p>Haiku offers a neat way to quickly move or resize windows:<br />
-Holding down <span class="key">CTRL</span> <span class="key">ALT</span> will highlight the window borders nearest to the mouse pointer.<br />
-Click and dragging with the <i>right</i> mouse button will resize the window along the highlighted border(s).<br />
-Click and drag with the <i>left</i> mouse button to move it around.</p>
+<p>Haikuには、ウィンドウを素早く移動 / リサイズする素敵な方法があります。<br />
+<span class="key">CTRL</span> <span class="key">ALT</span>を押すと、マウスポインターに一番近いウィンドウ枠がハイライトします。<br />
+マウスの<i>右</i>ボタンでクリック&amp;ドラッグすると、ハイライトした枠に沿ってリサイズします。<br />
+マウスの<i>左</i>ボタンでクリック&amp;ドラッグすると、リサイズします。</p>
 
 <div class="shot">
 <img src="./images/quicktour/move-resize.png" alt="Move with CTRL+ALT+left mouse button" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">ウィンドウを素早く移動 / リサイズする方法</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="stack" name="stack">Window management: Stack</a></h1>
+<div class="topic">
+<h1><a id="stack" name="stack">ウィンドウ管理: スタック</a></h1>
 
-<p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
-While holding the <span class="key">OPT</span> key (normally that's <span class="key">WIN</span> on the keyboard), tabs change color when they overlap; drop the window to establish the stacking.<br />
-You un-stack by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>"スタック"とは、ウィンドウを互いに重ね合わせて、黄色いタブを自動的に再配置することです。<br />
+<span class="key">OPT</span> キー (通常キーボード上の <span class="key">WIN</span> です)を押していると、重なったタブの色が替わるので、ウィンドウをドロップしてスタックが確立します。<br />
+<span class="key">OPT</span>を押しながら、ウィンドウを黄色いタブのグループ外へドラッグすれば、スタックが解除されます。</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -224,17 +225,17 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/stack.gif" alt="Stacking windows" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">スタック&amp;タイル</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="tile" name="tile">Window management: Tile</a></h1>
+<div class="topic">
+<h1><a id="tile" name="tile">ウィンドウ管理: タイル</a></h1>
 
-<p>"Tiling" means gluing windows horizontally or vertically together.<br />
-While holding <span class="key">OPT</span>, the borders that'll fuse together when you drop the window change color when brought near each other.<br />
-You un-tile by holding <span class="key">OPT</span> and dragging a window out of its group by the yellow tab.</p>
+<p>"タイル"はウィンドウを互いに水平または垂直にくっつけることです。<br />
+<span class="key">OPT</span> を押しながら、ウィンドウを別のウィンドウの近くへ移動すると色が替わるので、ドロップするとくっつきます。<br />
+<span class="key">OPT</span>を押しながら、ウィンドウを黄色いタブのグループ外へドラッグすれば、タイルが解除されます。</p>
 
 <!-- Gif created from 3 images at https://ezgif.com/maker/
 Delay time 200 (= 2 secs), option "Don't stack frames" -->
@@ -242,183 +243,183 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 <img src="./images/quicktour/tile.gif" alt="Tiling windows" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">スタック&amp;タイル</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
+<div class="topic">
+<h1><a id="workspaces" name="workspaces">ワークスペース</a></h1>
 
-<p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
-Up to 32 of these workspaces can be set from the <span class="app">Screen</span> preferences.</p>
-<p>The <span class="app">Workspaces</span> desktop applet can be used to change workspaces or to drag a window from one to another.</p>
-<p>The quick keyboard shortcut to change workspaces is <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>.<br />
-If you add <span class="key">SHIFT</span> to that, the active window is taken with you to that workspace.</p>
+<p>ワークスペースは独自の解像度、色深度および背景を備えた仮想デスクトップです。<br />
+これらのワークスペースは、32 個まで<span class="app">画面</span>プレファレンスから設定できます。</p>
+<p><span class="app">ワークスペース</span>デスクトップアプレットは、ワークスペースの切り替えやワークスペース間のウィンドウの移動に使われます。</p>
+<p>ワークスペースを切り替える素早いショートカットは、<span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">←</span> / <span class="key">→</span> / <span class="key">↑</span> / <span class="key">↓</span>です。<br />
+それに<span class="key">SHIFT</span>を加えると、アクティブウィンドウも一緒に移動します。</p>
 
 <div class="shot">
 <img src="./images/quicktour/workspaces.png" alt="The Workspaces applet" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">ワークスペース</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">画面</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="replicants" name="replicants">Replicants</a></h1>
+<div class="topic">
+<h1><a id="replicants" name="replicants">レプリカント</a></h1>
 
-<p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
-Provided Deskbar's option to <span class="menu">Show replicants</span> is activated, replicants are indicated by a small handle.<br />
-You can drag &amp; drop them by the handle onto the Desktop, where they are fully functional without their parent app running.</p>
+<p>レプリカントは、アプリケーションの小さな内蔵パーツで、デスクトップ(やその他のプログラム)に組み込めます。<br />
+Deskbarの<span class="menu">レプリカントを表示</span>オプションが有効なら、レプリカントは小さなハンドルで表示されます。<br />
+そのハンドルをデスクトップにドラッグ&amp;ドロップすれば、元のアプリケーションが動いてなくてもそこで完全に機能します。</p>
 
 <!-- [screenshot of various Replicants] -->
 <div class="shot">
 <img src="./images/quicktour/replicant.png" alt="A weather app and its replicant" />
 </div>
 
-<p>You can move a replicant by its handle and remove it with a right-click on it and choosing <span class="menu">Remove replicant</span>.</p>
+<p>ハンドルでレプリカントを移動でき、ハンドルの左クリックで<span class="menu">レプリカントを削除</span>を選ぶとレプリカントを削除できます。</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">レプリカント</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
+<div class="topic">
+<h1><a id="singlewindow" name="singlewindow">シングルウィンドウナビゲーション</a></h1>
 
-<p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
-Holding the <span class="key">OPT</span> key (normally <span class="key">WIN</span> on the keyboard) prevents this as it automatically closes the parent folder.<br />
-Alternatively, you can activate <span class="menu">Single window navigation</span> from the <span class="app">Tracker</span> preferences.<br />
-<span class="menu">Show navigator</span> will add back/forward buttons.</p>
+<p>ダブルクリックでフォルダーを次々に下っていくやり方では、すぐにTrackerウィンドウをたくさん開いてしまいます。<br />
+<span class="key">OPT</span>キー(通常、キーボード上の<span class="key">WIN</span>です)を押すと、自動で親フォルダーを閉じるのでこれを防げます。<br />
+もう一つの方法として、<span class="menu">シングルウィンドウナビゲーション</span>を<span class="app">Tracker</span>設定から有効にします。<br />
+<span class="menu">ナビゲーターを表示</span>は戻る/進むボタンを追加します。</p>
 
 <!-- [screenshot: Tracker preferences and Tracker window with navigator] -->
 <div class="shot">
 <img src="./images/quicktour/singlewindow.png" alt="Using Single window navigation" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">参考:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
+<div class="topic">
+<h1><a id="drilldown" name="drilldown">ドリルダウンナビゲーション</a></h1>
 
-<p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
-Drill your way down until you find the folder or file to open.</p>
+<p>フォルダーの深い階層を開くもうひとつの素敵な方法は、"ドリルダウンナビゲーション"と呼ばれています。フォルダーか、Trackerウィンドウのどこか(またはデスクトップ)の右クリックでコンテキストメニューが開きます。いろいろなコマンドの中に、サブフォルダーを含む現在のフォルダーのメニューがあります。<br />
+開きたいフォルダーかファイルが見つかるまでドリルダウンします。</p>
 
 <div class="shot">
 <img src="./images/quicktour/drilldown.png" alt="Drilling down folder hierarchies" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker ナビゲーション</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
+<div class="topic">
+<h1><a id="mounting" name="mounting">ボリュームのマウント</a></h1>
 
-<p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
-This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the <span class="menu">Mount</span> submenu. You find the same <span class="menu">Mount</span> menu in the Deskbar. ISO images can be mounted with a double-click.</p>
+<p>ハードディスク、CD、USBメモリなどにアクセスするには、まずボリュームをマウントする必要があります。マウンドされれば、アイコンがデスクトップ上に現れます。<br />
+これは、デスクトップやマウント済のボリューム(起動ディスクのような)を右クリックして、<span class="menu">マウント</span>サブメニューからボリュームを選ぶことで実行されます。同じ<span class="menu">マウント</span>メニューは、Deskbarにもあります。ISOイメージは、ダブルクリックでマウントできます。</p>
 
-<div class="box-warning">Before removing a USB drive etc., you have to right-click its icon and choose <span class="menu">Unmount</span> and wait for its icon to disappear. Otherwise you may lose data not yet written to it!</div>
+<div class="box-warning">USBドライブなどを取り外す前には、アイコンを右クリックして<span class="menu">アンマウント</span>メニューを選択し、アイコンが消えるまで待ちます。そうしないと、まだ書き込まれていないデータを失うかもしれません!</div>
 
 <div class="shot">
 <img src="./images/quicktour/mount.png" alt="Mounting a volume" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">ボリュームのマウント</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
+<div class="topic">
+<h1><a id="filesystem" name="filesystem">ファイルシステムレイアウト</a></h1>
 
-<p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
+<p>現在、Haikuはマルチユーザーではありませんが、ファイルシステムツリーにはすでに2つのブランチがあります:</p>
 
 <table summary="layout" border="0" cellspacing="0" cellpadding="8">
-<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>The system hierarchy contains system files and settings for all users. The package management makes most folders under /system effectively read-only. Packages contain all their files in a fixed folder hierarchy. Upon installation, a package gets "mounted" and all its files just appear to be in that hierarchy in the /system folder.<br />
-The folders there (like <i>add-ons</i>, <i>apps</i>, <i>bin</i> etc.) are just a virtual amalgamation of all the installed packages and are therefore read-only. Exceptions are <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<tr><td><img src="../images/quicktour/folder_haiku.png" alt="System" /><br /><span class="path">/boot/system/</span></td><td> </td><td>System階層は、システムファイルとすべてのユーザー用の設定を含みます。パッケージ管理は、/system以下のほとんどのフォルダーを事実上読み取り専用にします。パッケージは一定のフォルダ階層の中にすべてのファイルを含みます。インストール中に、パッケージは"マウント"され、含まれるすべてのファイルは/systemフォルダー階層に現れます。<br />
+階層内にあるフォルダー(<i>add-ons</i>、<i>apps</i>、<i>bin</i>などのような)は、インストール済パッケージの仮想融合であり、そのため読み取り専用となっています。例外は、<i>cache</i>、<i>non-packaged</i>、<i>settings</i>、および<i>var</i>です。
 <ul>
-<li><span class="path">/system/packages/</span> is the default install location for software.</li>
-<li><span class="path">/system/documentation/</span> is used by some applications to store their manual.</li>
-</ul>
-</td></tr>
-<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>The home hierarchy is your personal folder where you keep your data and settings. The folder /boot/home/config (or shortened ~/config) mirrors the /system folder described above and is likewise virtually read-only with the same exceptions of <i>cache</i>, <i>non-packaged</i>, <i>settings</i>, and <i>var</i>.
+<li><span class="path">/system/packages/</span>は、ソフトウェアがデフォルトでインストールされる場所です。</li>
+<li><span class="path">/system/documentation/</span>は、いくつかのソフトウェアがマニュアルをインストールするのに用います。</li>
+</ul></td></tr>
+<tr><td><img src="../images/quicktour/folder_home.png" alt="Home" /><br /><span class="path">/boot/home/</span></td><td> </td><td>Home階層は、ユーザー個人のフォルダーで、ユーザーのデータや設定を保存します。/boot/home/configフォルダー(または縮めて~/config)は、既に述べた/systemフォルダーのミラーで、同様に仮想的に読み取り専用です。例外は同じく<i>cache</i>、<i>non-packaged</i>、<i>settings</i>,および<i>var</i>です。
 <ul>
-<li><span class="path">~/Desktop/</span> is where the files of your Desktop live.</li>
-<li><span class="path">~/config/settings/</span> is where the system and applications store your settings.</li>
+<li><span class="path">~/Desktop/</span>は、デスクトップ上のファイルがある場所です。</li>
+<li><span class="path">~/config/settings/</span>は、システムとアプリケーションがユーザー設定を保存する場所です。</li>
 </ul>
 </td></tr>
 </table>
 
-<p>The writable <i>non-packaged</i> folders mirror the hierarchy of the /system or ~/config/ hierarchy (<i>add-ons</i>, <i>apps</i>, <i>bin</i>…).<br />
-Software that doesn't come in form of a HPKG package can be installed here.</p>
+<p>書込み可能な<i>non-packaged</i>フォルダーは、/system階層または~/config/階層(<i>add-ons</i>、<i>apps</i>、<i>bin</i>…)のコピーです。<br />
+HPKGパッケージの形で供給されないソフトウェアはここにインストールされます。</p>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">ファイルシステムレイアウト</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">アプリケーション</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
-<h1><a id="queries" name="queries">Finding files with queries</a></h1>
+<div class="topic">
+<h1><a id="queries" name="queries">クエリでファイルを探す</a></h1>
 
-<p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
+<p>Haikuフォーマット(BFS)ボリューム上のファイルは、Deskbarからの<span class="menu">検索…</span>で素早く検索されます。ファイルやフォルダの名前の代わりに、ファイルタイプに特有な属性、
+たとえば、MP3コレクション内のアーティスト名も検索できます。</p>
 
 <!-- [screenshot of Find window and result window of Artitst == Fairport] -->
 <div class="shot">
 <img src="./images/quicktour/query.png" alt="Finding all MP3s of an artist" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">クエリ</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">ファイルタイプ、属性、インデックス、およびクエリ</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="wireless" name="wireless">Wireless connection</a></h1>
+<div class="topic">
+<h1><a id="wireless" name="wireless">ワイヤレス接続</a></h1>
 
-<p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
-or by selecting your network from the <span class="app">Network</span> preferences.<br />
-When the connection is established, you'll be asked for the network's encryption and password.</p>
+<p>WLANルーターへの接続は、Deskbarトレイ内の<span class="app">ネットワーク状況</span>をクリックでできます。<br />
+または、<span class="app">ネットワーク</span>プレファレンスからネットワークを選択することでできます。<br />
+接続が確立すると、ネットワークの暗号化とパスワードについて質問されます。</p>
 
 <!-- [screenshot of Network prefs, context menu of icon in deskbar] -->
 <div class="shot">
 <img src="./images/quicktour/wireless.png" alt="Connecting with a wireless network" />
 </div>
 
-<div class="further">Further reading:<br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+<div class="further">参考:<br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">ワイヤレスネットワーク</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">ネットワーク状況</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">ネットワークプレファレンス</a></div>
+</div>
 
 
-<x-topic>
-<h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
+<div class="topic">
+<h1><a id="moresoftware" name="moresoftware">ソフトウェアの入手と更新</a></h1>
 
-<p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
-<span class="app">SoftwareUpdater</span> should be started from time to time to update installed software as well as Haiku itself.</p>
+<p>Deskbarのアプリケーションメニューにある<span class="app">HaikuDepot</span>は、ソフトウェアパッケージを検索、インストール及びアンインストールする場所です。<br />
+<span class="app">ソフトウェアの更新</span>は、インストール済ソフトウェアおよびHaiku自体をアップデートするために時々起動されるべきです。</p>
 
 <!-- [screenshot of HaikuDepot and SoftwareUpdater] -->
 <div class="shot">
 <img src="./images/quicktour/moresoftware.png" alt="Installing and updating apps" />
 </div>
 
-<div class="further">Further reading:<br />
+<div class="further">参考:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
-<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">ソフトウェアの更新</a><br />
+<a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">リポジトリ</a></div>
+</div>
 
+<div>
 <h1><a id="end" name="end">終わりに</a></h1>
 
 <p>これでツアーは終わりです。これが新しいOSにすぐに慣れる手助けになることを期待します!</p>
diff --git a/welcome/pl/quicktour.html b/welcome/pl/quicktour.html
index c7bd040f..308ab887 100644
--- a/welcome/pl/quicktour.html
+++ b/welcome/pl/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/pt_BR/quicktour.html b/welcome/pt_BR/quicktour.html
index 046a1fef..d721b498 100644
--- a/welcome/pt_BR/quicktour.html
+++ b/welcome/pt_BR/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/pt_PT/quicktour.html b/welcome/pt_PT/quicktour.html
index f2035177..52fed2e1 100644
--- a/welcome/pt_PT/quicktour.html
+++ b/welcome/pt_PT/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/ro/quicktour.html b/welcome/ro/quicktour.html
index d1ce1179..479043aa 100644
--- a/welcome/ro/quicktour.html
+++ b/welcome/ro/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/ru/quicktour.html b/welcome/ru/quicktour.html
index 445b920f..1ccbe6f7 100644
--- a/welcome/ru/quicktour.html
+++ b/welcome/ru/quicktour.html
@@ -89,7 +89,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -116,8 +116,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -129,10 +130,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -144,10 +145,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -160,10 +161,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -175,10 +176,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -191,10 +192,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -208,10 +209,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -226,10 +227,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -244,10 +245,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -263,10 +264,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -282,10 +283,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -300,10 +301,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -315,10 +316,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -332,10 +333,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -363,10 +364,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -379,10 +380,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -398,10 +399,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -416,9 +417,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/sk/quicktour.html b/welcome/sk/quicktour.html
index eb91164d..7a63b101 100644
--- a/welcome/sk/quicktour.html
+++ b/welcome/sk/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/sv_SE/quicktour.html b/welcome/sv_SE/quicktour.html
index 36d1be74..147ff72d 100644
--- a/welcome/sv_SE/quicktour.html
+++ b/welcome/sv_SE/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/uk/quicktour.html b/welcome/uk/quicktour.html
index 3a6942d5..1e3d4fc7 100644
--- a/welcome/uk/quicktour.html
+++ b/welcome/uk/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>
diff --git a/welcome/welcome_ca.html b/welcome/welcome_ca.html
index 65664b05..218171b5 100644
--- a/welcome/welcome_ca.html
+++ b/welcome/welcome_ca.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Conegueu el sistema</a></h2>
-<p>The first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing. If you never experienced it, have a look at these links:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="ca/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/ca/contents.html">Haiku User Guide</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_de.html b/welcome/welcome_de.html
index 173d05d5..0ac75d24 100644
--- a/welcome/welcome_de.html
+++ b/welcome/welcome_de.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Das System kennenlernen</a></h2>
-<p>Zumindest zu Beginn wird sich Haiku sehr eng an sein Vorbild BeOS R5 halten. Insbesondere wer mit diesem Betriebssystem keine Erfahrungen sammeln durfte, seien diese Links empfohlen:</p>
+<p>Während sich Haiku zumindest zu Beginn sehr eng an sein Vorbild BeOS R5 halten wird, gibt es einige Neuerungen und Verbesserungen die das Haiku Team über die Jahre entwickelt hat. Ehemaligen BeOS Benutzern ebenso wie neuen Usern, seien diese Links empfohlen:</p>
 <ul>
+	<li><a href="de/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/de/contents.html">Haiku User Guide</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Finde Hilfe und werde Teil der Haiku Gemeinschaft</a></li>
 </ul>
diff --git a/welcome/welcome_en.html b/welcome/welcome_en.html
index aa700763..d42ed051 100644
--- a/welcome/welcome_en.html
+++ b/welcome/welcome_en.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -90,8 +90,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Getting to know the system</a></h2>
-<p>The first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing. If you never experienced it, have a look at these links:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="en/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/en/contents.html">Haiku User Guide</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_es.html b/welcome/welcome_es.html
index 364f3924..f1c28605 100644
--- a/welcome/welcome_es.html
+++ b/welcome/welcome_es.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -96,8 +96,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Habituándose al sistema</a></h2>
-<p>Las primeras versiones de Haiku serán muy similares a BeOS R5, el sistema operativo que está recreando. Si nunca lo ha probado, puede mirar estos enlaces:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="es/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/es/contents.html">Guía de usuario de Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Reciba ayuda y soporte y vuélvase parte de la comunidad</a></li>
 </ul>
diff --git a/welcome/welcome_fi.html b/welcome/welcome_fi.html
index 95364a05..96cff903 100644
--- a/welcome/welcome_fi.html
+++ b/welcome/welcome_fi.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -92,8 +92,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Järjestelmään tutustuminen</a></h2>
-<p>Haikun ensimmäiset julkaisut ovat paljolti kuin BeOS R5, käyttöjärjestelmän uudelleentoteutus. Jos et ole koskaan kokenut sitä, vilkaise näitä linkkejä:</p>
+<p>Vaikka Haikun ensimmäiset julkaisut ovat paljolti kuin BeOS R5, käyttöjärjestelmä on toteutettu uudelleen: siinä on monia lisäyksiä ja parannuksia, jotka Haiku-ryhmä on kehittänyt vuosien kuluessa. Joten jos olen palaava BeOS-käyttäjä tai uusi käyttäjä, vilkaise näitä linkkejä:</p>
 <ul>
+	<li><a href="fi/quicktour.html">Haiku-pikaopas</a></li>
 	<li><a href="../userguide/fi/contents.html">Haiku-käyttäjäopas</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Hae apua ja tukea ja tule osaksi yhteisöä</a></li>
 </ul>
diff --git a/welcome/welcome_fr.html b/welcome/welcome_fr.html
index 17ce7479..f4855dca 100644
--- a/welcome/welcome_fr.html
+++ b/welcome/welcome_fr.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -96,8 +96,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Comment se familiariser avec le système</a></h2>
-<p>Les premières versions de Haiku auront une apparence et des fonctionnalités proches de celles de BeOS R5, le système d'exploitation qu'il tente de ré-implémenter. Si vous ne l'avez jamais essayé, jetez un œil à ces liens :</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="fr/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/fr/contents.html">Guide utilisateur d'Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_fur.html b/welcome/welcome_fur.html
index b983e86c..e9293bcb 100644
--- a/welcome/welcome_fur.html
+++ b/welcome/welcome_fur.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -91,8 +91,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Getting to know the system</a></h2>
-<p>The first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing. If you never experienced it, have a look at these links:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="fur/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/fur/contents.html">Haiku User Guide</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_hu.html b/welcome/welcome_hu.html
index 70ea2c06..8951c565 100644
--- a/welcome/welcome_hu.html
+++ b/welcome/welcome_hu.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">A rendszer megismerése</a></h2>
-<p>A Haiku sok tekintetben hasonlít a BeOS R5-ös verziójára, ezért tekinthetjük a modern reinkarnációjának is. Ha eddig még nem találkoztál a rendszerrel, akkor ajánlom figyelmedbe a következő oldalakat:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="hu/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/hu/contents.html">Haiku felhasználói útmutató</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_id.html b/welcome/welcome_id.html
index 679b46db..c596413a 100644
--- a/welcome/welcome_id.html
+++ b/welcome/welcome_id.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -57,6 +57,7 @@
 
 <div id="content">
 <div>
+<div class="box-info">Terjemahan halaman ini belum lengkap. Sampai saat itu, bagian yang belum selesai menggunakan aslinya bahasa Inggris.</div>
 
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Indeks</td></tr>
@@ -92,8 +93,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Mengenal sistem</a></h2>
-<p>Rilis pertama Haiku akan sangat mirip dengan BeOS R5, sistem operasi yang sedang diimplementasikan kembali. Jika Anda belum pernah mengalaminya, lihat tautan ini:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="id/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/id/contents.html">Petunjuk penggunaan Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Dapatkan bantuan dan dukungan dan menjadi bagian dari komunitas</a></li>
 </ul>
diff --git a/welcome/welcome_it.html b/welcome/welcome_it.html
index f5fd6521..f280b94c 100644
--- a/welcome/welcome_it.html
+++ b/welcome/welcome_it.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="indice" /></a>
 <a id="system" name="system">Per conoscere il sistema</a></h2>
-<p>Le prime release di Haiku saranno molto simili al BeOS R5, il sistema operativo che sta re-implementando. Se non l'hai mai provato, dai un'occhiata a questi link:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="it/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/it/contents.html">Guida dell'utente Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_jp.html b/welcome/welcome_jp.html
index 728511ba..0be890d9 100644
--- a/welcome/welcome_jp.html
+++ b/welcome/welcome_jp.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -60,9 +60,10 @@
 
 <div id="content">
 <div>
+<div class="box-info">このページの翻訳はまだ完全ではありません。完成するまでは、未完成の部分はオリジナルの英文を使用します。</div>
 
 <table class="index" id="index" summary="index">
-<tr class="heading"><td>インデックス</td></tr>
+<tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
 	<a href="#welcome">Haiku へようこそ!</a><br />
 	<a href="#bugreport">バグに注意</a><br />
@@ -95,8 +96,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">システムを把握する</a></h2>
-<p>最初の Haiku のリリースは BeOS R5 の再実装のようになる予定ですが、まだ体験していないならこれらも見ると良いでしょう:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="jp/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/jp/contents.html">Haiku ユーザーガイド</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">ヘルプとサポート、そしてコミュニティーの一員になるには</a></li>
 </ul>
diff --git a/welcome/welcome_pl.html b/welcome/welcome_pl.html
index b7e08eb0..274bc71d 100644
--- a/welcome/welcome_pl.html
+++ b/welcome/welcome_pl.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -93,8 +93,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Poznawanie systemu</a></h2>
-<p>Pierwsze wydanie Haiku będzie bardzo podobne do BeOS-a R5, systemu który w założeniu reimplementuje. Jeśli nigdy nie miałeś z nim styczności, zerknij na poniższe strony:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="pl/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/pl/contents.html">Podręcznik użytkownika Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_pt_BR.html b/welcome/welcome_pt_BR.html
index e232a184..366249dd 100644
--- a/welcome/welcome_pt_BR.html
+++ b/welcome/welcome_pt_BR.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -95,8 +95,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Conhecendo o sistema</a></h2>
-<p>A primeira versão do Haiku será muito mais como o BeOS R5, o sistema operacional que está sendo reimplementado. Se você nunca o experimentou, dê uma olhada nestes vínculos:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="pt_BR/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/pt_BR/contents.html">Guia do Usuário Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_pt_PT.html b/welcome/welcome_pt_PT.html
index b64e2aba..70669b25 100644
--- a/welcome/welcome_pt_PT.html
+++ b/welcome/welcome_pt_PT.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -93,8 +93,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Conhecer o sistema</a></h2>
-<p>A primeira versão do Haiku será muito semelhante ao BeOS R5, o sistema operativo que está a ser reimplementado. Se nunca o experimentou, dê uma olhada nestas ligações:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="pt_PT/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/pt_PT/contents.html">Guia do Utilizador do Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Obter ajuda e suporte, e tornar-se parte da comunidade</a></li>
 </ul>
diff --git a/welcome/welcome_ro.html b/welcome/welcome_ro.html
index 9ffcdb58..f214fda0 100644
--- a/welcome/welcome_ro.html
+++ b/welcome/welcome_ro.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Cunoașterea sistemului</a></h2>
-<p>Prima versiune(i) ale Haiku vor fi foarte asemănătoare cu BeOS R5, sistemul de operare pe care îl reimplementează. Dacă nu l-ați experimentat niciodată, uitați-vă la aceste resurse:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="ro/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/ro/contents.html">Ghid de utilizare Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_ru.html b/welcome/welcome_ru.html
index 478ccbc6..9133403c 100644
--- a/welcome/welcome_ru.html
+++ b/welcome/welcome_ru.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -61,6 +61,7 @@
 
 <div id="content">
 <div>
+<div class="box-info">Перевод этой страницы еще не завершен. Пока это не произойдет, незавершенные части будут на английском.</div>
 
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Содержание</td></tr>
@@ -96,8 +97,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Знакомство с системой</a></h2>
-<p>Первые релизы Haiku будут похожи по функционалу и вешнему виду на BeOS R5, которую она и призвана повторить. Если вы никогда не пользовались этой операционной системой, то рекомендуем воспользоваться следующими ссылками:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="ru/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/ru/contents.html">Руководство пользователя Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Список сайтов о BeOS/Haiku</a></li>
 </ul>
diff --git a/welcome/welcome_sk.html b/welcome/welcome_sk.html
index 2792a8ec..dc761b81 100644
--- a/welcome/welcome_sk.html
+++ b/welcome/welcome_sk.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Spoznávanie systému</a></h2>
-<p>Prvé vydanie či vydania Haiku budú veľmi podobné ako BeOS R5, operačný systém, ktorý sa snaží reimplementovať. Ak ho nikdy nezažili, pozrite sa na tieto odkazy:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="sk/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/sk/contents.html">Používateľská príručka Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_sv_SE.html b/welcome/welcome_sv_SE.html
index 31209461..ce0c35ba 100644
--- a/welcome/welcome_sv_SE.html
+++ b/welcome/welcome_sv_SE.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Lär känna Haiku</a></h2>
-<p>Dom första utgåvorna av Haiku kommer att vara väldigt lik BeOS R5, operativsystemet som vi omimplementerar. Om du aldrig har upplevt det, ta då en titt på följande länkar:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="sv_SE/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/sv_SE/contents.html">Haiku's Användarhandbok</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_uk.html b/welcome/welcome_uk.html
index cb2aded7..04c03935 100644
--- a/welcome/welcome_uk.html
+++ b/welcome/welcome_uk.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,8 +94,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">Знайомство з системою</a></h2>
-<p>Перші релізи Haiku будуть схожі по функціоналу і зовнішньому вигляду на BeOS R5, яку ми і намагалися відтворити. Якщо Ви ніколи нею не користувались варто скористатись такими посиланнями:</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="uk/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/uk/contents.html"> Настанова користувачеві Haiku</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl">Get help and support and become a part of  the community</a></li>
 </ul>
diff --git a/welcome/welcome_zh_CN.html b/welcome/welcome_zh_CN.html
index 54c705c9..6ed21828 100644
--- a/welcome/welcome_zh_CN.html
+++ b/welcome/welcome_zh_CN.html
@@ -4,7 +4,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008-2018, Haiku. All rights reserved.
+ * Copyright 2008-2019, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -95,8 +95,9 @@
 <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="system" name="system">了解 Haiku 操作系统</a></h2>
-<p>Haiku 第一个系列的版本将会非常类似于BeOS R5，也就是 Haiku 要复刻的操作系统。如果您从未尝试过该系统，可参阅以下链接：</p>
+<p>While the first release(s) of Haiku will be very much like the BeOS R5, the operating system it is reimplementing, there are many additions and improvements that were developed by the Haiku team over the years. So, if you're a returning BeOS user or are new user, have a look at these links:</p>
 <ul>
+	<li><a href="zh_CN/quicktour.html">Haiku Quick Tour</a></li>
 	<li><a href="../userguide/zh_CN/contents.html">Haiku 用户指南</a></li>
 	<li><a href="https://www.haiku-os.org/community/" class="printurl"> 获取帮助支持和加入社区</a></li>
 </ul>
diff --git a/welcome/zh_CN/quicktour.html b/welcome/zh_CN/quicktour.html
index d58f87d0..e768694e 100644
--- a/welcome/zh_CN/quicktour.html
+++ b/welcome/zh_CN/quicktour.html
@@ -87,7 +87,7 @@
 <table class="index" id="index" summary="index">
 <tr class="heading"><td>Index</td></tr>
 <tr class="index"><td>
-[1] <a href="#start">Start</a><br />
+[1] <a href="#start">Welcome</a><br />
 [2] <a href="#deskbar">The Deskbar</a><br />
 [3] <a href="#window">The window widgets</a><br />
 [4] <a href="#shortcutkey">The shortcut key</a><br />
@@ -114,8 +114,9 @@
 <p>While Haiku shares many ideas with other operating systems, it does have a unique approach in some areas that are worth pointing out. In just a few slides, you’ll learn about the most important Haiku features and peculiarities that’ll help you get a running start.</p>
 <p>At the bottom right of each page, are links for "further reading" that point to additional resources, like related topics in the <a href="https://www.haiku-os.org/docs/userguide/{LANG}/contents.html" target="_blank">Userguide</a>.</p>
 
+</div>
 
-<x-topic>
+<div class="topic">
 <h1><a id="deskbar" name="deskbar">The Deskbar</a></h1>
 
 <p>By default at the top right corner of the desktop, the Deskbar is the hub of interacting with Haiku. You can start applications, applets and preferences from there, for example, and switch between running applications.</p>
@@ -127,10 +128,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/deskbar.html" target="_blank">Deskbar</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="window" name="window">The window widgets</a></h1>
 
 <p>Here's a typical Haiku window with its usual widgets:</p>
@@ -142,10 +143,10 @@
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html" target="_blank">Haiku's GUI</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="shortcutkey" name="shortcutkey">The shortcut key</a></h1>
 
 <p>The <span class="app">Keymap</span> preferences let you switch from the Haiku standard <span class="key">ALT</span> key to <span class="key">CTRL</span> (Windows/Linux mode). This is a global switch, so for example quitting a program in the shell will then be done with <span class="key">ALT</span> <span class="key">C</span> instead the usual <span class="key">CTRL</span> <span class="key">C</span>.<br />
@@ -158,10 +159,10 @@ This inconsistancy is one reason for the default <span class="key">ALT</span> sh
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/keyboard-shortcuts.html" target="_blank">Shortcuts and key combinations</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="twitcher" name="twitcher">The Twitcher</a></h1>
 
 <p>Holding <span class="key">CTRL</span> <span class="key">TAB</span> summons the <span class="app">Twitcher</span> where you switch between running applications.<br />
@@ -173,10 +174,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/twitcher.html" target="_blank">Twitcher</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="teammonitor" name="teammonitor">The Team monitor</a></h1>
 
 <p>If some application crashed badly and maybe won't disappear from Deskbar's running application list, press <span class="key">CTRL</span> <span class="key">ALT</span> <span class="key">DEL</span> to invoke the <span class="app">Team monitor</span>. Here you can select an entry and kill a misbehaving app.</p>
@@ -189,10 +190,10 @@ Tapping the <span class="key">TAB</span> key only quickly while holding <span cl
 Hold <span class="key">SHIFT</span> <span class="key">CTRL</span> <span class="key">ALT</span> and click on the offending entry in the Deskbar. Poof!</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/teammonitor.html" target="_blank">Team monitor</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="move-resize" name="move-resize">Window management: Move &amp; Resize</a></h1>
 
 <p>Haiku offers a neat way to quickly move or resize windows:<br />
@@ -206,10 +207,10 @@ Click and drag with the <i>left</i> mouse button to move it around.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#move-resize" target="_blank">A quick way to move or resize windows</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="stack" name="stack">Window management: Stack</a></h1>
 
 <p>"Stacking" is putting windows on top of each other, automatically moving the yellow tabs into position.<br />
@@ -224,10 +225,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="tile" name="tile">Window management: Tile</a></h1>
 
 <p>"Tiling" means gluing windows horizontally or vertically together.<br />
@@ -242,10 +243,10 @@ Delay time 200 (= 2 secs), option "Don't stack frames" -->
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#stack-tile" target="_blank">Stack &amp; Tile</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="workspaces" name="workspaces">Workspaces</a></h1>
 
 <p>Workspaces are virtual desktops, complete with their own resolution, color depth and background.<br />
@@ -261,10 +262,10 @@ If you add <span class="key">SHIFT</span> to that, the active window is taken wi
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workspaces.html" target="_blank">Workspaces</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/screen.html" target="_blank">Screen</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="replicants" name="replicants">Replicants</a></h1>
 
 <p>Replicants are small self-contained parts of applications that can be integrated into the Desktop (and other programs).<br />
@@ -280,10 +281,10 @@ You can drag &amp; drop them by the handle onto the Desktop, where they are full
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/gui.html#replicants" target="_blank">Replicants</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="singlewindow" name="singlewindow">Single window navigation</a></h1>
 
 <p>Double-clicking your way down folder after folder, you'll quickly end up with many open Tracker windows.<br />
@@ -298,10 +299,10 @@ Alternatively, you can activate <span class="menu">Single window navigation</spa
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html" target="_blank">Tracker</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="drilldown" name="drilldown">Drill-down navigation</a></h1>
 
 <p>A nice alternative to opening a deep hierarchy of folders is called "drill-down navigation". Right-clicking a folder or anywhere in a Tracker window (or the Desktop) will open a context menu. Beside various expected commands, there's a menu of the current folder at the top that contains all its subfolders.<br />
@@ -313,10 +314,10 @@ Drill your way down until you find the folder or file to open.</p>
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#navigating" target="_blank">Tracker navigation</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="mounting" name="mounting">Mounting volumes</a></h1>
 
 <p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume. Once mounted, its icon appears on the Desktop.<br />
@@ -330,10 +331,10 @@ This is done with a right-click on the Desktop or an already mounted volume (lik
 
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/tracker.html#mounting-volumes" target="_blank">Mounting volumes</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="filesystem" name="filesystem">Filesystem layout</a></h1>
 
 <p>While Haiku is currently not multi-user, there are already two branches in the filesystem tree:</p>
@@ -361,10 +362,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/filesystem-layout.html" target="_blank">Filesystem layout</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications.html" target="_blank">Applications</a><br />
 <a href="https://git.haiku-os.org/haiku/tree/docs/develop/packages/DirectoryStructure.rst" target="_blank">Directory structure</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="queries" name="queries">Finding files with queries</a></h1>
 
 <p>Files on Haiku formatted (BFS) volumes are quickly searched with <span class="menu">Find…</span> from the Deskbar. Instead of file and folder names, you can also look through filetype specific attributes, e.g. for an artist in your MP3 collection.</p>
@@ -377,10 +378,10 @@ Software that doesn't come in form of a HPKG package can be installed here.</p>
 <div class="further">Further reading:<br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/queries.html" target="_blank">Queries</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-filetypes+attributes.html" target="_blank">Filetypes, Attributes, Index and Queries</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="wireless" name="wireless">Wireless connection</a></h1>
 
 <p>You can connect to your WLAN router either by right-clicking the <span class="app">NetworkStatus</span> icon in Deskbar's tray,<br />
@@ -396,10 +397,10 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/workshop-wlan.html" target="_blank">Wireless networking</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/desktop-applets/networkstatus.html" target="_blank">NetworkStatus</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/network.html" target="_blank">Network preferences</a></div>
-</x-topic>
+</div>
 
 
-<x-topic>
+<div class="topic">
 <h1><a id="moresoftware" name="moresoftware">Getting more and updating software</a></h1>
 
 <p><span class="app">HaikuDepot</span> from the Deskbar's applications menu is where to search, install and uninstall software packages.<br />
@@ -414,9 +415,9 @@ When the connection is established, you'll be asked for the network's encryption
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/haikudepot.html" target="_blank">HaikuDepot</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/applications/softwareupdater.html" target="_blank">SoftwareUpdater</a><br />
 <a href="https://www.haiku-os.org/docs/userguide/{LANG}/preferences/repositories.html" target="_blank">Repositories</a></div>
-</x-topic>
-
+</div>
 
+<div>
 <h1><a id="end" name="end">The end</a></h1>
 
 <p>This is the end of the tour. We hope it helped you to quickly feel at home in your new OS!</p>