diff --git a/site.cfg b/site.cfg
index 4100890..afa90c4 100644
--- a/site.cfg
+++ b/site.cfg
@@ -134,15 +134,20 @@ content: content-sitemap.tpl.html
 
 [hpr_ogg]
 root_template: rss.tpl.xml
-content: rss-hpr_ogg.tpl.xml
+content: rss-hpr.tpl.xml
 filename: hpr_ogg.rss
+media_file_extension: ogg
 
 [hpr_mp3]
 root_template: rss.tpl.xml
-content: rss-hpr_mp3.tpl.xml
+content: rss-hpr.tpl.xml
 filename: hpr_mp3.rss
+media_file_extension: mp3
+audio_mime_type: mpeg
 
 [hpr_spx]
 root_template: rss.tpl.xml
-content: rss-hpr_spx.tpl.xml
+content: rss-hpr.tpl.xml
 filename: hpr_spx.rss
+media_file_extension: spx
+
diff --git a/templates/rss-hpr_mp3.tpl.xml b/templates/rss-hpr.tpl.xml
similarity index 66%
rename from templates/rss-hpr_mp3.tpl.xml
rename to templates/rss-hpr.tpl.xml
index 174c76e..b07e0bb 100644
--- a/templates/rss-hpr_mp3.tpl.xml
+++ b/templates/rss-hpr.tpl.xml
@@ -1,5 +1,5 @@
 <!--% PROCESS 'shared-item.tpl.xml' %-->
 <!--% PROCESS 'rss-query-hpr.tpl.xml' %-->
 <!--% FOREACH episode IN feed_result %-->
-<!--% display_item(episode, 'mp3', 'mpeg') %-->
+<!--% display_item(episode, media_file_extension, audio_mime_type) %-->
 <!--% END %-->
diff --git a/templates/rss-hpr_ogg.tpl.xml b/templates/rss-hpr_ogg.tpl.xml
deleted file mode 100644
index 3b012a8..0000000
--- a/templates/rss-hpr_ogg.tpl.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!--% PROCESS 'shared-item.tpl.xml' %-->
-<!--% PROCESS 'rss-query-hpr.tpl.xml' %-->
-<!--% FOREACH episode IN feed_result %-->
-<!--% display_item(episode, 'ogg') %-->
-<!--% END %-->
diff --git a/templates/rss-hpr_spx.tpl.xml b/templates/rss-hpr_spx.tpl.xml
deleted file mode 100644
index eb08122..0000000
--- a/templates/rss-hpr_spx.tpl.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!--% PROCESS 'shared-item.tpl.xml' %-->
-<!--% PROCESS 'rss-query-hpr.tpl.xml' %-->
-<!--% FOREACH episode IN feed_result %-->
-<!--% display_item(episode, 'spx') %-->
-<!--% END %-->