Index: help/channel_dirble.page
==================================================================
--- help/channel_dirble.page
+++ help/channel_dirble.page
@@ -7,11 +7,12 @@
 	<link type="guide" xref="channels#list"/>
         <desc>Dirble.com</desc>
 </info>
 
 	<title>Dirble</title>
-
+        <subtitle><link href="http://dirble.com/">//dirble.com/</link></subtitle>
+	
 	<p>Dirble.com is another radio station directory, made up of
 	user-contributed content, and automatic streaming server polling.</p>
 
 	<p>It provides a JSON API, which as of v2 has a lot of unneeded meta
 	information and internal ids. But it's actually nicer to scan, and

Index: help/channel_filtermusic.page
==================================================================
--- help/channel_filtermusic.page
+++ help/channel_filtermusic.page
@@ -6,11 +6,12 @@
 	<link type="guide" xref="index#channels"/>
 	<link type="guide" xref="channels#list"/>
         <desc>Selection of the best radio stations</desc>
 </info>
 
-	<title>filtermusic.net</title>
+	<title>filtermusic</title>
+        <subtitle><link href="http://filtermusic.net/">//filtermusic.net/</link></subtitle>
 
 
 	<p>Filtermusic summarizes all the common genres, but is primarily
 	focused on electro/dance/pop stations.  It elects on listener
 	popularity and freshness or something.</p>

Index: help/channel_internetradioorguk.page
==================================================================
--- help/channel_internetradioorguk.page
+++ help/channel_internetradioorguk.page
@@ -7,16 +7,17 @@
 	<link type="guide" xref="channels#list"/>
 	<link type="guide" xref="configuration#plugins"/>
         <desc>Large radio directory from the UK.</desc>
 </info>
 
-	<title>Internet-Radio.com</title>
-
+	<title>Internet-Radio</title>
+        <subtitle><link href="http://internet-radio.com/">//internet-radio.com/</link></subtitle>
+        
 	<p>Internet-Radio.com is a broad alternative to Shoutcast.
 	It has regained station homepages for most entries again.
 	Genres are similiar to Shoutcast.</p>
 
 	<note><p>Note that this plugin has its own setting on how many
 	links to retrieve.  Instead of stream numbers, it only counts pages
 	(which however speeds up processing now).</p></note>
 
 </page>

Index: help/channel_jamendo.page
==================================================================
--- help/channel_jamendo.page
+++ help/channel_jamendo.page
@@ -7,10 +7,11 @@
 	<link type="guide" xref="channels#list"/>
         <desc>Creative Commons music and artist hub.</desc>
 </info>
 
 <title>Jamendo</title>
+<subtitle><link href="http://jamendo.com/">//jamendo.com/</link></subtitle>
 
 <p>Jamendo is a Creative Comments licensing oriented music distributor. It hosts audio
 files for individual musicians and artists. Tracks and albums can thus be downloaded
 free of charge. Yeah, imagine that.</p>
 

Index: help/channel_live365.page
==================================================================
--- help/channel_live365.page
+++ help/channel_live365.page
@@ -7,11 +7,11 @@
 	<link type="guide" xref="channels#list"/>
         <desc>Live365 radio network</desc>
 </info>
 
 	<title>Live365</title>
-
+        <subtitle><link href="http://live365.com/">//live365.com/</link></subtitle>
 	<p>Live365 is a radio broadcasting service and directory. It categorizes stations in
         over 250 genres. Not all radio stations are free to listen however. It's a commercial
         provider. Therefore streamtuner2 tries to filter result lists.</p>
 
 	<p>This channel plugin is known to break once in a while. And it can't be guaranteed

Index: help/channel_modarchive.page
==================================================================
--- help/channel_modarchive.page
+++ help/channel_modarchive.page
@@ -3,15 +3,16 @@
 	id="modarchive">
 
 <info>
 	<link type="guide" xref="index#channels"/>
 	<link type="guide" xref="channels#list"/>
-        <desc>MOD files.</desc>
+        <desc>Tracker audio file collection.</desc>
 </info>
 
 	<title>The MOD Archive</title>
-
+        <subtitle><link href="http://modarchive.org/">//modarchive.org/</link></subtitle>          
+        
 	<p>MODArchive is a collection of module/tracker files. It's a community project, and
         categorizes individual audio files. You'll need a MOD-capable audio player.</p>
 
         <list>
              <item><p>XMP/libxmp</p></item>

