Index: help/action_homepage.page
==================================================================
--- help/action_homepage.page
+++ help/action_homepage.page
@@ -8,20 +8,23 @@
 	<link type="guide" xref="streams#actions"/>
 	</info>
 
 	<title>Radio homepages</title>
 
-	<p>Most radio stations are listed with a homepage URL. Use the <gui style="button">house</gui> symbol in the
-	toolbar or <guiseq><gui>right click</gui> <gui>homepage</gui></guiseq> to open it in a web browser.</p>
+	<p>Most radio stations are listed with a homepage URL. Use the <gui
+	style="button"><key>🏠</key> house</gui> symbol in the toolbar or
+	<guiseq><gui>right click</gui> <gui>homepage</gui></guiseq> to open
+	it in a web browser.</p>
 
-        <p>Some homepage links are guessed, because some channels (e.g. Shoutcast) don't provide them (anymore).
-	If you play a station without homepage URL, it automatically gets googled. (The link will be visible
-        once you reselect the genre/category.)
-        </p>
+        <p>Some homepage links are guessed, because some channels (e.g.
+	Shoutcast) don't provide them (anymore).  If you play a station
+	without homepage URL, it automatically gets googled.  (The link will
+	be visible once you reselect the genre/category.) </p>
 
 	<section>
 	<title>Channel homepages</title>
-	<p>You can also visit channel homepages (Shoutcast.com, Xiph.org, etc).
-        Either from the <gui>Channel</gui> menu, or via	double clicking the channel tab.</p>
+	<p>You can also visit channel homepages (Shoutcast.com, Xiph.org,
+	etc).  Either from the <gui>Channel</gui> menu, or via double
+	clicking the channel tab.</p>
 	</section>
 
 </page>

Index: help/action_recording.page
==================================================================
--- help/action_recording.page
+++ help/action_recording.page
@@ -11,11 +11,11 @@
 
 <title>Recording</title>
 
 <p>Most stations that stream MP3 or OGG music can be recorded. This is
 accomplished through the command-line tool <app>streamripper</app>.  If you
-select a station and press <gui style="button">● record</gui>, a console
+select a station and press <gui style="button"><key>●</key> record</gui>, a console
 window should appear, where streamripper shows its progress.</p>
 
 <p>You can <link xref="configuration">configure the recording tool</link>
 according to audio types again. Usually you want to use the <link
 xref="config_apps#placeholders"><cmd>%srv</cmd> placeholder</link>.</p>

Index: help/channel_modarchive.page
==================================================================
--- help/channel_modarchive.page
+++ help/channel_modarchive.page
@@ -28,12 +28,12 @@
 	<p>Audio files are packaged up in ZIP files on MODArchive. 
 	While they are different formats (IT, S3M, XM, etc) they'll all
 	carry a generic <var>audio/mod+zip</var> type specifier in
 	streamtuner2 for configuration:</p>
 	
-        <table shade="rows" rules="rows cols">
-            <tr><td rowspan="2">Recording apps</td></tr>
+        <table shade="rows cols" rules="rows cols">
+            <tr><td colspan="2"><p>Recording apps</p></td></tr>
             <tr><td><p><var>audio/mod+zip</var></p></td>   <td><p><cmd>cd ~/Music ; wget %srv</cmd></p></td></tr>
         </table>
         
 	<p>You can use <cmd>curl</cmd>, or wrap the command with <cmd>xterm</cmd>
 	(though files are too quick to download).

Index: help/html/homepage.html
==================================================================
--- help/html/homepage.html
+++ help/html/homepage.html
@@ -15,21 +15,23 @@
 </div></div>
 <div class="body">
 <div class="hgroup"><h1 class="title"><span class="title">Radio homepages</span></h1></div>
 <div class="region">
 <div class="contents">
