diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index 9b3b643..0ad89a1 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -75,7 +75,7 @@ Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pa
 	</header>
 	<div><!--% episode.notes %--></div>
 <footer>
-	<!--% listen_now(episode, "hpr", baseurl, media_hostname) %-->
+<!--% listen_now(episode, "hpr", baseurl, media_baseurl) %-->
 <p>
 <!--% episode_navigation %-->
 </p>
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 1743d75..a1cb3b7 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -84,7 +84,7 @@
 	</header>
 		<!--% latest_episodes.notes %-->
 	<footer>
-		<!--% listen_now(latest_episodes, "hpr", baseurl, media_hostname) %-->
+		<!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
 	</footer>
 </article>
 <!--% END %-->
diff --git a/templates/content-twat_episode.tpl.html b/templates/content-twat_episode.tpl.html
index 204795b..ef9d965 100644
--- a/templates/content-twat_episode.tpl.html
+++ b/templates/content-twat_episode.tpl.html
@@ -58,14 +58,14 @@
 <img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %--> <br>
-<!--% display_listen_in(episode.id) %-->  
+<!--% display_listen_in(episode.id, "twat") %-->  
 </p>
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
 <p><em><!--% episode.series_description %--></em></p>
 	</header>
 	<div><!--% episode.notes %--></div>
 <footer>
-<!--% listen_now(episode, "twat", baseurl, media_hostname) %-->
+<!--% listen_now(episode, "twat", baseurl, media_baseurl) %-->
 <p>
 <!--% episode_navigation %-->
 </p>
diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index 52c0b8c..fda30b1 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -11,8 +11,15 @@
 	<span><label>Tags:</label> <em><!--% tags %--></em>.</span>
 <!--% END %-->
 
-<!--% MACRO display_listen_in(eps_id) BLOCK %-->
-Listen in <a href="<!--% media_baseurl(baseurl, media_hostname) %-->local/hpr<!--% eps_id %-->.ogg">ogg</a>, <a href="<!--% media_baseurl(baseurl, media_hostname) %-->local/hpr<!--% eps_id %-->.spx">spx</a>, or <a href="<!--% media_baseurl(baseurl, media_hostname) %-->local/hpr<!--% eps_id %-->.mp3">mp3</a> format.
+<!--% MACRO display_listen_in(eps_id, episode_type) BLOCK %-->
+<!--% IF episode_type == "" %--><!--% episode_type = 'hpr' %--><!--% END %-->
+Listen in 
+<!--% IF episode_type == 'hpr' %-->
+<a href="<!--% media_path(eps_id, episode_type, 'ogg', baseurl, media_baseurl) %-->">ogg</a>,
+<a href="<!--% media_path(eps_id, episode_type, 'spx', baseurl, media_baseurl) %-->">spx</a>,
+or 
+<!--% END %-->
+<a href="<!--% media_path(eps_id, episode_type, 'mp3', baseurl, media_baseurl) %-->">mp3</a> format.
 <!--% END %-->
 
 <!--% MACRO display_comments_tally(eps_id, tally) BLOCK %-->
diff --git a/templates/shared-listen-now.tpl.html b/templates/shared-listen-now.tpl.html
index d6219a5..a6f961a 100644
--- a/templates/shared-listen-now.tpl.html
+++ b/templates/shared-listen-now.tpl.html
@@ -1,19 +1,16 @@
-<!--% MACRO listen_now(episode, episode_type, baseurl, media_hostname) BLOCK %-->
-<!--% IF episode_type == "twat" %-->
-<!--% media_folder = "eps" %--><!--% ELSE %--><!--% media_folder = "local" %-->
-<!--% END %-->
+<!--% MACRO listen_now(episode, episode_type, baseurl, media_baseurl) BLOCK %-->
 	<h2>Listen Now</h2>
 	<p>Duration: <!--% display_episode_duration(episode.duration) %--></p>
 	<audio controls preload="none">
-	<source src="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.ogg" type="audio/ogg" >
-		<source src="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.mp3" type="audio/mpeg" >
+	<source src="<!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %-->" type="audio/ogg" >
+		<source src="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->" type="audio/mpeg" >
 	</audio>
 	<ul>
 <!--% IF episode_type != "twat" %-->
-		<li>ogg: <a href="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.ogg"><!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.ogg</a></li>
-		<li>spx: <a href="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.spx"><!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.spx</a></li>
+		<li>ogg: <a href="<!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'ogg', baseurl, media_baseurl) %--></a></li>
+		<li>spx: <a href="<!--% media_path(episode.id, episode_type, 'spx', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'spx', baseurl, media_baseurl) %--></a></li>
 <!--% END %-->
-		<li>mp3: <a href="<!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.mp3"><!--% media_baseurl(baseurl, media_hostname) %--><!--% media_folder %-->/<!--% episode_type %--><!--% episode.id %-->.mp3</a></li>
+		<li>mp3: <a href="<!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %-->"><!--% media_path(episode.id, episode_type, 'mp3', baseurl, media_baseurl) %--></a></li>
 	</ul>
 <!--% END %-->