Index: help/channel_myoggradio.page
==================================================================
--- help/channel_myoggradio.page
+++ help/channel_myoggradio.page
@@ -8,10 +8,11 @@
 	<link type="guide" xref="configuration#plugins"/>
         <desc>Open source stream directory.</desc>
 </info>
 
 <title>MyOggRadio</title>
+<subtitle><link href="http://myoggradio.org/">//myoggradio.org/</link></subtitle>          
 
 <p><link href="http://ehm.homelinux.org/MyOggRadio/">MyOggRadio</link> is an open
 source internet radio directory project.</p>
 
 <p>Since it provides its station list as JSON it's very well supported.</p>

Index: help/channel_radionomy.page
==================================================================
--- help/channel_radionomy.page
+++ help/channel_radionomy.page
@@ -7,35 +7,36 @@
 	<link type="guide" xref="channels#list"/>
         <desc>European internet streaming provider</desc>
 </info>
 
 	<title>Radionomy</title>
+	<subtitle><link href="http://radionomy.com/">//radionomy.com/</link></subtitle>
 
 	<p>Radionomy is an internet radio streaming provider, orginally
-	founded in Belgium.  It "owns" a pretty slice of the worldwide
-	internet radio stuff these days.  It took over Shoutcast.com for
+	founded in Belgium.  It commands a pretty big slice of the worldwide
+	internet radio stuff these days. - It took over Shoutcast.com for
 	instance.</p>
 
-	<p>Their primary directory on Radionomy.com lists only stations,
-	that radionomy itself provides the servers for.  It's over 6000
-	already.  Both listening and station hosting are freegiven agreement
+	<p>Their primary directory on Radionomy.com lists only stations
+	that radionomy itself hosts streaming servers for.  It's over 6000
+	already.  Both listening and station hosting are free (given agreement
 	to autoplay advertisements, and a minimum quota of daily listeners). 
-	It's thus still growing.</p>
+	Radionomy is therefore pretty popular and growing.</p>
 	
 	<p>The extraction method in streamtuner2 uses a mix of RegExp,
 	DOM traversal, and JSON extraction, with some AJAX updating spiced
-	in. It follows the scheme of the website to fetch station lists.
+	in. (It closely follows the website scheme to fetch station lists.)
 	</p>
 	
 	<section>
 	 <title>config options</title>
 	 
-         <p> You can configure the number of pages it'll try ('3' by
+         <p> You can configure the number of pages it'll try (<key>3</key> by
   	 default) to influence the length of station lists.</p>
 	
-	 <p> And the song title updating ("OnAir Updates") can be disabled.
+	 <p> And the song title updating ("<key>OnAir Updates</key>") can be disabled.
 	 Future versions of this channel plugin might poll it automatically,
 	 and keep the station list auto-updated.</p>
 	
 	 </section>
 
 </page>

Index: help/channel_shoutcast.page
==================================================================
--- help/channel_shoutcast.page
+++ help/channel_shoutcast.page
@@ -4,14 +4,15 @@
 
 <info>
 	<link type="guide" xref="index#channels"/>
 	<link type="guide" xref="channels#list"/>
 	<link type="guide" xref="configuration#plugins"/>
-        <desc>One of the bigger radio station lists.</desc>
+        <desc>Probably still the largest radio station list.</desc>
 </info>
 
 	<title>Shoutcast</title>
+	<subtitle><link	href="http://shoutcast.com/">//shoutcast.com/</link></subtitle>
 
 	<p>SHOUTcast is the name of a MP3 streaming server software. It automatically collects all
 	station lists on shoutcast.com.
         </p>
 

Index: help/channel_somafm.page
==================================================================
--- help/channel_somafm.page
+++ help/channel_somafm.page
@@ -7,10 +7,11 @@
 	<link type="guide" xref="channels#list"/>
         <desc>Set of radio stations</desc>
 </info>
 
 	<title>SomaFM</title>
+	<subtitle><link	href="http://somafm.com/">//somafm.com/</link></subtitle>
 
 	<p>SomaFM is a small radio station network. It provides its own
 	unique channels. Which streamtuner2 shows in a static list.</p>
 
 	<p>It provides streaming links in different audio formats. Only

Index: help/channel_surfmusik.page
==================================================================
--- help/channel_surfmusik.page
+++ help/channel_surfmusik.page
@@ -8,10 +8,11 @@
 	<link type="guide" xref="configuration#plugins"/>
         <desc>International radio listings.</desc>
 </info>
 
 	<title>SurfMusic</title>