-<p class="p">Most radio stations are listed with a homepage URL. Use the <span class="gui">house</span> symbol in the
-	toolbar or <span class="guiseq"><span class="gui">right click</span> ▸ <span class="gui">homepage</span></span> to open it in a web browser.</p>
-<p class="p">Some homepage links are guessed, because some channels (e.g. Shoutcast) don't provide them (anymore).
-	If you play a station without homepage URL, it automatically gets googled. (The link will be visible
-        once you reselect the genre/category.)
-        </p>
+<p class="p">Most radio stations are listed with a homepage URL. Use the <span class="gui"><span class="key"><kbd>🏠</kbd></span> house</span> symbol in the toolbar or
+	<span class="guiseq"><span class="gui">right click</span> ▸ <span class="gui">homepage</span></span> to open
+	it in a web browser.</p>
+<p class="p">Some homepage links are guessed, because some channels (e.g.
+	Shoutcast) don't provide them (anymore).  If you play a station
+	without homepage URL, it automatically gets googled.  (The link will
+	be visible once you reselect the genre/category.) </p>
 </div>
 <div id="" class="sect"><div class="inner">
 <div class="hgroup"><h2 class="title"><span class="title">Channel homepages</span></h2></div>
-<div class="region"><div class="contents"><p class="p">You can also visit channel homepages (Shoutcast.com, Xiph.org, etc).
-        Either from the <span class="gui">Channel</span> menu, or via	double clicking the channel tab.</p></div></div>
+<div class="region"><div class="contents"><p class="p">You can also visit channel homepages (Shoutcast.com, Xiph.org,
+	etc).  Either from the <span class="gui">Channel</span> menu, or via double
+	clicking the channel tab.</p></div></div>
 </div></div>
 <div class="sect sect-links" role="navigation">
 <div class="hgroup"></div>
 <div class="contents"><div class="links guidelinks"><div class="inner">
 <div class="title"><h2><span class="title">More Information</span></h2></div>

Index: help/html/introduction.html
==================================================================
--- help/html/introduction.html
+++ help/html/introduction.html
@@ -51,39 +51,42 @@
 <tr>
 <td style="border-top-style: solid;"><p class="p"><span class="link"><a href="bookmarks.html" title="Bookmarks">Bookmarks</a></span></p></td>
 <td style="border-top-style: solid;border-left-style: solid;"><p class="p">Copy radio entry over into the <span class="gui">bookmarks</span> channel.</p></td>
 </tr>
 <tr class="shade">
-<td style="border-top-style: solid;"><p class="p">Homepage</p></td>
+<td style="border-top-style: solid;"><p class="p"><span class="link"><a href="homepage.html" title="Radio homepages">Homepage</a></span></p></td>
 <td style="border-top-style: solid;border-left-style: solid;"><p class="p">Most radio stations have a homepage, which you can start a web browser for.</p></td>
 </tr>
 <tr>
-<td style="border-top-style: solid;"><p class="p">Saving</p></td>
+<td style="border-top-style: solid;"><p class="p"><span class="link"><a href="saving.html" title="Saving">Saving</a></span></p></td>
 <td style="border-top-style: solid;border-left-style: solid;"><p class="p">A radio entry can be exported as .pls, .xspf, .m3u, .desktop, or .json file.</p></td>
 </tr>
 <tr class="shade">
-<td style="border-top-style: solid;"><p class="p">Extensions<span class="guiseq"><span class="gui"></span> ▸ <span class="gui"></span></span></p></td>
+<td style="border-top-style: solid;"><p class="p"><span class="link"><a href="contrib_features.html" title="→ Feature plugins">Extensions<span class="guiseq"><span class="gui"></span> ▸ <span class="gui"></span></span></a></span></p></td>
 <td style="border-top-style: solid;border-left-style: solid;"><p class="p">Some plugins add other features in this submenu.</p></td>
 </tr>
 <tr>