+	<subtitle><link	href="http://surfmusic.de/">//surfmusic.de/</link></subtitle>
 
 	<p><link href="http://surfmusic.de/">SurfMusic</link> is a user-collection of
         internet radios. It's grouped by genres, or locations / countries.</p>
 
         <p>It's both pretty large and rather quick to extract listings from. And it mostly

Index: help/channel_tunein.page
==================================================================
--- help/channel_tunein.page
+++ help/channel_tunein.page
@@ -7,11 +7,12 @@
 	<link type="guide" xref="channels#list"/>
         <desc>Radio and Podcast directory.</desc>
 </info>
 
 	<title>TuneIn</title>
+	<subtitle><link	href="http://tunein.com/">//tunein.com/</link></subtitle>
 
 	<p>TuneIn hosts a major radio, show and podcast directory. It also provides the
         RadioTime/AIR interface for listener feedback or something. ST2 queries the OPML
         lists only for radio stations currently.</p>
 
 </page>

Index: help/channel_ubuntuusers.page
==================================================================
--- help/channel_ubuntuusers.page
+++ help/channel_ubuntuusers.page
@@ -7,10 +7,11 @@
 	<link type="guide" xref="channels#list"/>
         <desc>Wiki list of radio stations</desc>
 </info>
 
 	<title>UbuntuUsers</title>
+	<subtitle><link	href="http://ubuntuusers.de/">//ubuntuusers.de/</link></subtitle>
 
 	<p>There's a manually curated list of radio stations in the
 	UbuntuUsers.de Wiki. Like the origin website, most entries are
 	German or European stations.</p>
 

Index: help/channel_xiph.page
==================================================================
--- help/channel_xiph.page
+++ help/channel_xiph.page
@@ -8,10 +8,11 @@
 	<link type="guide" xref="configuration#plugins"/>
         <desc>ICEcast radio directory.</desc>
 </info>
 
 	<title>Xiph.org</title>
+	<subtitle><link	href="http://dir.xiph.org/">//dir.xiph.org/</link></subtitle>
 
 	<p>Xiph.org is a non-profit organization, which develops and
 	promotes the OGG streaming format, and develops audio compression
 	schemes such as Vorbis, FLAC, Opus, or the Theora video encoding
 	enve.  It also hosts a list of ICEcast streaming stations. ICEcast

Index: help/channel_youtube.page
==================================================================
--- help/channel_youtube.page
+++ help/channel_youtube.page
@@ -8,14 +8,15 @@
 	<link type="guide" xref="configuration#plugins"/>
         <desc>Youtube music/video listings.</desc>
 </info>
 
 	<title>Youtube</title>
+	<subtitle><link	href="http://youtube.com/">//youtube.com/</link></subtitle>
 
-	<p>Googles <link href="https://youtube.com/">Youtube</link> provides a quirky
-        JSON API that makes browsing channels and genres feasible. This beta plugin
-        provides a little overview, and usually retrieves recent video uploads.</p>
+	<p>Googles Youtube provides a quirky JSON API that makes browsing
+        channels and genres feasible.  This beta plugin provides a little
+        overview, and usually retrieves recent video uploads.</p>
 
         <p>VLC can directly play Youtube URLs. For other players one can use
         <link href="http://youtube-dl.org/">youtube-dl</link> as wrapper.
         For example <cmd>totem $(youtube-dl %srv)</cmd> as configured player
         command.</p>

Index: help/html/channels.html
==================================================================
--- help/html/channels.html
+++ help/html/channels.html
@@ -34,24 +34,24 @@
 <div id="list" class="sect"><div class="inner">
 <div class="hgroup"><h2 class="title"><span class="title">Available channels</span></h2></div>
 <div class="region"><div class="contents"><div class="links topiclinks"><div class="inner"><div class="region">
 <div class="linkdiv "><a class="linkdiv" href="bookmarks.html" title="Bookmarks"><span class="title">Bookmarks</span><span class="linkdiv-dash"> — </span><span class="desc">Collect favourites via bookmark function, entry editing and deleting.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="dirble.html" title="Dirble"><span class="title">Dirble</span><span class="linkdiv-dash"> — </span><span class="desc">Dirble.com</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="internet_radio_org_uk.html" title="Internet-Radio.com"><span class="title">Internet-Radio.com</span><span class="linkdiv-dash"> — </span><span class="desc">Large radio directory from the UK.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="internet_radio_org_uk.html" title="Internet-Radio"><span class="title">Internet-Radio</span><span class="linkdiv-dash"> — </span><span class="desc">Large radio directory from the UK.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="jamendo.html" title="Jamendo"><span class="title">Jamendo</span><span class="linkdiv-dash"> — </span><span class="desc">Creative Commons music and artist hub.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="live365.html" title="Live365"><span class="title">Live365</span><span class="linkdiv-dash"> — </span><span class="desc">Live365 radio network</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="myoggradio.html" title="MyOggRadio"><span class="title">MyOggRadio</span><span class="linkdiv-dash"> — </span><span class="desc">Open source stream directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="radionomy.html" title="Radionomy"><span class="title">Radionomy</span><span class="linkdiv-dash"> — </span><span class="desc">European internet streaming provider</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="shoutcast.html" title="Shoutcast"><span class="title">Shoutcast</span><span class="linkdiv-dash"> — </span><span class="desc">One of the bigger radio station lists.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="shoutcast.html" title="Shoutcast"><span class="title">Shoutcast</span><span class="linkdiv-dash"> — </span><span class="desc">Probably still the largest radio station list.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="somafm.html" title="SomaFM"><span class="title">SomaFM</span><span class="linkdiv-dash"> — </span><span class="desc">Set of radio stations</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="surfmusik.html" title="SurfMusic"><span class="title">SurfMusic</span><span class="linkdiv-dash"> — </span><span class="desc">International radio listings.</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="modarchive.html" title="The MOD Archive"><span class="title">The MOD Archive</span><span class="linkdiv-dash"> — </span><span class="desc">MOD files.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="modarchive.html" title="The MOD Archive"><span class="title">The MOD Archive</span><span class="linkdiv-dash"> — </span><span class="desc">Tracker audio file collection.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="tunein.html" title="TuneIn"><span class="title">TuneIn</span><span class="linkdiv-dash"> — </span><span class="desc">Radio and Podcast directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="ubuntuusersm.html" title="UbuntuUsers"><span class="title">UbuntuUsers</span><span class="linkdiv-dash"> — </span><span class="desc">Wiki list of radio stations</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="xiph.html" title="Xiph.org"><span class="title">Xiph.org</span><span class="linkdiv-dash"> — </span><span class="desc">ICEcast radio directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="youtube.html" title="Youtube"><span class="title">Youtube</span><span class="linkdiv-dash"> — </span><span class="desc">Youtube music/video listings.</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="filtermusic.html" title="filtermusic.net"><span class="title">filtermusic.net</span><span class="linkdiv-dash"> — </span><span class="desc">Selection of the best radio stations</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="filtermusic.html" title="filtermusic"><span class="title">filtermusic</span><span class="linkdiv-dash"> — </span><span class="desc">Selection of the best radio stations</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="icast.html" title="iCast.io"><span class="title">iCast.io</span><span class="linkdiv-dash"> — </span><span class="desc">iCast (removed)</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="itunes.html" title="iTunes Radios via RS"><span class="title">iTunes Radios via RS</span><span class="linkdiv-dash"> — </span><span class="desc">iTunes (RoliSoft Playlists)</span></a></div>
 </div></div></div></div></div>
 </div></div>
 <div id="homepage" class="sect"><div class="inner">

Index: help/html/configuration.html
==================================================================
--- help/html/configuration.html
+++ help/html/configuration.html
@@ -236,13 +236,13 @@
     applied right away for already active channel/feature plugins.</p>
 <div class="note" title="Note"><div class="inner"><div class="region"><div class="contents"><p class="p">If you want to find out more about the short option descriptions (most settings are checkboxes),
     please have a look into the channels directory /usr/share/streamtuner2/channels/ and corresponding
     *.py files. These are somewhat readable even to non-programmers, and sometimes contain more information.</p></div></div></div></div>
 <div class="links topiclinks"><div class="inner"><div class="region">