-<td style="border-top-style: solid;"><p class="p">Editing</p></td>
+<td style="border-top-style: solid;"><p class="p"><span class="link"><a href="edit.html" title="Edit">Editing</a></span></p></td>
 <td style="border-top-style: solid;border-left-style: solid;"><p class="p">This command is in the <span class="gui">Edit</span> and context menu, allows to inspect and modify radio descriptions.</p></td>
 </tr>
 <tr class="shade">
-<td style="border-top-style: solid;"><p class="p">Searching</p></td>
+<td style="border-top-style: solid;"><p class="p"><span class="link"><a href="search.html" title="Searching">Searching</a></span></p></td>
 <td style="border-top-style: solid;border-left-style: solid;"><p class="p">You can get a radio list according to search criteria.</p></td>
 </tr>
 </table></div></div></div>
 <p class="p"> Play, Record and Homepage also have buttons in the toolbar.</p>
 </div></div>
 </div></div>
 <div id="none" class="sect"><div class="inner">
 <div class="hgroup"><h2 class="title"><span class="title">Refresh radio lists</span></h2></div>
-<div class="region"><div class="contents"><p class="p">After some time, stream informations become obsolete. Therefore you should regularily
-	refresh the lists. The <span class="gui">Reload</span> button in the toolbar (or <span class="key"><kbd>F5</kbd></span>) is your friend. You can
-	also update the category lists with <span class="guiseq"><span class="gui">Channel</span> ▸ <span class="gui">Reload Category Tree</span></span>
-	and load favicons using <span class="guiseq"><span class="gui">Channel</span> ▸ <span class="gui">Update favicons..</span></span>.</p></div></div>
+<div class="region"><div class="contents">
+<p class="p">After some time, stream informations become obsolete. Therefore you should regularily
+	<span class="link"><a href="reloading.html" title="Reloading">refresh</a></span> the lists. The <span class="gui">Reload</span> button in the toolbar
+	(or <span class="key"><kbd>F5</kbd></span>) is your friend.</p>
+<p class="p">You can also update the category lists with <span class="guiseq"><span class="gui">Channel</span> ▸ <span class="gui">Reload Category Tree</span></span>
+	and load <span class="link"><a href="favicon.html" title="Station favicons">favicons</a></span> using <span class="guiseq"><span class="gui">Channel</span> ▸ <span class="gui">Update favicons..</span></span>.</p>
+</div></div>
 </div></div>
 <div id="" class="sect"><div class="inner">
 <div class="hgroup"></div>
 <div class="region"><div class="contents"><div class="note note-tip" title="Tip"><div class="inner"><div class="region"><div class="contents"><p class="p">You should only select radio stations and genres that you like.</p></div></div></div></div></div></div>
 </div></div>

Index: help/html/modarchive.html
==================================================================
--- help/html/modarchive.html
+++ help/html/modarchive.html
@@ -36,14 +36,14 @@
 <p class="p">Audio files are packaged up in ZIP files on MODArchive. 
 	While they are different formats (IT, S3M, XM, etc) they'll all
 	carry a generic <span class="var">audio/mod+zip</span> type specifier in
 	streamtuner2 for configuration:</p>
 <div class="table"><div class="inner"><div class="region"><table class="table">
-<tr><td rowspan="2"></td></tr>
+<tr><td colspan="2"><p class="p">Recording apps</p></td></tr>
 <tr class="shade">
 <td style="border-top-style: solid;"><p class="p"><span class="var">audio/mod+zip</span></p></td>
-<td style="border-top-style: solid;border-left-style: solid;"><p class="p"><span class="cmd">cd ~/Music ; wget %srv</span></p></td>
+<td class="shade" style="border-top-style: solid;border-left-style: solid;"><p class="p"><span class="cmd">cd ~/Music ; wget %srv</span></p></td>
 </tr>
 </table></div></div></div>
 <p class="p">You can use <span class="cmd">curl</span>, or wrap the command with <span class="cmd">xterm</span>
 	(though files are too quick to download).
 	A few file managers might be able to open the URLs directly even.