-<div class="linkdiv "><a class="linkdiv" href="internet_radio_org_uk.html" title="Internet-Radio.com"><span class="title">Internet-Radio.com</span><span class="linkdiv-dash"> — </span><span class="desc">Large radio directory from the UK.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="internet_radio_org_uk.html" title="Internet-Radio"><span class="title">Internet-Radio</span><span class="linkdiv-dash"> — </span><span class="desc">Large radio directory from the UK.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="myoggradio.html" title="MyOggRadio"><span class="title">MyOggRadio</span><span class="linkdiv-dash"> — </span><span class="desc">Open source stream directory.</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="shoutcast.html" title="Shoutcast"><span class="title">Shoutcast</span><span class="linkdiv-dash"> — </span><span class="desc">One of the bigger radio station lists.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="shoutcast.html" title="Shoutcast"><span class="title">Shoutcast</span><span class="linkdiv-dash"> — </span><span class="desc">Probably still the largest radio station list.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="surfmusik.html" title="SurfMusic"><span class="title">SurfMusic</span><span class="linkdiv-dash"> — </span><span class="desc">International radio listings.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="xiph.html" title="Xiph.org"><span class="title">Xiph.org</span><span class="linkdiv-dash"> — </span><span class="desc">ICEcast radio directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="youtube.html" title="Youtube"><span class="title">Youtube</span><span class="linkdiv-dash"> — </span><span class="desc">Youtube music/video listings.</span></a></div>
 </div></div></div>
 </div></div>

Index: help/html/dirble.html
==================================================================
--- help/html/dirble.html
+++ help/html/dirble.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Dirble</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Dirble</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://dirble.com/" title="http://dirble.com/">//dirble.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Dirble.com is another radio station directory, made up of
 	user-contributed content, and automatic streaming server polling.</p>
 <p class="p">It provides a JSON API, which as of v2 has a lot of unneeded meta

Index: help/html/filtermusic.html
==================================================================
--- help/html/filtermusic.html
+++ help/html/filtermusic.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-<title>filtermusic.net</title>
+<title>filtermusic</title>
 <link rel="stylesheet" type="text/css" href="C.css">
 <script type="text/javascript" src="jquery.js"></script><script type="text/javascript" src="jquery.syntax.js"></script><script type="text/javascript" src="yelp.js"></script>
 </head>
 <body><div class="page" role="main">
 <div class="header"><div class="trails" role="navigation">
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">filtermusic.net</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">filtermusic</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://filtermusic.net/" title="http://filtermusic.net/">//filtermusic.net/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Filtermusic summarizes all the common genres, but is primarily
 	focused on electro/dance/pop stations.  It elects on listener
 	popularity and freshness or something.</p>

Index: help/html/index.html
==================================================================
--- help/html/index.html
+++ help/html/index.html
@@ -29,26 +29,26 @@
 <div class="hgroup"><h2 class="title"><span class="title">Channel tabs</span></h2></div>
 <div class="region"><div class="contents"><div class="links topiclinks"><div class="inner"><div class="region">
 <div class="links-twocolumn">
 <div class="linkdiv "><a class="linkdiv" href="bookmarks.html" title="Bookmarks"><span class="title">Bookmarks</span><span class="linkdiv-dash"> — </span><span class="desc">Collect favourites via bookmark function, entry editing and deleting.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="dirble.html" title="Dirble"><span class="title">Dirble</span><span class="linkdiv-dash"> — </span><span class="desc">Dirble.com</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="internet_radio_org_uk.html" title="Internet-Radio.com"><span class="title">Internet-Radio.com</span><span class="linkdiv-dash"> — </span><span class="desc">Large radio directory from the UK.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="internet_radio_org_uk.html" title="Internet-Radio"><span class="title">Internet-Radio</span><span class="linkdiv-dash"> — </span><span class="desc">Large radio directory from the UK.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="jamendo.html" title="Jamendo"><span class="title">Jamendo</span><span class="linkdiv-dash"> — </span><span class="desc">Creative Commons music and artist hub.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="live365.html" title="Live365"><span class="title">Live365</span><span class="linkdiv-dash"> — </span><span class="desc">Live365 radio network</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="myoggradio.html" title="MyOggRadio"><span class="title">MyOggRadio</span><span class="linkdiv-dash"> — </span><span class="desc">Open source stream directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="radionomy.html" title="Radionomy"><span class="title">Radionomy</span><span class="linkdiv-dash"> — </span><span class="desc">European internet streaming provider</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="shoutcast.html" title="Shoutcast"><span class="title">Shoutcast</span><span class="linkdiv-dash"> — </span><span class="desc">One of the bigger radio station lists.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="shoutcast.html" title="Shoutcast"><span class="title">Shoutcast</span><span class="linkdiv-dash"> — </span><span class="desc">Probably still the largest radio station list.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="somafm.html" title="SomaFM"><span class="title">SomaFM</span><span class="linkdiv-dash"> — </span><span class="desc">Set of radio stations</span></a></div>
 </div>
 <div class="links-twocolumn">
 <div class="linkdiv "><a class="linkdiv" href="surfmusik.html" title="SurfMusic"><span class="title">SurfMusic</span><span class="linkdiv-dash"> — </span><span class="desc">International radio listings.</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="modarchive.html" title="The MOD Archive"><span class="title">The MOD Archive</span><span class="linkdiv-dash"> — </span><span class="desc">MOD files.</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="modarchive.html" title="The MOD Archive"><span class="title">The MOD Archive</span><span class="linkdiv-dash"> — </span><span class="desc">Tracker audio file collection.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="tunein.html" title="TuneIn"><span class="title">TuneIn</span><span class="linkdiv-dash"> — </span><span class="desc">Radio and Podcast directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="ubuntuusersm.html" title="UbuntuUsers"><span class="title">UbuntuUsers</span><span class="linkdiv-dash"> — </span><span class="desc">Wiki list of radio stations</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="xiph.html" title="Xiph.org"><span class="title">Xiph.org</span><span class="linkdiv-dash"> — </span><span class="desc">ICEcast radio directory.</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="youtube.html" title="Youtube"><span class="title">Youtube</span><span class="linkdiv-dash"> — </span><span class="desc">Youtube music/video listings.</span></a></div>
-<div class="linkdiv "><a class="linkdiv" href="filtermusic.html" title="filtermusic.net"><span class="title">filtermusic.net</span><span class="linkdiv-dash"> — </span><span class="desc">Selection of the best radio stations</span></a></div>
+<div class="linkdiv "><a class="linkdiv" href="filtermusic.html" title="filtermusic"><span class="title">filtermusic</span><span class="linkdiv-dash"> — </span><span class="desc">Selection of the best radio stations</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="icast.html" title="iCast.io"><span class="title">iCast.io</span><span class="linkdiv-dash"> — </span><span class="desc">iCast (removed)</span></a></div>
 <div class="linkdiv "><a class="linkdiv" href="itunes.html" title="iTunes Radios via RS"><span class="title">iTunes Radios via RS</span><span class="linkdiv-dash"> — </span><span class="desc">iTunes (RoliSoft Playlists)</span></a></div>
 </div>
 </div></div></div></div></div>
 </div></div>

Index: help/html/internet_radio_org_uk.html
==================================================================
--- help/html/internet_radio_org_uk.html
+++ help/html/internet_radio_org_uk.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-<title>Internet-Radio.com</title>
+<title>Internet-Radio</title>
 <link rel="stylesheet" type="text/css" href="C.css">
 <script type="text/javascript" src="jquery.js"></script><script type="text/javascript" src="jquery.syntax.js"></script><script type="text/javascript" src="yelp.js"></script>
 </head>
 <body><div class="page" role="main">
 <div class="header"><div class="trails" role="navigation">
@@ -14,11 +14,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#configuration" title="Configuration">Configuration</a> » <a class="trail" href="configuration.html" title="Settings dialog">Settings dialog</a> › <a class="trail" href="configuration.html#plugins" title="Channel and feature plugins and settings">Channel and feature plugins and settings</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Internet-Radio.com</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Internet-Radio</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://internet-radio.com/" title="http://internet-radio.com/">//internet-radio.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Internet-Radio.com is a broad alternative to Shoutcast.
 	It has regained station homepages for most entries again.
 	Genres are similiar to Shoutcast.</p>

Index: help/html/jamendo.html
==================================================================
--- help/html/jamendo.html
+++ help/html/jamendo.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Jamendo</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Jamendo</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://jamendo.com/" title="http://jamendo.com/">//jamendo.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Jamendo is a Creative Comments licensing oriented music distributor. It hosts audio
 files for individual musicians and artists. Tracks and albums can thus be downloaded
 free of charge. Yeah, imagine that.</p>

Index: help/html/live365.html
==================================================================
--- help/html/live365.html
+++ help/html/live365.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Live365</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Live365</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://live365.com/" title="http://live365.com/">//live365.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Live365 is a radio broadcasting service and directory. It categorizes stations in
         over 250 genres. Not all radio stations are free to listen however. It's a commercial
         provider. Therefore streamtuner2 tries to filter result lists.</p>

Index: help/html/modarchive.html
==================================================================
--- help/html/modarchive.html
+++ help/html/modarchive.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">The MOD Archive</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">The MOD Archive</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://modarchive.org/" title="http://modarchive.org/">//modarchive.org/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">MODArchive is a collection of module/tracker files. It's a community project, and
         categorizes individual audio files. You'll need a MOD-capable audio player.</p>
 <div class="list"><div class="inner"><div class="region"><ul class="list">