Index: help/html/recording.html
==================================================================
--- help/html/recording.html
+++ help/html/recording.html
@@ -19,11 +19,11 @@
 <div class="hgroup"><h1 class="title"><span class="title">Recording</span></h1></div>
 <div class="region">
 <div class="contents">
 <p class="p">Most stations that stream MP3 or OGG music can be recorded. This is
 accomplished through the command-line tool <span class="app">streamripper</span>.  If you
-select a station and press <span class="gui">● record</span>, a console
+select a station and press <span class="gui"><span class="key"><kbd>●</kbd></span> record</span>, a console
 window should appear, where streamripper shows its progress.</p>
 <p class="p">You can <span class="link"><a href="configuration.html" title="Configuration / Settings dialog">configure the recording tool</a></span>
 according to audio types again. Usually you want to use the <span class="link"><a href="config_apps.html#placeholders" title="URL placeholders"><span class="cmd">%srv</span> placeholder</a></span>.</p>
 </div>
 <div id="" class="sect"><div class="inner">

Index: help/html/reloading.html
==================================================================
--- help/html/reloading.html
+++ help/html/reloading.html
@@ -12,11 +12,11 @@
 <div class="body">
 <div class="hgroup"><h1 class="title"><span class="title">Reloading</span></h1></div>
 <div class="region">
 <div class="contents">
 <p class="p">Station information can get stale. Especially Shoutcast invalidates old information
-        frequently. Therefore you have to <span class="guiseq"><span class="gui"></span> ▸ <span class="gui">Reload</span></span> the lists.
+        frequently. Therefore you have to <span class="gui"><span class="key"><kbd>↻</kbd></span> Reload</span> the lists.
         There is an action button below the menu bar for this.
         It retrieves the current data from the directory service.</p>
 <p class="p">Favicons aren't loaded automatically. There is a menu entry in Channels for that, which
         works in the background and doesn't display the new icons automatically either. Simply
         reselect the category/genre in the left pane. Or again, use the station reload button.</p>

Index: help/html/search.html
==================================================================
--- help/html/search.html
+++ help/html/search.html
@@ -29,23 +29,38 @@
 </div></div>
 <div id="cachesearch" class="sect"><div class="inner">
 <div class="hgroup"><h2 class="title"><span class="title">Search window</span></h2></div>
 <div class="region"><div class="contents">
 <p class="p">You can get to the search dialog via <span class="guiseq"><span class="gui">Edit</span> ▸ <span class="gui">Find</span></span> or <span class="key"><kbd>Ctrl</kbd></span>+<span class="key"><kbd>F</kbd></span>.  Centrally
-	to this dialog is the text field, where you can specify the phrase
+	to this dialog is a text field, where you can specify the phrase
 	to scan for.</p>
 <div class="media media-image"><div class="inner"><img src="img/search.png" class="media media-block" alt=""></div></div>