Index: help/html/myoggradio.html
==================================================================
--- help/html/myoggradio.html
+++ help/html/myoggradio.html
@@ -14,11 +14,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#configuration" title="Configuration">Configuration</a> » <a class="trail" href="configuration.html" title="Settings dialog">Settings dialog</a> › <a class="trail" href="configuration.html#plugins" title="Channel and feature plugins and settings">Channel and feature plugins and settings</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">MyOggRadio</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">MyOggRadio</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://myoggradio.org/" title="http://myoggradio.org/">//myoggradio.org/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p"><span class="link"><a href="http://ehm.homelinux.org/MyOggRadio/" title="http://ehm.homelinux.org/MyOggRadio/">MyOggRadio</a></span> is an open
 source internet radio directory project.</p>
 <p class="p">Since it provides its station list as JSON it's very well supported.</p>

Index: help/html/radionomy.html
==================================================================
--- help/html/radionomy.html
+++ help/html/radionomy.html
@@ -12,33 +12,36 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Radionomy</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Radionomy</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://radionomy.com/" title="http://radionomy.com/">//radionomy.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Radionomy is an internet radio streaming provider, orginally
-	founded in Belgium.  It "owns" a pretty slice of the worldwide
-	internet radio stuff these days.  It took over Shoutcast.com for
+	founded in Belgium.  It commands a pretty big slice of the worldwide
+	internet radio stuff these days. - It took over Shoutcast.com for
 	instance.</p>
-<p class="p">Their primary directory on Radionomy.com lists only stations,
-	that radionomy itself provides the servers for.  It's over 6000
-	already.  Both listening and station hosting are freegiven agreement
+<p class="p">Their primary directory on Radionomy.com lists only stations
+	that radionomy itself hosts streaming servers for.  It's over 6000
+	already.  Both listening and station hosting are free (given agreement
 	to autoplay advertisements, and a minimum quota of daily listeners). 
-	It's thus still growing.</p>
+	Radionomy is therefore pretty popular and growing.</p>
 <p class="p">The extraction method in streamtuner2 uses a mix of RegExp,
 	DOM traversal, and JSON extraction, with some AJAX updating spiced
-	in. It follows the scheme of the website to fetch station lists.
+	in. (It closely follows the website scheme to fetch station lists.)
 	</p>
 </div>
 <div id="" class="sect"><div class="inner">
 <div class="hgroup"><h2 class="title"><span class="title">config options</span></h2></div>
 <div class="region"><div class="contents">
-<p class="p"> You can configure the number of pages it'll try ('3' by
+<p class="p"> You can configure the number of pages it'll try (<span class="key"><kbd>3</kbd></span> by
   	 default) to influence the length of station lists.</p>
-<p class="p"> And the song title updating ("OnAir Updates") can be disabled.
+<p class="p"> And the song title updating ("<span class="key"><kbd>OnAir Updates</kbd></span>") can be disabled.
 	 Future versions of this channel plugin might poll it automatically,
 	 and keep the station list auto-updated.</p>
 </div></div>
 </div></div>
 <div class="sect sect-links" role="navigation">

Index: help/html/shoutcast.html
==================================================================
--- help/html/shoutcast.html
+++ help/html/shoutcast.html
@@ -14,11 +14,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#configuration" title="Configuration">Configuration</a> » <a class="trail" href="configuration.html" title="Settings dialog">Settings dialog</a> › <a class="trail" href="configuration.html#plugins" title="Channel and feature plugins and settings">Channel and feature plugins and settings</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Shoutcast</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Shoutcast</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://shoutcast.com/" title="http://shoutcast.com/">//shoutcast.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">SHOUTcast is the name of a MP3 streaming server software. It automatically collects all
 	station lists on shoutcast.com.
         </p>

Index: help/html/somafm.html
==================================================================
--- help/html/somafm.html
+++ help/html/somafm.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">SomaFM</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">SomaFM</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://somafm.com/" title="http://somafm.com/">//somafm.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">SomaFM is a small radio station network. It provides its own
 	unique channels. Which streamtuner2 shows in a static list.</p>
 <p class="p">It provides streaming links in different audio formats. Only

Index: help/html/surfmusik.html
==================================================================
--- help/html/surfmusik.html
+++ help/html/surfmusik.html
@@ -14,11 +14,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#configuration" title="Configuration">Configuration</a> » <a class="trail" href="configuration.html" title="Settings dialog">Settings dialog</a> › <a class="trail" href="configuration.html#plugins" title="Channel and feature plugins and settings">Channel and feature plugins and settings</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">SurfMusic</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">SurfMusic</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://surfmusic.de/" title="http://surfmusic.de/">//surfmusic.de/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p"><span class="link"><a href="http://surfmusic.de/" title="http://surfmusic.de/">SurfMusic</a></span> is a user-collection of
         internet radios. It's grouped by genres, or locations / countries.</p>
 <p class="p">It's both pretty large and rather quick to extract listings from. And it mostly

Index: help/html/tunein.html
==================================================================
--- help/html/tunein.html
+++ help/html/tunein.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">TuneIn</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">TuneIn</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://tunein.com/" title="http://tunein.com/">//tunein.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents"><p class="p">TuneIn hosts a major radio, show and podcast directory. It also provides the
         RadioTime/AIR interface for listener feedback or something. ST2 queries the OPML
         lists only for radio stations currently.</p></div>
 <div class="sect sect-links" role="navigation">

Index: help/html/ubuntuusersm.html
==================================================================
--- help/html/ubuntuusersm.html
+++ help/html/ubuntuusersm.html
@@ -12,11 +12,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#browsing" title="Browsing channels and radio stations">Browsing channels and radio stations</a> » <a class="trail" href="channels.html" title="Channels">Channels</a> › <a class="trail" href="channels.html#list" title="Available channels">Available channels</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">UbuntuUsers</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">UbuntuUsers</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://ubuntuusers.de/" title="http://ubuntuusers.de/">//ubuntuusers.de/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">There's a manually curated list of radio stations in the
 	UbuntuUsers.de Wiki. Like the origin website, most entries are
 	German or European stations.</p>

Index: help/html/xiph.html
==================================================================
--- help/html/xiph.html
+++ help/html/xiph.html
@@ -14,11 +14,14 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#configuration" title="Configuration">Configuration</a> » <a class="trail" href="configuration.html" title="Settings dialog">Settings dialog</a> › <a class="trail" href="configuration.html#plugins" title="Channel and feature plugins and settings">Channel and feature plugins and settings</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Xiph.org</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Xiph.org</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://dir.xiph.org/" title="http://dir.xiph.org/">//dir.xiph.org/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
 <p class="p">Xiph.org is a non-profit organization, which develops and
 	promotes the OGG streaming format, and develops audio compression
 	schemes such as Vorbis, FLAC, Opus, or the Theora video encoding

Index: help/html/youtube.html
==================================================================
--- help/html/youtube.html
+++ help/html/youtube.html
@@ -14,16 +14,19 @@
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#channels" title="Channel tabs">Channel tabs</a> » </div>
 <div class="trail">
 <a class="trail" href="index.html" title="♪ Streamtuner2"><span class="media"><span class="media media-image"><img src="img/logo.png" class="media media-inline" alt="♪"></span></span> Streamtuner2 </a> › <a class="trail" href="index.html#configuration" title="Configuration">Configuration</a> » <a class="trail" href="configuration.html" title="Settings dialog">Settings dialog</a> › <a class="trail" href="configuration.html#plugins" title="Channel and feature plugins and settings">Channel and feature plugins and settings</a> » </div>
 </div></div>
 <div class="body">
-<div class="hgroup"><h1 class="title"><span class="title">Youtube</span></h1></div>
+<div class="hgroup">
+<h1 class="title"><span class="title">Youtube</span></h1>
+<h2 class="subtitle"><span class="subtitle"><span class="link"><a href="http://youtube.com/" title="http://youtube.com/">//youtube.com/</a></span></span></h2>
+</div>
 <div class="region">
 <div class="contents">
-<p class="p">Googles <span class="link"><a href="https://youtube.com/" title="https://youtube.com/">Youtube</a></span> provides a quirky
-        JSON API that makes browsing channels and genres feasible. This beta plugin
-        provides a little overview, and usually retrieves recent video uploads.</p>
+<p class="p">Googles Youtube provides a quirky JSON API that makes browsing
+        channels and genres feasible.  This beta plugin provides a little
+        overview, and usually retrieves recent video uploads.</p>
 <p class="p">VLC can directly play Youtube URLs. For other players one can use
         <span class="link"><a href="http://youtube-dl.org/" title="http://youtube-dl.org/">youtube-dl</a></span> as wrapper.
         For example <span class="cmd">totem $(youtube-dl %srv)</span> as configured player
         command.</p>
 <p class="p">Youtube-dl is preconfigued as "recording"/download tool for this channel