-<p class="p">It either will search in all channels, or just the last active
-        channel/service.</p>
-<p class="p">Then there are two search variants.  You mostly want to use
-        the live <span class="gui">Server search</span>.  It passes your search terms to
-        the actual directory services, and loads the most recent data into a
-        result list. This might take a few seconds. And it's not implemented
-        for all channel plugins. (Some websites/APIs don't have a search.)</p>
-<p class="p">While <span class="gui">Cache find</span> would just look up entries in your
-        already downloaded channel/genre lists.  This is sufficient when
-        you're just looking for something previously seen/listened to.</p>
+<p class="p">It either will search in:</p>
+<div class="list"><div class="inner"><div class="region"><ul class="list">
+<li class="list"><p class="p"><span class="gui">☐ all channels</span></p></li>
+<li class="list"><p class="p"><span class="gui">☒ last active channel/service.</span>
+                (You therefore want to switch channel tabs before
+                invoking this search mode.)</p></li>
+</ul></div></div></div>
+<p class="p">Then there are two search variants:</p>
+<div class="list"><div class="inner"><div class="region"><ul class="list">
+<li class="list">
+<div class="title title-item"><h3><span class="title"><span class="key"><kbd>Server search</kbd></span></span></h3></div>
+<p class="p">You mostly want to use the live <span class="gui">server search</span>.  It
+	 passes your search terms to the actual directory services, and
+	 loads the most recent data into a result list.</p>
+<p class="p">This might take
+         a few seconds.  And it's not implemented for all channel plugins. 
+	 (Some websites/APIs don't have a search.)</p>
+</li>
+<li class="list">
+<div class="title title-item"><h3><span class="title"><span class="key"><kbd>Cache find</kbd></span></span></h3></div>
+<p class="p">While <span class="gui">cache find</span> would just look up entries in your
+         already downloaded channel/genre lists.  This is sufficient when
+         you're just looking for something previously seen/listened to.</p>
+</li>
+</ul></div></div></div>
 </div></div>
 </div></div>
 <div class="sect sect-links" role="navigation">
 <div class="hgroup"></div>
 <div class="contents"><div class="links guidelinks"><div class="inner">

Index: help/introduction.page
==================================================================
--- help/introduction.page
+++ help/introduction.page
@@ -36,27 +36,28 @@
 	or access the context menu with a right click.</p>
 	<table shade="rows" rules="rows cols">
 		<tr><td><p><link xref="playing">Play</link></p></td><td><p>Starts the radio in a configured audio player</p></td></tr>
 		<tr><td><p><link xref="recording">Record</link></p></td><td><p>Opens a terminal window and streamripper, which cuts the radio broadcast into individual mp3 songs.</p></td></tr>
 		<tr><td><p><link xref="bookmarks">Bookmarks</link></p></td><td><p>Copy radio entry over into the <gui>bookmarks</gui> channel.</p></td></tr>
-		<tr><td><p>Homepage</p></td><td><p>Most radio stations have a homepage, which you can start a web browser for.</p></td></tr>
-		<tr><td><p>Saving</p></td><td><p>A radio entry can be exported as .pls, .xspf, .m3u, .desktop, or .json file.</p></td></tr>
-		<tr><td><p>Extensions<guiseq><gui/><gui/></guiseq></p></td><td><p>Some plugins add other features in this submenu.</p></td></tr>
-		<tr><td><p>Editing</p></td><td><p>This command is in the <gui>Edit</gui> and context menu, allows to inspect and modify radio descriptions.</p></td></tr>
-		<tr><td><p>Searching</p></td><td><p>You can get a radio list according to search criteria.</p></td></tr>
+		<tr><td><p><link xref="homepage">Homepage</link></p></td><td><p>Most radio stations have a homepage, which you can start a web browser for.</p></td></tr>
+		<tr><td><p><link xref="saving">Saving</link></p></td><td><p>A radio entry can be exported as .pls, .xspf, .m3u, .desktop, or .json file.</p></td></tr>
+		<tr><td><p><link xref="contrib_features">Extensions<guiseq><gui/><gui/></guiseq></link></p></td><td><p>Some plugins add other features in this submenu.</p></td></tr>
+		<tr><td><p><link xref="edit">Editing</link></p></td><td><p>This command is in the <gui>Edit</gui> and context menu, allows to inspect and modify radio descriptions.</p></td></tr>
+		<tr><td><p><link xref="search">Searching</link></p></td><td><p>You can get a radio list according to search criteria.</p></td></tr>
 	</table>
 	<p> Play, Record and Homepage also have buttons in the toolbar.</p>
 	</section>
 
 	<section id="none">
 	<title>Refresh radio lists</title>
 	<p>After some time, stream informations become obsolete. Therefore you should regularily
-	refresh the lists. The <gui>Reload</gui> button in the toolbar (or <key>F5</key>) is your friend. You can
-	also update the category lists with <guiseq><gui>Channel</gui> <gui>Reload Category Tree</gui></guiseq>
-	and load favicons using <guiseq><gui>Channel</gui> <gui>Update favicons..</gui></guiseq>.</p>
+	<link xref="reloading">refresh</link> the lists. The <gui>Reload</gui> button in the toolbar
+	(or <key>F5</key>) is your friend.</p>
+	<p>You can also update the category lists with <guiseq><gui>Channel</gui> <gui>Reload Category Tree</gui></guiseq>
+	and load <link xref="favicon">favicons</link> using <guiseq><gui>Channel</gui> <gui>Update favicons..</gui></guiseq>.</p>
 	</section>
 
 	<section>
 	<note style="tip"><p>You should only select radio stations and genres that you like.</p></note>
 	</section>
 
 </page>

Index: help/reloading.page
==================================================================
--- help/reloading.page
+++ help/reloading.page
@@ -8,15 +8,15 @@
 </info>
 
 	<title>Reloading</title>
 	
         <p>Station information can get stale. Especially Shoutcast invalidates old information
-        frequently. Therefore you have to <guiseq><gui></gui> <gui>Reload</gui></guiseq> the lists.
+        frequently. Therefore you have to <gui style="button"><key>↻</key> Reload</gui> the lists.
         There is an action button below the menu bar for this.
         It retrieves the current data from the directory service.</p>
 
 	<p>Favicons aren't loaded automatically. There is a menu entry in Channels for that, which
         works in the background and doesn't display the new icons automatically either. Simply
         reselect the category/genre in the left pane. Or again, use the station reload button.</p>
 
 
 </page>

Index: help/search.page
==================================================================
--- help/search.page
+++ help/search.page
@@ -23,26 +23,39 @@
 	<section id="cachesearch">
 	<title>Search window</title>
 
 	<p>You can get to the search dialog via <guiseq><gui>Edit</gui>
 	<gui>Find</gui></guiseq> or <key>Ctrl</key>+<key>F</key>.  Centrally
-	to this dialog is the text field, where you can specify the phrase
+	to this dialog is a text field, where you can specify the phrase
 	to scan for.</p>
 
 	<media src="img/search.png" type="image" mime="image/png" />
 
-        <p>It either will search in all channels, or just the last active
-        channel/service.</p>
-
-	<p>Then there are two search variants.  You mostly want to use
-        the live <gui>Server search</gui>.  It passes your search terms to
-        the actual directory services, and loads the most recent data into a
-        result list. This might take a few seconds. And it's not implemented
-        for all channel plugins. (Some websites/APIs don't have a search.)</p>
-
-	<p>While <gui>Cache find</gui> would just look up entries in your
-        already downloaded channel/genre lists.  This is sufficient when
-        you're just looking for something previously seen/listened to.</p>
+        <p>It either will search in:</p>
+        <list>
+          <item><p><gui>☐ all channels</gui></p></item>
+          <item><p><gui>☒ last active channel/service.</gui>
+                (You therefore want to switch channel tabs before
+                invoking this search mode.)</p></item>
+        </list>
+
+	<p>Then there are two search variants:</p>
+	<list>
+	<item>
+	 <title><key>Server search</key></title>
+	 <p>You mostly want to use the live <gui>server search</gui>.  It
+	 passes your search terms to the actual directory services, and
+	 loads the most recent data into a result list.</p><p>This might take
+         a few seconds.  And it's not implemented for all channel plugins. 
+	 (Some websites/APIs don't have a search.)</p>
+	</item>
+	<item>
+	 <title><key>Cache find</key></title>
+	 <p>While <gui>cache find</gui> would just look up entries in your
+         already downloaded channel/genre lists.  This is sufficient when
+         you're just looking for something previously seen/listened to.</p>
+        </item>
+        </list>
 
 	</section>
 
 </page>