130 changed files with 1366 additions and 23357 deletions
--- a/GETTING_STARTED.md
+++ b/GETTING_STARTED.md
@ -1,215 +0,0 @@
-# Clone the repository
-
-If git is not installed on the operating system, please install it now 
-(see the git documentation for [instructions on installing git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)).
-
-To retrieve the code from the repository on anhonesthost.net (a username and 
-password are required), run:
-
-`git clone https://repo.anhonesthost.net/HPR/hpr_generator.git`
-
-On success, an "hpr_generator" directory will be created in the folder from 
-which the clone command was executed containing a local copy of the git repository.
-
-# Install required Perl modules
-
-Installing the Perl modules is the most finicky part of the installation process. 
-The needed Perl modules can be found using the operating system's package 
-manager or using the modules found in the 
-[Comprehensive Perl Archive Network (CPAN)](https://www.cpan.org/).
-
-## Installing modules on Debian based Linux distributions
-
-Run command (tested on Debian 11):
-
-```
-apt install libconfig-std-perl \
-	libtemplate-perl \
-	libtemplate-plugin-dbi-perl \
-	libdbd-sqlite3-perl libdate-calc-perl \
-	libtie-dbi-perl \
-	libtext-csv-xs-perl \
-	libhtml-parser-perl \
-	libtemplate-plugin-html-strip-perl
-
-```
-
-## Using CPAN to install the modules
-
-A cross platform method to install the needed modules is the Perl CPAN application. 
-Make sure that the [gcc](https://www.gnu.org/software/gcc/), 
-[make](https://www.gnu.org/software/make/manual/make.html), 
-and [cpan](https://perldoc.perl.org/CPAN) commands are available. 
-Install them using the operating system's package manager, or from source.
-
-Run commands:
-
-```
-cpan Config::Std
-cpan Template
-cpan Template::Plugin::DBI
-cpan Template::Plugin::HTML::Strip
-cpan DBD::SQLite
-cpan Date::Calc
-cpan Tie::DBI
-cpan Text:CSV_XS
-```
-
-## Testing for Perl module dependencies
-
-A bash script is included in the utils directory that will list the Perl modules used by the site-generator and report whether the modules are installed on the current OS.
-
-It can be run from any directory. To run from the utils directory:
-
-```
-./check-dependencies.sh
-```
-
-# Create the HPR database
-
-The hpr_generator relies on information from a database to generate many of the 
-files for the website (for example: index.html, series/index.html, 
-hpr_mp3.rss, etc). This data is available from a MySQL dump file found on 
-hackerpublicradio.org at URL "https://www.hackerpublicradio.org/hpr.sql".
-
-The first step is to download the hpr.sql file. This can be done using your 
-browser, or by running one of the following commands:
-
-`curl https://www.hackerpublicradio.org/hpr.sql --output ./hpr.sql`
-
-or
-
-`wget --directory-prefix=./ https://www.hackerpublicradio.org/hpr.sql`
-
-## Creating an SQLite database file
-
-The SQL of the hpr.sql file must be converted from MySQL specific statements to 
-SQLite specific statements. The mysql2sqlite script found in the utils directory 
-is used for this conversion. First remove the lines from hpr.sql that 
-mysql2sqlite can't handle:
-
-`sed '/^DELIMITER ;;/,/^DELIMITER ;/d' < ./hpr.sql > ./hpr-sqlite.sql`
-
-Next run the mysql2sqlite script piping its output into the sqlite3 
-program which creates the hpr.db file:
-
-`./utils/mysql2sqlite ./hpr-sqlite.sql | sqlite3 ./hpr.db`
-
-For convenience, the update-sqlite-db.sh script in the utils directory
-automates the above steps (including downloading the hpr.sql file). 
-From the root of the local hpr_generator repository run:
-
-`./utils/update-sqlite-db.sh`
-
-# Configure the site-generator
-
-In your favorite text editor, open the site.cfg file found in the root of the 
-"hpr_generator" folder. Full details about options for configuring the site.cfg 
-file are found in the comments within the file.
-
-## Configuring the database connection
-
-Any database supported by the Perl:DBI and Perl::DBD modules can be used with 
-the site-generator program. Currently the hpr_generator project works with 
-a MySQL or SQLite database.
-
-Find the [DBI] section of the file. It should look like the following
-
-```
-[DBI]
-# Configuration settings for SQLite
-#database: sqlite
-#driver: dbi:SQLite:hpr.db 
-#user:        (not used - leave blank)
-#password:    (not used - leave blank)
-# Configuration settings for MySQL
-#database: mysql
-#driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
-#user: hpr-generator  (Suggested user with read-only privileges)
-#password: *********  (Password for user)
-```
-
-### SQLite
-
-Remove the comment character from the start of the database and driver 
-option lines:
-
- ```
-# Configuration settings for SQLite
-database: sqlite
-driver: dbi:SQLite:hpr.db 
-#user:        (not used - leave blank)
-#password:    (not used - leave blank)
-```
-
-The hpr.db section of the driver option `dbi:SQLite:hpr.db` is the path 
-to the sqlite file. The default assumes the hpr.db file is located in the same
-directory as the site-generator. 
-
-### MySQL
-
-Remove the comment character from the start of the database, driver, 
-user, and password option lines:
-
- ```
-# Configuration settings for MySQL
-database: mysql
-driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
-user: hpr-generator
-password: *********
-```
-
-This assumes that the MySQL database service is available at the localhost 
-hostname, that the database name (hpr_hpr) is the database created from 
-the hpr.sql dump file or manually created by you, that the user (hpr-generator) 
-was added by you and has read rights to the hpr_hpr database, and that the 
-password (replace ********* with the actual password) matches the password set 
-for the hpr-generator database user.
-
-## Configuring the website for viewing locally
-
-For HTML links to work when viewing the files on your local machine using the 
-"file://" protocal (i.e. using the "Open..." command in your browser, each HTML 
-file must include a \<base\> meta-data tag in the \<head\> section of its 
-contents. To configure this in the site.cfg file, find the [root_template] 
-section. It should look like the following:
-
-```
-[root_template]
-content: page.tpl.html
-#baseurl: OPTIONAL [i.e. file://<full path to local website directory>]
-```
-Below the #baseurl comment line add:
-
-```
-baseurl: file://</path/to>/hpr_generator/public_html
-```
-
-Replace \<path/to\> with the full path to the hpr_generator directory. For 
-example: `file:///home/HPR/development/hpr_generator/public_html`
-
-## Configuring the website media file links
-
-If you do not want to host all the media files (currently, audio files and 
-transcription files), you can configure the `media_baseurl` option. This can 
-be added to the [root_template] section of the site.cfg file. Suggested 
-external site is archive.org. To use this site add:
-
-```
-media_baseurl: https://archive.org/download/hpr$eps_id/
-```
-
-# Run the site-generator
-
-Run the site generator form the hpr_generator directory:
-
-```
-./site-generator --all
-```
-
-This will generate all the files for the website. For more examples and to see 
-all available options run:
-
-```
-./site-generator --help
-```
--- a/README.md
+++ b/README.md
@ -3,77 +3,51 @@ Static web page generator for the Hacker Public Radio website.

 ## Installation
 * Clone or download this repository
-* With SQLite
-	* Create the sqlite3 database from the hpr.sql MySQL dump file available on
-	  hackerpublicradio.org. The default name for the database file is "hpr.db"
-	  and should be located in the root of the project directory. The name and
-	  location can be set in the site.cfg file.
-	* An "update-hpr.sh" helper script is available in the utils directory. This
-	  script will download the hpr.sql file, convert it to the SQLite hpr.db file,
-	  and regenerate the website using the site-generator.
-		1. `cd` into the root of the project directory
-		2.  Run `./utils/update-hpr.sh`
-	* SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries. Must convert WITH
-	  clauses to sub-queries when using earlier versions of SQLite.
-* With MySQL
-	* Create database hpr_hpr in the MySQL server from HPR dump file.
-		- ``sudo mysql --host=localhost < hpr.sql``
-	* Create a user that will be used by the site-generator.
-		- Suggested username: hpr-generator
-		- ``CREATE USER 'hpr-generator'@'localhost' IDENTIFIED BY '<password>';``
-	* Limit the user's privileges to EXECUTE and SELECT
-		- ``GRANT SELECT ON hpr_hpr.* TO 'hpr-generator'@'localhost';``
-		- ``GRANT EXECUTE ON `hpr_hpr`.* TO 'hpr-generator'@'localhost';``
+* Create the sqlite3 database from the files in the _sql directory. The default name for the database file is "hpr.db" and should be located in the root of the project directory. The name and location can be set in the site.cfg file.
+* Two sql helper scripts are available to generate an empty database or a database filled with test data.
+  - For an empty database: `cat Create_Database_Empty.sql | sqlite3 hpr.db`
+  - For a database with test data: `cat Create_Database_Test.sql | sqlite3 hpr.db`
+* SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries. Must convert WITH 
+  clauses to sub-queries when using earlier versions of SQLite.
 * Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
-    * Getopt::Long
+    * GetOpt
    * Pod::Usage
    * Config::Std
    * Template
    * Template::Plugin::File
    * Template::Plugin::DBI
-    * Template::Plugin::Date
-    * Template::Plugin::HTML::Strip
    * DBI
    * Tie::DBI
-    * DBD::SQLite or DBD::mysql
+    * DBD::SQLite
    * Date::Calc
-    * Text::CSV_XS
-    * HTML::Entities
-
-* See the [Getting Started](GETTING_STARTED.md) tutorial for more details on
-  installing the HPR generator.

 ## Usage
 Generate two specific pages:
-`site-generator index about`
+`site-generator index about`		

 Generate the whole site:
-`site-generator --all`
+`site-generator --all`	

 Generate pages based on the same template:
 `site-generator correspondent=1,3,5..10`

 ## Support
-Please [submit an Issue](https://repo.anhonesthost.net/HPR/hpr_generator/issues),
+Please [submit an Issue](https://repo.anhonesthost.net/rho_n/hpr_generator/issues),
 and add the label "**Help Request**" for help running or installing the site-generator.

-For discussing HPR site generation in general, please [submit an Issue](https://repo.anhonesthost.net/HPR/hpr_generator/issues) and add the label "**General Discussion**".
+For discussing HPR site generation in general, please [submit an Issue](https://repo.anhonesthost.net/rho_n/hpr_generator/issues) and add the label "**General Discussion**".

 ## Contributing
 Happy to take any contributions or suggestions.

-To contribute code or documentation, please create a fork of the project and [submit a pull request](https://repo.anhonesthost.net/HPR/hpr_generator/pulls) or send a patch. If an issue exists that is related to your patch, please assign the issue to yourself, or if it is already assigned to someone else, please coordinate with them to minimize duplicated efforts.
+To contribute code or documentation, please create a fork of the project and [submit a pull request](https://repo.anhonesthost.net/rho_n/hpr_generator/pulls) or send a patch. If an issue exists that is related to your patch, please assign the issue to yourself, or if it is already assigned to someone else, please coordinate with them to minimize duplicated efforts.

-If you have found an error in the code or the generated HTML, please [submit an Issue](https://repo.anhonesthost.net/HPR/hpr_generator/issues),
+If you have found an error in the code or the generated HTML, please [submit an Issue](https://repo.anhonesthost.net/rho_n/hpr_generator/issues),
 and add the label "**Bug Found**".

-To make a suggestion, please [submit an Issue](https://repo.anhonesthost.net/HPR/hpr_generator/issues),
+To make a suggestion, please [submit an Issue](https://repo.anhonesthost.net/rho_n/hpr_generator/issues),
 and add the label "**Feature Request**".

 ## Authors and acknowledgment
-* Roan "Rho`n" Horning
-* Dave Morriss
-* gordons
-* Ken Fallon
-* norrist
+* Roan "Rho`n" Horning 

--- a/public_html/css/hpr.css
+++ b/public_html/css/hpr.css
@ -1,494 +1,262 @@
@charset "utf-8";
 /* Website design Copyright Ken Fallon - Released into the public domain/

-https://creativecommons.org/publicdomain/ 
+http://creativecommons.org/publicdomain/ 
 
 */
-/*
- *	See the following for the modern CSS responsive design techniques used in this file:
- *	- MDN web docs: Responsive design 
- *		-- https://developer.mozilla.org/en-US/docs/Learn/CSS/CSS_layout/Responsive_Design
- *	- Matthew James Tayler: Responsive Font Size (Optimal Text at Every Breakpoint) 
- *		-- https://matthewjamestaylor.com/responsive-font-size
- *	- CSS-Tricks: Linearly Scale font-size with CSS clamp() Based on the Viewport
- *		-- https://css-tricks.com/linearly-scale-font-size-with-css-clamp-based-on-the-viewport/
-*/

-html {
-	margin: 0;
-	padding: 0;
-	display: block;
+p.meta span label { font-weight: bold; }
+@media only screen and (min-width: 479px) { 
+
+body {background: #dfdfdf;}
+div, h1, h2, h3, h4, h5, h6, p, ul, ol, li, dl, dt, dd, img, form, fieldset, input, textarea, blockquote {
+  font-family: Verdana, Arial, Helvetica, sans-serif;/* 1em/1.5 OpenDyslexic, */
+  color: #4D4D4D; /* HPR Grey */
+  background: white;
 }

-body {
-	display: block;
-	background: #dfdfdf;
-	font-size: 1rem; /* fallback for browsers that don't support the clamp function) */
-	font-size: clamp(1rem, 15px + 0.3vw, 1.07rem);
-	margin: 0;
-	padding: 0;
-}
-
-div,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-ul,
-ol,
-li,
-dl,
-dt,
-dd,
-img,
-form,
-fieldset,
-input,
-textarea,
-blockquote {
-	font-family: Verdana, Arial, Helvetica, sans-serif; /* 1em/1.5 OpenDyslexic, */
-	color: #4D4D4D; /* HPR Grey */
-	background: white;
-}
-
-h1 {
-	font-size: 1.5rem;
-	margin: 1.25rem 0 0.75rem 0;
-}
-
-h2,
-article * h1 {
-	font-size: 1.45rem;
-	margin: 1.25rem 0 0.75rem 0;
-}
-
-h3,
-article * h2 {
-	font-size: 1.25rem;
-	margin: 1.25rem 0 0.75rem 0;
-}
-
-h4,
-article * h3 {
-	font-size: 1.15rem;
-	margin: 1.25rem 0 0.75rem 0;
-}
-
-img {
-	max-width: 100%;
-	height: auto;
-}
-
-ul {
-	padding-left: 1.15rem;
-}
-
-li {
-	line-height: 1.25;
-}
-
-a {
-	text-decoration: none;
-}
-
-a:hover {
-	cursor: pointer;
-}
-
-hr {
-	background: #4D4D4D;
-	border: 0;
-	height: 0.25em;
-}
-
-audio {
-	padding: .7em 0em .5em 0em;
-	clear: both;
-	position: relative;
-	z-index: auto;
-}
-
-.audcredit {
-	font-size: 75%;
-	margin-bottom: 1em;
-}
-
-p.meta {
-	line-height: 1.25;
-}
-
-p.meta span label {
-	font-weight: bold;
-}
-
-article>p,
-#maincontent>p {
-	line-height: 1.45;
-}
-
-article#previous_five_weeks>* {
-	line-height: 1.35;
-	margin: 0;
-	padding: 0;
-}
-
-article#previous_five_weeks>h3 {
-	margin: 1.5rem 0 0.5rem 0;
-}

 #container {
-	max-width: 58rem;
-	margin: 0.25rem;
-	padding: 0.75rem; /* fallback for browsers that don't support the clamp function) */
-	padding: clamp(0.75rem, -0.25rem + 3vw, 2.0rem);
+	width: 100%;
+	max-width: 58em;
+	margin: auto;
 	overflow: hidden;
+	padding: .5em;
+	border: thin solid;
 	background: white;
-	border: thin solid #4D4D4D;
 }

 .shadow {
-	-moz-box-shadow:    2px 3px 6px 3px #675958;
-	-webkit-box-shadow: 2px 3px 6px 3px #675958;
-	box-shadow:         2px 3px 6px 3px #675958;
+  -moz-box-shadow:    2px 3px 6px 3px #675958;
+  -webkit-box-shadow: 2px 3px 6px 3px #675958;
+  box-shadow:         2px 3px 6px 3px #675958;}
+
+#hprlogo { 
+  display: block; 
+  position: relative; 
+  top: 0; 
+  left: 0; 
+  border: 0; 
+  margin: 0.75em;
+  float:left;
 }

-.thick_bar {
-	background-color: #4D4D4D;
-	color: white;
-	padding: 0.5rem;
-	margin: 1rem 0 1rem 0;
+#hpr_banner { 
+  display: block; 
+  position: relative;
+  border: 0; 
+  margin: 0.75em;
+  float: left;
 }

-img#hprlogo {
-	max-width: 20vw;
-	padding-right: clamp(0.75rem, -0.25rem + 3vw, 1.5rem);
-	float: left;
-	margin-top: 1rem;
-	margin-bottom: clamp(0.75rem, -0.25rem + 2vw, 1.5rem);
-}
-
-#hpr_banner {
-	/* display: inline-block; */
-	border: 0;
-	margin: 0 0 0rem 0;
-	padding: 0;
-}
-
-#hpr_banner p {
-	margin: 0 0 0.5rem 0;
-}
-
-#hpr_banner h1#sitename {
-	font-size: clamp(1.44rem, -1rem + 3vw, 2rem);
-	letter-spacing: 0.06rem;
-	margin: 0;
-	padding: 0;
-}
-
-#hpr_banner h2 {
-	font-size: clamp(0.74rem, -1rem + 2vw, 1rem);
-	font-weight: 510;
-	margin: 0 0 1rem 0;
-	padding: 0;
-}
-
-#hpr_banner h3 {
-	font-size: 1rem;
-	font-weight: normal;
-	margin: 0 0 0.5rem 0;
-	padding: 0;
-}
-
-header>hr {
-	clear: both;
-}
+#hpr_banner h1 {margin: -.25em 0em -.5em 0em;}
+#hpr_banner h2 {font-size: 100%; font-weight: lighter; }
+#hpr_banner h3 {font-size: 90%; font-weight: lighter; }

 #accessible_menu {
-	font-size: smaller;
+  font-size: small;
 }

 /* The main navigation menu */
-header>nav.menu {
-	display: block;
-	background-color: #4D4D4D; /* HPR Grey */
-	text-align: Left;
-	clear: both; /* Forces the menu to appear after the HPR Header block */
-	padding: 0;
-	margin: 0;
+.menu {
+  background: #4D4D4D; /* HPR Grey */
+  text-align: Left;
+  clear:both; /* Forces the menu to appear after the HPR Header block */
+  padding: 0em 0em;
+  margin: 0em 0em;
 }

-header>nav.menu ul {
-	margin: 0;
-	padding: 0.5rem;
-	background-color: inherit;
-	color: white;
+.menu ul ul { /* Causes the sub menus not to be displayed, until hover shows them */
+  display: none;
 }

-header>nav.menu ul li {
-	display: inline-block;
-	background-color: inherit;
-	color: inherit;
-	line-height: 1.5;
-	margin: 0;
-	padding: 0;
-	padding-right: clamp(0.5rem, -0.25rem + 3vw, 2.5rem);
-}
+#main_menu li a {display: block;}

-header>nav.menu ul li a {
-	color: white;
-	text-decoration: none;
-	display: block;
-	padding: 0.25rem 0;
-}
-
-header>nav.menu ul li a:hover {
-	border-bottom: thin solid white;
-	padding: 0.15rem 0;
-	-webkit-transition: 0.3s ease-in-out color;
-	-moz-transition: 0.3s ease-in-out color;
-	transition: 0.3s ease-in-out color;
-}
-
-header>nav.menu ul li a:visited {
-	color: #EDEDED;
-}
-
-a:active,
-header>nav.menu ul li a:active {
-	color: red;
-}
-
-pre {
-	/* Add background, border and scrollbar to <pre> */
-	background: #eee;
-	border: 1px solid #ddd;
-	overflow: auto;
-	clear: both;
-	padding: 0.5rem
-}
-
-pre code {
-	padding-right: 0.5rem;
-	font-size: 0.85rem;
-	line-height: 1;
-}
-
-pre.comment {
-	white-space: pre-wrap;
-	line-height: 1.2rem;
-}
-
-table.hosts {
-	font-size: clamp(0.82rem, -0.25rem + 3vw, 1.0rem);
-	width: 100%;
-	background: white;
-	margin: 0 auto;
-	border-collapse: collapse;
-	display: inline-table;
+.menu ul li { padding: .25em 0em;}

 }

-table.hosts tr:nth-child(even) {
-	background-color: #cccccc;
-	border-bottom: thick solid white;
+.menu ul { /* The menu bar background across screen */
+  background: #4D4D4D; /* HPR Grey */
+  color: white;
+  padding: 0 10px; /* Keeps sub menus to the left */
+  list-style: none;
+  position: relative;
+  margin: 0;
+  display: inline-table;
 }

-table.hosts tr:nth-child(odd) {
-	background-color: white;
-	border-bottom: thick solid white;
+.menu ul:after { /* Forces the dropdown to be a block with non float */
+  content: ""; 
+  clear: both; 
+  display: block;
 }

-table.hosts tr td img {
-	vertical-align: middle;
-	max-height: 80px;
+.menu ul li {
+  background: #4D4D4D; /* HPR Grey */
+  color: white;
+  float: left;
+  padding: .5em 1em;
 }

-table.hosts th:first-child,
-table.hosts td:first-child {
-	min-width: 60px;
-	max-width: 80px;
-	text-align: left;
+.menu ul li a {
+  background: #4D4D4D; /* HPR Grey */
+  color: white;
+  display: block; 
+  text-decoration: none;
+}
+    
+.menu ul ul {
+  background: #4D4D4D; /* HPR Grey */
+  color: white;
+  padding: 0;
+  position: absolute; 
+  top: 100%;
 }

-table.hosts th:nth-child(2),
-table.hosts td:nth-child(2) {
-	text-align: left;
-	padding-left: clamp(0.15rem, -0.25rem + 3vw, 0.5rem);
+.menu ul ul li {
+  background: #4D4D4D; /* HPR Grey */
+  color: white;
+  float: none; 
+  position: relative;
+}
+    
+.menu ul ul ul {
+  position: absolute; 
+  left: 100%; 
+  top:0;
 }

-table.hosts th:nth-child(3),
-table.hosts td:nth-child(3),
-table.hosts th:nth-child(4),
-table.hosts td:nth-child(4) {
-	width: 10%;
-	padding-right: clamp(0.10rem, -0.25rem + 3vw, 1rem);
+
+hr {
+  background: #4D4D4D;  /* HPR Grey */
+  border: 0;
+  height: 0.25em;
 }

-body>div>footer {
-	margin-top: 2rem;
+/* The multi colum footer layout */
+
+#footer_page {
+  width:100%;
 }

-footer #more_info nav.column {
-	clear: both;
-	font-size: 0.9rem;
-	margin-left: 0.5rem;
+.column {
+  width:12%;
+  background-color: white;
+  color: #4D4D4D; /* HPR Grey */
+  float:left;
+  margin:0 10px;
+  display: block;
 }

-footer #more_info nav.column ul li {
-	float: left;
-	margin-right: 1.5rem;
-	margin-bottom: 1rem;
+.column li {
+  list-style:none;
+  padding: .25em 0em;
+  font-size: 85%;
 }

-footer #more_info nav.column h2 {
-	font-size: 1.35rem;
-	margin-top: 0.5rem;
+.thick_bar {
+  width:100%;
+  background-color: #4D4D4D; /* HPR Grey */
+  color: white;
+  float:left;   
+  clear: both;
+  height:1.5em;
+  padding: .5em 0em .5em 0em;
+  font-size: 1em;
+  margin: 1em 0em 1em 0em;
 }

-footer h1.thick_bar {
-	clear: left;
-	font-size: 1.15rem;
+#more_info {margin: auto;}
+nav.column { display: block; padding: 0em 1em 0em 1em;}
+#copyright {
+  font-size: small;
+  width:100%;
+  float:left;   
 }

-footer #copyright {
-	font-size: smaller;
-	margin-left: 0.5rem;
-	margin-right: 0.5rem;
+article, #copyright p {
+  padding: 0 10px;
 }

-fieldset>table,
-fieldset>table thead,
-fieldset>table tbody,
-fieldset>table tr,
-fieldset>table th,
-fieldset>table td,
-fieldset>table td input,
-fieldset>table td textarea {
-	display: block;
-	font-size: 1rem;
+audio {padding: .7em 0em .5em 0em; clear: both; position: relative; z-index:auto;}
+.audcredit { font-size: 75%;margin-bottom: 1em;}
+h1.showtitle { font-size: 125%;}
+
+/* Full Index Page styling */
+#index_full h2.title {
+	font-weight: lighter;
+	margin-bottom: -.5em;
+	padding: .5em 0em 0em 0em; 
+	font-size: 110%;}
+
+#index_full p.meta {font-size: 85%;}
+
+#small {
+  font-size: small;
 }

-fieldset>table {
-	width: calc(100vw + -16vw + -1rem);
-	max-width: 100%;
+p.author { font-size: 85%;}
+p.shownotes { padding: .5em;}
+#maincontent footer p { font-size: 75%; margin-bottom: 1em;}
+/* link styling */
+a:link {text-decoration: none;}
+
+table {
+    width:100%;
+}
+table, th, td {
+    border-collapse: collapse;
+    padding: 2px;
+    text-align: left;
+}
+table#t01, table#t01 th, table#t01 td {
+    border: 1px solid black;
+}
+table#t01 th, table#t01 td {
+    padding: 5px;
+    text-align: left;
+}
+table#t01 tr:nth-child(even) {
+    background-color: #eee;
+}
+table#t01 tr:nth-child(odd) {
+   background-color:#fff;
+}
+table#t01 th	{
+    background-color: #4D4D4D;
+    color: white;
 }

-fieldset>table td input,
-fieldset>table td textarea {
-	width: calc(100vw + -16vw + -1.5rem);
-	max-width: 100%;
-	border: thin solid #DFDFDF;
-	margin-bottom: 0.5rem;
-	padding: 0.5rem;
+pre { /* Add background, border and scrollbar to <pre> */
+    background: #eee;
+    border: 1px solid #ddd;
+    overflow: auto;
+    clear: both;
 }

-fieldset>table td select {
-	margin-bottom: 0.5rem;
-	padding: 0.25rem;
 }

-fieldset>table td input[type="radio"] {
-	display: initial;
-	width: initial;
-	margin-bottom: 0.5rem;
+@media only screen and (max-width: 680px) { 
+	#container {width: 95%;}
+	img#hprlogo {float: left; max-width: 85px; padding: .35em;}
+	.column {width: 15%;}
+	h1 {font-size: 140%;}
+	h2 {font-size: 120%;}
+	h3 {font-size: 100%;}
+	nav.column { display: block; padding: 0em .25em 0em .25em;}
+	#footer_page li {font-size: 85%; padding: .5em .25em .5em .25em;}
+	footer p {font-size: 75%;}
+	audio {float: none; }
 }

-fieldset>input {
-	background: #4D4D4D;
-	color: white;
-	font-weight: 600;
-	padding: 0.5rem;
-	border: thin solid #DFDFDF;
-	border-radius: 0.2rem;
+@media only screen and (max-width: 479px) { 
+	body {background: #ffffff; color: #4D4D4D; font-family: Verdana, Arial, Helvetica, sans-serif;/* 1em/1.5 OpenDyslexic, */}
+	li {font-size: 100%; padding: .75em 0em .75em 0em; margin-left: -.25em;}
+	img#hprlogo {float: left; max-width: 65px; padding: .35em;}
+	.column {width: auto;}
+	h1#sitename { clear: both;}
+	a:link {text-decoration: none;}
+	audio {padding: .7em 0em .5em 0em; width: 95%; max-width: 300px;}
+	.audcredit { font-size: 65%; margin-bottom: 1em;}
 }
-
-@media only screen and (min-width: 58rem) {
-	#container {
-		margin: 0.5rem auto;
-	}
-
-	.shadow {
-		-moz-box-shadow:    1px 2px 5px 2px #675958;
-		-webkit-box-shadow: 1px 2px 5px 2px #675958;
-		box-shadow:         1px 2px 5px 2px #675958;
-	}
-
-	img#hprlogo {
-		margin-bottom: 1.5rem;
-	}
-
-	#hpr_banner {
-		float: left;
-	}
-
-	#hpr_banner h1#sitename {
-		font-size: 2rem;
-	}
-
-	#hpr_banner h2 {
-		font-size: 1rem;
-	}
-
-	header>hr {
-		clear: right;
-	}
-
-	footer #more_info nav.column {
-		clear: none;
-		float: left;
-		width: 19.5%;
-		margin-left: 0;
-	}
-
-	footer #more_info nav.column:first-child {
-		margin-left: 0.5rem;
-	}
-
-	footer #more_info nav.column ul li {
-		float: none;
-		margin-bottom: 0.5rem;
-	}
-
-	fieldset>table,
-	fieldset>table thead,
-	fieldset>table tbody,
-	fieldset>table tr,
-	fieldset>table th,
-	fieldset>table td,
-	fieldset>table td input,
-	fieldset>table td textarea {
-		display: revert;
-		width: revert;
-	}
-
-	fieldset>table tr {
-		vertical-align: baseline;
-	}
-
-	fieldset>table tr:nth-child(3) {
-		vertical-align: top;
-	}
-
-	fieldset>table tr:nth-child(3) td:first-child {
-		padding-top: 0.5rem;
-	}
-
-	fieldset>table tr:nth-last-child(3) td:first-child {
-		padding-top: 1rem;
-	}
-
-	fieldset>table tr:nth-last-child(2) {
-		vertical-align: top;
-	}
-
-	fieldset>table tr:nth-last-child(2) td:first-child {
-		padding-top: 0.75rem;
-	}
-
-	fieldset>table td input[type="radio"] {
-		margin-top: 1.5rem;
-	}
-}
--- a/public_html/images/hosts/149.png
+++ b/public_html/images/hosts/149.png
--- a/public_html/images/hosts/421.png
+++ b/public_html/images/hosts/421.png
--- a/public_html/images/hosts/425.png
+++ b/public_html/images/hosts/425.png
--- a/public_html/images/hosts/433.png
+++ b/public_html/images/hosts/433.png
--- a/public_html/images/livestream.png
+++ b/public_html/images/livestream.png
--- a/public_html/images/mumble-howto/01-intro.png
+++ b/public_html/images/mumble-howto/01-intro.png
--- a/public_html/images/mumble-howto/02-device-selection.png
+++ b/public_html/images/mumble-howto/02-device-selection.png
--- a/public_html/images/mumble-howto/03-device-tuning.png
+++ b/public_html/images/mumble-howto/03-device-tuning.png
--- a/public_html/images/mumble-howto/04-volume.png
+++ b/public_html/images/mumble-howto/04-volume.png
--- a/public_html/images/mumble-howto/05-ptt.png
+++ b/public_html/images/mumble-howto/05-ptt.png
--- a/public_html/images/mumble-howto/06-notts.png
+++ b/public_html/images/mumble-howto/06-notts.png
--- a/public_html/images/mumble-howto/07-positional-audio.png
+++ b/public_html/images/mumble-howto/07-positional-audio.png
--- a/public_html/images/mumble-howto/08-stats.png
+++ b/public_html/images/mumble-howto/08-stats.png
--- a/public_html/images/mumble-howto/09-cert.png
+++ b/public_html/images/mumble-howto/09-cert.png
--- a/public_html/images/mumble-howto/10-finished.png
+++ b/public_html/images/mumble-howto/10-finished.png
--- a/public_html/images/mumble-howto/11-username.png
+++ b/public_html/images/mumble-howto/11-username.png
--- a/public_html/images/mumble-howto/12-accept-cert.png
+++ b/public_html/images/mumble-howto/12-accept-cert.png
--- a/public_html/images/mumble-howto/13-audio-test.png
+++ b/public_html/images/mumble-howto/13-audio-test.png
--- a/public_html/images/mumble-howto/14-audio-ping.png
+++ b/public_html/images/mumble-howto/14-audio-ping.png
--- a/public_html/images/mumble-howto/15-audio-pong.png
+++ b/public_html/images/mumble-howto/15-audio-pong.png
--- a/public_html/images/mumble-howto/16-hpr-room.png
+++ b/public_html/images/mumble-howto/16-hpr-room.png
--- a/public_html/images/mumble-howto/17-register.png
+++ b/public_html/images/mumble-howto/17-register.png
--- a/public_html/images/mumble-howto/18-register-confirm.png
+++ b/public_html/images/mumble-howto/18-register-confirm.png
--- a/public_html/images/mumble-howto/20-add-new.png
+++ b/public_html/images/mumble-howto/20-add-new.png
--- a/public_html/images/mumble-howto/21-add-server.png
+++ b/public_html/images/mumble-howto/21-add-server.png
--- a/public_html/images/mumble-howto/22-pavucontrol-recording.png
+++ b/public_html/images/mumble-howto/22-pavucontrol-recording.png
--- a/public_html/images/mumble-howto/23-pavucontrol-playback.png
+++ b/public_html/images/mumble-howto/23-pavucontrol-playback.png
--- a/public_html/press/2011-08-01_hpr-linux-format.png
+++ b/public_html/press/2011-08-01_hpr-linux-format.png
--- a/public_html/press/2012-12-24_10-great-podcasts-for-linux-open-source-geeks.pdf
+++ b/public_html/press/2012-12-24_10-great-podcasts-for-linux-open-source-geeks.pdf
--- a/public_html/press/2013-10-11_Illuminating_Linux_Podcasts.pdf
+++ b/public_html/press/2013-10-11_Illuminating_Linux_Podcasts.pdf
--- a/public_html/press/2014-04-11_hand-picked-audio-podcasts-for-linux-users.pdf
+++ b/public_html/press/2014-04-11_hand-picked-audio-podcasts-for-linux-users.pdf
--- a/public_html/press/2014-04-19_10_Useful_Places_Hosting_Informative_Podcasts_On_Linux.pdf
+++ b/public_html/press/2014-04-19_10_Useful_Places_Hosting_Informative_Podcasts_On_Linux.pdf
--- a/public_html/press/2014-06-30_Free_software_on_Hacker_Public_Radio.pdf
+++ b/public_html/press/2014-06-30_Free_software_on_Hacker_Public_Radio.pdf
--- a/public_html/press/2014-12-09_podcasts_that_dont_suck_2014_edition.pdf
+++ b/public_html/press/2014-12-09_podcasts_that_dont_suck_2014_edition.pdf
--- a/public_html/press/2016-01-18_Information_Security_Podcast_Roundup_2016_Edition.pdf
+++ b/public_html/press/2016-01-18_Information_Security_Podcast_Roundup_2016_Edition.pdf
--- a/public_html/press/2016-05-18_solutionsreview.com_endpoint-security_top-ten-cybersecurity-podcasts.png
+++ b/public_html/press/2016-05-18_solutionsreview.com_endpoint-security_top-ten-cybersecurity-podcasts.png
--- a/public_html/press/2016-06-26_www.podcastawards.com.png
+++ b/public_html/press/2016-06-26_www.podcastawards.com.png
--- a/public_html/press/2017-09-28_Podcast_Awards-The_Peoples_Choice.pdf
+++ b/public_html/press/2017-09-28_Podcast_Awards-The_Peoples_Choice.pdf
--- a/public_html/press/2018-08-01_linuxlinks.com_review-linux-podcast-scene-movers-shakers.pdf
+++ b/public_html/press/2018-08-01_linuxlinks.com_review-linux-podcast-scene-movers-shakers.pdf
--- a/public_html/press/2019-10-18_blog.feedspot.com-hacker_podcasts-Top_10_Hacker_Podcasts_You_Must_Follow_in_2019.pdf
+++ b/public_html/press/2019-10-18_blog.feedspot.com-hacker_podcasts-Top_10_Hacker_Podcasts_You_Must_Follow_in_2019.pdf
--- a/public_html/press/2019-10-20_twit.tv_shows_floss-weekly_episodes_553.pdf
+++ b/public_html/press/2019-10-20_twit.tv_shows_floss-weekly_episodes_553.pdf
--- a/public_html/press/2020-12-01_www.digitalguardian.com_blog_best-information-security-podcasts_35_of_the_Best_Information_Security_Podcasts_to_Follow_in_2019.pdf
+++ b/public_html/press/2020-12-01_www.digitalguardian.com_blog_best-information-security-podcasts_35_of_the_Best_Information_Security_Podcasts_to_Follow_in_2019.pdf
--- a/public_html/press/2021-01-01_www.securitydegreehub.com_best-cybersecurity-podcasts_25_Best_Cybersecurity_Podcasts-Security_Degree_Hub.pdf
+++ b/public_html/press/2021-01-01_www.securitydegreehub.com_best-cybersecurity-podcasts_25_Best_Cybersecurity_Podcasts-Security_Degree_Hub.pdf
--- a/public_html/press/2022-06-30_medium.com_voldimmoral_10-cybersecurity-podcast-to-follow-in-2022-and-into-2023-2e5e13b88f57.pdf
+++ b/public_html/press/2022-06-30_medium.com_voldimmoral_10-cybersecurity-podcast-to-follow-in-2022-and-into-2023-2e5e13b88f57.pdf
--- a/public_html/promos/HPRpromoKlaatu.ogg
+++ b/public_html/promos/HPRpromoKlaatu.ogg
--- a/public_html/promos/HPRpromoNewsCast.ogg
+++ b/public_html/promos/HPRpromoNewsCast.ogg
--- a/public_html/promos/HPRpromoSkirlet.ogg
+++ b/public_html/promos/HPRpromoSkirlet.ogg
--- a/public_html/promos/hpr-contributor-promo-basenettheme.ogg
+++ b/public_html/promos/hpr-contributor-promo-basenettheme.ogg
--- a/public_html/promos/hpr-contributor-promo-sax.ogg
+++ b/public_html/promos/hpr-contributor-promo-sax.ogg
--- a/public_html/promos/hpr-nye-promo.ogg
+++ b/public_html/promos/hpr-nye-promo.ogg
--- a/556
+++ b/556
@ -1,96 +1,68 @@
 #!/usr/bin/perl

-# {{{ POD documentation
-
 =head1 NAME

-        site-generator - HPR Site Generator
+	site-generator - HPR Site Generator

 =head1 SYNOPSIS

-        site-generator [OPTION]... PAGE|PAGE=<comma separated list of ids>...
+	site-generator [OPTION]... PAGE|PAGE=<comma separated list of ids>...

-        -a, --all           generate all pages defined in configuration file
-        -c, --configuration path to configuration file
-        -l, --list          print list of configured pages
-        -p, --preview       print generated pages to standard out
-        -q, --quiet         suppress progress information while generating pages
-        -v, --verbose       print extended progress information while generating pages
-        --help              print this help message
+	-a, --all      generate all pages defined in configuration file
+	-l, --list     print list of configured pages
+	-p, --preview  print generated pages to standard out
+	-q, --quiet    suppress progress information while generating pages
+	-v, --verbose  print extended progress information while generating pages
+	--help         print this help message

-        Where I<PAGE> is a file name of a web page
-        or the special I<ALL> (to generate all pages).
+	Where I<PAGE> is a file name of a web page 
+	or the special I<ALL> (to generate all pages).

-        Examples:
+	Examples:

-                Generate two specific pages:
-                site-generator index about
+		Generate two specific pages:
+		site-generator index about

-                Generate the whole site:
-                site-generator --all
-
-                Generate pages based on the same template:
-                site-generator correspondent=1,3,5..10
-
-                Generate two specific pages with a different configuration:
-                site-generator --configuration=site_sqlite.cfg index about
+		Generate the whole site:
+		site-generator --all

+		Generate pages based on the same template:
+		site-generator correspondent=1,3,5..10

 =head1 DESCRIPTION

-This is a site generator for the Hacker Public Radio website based upon the
-Perl Template Toolkit.
+This is a site generator for the Hacker Public Radio website based upon the Perl Templates Toolkit.

 =head1 INSTALLATION

-        With SQLite
-        * Create the sqlite3 database from the hpr.sql MySQL dump file available on
-          hackerpublicradio.org. The default name for the database file is "hpr.db"
-          and should be located in the root of the project directory. The name and
-          location can be set in the site.cfg file.
-        * An "update-hpr.sh" helper script is available in the utils directory. This
-          script will download the hpr.sql file, convert it to the SQLite hpr.db file,
-          and regenerate the website using the site-generator.
-                1. `cd` into the root of the project directory
-                2.  Run `./utils/update-hpr.sh`
-        * SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries.
-          Must convert WITH clauses to sub-queries when using earlier versions of SQLite.
-
-        With MySQL
-        * Create database hpr_hpr in the MySQL server from HPR dump file.
-                - sudo mysql --host=localhost < hpr.sql
-        * Create a user that will be used by the site-generator.
-                - Suggested username: hpr-generator
-                - CREATE USER 'hpr-generator'@'localhost' IDENTIFIED BY '<password>';
-        * Limit the user's privileges to EXECUTE and SELECT
-                - GRANT SELECT ON hpr_hpr.* TO 'hpr-generator'@'localhost';
-                - GRANT EXECUTE ON `hpr_hpr`.* TO 'hpr-generator'@'localhost';
-
-        Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
-                * Config::Std
-                * DBD::SQLite or DBD:mysql
-                * DBI
-                * Data::Dumper
-                * Date::Calc
-                * GetOpt::Long
-                * HTML::Entities
-                * Pod::Usage
-                * Template
-                * Template::Plugin::DBI
-                * Template::Plugin::Date
-                * Template::Plugin::File
-                * Template::Plugin::HTML::Strip
-                * Text::CSV_XS
-                * Tie::DBI
+	* Create the sqlite3 database from the files in the _sql directory. The default name for the 
+	  database file is "hpr.db" and should be located in the root of the project directory. The 
+	  name and location can be set in the site.cfg file.
+	* Two sql helper scripts are available to generate an empty database or a database filled with test data.
+	  - For an empty database: `cat Create_Database_Empty.sql | sqlite3 hpr.db`
+	  - For a database with test data: `cat Create_Database_Test.sql | sqlite3 hpr.db`
+	* SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries. Must convert WITH 
+	  clauses to sub-queries when using earlier versions of SQLite.
+	* Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
+		* GetOpt
+		* Pod::Usage
+		* Config::Std
+		* Template
+		* Template::Plugin::File
+		* Template::Plugin::DBI
+		* DBI
+		* Tie::DBI
+		* DBD::SQLite
+		* Date::Calc

 =head1 AUTHOR

-        Roan Horning <roan.horning@no-spam.gmail.com>
+	Roan Horning <roan.horning@no-spam.gmail.com>

 =head1 LICENSE

-        site-generator -- a static website generator for HPR
-        Copyright (C) 2022 Roan Horning
+	site-generator -- a static website generator for HPR
+	Copyright (C) 2022 Roan Horning

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
@ -103,332 +75,228 @@ Perl Template Toolkit.
    GNU Affero General Public License for more details.

    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.	

 =cut

-# }}}
-
-use 5.012;
 use strict;
 use warnings;
-use open ':encoding(UTF-8)';

 use Getopt::Long qw(:config auto_help);
 use Pod::Usage;
 use Config::Std;
-use Text::CSV_XS;
-#use HTML::Entities qw(encode_entities_numeric);
-use HTML::Entities qw(encode_entities);
-use Date::Calc;
-use DBI;
-use Tie::DBI;
 use Template;
-use Template::Plugin::Date;
-use Template::Plugin::DBI;
-use Template::Plugin::HTML::Strip;
-
 use Data::Dumper;

 exit main();

 sub main {

-    # Argument parsing
-    my $all;
-    my $configuration_path;
-    my $preview;
-    my $verbose;
-    my $quiet;
-    GetOptions(
-        'all'             => \$all,
-        'configuration=s' => \$configuration_path,
-        'list'            => \&print_available_pages,
-        'preview'         => \$preview,
-        'verbose'         => \$verbose,
-        'quiet'           => \$quiet,
-    ) or pod2usage(1);
-    pod2usage(1) unless @ARGV || $all;
-    my (@page_args) = @ARGV;
+	# Argument parsing
+	my $all;
+	my $preview;
+	my $verbose;
+	my $quiet;
+	GetOptions(
+		'all'     => \$all,
+		'list'    => \&print_available_pages,
+		'preview' => \$preview,
+		'verbose' => \$verbose,
+		'quiet'   => \$quiet,
+	) or pod2usage(1);
+	pod2usage(1) unless @ARGV || $all;
+	my (@page_args) = @ARGV;

-    if ($quiet) {
-        $verbose = 'quiet';
-    };
+	if ($quiet) {
+		$verbose = 'quiet';
+	};

-    if (!$configuration_path) {
-        $configuration_path = "site.cfg";
-    }
+	# Load config file
+	read_config "site.cfg" => my %config;

-    my %config;
-    if ( -f $configuration_path ) {
-        # Load config file
-        read_config $configuration_path => %config;
-    }
-    else {
-        print STDOUT "Could not read configuration file: $configuration_path\n";
-        exit 1;
-    }
+	my $tt = get_template_html($config{DBI});

-    my $tt = get_template_html($config{DBI}, $config{app_paths});
+	# If command line option all is set, parse configuration file 
+	# for all pages
+	if ($all) {
+		@page_args = keys %config;

-    #
-    # Define a TT² vmethod called 'csv_parse', it takes a scalar value and
-    # returns an arrayref. Also define a filter called 'xml_entity' which
-    # numerically encodes non-ASCII characters.
-    #
-    $tt->context->define_vmethod( 'scalar', 'csv_parse', \&parse_csv );
-    $tt->context->define_filter( 'xml_entity', \&xml_entity );
+		# Remove non page sections of the configuration file
+		# from the generated list of pages.
+		@page_args= grep { $_ ne 'DBI' } @page_args;
+		@page_args= grep { $_ ne 'root_template' } @page_args;
+	};
+	foreach my $page_arg (@page_args) {
+		my %parsed_arg = parse_page_arg($page_arg);
+		if (exists($config{$parsed_arg{'page'}})) {
+			my $page_config = $config{$parsed_arg{'page'}}; 
+			$page_config->{'page'} = $parsed_arg{'page'};

-    # If command line option all is set, parse configuration file
-    # for all pages
-    if ($all) {
-        @page_args = keys %config;
+			# Set page's root_template to the default root_template if the 
+			# page root_template property is not set in the configuration file.
+			if (exists $page_config->{'root_template'} == 0) {
+				$page_config->{'root_template'} = $config{root_template}{content};
+			}

-        # Remove non page sections of the configuration file
-        # from the generated list of pages.
-        @page_args= grep { $_ ne 'DBI' } @page_args;
-        @page_args= grep { $_ ne 'root_template' } @page_args;
-        @page_args= grep { $_ ne 'app_paths' } @page_args;
+			if (exists $config{root_template}{baseurl}) {
+				$page_config->{'baseurl'} = $config{root_template}{baseurl};
+			}

-    };
-    foreach my $page_arg (@page_args) {
-        my %parsed_arg = parse_page_arg($page_arg);
-        if (exists($config{$parsed_arg{'page'}})) {
-            my $page_config = $config{$parsed_arg{'page'}};
-            $page_config->{'page'} = $parsed_arg{'page'};
-
-            # Set page's root_template to the default root_template if the
-            # page root_template property is not set in the configuration file.
-            if (exists $page_config->{'root_template'} == 0) {
-                $page_config->{'root_template'} = $config{root_template}{content};
-            }
-
-            # Set all config root_template properties as default page config properties
-            # except the previously set root_template content property
-            my @root_args = grep { $_ ne 'content' } keys %{$config{root_template}};
-            foreach my $root_arg (@root_args) {
-                if (exists $page_config->{$root_arg} == 0) {
-                    $page_config->{$root_arg} = $config{root_template}{$root_arg};
-                }
-            }
-
-            if ($page_config->{'multipage'} && $page_config->{'multipage'} eq 'true') {
-                if (scalar @{$parsed_arg{'ids'}} == 0) {
-                    @{$parsed_arg{'ids'}} = get_ids_from_db($tt, \$page_config);
-                }
-                foreach my $id (@{$parsed_arg{'ids'}}) {
-                    $page_config->{'id'} = $id;
-                    verbose ($verbose, "Generating page: $page_config->{'page'} with id: $id");
-                    generate_page($tt, \$page_config, $preview);
-                }
-            }
-            else {
-                verbose ($verbose, "Generating page: $page_config->{'page'}");
-                generate_page($tt, \$page_config, $preview);
-            }
-        }
-        else {
-            verbose (1, "\nWarning: Page $parsed_arg{'page'} is not defined in the configuration file.");
-        }
-    }
+			if ($page_config->{'multipage'} && $page_config->{'multipage'} eq 'true') {
+				if (scalar @{$parsed_arg{'ids'}} == 1) {
+				  @{$parsed_arg{'ids'}} = get_ids_from_db($tt, \$page_config);	
+				}
+				foreach my $id (@{$parsed_arg{'ids'}}) {
+					$page_config->{'id'} = $id;
+					verbose ($verbose, "Generating page: $page_config->{'page'} with id: $id");
+					generate_page($tt, \$page_config, $preview);
+				}
+			}
+			else {
+				verbose ($verbose, "Generating page: $page_config->{'page'}");
+				generate_page($tt, \$page_config, $preview);
+			}
+		}
+		else {
+			verbose (1, "\nWarning: Page $parsed_arg{'page'} is not defined in the configuration file.");
+		}
+	}
    verbose (1, "\nFinished processing the files.");
-    return 0;
+	return 0;
 }

-sub get_template_html {
-    # For an HTML based Template file, define the
-    # template start and end tags to also function as
-    # HTML comments to make the template file valid HTML.
-    #
-    return Template->new(
-        {   INCLUDE_PATH => $_[1]{templates_path},
-            OUTPUT_PATH  => $_[1]{output_path},
-            EVAL_PERL    => 1,
-            START_TAG    => '<!--%',
-            END_TAG      => '%-->',
-            PRE_CHOMP    => 1,
-            POST_CHOMP   => 1,
-            CONSTANTS    => {
-                database => $_[0]{database},
-                driver   => $_[0]{driver},
-                user     => $_[0]{user},
-                password => $_[0]{password},
-            }
-        }
-    ) || die $Template::ERROR, "\n";
+sub get_template_html (\%@)  {
+	# For an HTML based Template file, define the 
+	# template start and end tags to also function as 
+	# HTML comments to make the template file valid HTML.
+	#
+	return Template->new({
+			INCLUDE_PATH => './templates',
+			OUTPUT_PATH	 => './public_html',
+			EVAL_PERL    => 1,
+			START_TAG	 => '<!--%',
+			END_TAG		 => '%-->',
+			PRE_CHOMP  => 1,
+			POST_CHOMP => 1,
+			CONSTANTS    => {
+				driver   => $_[0]{driver},
+				user     => $_[0]{user},
+				password => $_[0]{password},
+			}
+		}) || die $Template::ERROR, "\n";

 }

-sub generate_page {
-    my ( $tt, $config, $preview ) = @_;
-    my $html;
-    if ( !$preview ) {
-        $html = get_filename($$config);
-    }
-    $tt->process( $$config->{root_template},
-        $$config, $html
-    )
-        || die $tt->error(), "\n";
+sub generate_page  {
+	my ($tt, $config, $preview) = @_;
+	my $html;
+	if (!$preview) {
+		$html = get_filename($$config); 
+	}
+	$tt->process($$config->{root_template}, $$config, $html)
+	|| die $tt->error(), "\n";

 }

 sub verbose {
-        my ($verbose, $message) = @_;
-        if ($verbose) {
-                if ($verbose ne 'quiet') {
-                        print STDOUT "$message\n";
-                }
-        }
-        else {
-                STDOUT->autoflush(1);
-                print STDOUT ".";
-        };
+	my ($verbose, $message) = @_;
+	if ($verbose) {
+		if ($verbose ne 'quiet') { 
+			print STDOUT "$message\n";
+		}
+	}
+	else {
+		STDOUT->autoflush(1);
+		print STDOUT ".";
+	};
 }

 sub parse_page_arg {
-    my ($page_arg) =  @_;
-    # Split page name from page ids if available.
-    my ($page, $ids) = split(/=/, $page_arg);
-    my @ids;
-    $ids = "" unless defined $ids;
+	my ($page_arg) =  @_;
+	# Split page name from page ids if available.
+	my ($page, $ids) = split(/=/, $page_arg);
+	my @ids = [];

-    # Parse the page ids and push them onto @ids array
-    my @ids_by_comma = split(/\,/, $ids);
-    foreach my $id_by_comma (@ids_by_comma) {
-        my @ids_for_range = split(/\.\./, $id_by_comma);
-        if ((scalar @ids_for_range) == 2) {
-            push @ids, $ids_for_range[0]..$ids_for_range[1];
-        }
-        elsif ((scalar @ids_for_range) == 1) {
-            push @ids, $ids_for_range[0];
-        }
-        else {
-            verbose (1, "\nWarning: Page $page id range $id_by_comma could not be parsed.");
-        }
-    }
-    
-    return ('page' => $page, 'ids' => [@ids]);
+	if(!$ids) {
+		$ids = "";
+	}
+	else {
+		# Parse the page ids and push them onto @ids array 
+		my @ids_by_comma = split(/\,/, $ids);
+		foreach my $id_by_comma (@ids_by_comma) {
+			my @ids_for_range = split(/\.\./, $id_by_comma);
+			if ((scalar @ids_for_range) == 2) {
+				push @ids, $ids_for_range[0]..$ids_for_range[1]; 
+			}
+			elsif ((scalar @ids_for_range) == 1) {
+				push @ids, $ids_for_range[0];
+			}
+			else {
+				verbose (1, "\nWarning: Page $page id range $id_by_comma could not be parsed.");
+			}
+		}
+	}
+	return ('page' => $page, 'ids' => [@ids]);
 }

 sub get_ids_from_db {
-        # Use a template to generate a string of page identifiers.
-        # The template should return the string in the form of
-        # <comma><identifier><comma><identifier>...
-        #
-        my ($tt, $config)  = @_;
-        my $selected_ids = "";
-        my $id_template = "ids-$$config->{'page'}.tpl.html";
+	# Use a template to generate a string of page identifiers.
+	# The template should return the string in the form of 
+	# <comma><identifier><comma><identifier>...
+	#
+	my ($tt, $config)  = @_;
+	my $selected_ids = "";
+	my $id_template = "ids-$$config->{'page'}.tpl.html";

-        $tt->process($id_template, $$config, \$selected_ids)
-        || die $tt->error(), "\n";
-
-        # Starts with a newline and comma
-        return split(/,/, substr($selected_ids, 1));
+	$tt->process($id_template, $$config, \$selected_ids)
+	|| die $tt->error(), "\n";
+	
+	return split(/,/, substr($selected_ids, 1));
 }

 sub get_filename {
-        my ($config) = @_;
-        my $filename = "output.html";
-        my $base_path = "";
+	my ($config) = @_;
+	my $filename = "output.html";
+	my $base_path = "";

-        if ($$config{'filename'}) {
-                if (substr($$config{'filename'}, -1) eq '/') {
-                        $base_path = $$config{'filename'};
-                }
-                else {
-                        $filename = $$config{'filename'};
-                        my $padded_index = "";
-                        if (exists $$config{'id'} && $$config{'id'} ne "") {
-                                $padded_index = sprintf("%04d", $$config{'id'});
-                        }
-                        $filename =~ s/\[id\]/$padded_index/;
-                    return $filename;
-                }
-        }
-        # Default naming if full filename configuration is not supplied.
-        if ($$config{'multipage'} && $$config{'multipage'} eq 'true') {
-                my $padded_index = sprintf("%04d", $$config{'id'});
-                $filename = "$base_path$$config{'page'}${padded_index}.html";
-        }
-        else {
-                $filename = "$base_path$$config{'page'}.html";
-        }
-        return $filename;
+	if ($$config{'filename'}) {
+		if (substr($$config{'filename'}, -1) eq '/') {
+			$base_path = $$config{'filename'};
+		}
+		else {
+			$filename = $$config{'filename'};
+			my $padded_index = "";
+			if (exists $$config{'id'}) {
+				$padded_index = sprintf("%04d", $$config{'id'});
+			}
+			$filename =~ s/\[id\]/$padded_index/;
+		    return $filename;
+		}
+	}
+	# Default naming if full filename configuration is not supplied.
+	if ($$config{'multipage'} && $$config{'multipage'} eq 'true') {
+		my $padded_index = sprintf("%04d", $$config{'id'});
+		$filename = "$base_path$$config{'page'}${padded_index}.html";	
+	}
+	else {
+		$filename = "$base_path$$config{'page'}.html";
+	}
+	return $filename;
 }

 sub print_available_pages {
-    # Load config file
-    read_config "site.cfg" => my %config;
+	# Load config file
+	read_config "site.cfg" => my %config;

-    my @page_args = sort ( keys %config );
+	my @page_args = sort (keys %config);

-    # Remove non page sections of the configuration file
-    # from the generated list of pages.
-    @page_args = grep { $_ ne 'DBI' } @page_args;
-    @page_args = grep { $_ ne 'root_template' } @page_args;
+	# Remove non page sections of the configuration file
+	# from the generated list of pages.
+	@page_args= grep { $_ ne 'DBI' } @page_args;
+	@page_args= grep { $_ ne 'root_template' } @page_args;

-    foreach my $page_arg (@page_args) {
-        print "$page_arg\n";
-    }
-    exit;
+	foreach my $page_arg (@page_args) {
+		print "$page_arg\n";
+	}
+	exit;
 }
-
-#===  FUNCTION  ================================================================
-#         NAME: parse_csv
-#      PURPOSE: Parses a simple string containing CSV data
-#   PARAMETERS: $csv_in         CSV string
-#      RETURNS: An arrayref containing the parsed CSV elements
-#  DESCRIPTION: The Text::CSV_XS module instance is created with the option
-#               'allow_whitespace' to be forgiving of any spaces around the
-#               CSV elements and to strip them. Also, 'allow_loose_quotes' is
-#               forgiving of really messed up CSV. The 'binary' option
-#               permits any characters in the tags (expecting Unicode).
-#               The fields parsed from the tag string is checked for the
-#               existence of utf8 characters and encoded to ensure any found
-#               are properly stored.
-#       THROWS: No exceptions
-#     COMMENTS: None
-#     SEE ALSO: N/A
-#===============================================================================
-sub parse_csv {
-    my ($csv_in) = @_;
-
-    my $csv = Text::CSV_XS->new(
-        {   binary             => 1,
-            auto_diag          => 1,
-            allow_whitespace   => 1,
-            allow_loose_quotes => 1
-        }
-    );
-    my $status = $csv->parse($csv_in);
-    unless ( $status ) {
-        warn "Failed to parse CSV '$csv_in'\n" ;
-        return;
-    }
-    my @fields = $csv->fields();
-
-    @fields = map {utf8::encode($_) if utf8::is_utf8($_); $_} @fields;
-
-    return \@fields;
-}
-
-#===  FUNCTION  ================================================================
-#         NAME: xml_entity
-#      PURPOSE: Static filter to encode Unicode for XML
-#   PARAMETERS: $text           String to be processed
-#      RETURNS: Processed text
-#  DESCRIPTION:
-#       THROWS: No exceptions
-#     COMMENTS: None
-#     SEE ALSO: N/A
-#===============================================================================
-sub xml_entity {
-    my ($text) = @_;
-
-#    encode_entities_numeric( $text );
-    encode_entities( $text );
-
-    return $text;
-}
-
-# vim: syntax=perl:ts=8:sw=4:et:ai:tw=78:fo=tcrqn21:fdm=marker
--- a/site.cfg
+++ b/site.cfg
@ -1,24 +1,10 @@
 # Configure the Perl DBI driver to allow the templates communicate 
 # with the database.
 # dbi:<driver name [SQLite, CSV, ADO, mSQL, etc.]>:<database name>
-# For more information on Perl Template Toolkit see: 
-# http://template-toolkit.org/docs/manual/index.html
 [DBI]
-# Configuration settings for SQLite
-database: sqlite
 driver: dbi:SQLite:hpr.db 
-#user:        (not used - leave blank)
-#password:    (not used - leave blank)
-# Configuration settings for MySQL
-#database: mysql
-#driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
-#user: hpr-generator  (Suggested user with read-only privileges)
-#password: *********  (Password for user)
-
-# Configure the location of the templates and the generated HTML
-[app_paths]
-templates_path: ./templates
-output_path: ./public_html
+user: 
+password: 

 # Configure the root template page which pulls in the navigation and 
 # content templates used by each page. An optional baseurl property may 
@ -27,13 +13,6 @@ output_path: ./public_html
 [root_template]
 content: page.tpl.html
 #baseurl: OPTIONAL [i.e. file://<full path to local website directory>]
-#baseurl: file:///home/roan/Development/hpr/website/hpr_generator/public_html/
-baseurl: https://hackerpublicradio.org/
-http_baseurl: http://hackerpublicradio.org/
-hub_baseurl: https://hub.hackerpublicradio.org/
-media_baseurl: https://archive.org/download/hpr$eps_id/
-generator_name: The HPR Robot
-generator_email: robot.nospam@nospam.hackerpublicradio.org

 # Configure the navigation menu and the content templates for each page 
 # of the site:
@ -69,6 +48,10 @@ navigation: navigation-about.tpl.html
 content: content-correspondents.tpl.html
 filename: correspondents/index.html

+[contact]
+navigation: navigation-about.tpl.html
+content: content-contact.tpl.html
+
 [correspondent]
 navigation: navigation-about.tpl.html
 content: content-correspondent.tpl.html
@ -97,48 +80,57 @@ content: content-episode.tpl.html
 multipage: true
 filename: eps/hpr[id]/index.html

-[download]
-navigation: navigation-get-shows.tpl.html
-content: content-download.tpl.html
-
 [syndication]
 navigation: navigation-get-shows.tpl.html
 content: content-syndication.tpl.html

+[contribute]
+navigation: navigation-give-shows.tpl.html
+content: content-contribute.tpl.html
+
 [search]
 navigation: navigation-main.tpl.html
 content: content-search.tpl.html

-[sitemap]
-navigation: navigation-about.tpl.html
-content: content-sitemap.tpl.html
+[help_out]
+navigation: navigation-contribute.tpl.html
+content: content-help_out.tpl.html

-[tags]
-navigation: navigation-main.tpl.html
-content: content-tags.tpl.html
-
-[twat_episode]
+[download]
 navigation: navigation-get-shows.tpl.html
-content: content-twat_episode.tpl.html
-multipage: true
-filename: eps/twat[id]/index.html
-media_baseurl: https://www.hackerpublicradio.org/eps/
+content: content-download.tpl.html

-[mumble-howto]
-navigation: navigation-about.tpl.html
-content: content-mumble-howto.tpl.html
+[stuff_you_need_to_know]
+navigation: navigation-give-shows.tpl.html
+content: content-stuff_you_need_to_know.tpl.html

-[contact]
-navigation: navigation-about.tpl.html
-content: content-contact.tpl.html
+[theme]
+navigation: navigation-give-shows.tpl.html
+content: content-theme.tpl.html
+
+[requested_topics]
+navigation: navigation-give-shows.tpl.html
+content: content-requested_topics.tpl.html
+
+[recording]
+navigation: navigation-give-shows.tpl.html
+content: content-recording.tpl.html
+
+[request_a_slot]
+navigation: navigation-give-shows.tpl.html
+content: content-request_a_slot.tpl.html
+
+[podcatchers]
+navigation: navigation-contribute.tpl.html
+content: content-podcatchers.tpl.html

 [promote]
 navigation: navigation-about.tpl.html
-content: content-promote.tpl.html 
+content: content-promote.tpl.html

-[comments_viewer]
+[sitemap]
 navigation: navigation-about.tpl.html
-content: content-comments_viewer.tpl.html
+content: content-sitemap.tpl.html

 [hpr_ogg]
 root_template: rss.tpl.xml
@ -177,7 +169,3 @@ root_template: rss.tpl.xml
 content: rss-hpr_total.tpl.xml
 filename: hpr_total_spx.rss
 media_file_extension: spx
-
-[comments]
-root_template: rss-comments.tpl.xml
-filename: comments.rss
--- a/templates/content-about.tpl.html
+++ b/templates/content-about.tpl.html
--- a/templates/content-comments_viewer.tpl.html
+++ b/templates/content-comments_viewer.tpl.html
@ -1,42 +0,0 @@
-<!--% PROCESS 'shared-episode-summary.tpl.html' %-->
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'shared-listen-now.tpl.html' %-->
-<!--% PROCESS "queries-episode-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<h2>Comment Viewer</h2>
-<p>Because of the spammers we have had to turn on comment moderation. Sorry about the delay this will cause.</p>
-<p><a href="<!--% absolute_path(baseurl) %-->comments.rss">Subscribe</a> to the comment feed.</p>
-<hr />
-<!--% FOREACH item IN DBI.query('
-		SELECT C.*, 
-			H.host, H.hostid AS host_id, 
-			E.title AS episode_title,
-			E.date AS episode_date,
-			E.duration AS episode_duration,
-			M.id AS series_id, M.name AS series_name
-		FROM comments AS C
-		INNER JOIN eps AS E
-			ON C.eps_id = E.id 
-		INNER JOIN hosts AS H 
-			ON E.hostid = H.hostid 
-		INNER JOIN miniseries AS M
-			ON E.series = M.id
-		ORDER BY C.comment_timestamp  DESC	
-		LIMIT 30
-	')
-%-->
-
-<article>
-<header>
-	<h1><!--% item.comment_author_name %--> says: <!--% item.comment_title %--></h1>
-	<p><small>Posted at <!--% item.comment_timestamp %--> relating to the show <a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html">hpr<!--% item.eps_id %--></a> which was released on <!--% item.episode_date %--> by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a> entitled <em><!--% item.episode_title %--></em></small>
-</p>
-</header>
-<p class="comment">
-<!--% item.comment_text FILTER html_line_break %-->
-</p>
-<footer>
-Listen in <a href="<!--% media_path(item.eps_id, 'hpr', 'ogg', baseurl, media_baseurl) %-->">ogg</a>, <a href="<!--% media_path(item.eps_id, 'hpr', 'spx', baseurl, media_baseurl) %-->">spx</a>, or <a href="<!--% media_path(item.eps_id, 'hpr', 'mp3', baseurl, media_baseurl) %-->">mp3</a> format.</p></footer>
-</article>
-<hr />	
-<!--% END %-->
--- a/templates/content-contact.tpl.html
+++ b/templates/content-contact.tpl.html
@ -1,4 +1,4 @@
-<article>
+  <article>
    <header>
        <h1>Contact</h1>
    </header>
@ -6,7 +6,7 @@
    <ul>
      <li>email: <strong>admin -at- hackerpublicradio org</strong><br />
      <em>As an anti-spam measure you will get an error back but we do get your email.</em></li>
-      <li>Website: <a href="http://www.hackerpublicradio.org" target="_blank">www.hackerpublicradio.org</a></li>
+      <li>Website: <a href="http://www.www.hackerpublicradio.org" target="_blank">www.www.hackerpublicradio.org</a></li>
      <li>Mailist: <a href="http://www.hackerpublicradio.org/maillist" target="_blank">Maillist</a></li>
      <li><a href="https://web.libera.chat/gamja/?channels=oggcastplanet" target="_blank">#oggcastplanet</a></li>
      <li><a href="https://www.facebook.com/home.php?sk=group_130169220378872¬if_t=group_r2j" target="_blank">Facebook</a></li>
@ -18,4 +18,4 @@
    HPR is governed by the community, so decisions about how Hacker Public Radio should be run are made on the mailing list you can join it by going to :<br />
    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.hackerpublicradio.org/maillist">http://www.hackerpublicradio.org/maillist</a>
    </p>
-</article>
+  </article>
--- a/templates/content-contribute.tpl.html
+++ b/templates/content-contribute.tpl.html
@ -0,0 +1,87 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+ <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% FOREACH correspondents IN DBI.query('
+	SELECT COUNT(hostid) AS \'tally\' FROM hosts;
+	') %-->
+<h1>So you want to do a podcast ?</h1>
+<p>Well you've come to the right place. Our goal here at HPR is to make it as easy as possible for you to get a podcast released. We take care of the hard bits so you don't need to. Recording your first show is always a daunting prospect but over <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html"><!--% correspondents.tally %--></a> people like yourself have done it and so can you.
+  <!--% END %-->
+  </p>
+  <h2>1. Stuff you need to know</h2>
+  <ul>
+    <li>HPR will stop as a project if there are not enough <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#no_shows_no_hpr">Shows</a>.</li>
+    <li>We do not <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#syndication">syndicate</a> shows not produced for HPR.</li>
+    <li>You are agreeing to <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#license">license</a> your show CC BY-SA 4.0.</li>
+    <li>You have <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#permission">permission</a> to redistribute your show in its entirety.</li>
+    <li>Your audio will <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#not_moderated">not be moderated.</a></li>
+    <li>Your show will be signaled as containing <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#explicit">explicit</a> content.</li>
+    <li>You determine where in the <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#schedule">schedule</a> your show will be released.</li>
+    <li>We use <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#utf8">UTF-8</a> end to end.</li>
+    <li>Your show will be heard by an <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#international">International</a> Audience.</li>
+    <li>We also need <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#emergency_queue">emergency</a> shows.</li>
+    <li>You will no longer be allowed to edit HPR pages on <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html#wikipedia">Wikipedia</a>.</li>
+  </ul>
+  <p>
+  <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">More information.</a>
+  </p>
+  
+  <h2>2. Select a Topic</h2>
+  <p>
+  The first thing you will need to do is decide on a topic for your show. You might already have an idea but if not you can have a look at our <a href="<!--% absolute_path(baseurl) %-->eps/index.html">Archive</a> page for examples of shows people have recorded in the past. You can also look at our <a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Requested Topics</a>, or our <a href="<!--% absolute_path(baseurl) %-->series/index.html">Series</a> page to see if you can add your knowledge to the pool.
+  </p>
+  <p>
+  If you are <a href="<!--% absolute_path(baseurl) %-->will-my-show-be-of-interest-to-hackers.html">worried that your show may not be of interest to Hackers then follow this link</a> to check if it is.
+  </p>
+  <p>
+  If you can't think of anything to talk about then please just record a show telling us <a href="<!--% absolute_path(baseurl) %-->series/0029.html">how you got into tech</a> as a way to introducing yourself to the community.
+  </p>
+
+  <h2>3. Record your show</h2>
+  <p>
+  Please select <a href="<!--% absolute_path(baseurl) %-->recording.html">more detailed information on how to record a show</a>:
+  </p>
+  <ul>
+<!--    <li>Recording with the <a href="<!--% absolute_path(baseurl) %-->recording.html#callin_numbers">telephone</a>.</li> -->
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#portable_media_player">Recording with a portable media player</a>.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#smart_phone">Recording with a smart phone</a>.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#editing">Recording/Editing using your Computer</a>.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#phone_interviews">Recording Interviews with the Phone</a>.</li>
+	<li><a href="<!--% absolute_path(baseurl) %-->recording.html#round_table">Recording round table discussions</a>.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#background_music">Avoid Bedding/background music</a>.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#encoding">We mix down to Mono</a>.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->recording.html#no_metadata">No need to add Metadata</a> to the file.</li>
+  </ul>
+  <p>Don't forget to <strong>introduce yourself</strong> in your show.</p>
+  
+  <h2>4. Upload your show</h2>
+  <p>
+  Once you have your audio ready you can post your show by going to the <a href="https://www.hackerpublicradio.org/calendar.php">Calendar</a> page or press the <strong><a href="https://www.hackerpublicradio.org/calendar.php">⇧Upload⇧</strong></a> button.
+  </p>
+  <p>
+  After you have selected a date you will be redirected to the <a href="https://www.hackerpublicradio.org/request.php">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and so it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers.
+  </p>
+  <p>
+  <a href="<!--% absolute_path(baseurl) %-->request_a_slot.html">More Information</a>.
+  </p>
+  
+  <h2>Questions ?</h2>
+  <p>
+  Got any questions not covered here, then just email <strong>"admin" at "www.hackerpublicradio.org"</strong>, and we’ll get in touch with you with all you need to know about getting your show published.<br />
+  You can chat with other podcasters using IRC in the <strong>#oggcastplanet</strong> channel on the <a href="https://web.libera.chat/gamja/?channels=oggcastplanet">freenode.net</a> network. Follow us on <a href="https://identi.ca/group/hpr">identi.ca</a> (use the tag <strong>!hpr</strong>) and on <a href="https://twitter.com/hpr">Twitter</a> (use the tag <strong>#hpr</strong>). We have a <a href="https://www.facebook.com/home.php?sk=group_130169220378872">Facebook</a> and <a href="https://www.linkedin.com/groups?mostPopular=&amp;gid=3737302">LinkedIn</a> group, so please join and spread the word.</p> 
+  <h2>Still Nervous</h2>
+  <p> 
+  Fellow listeners like yourself contribute the shows and so we all know how hard it is to do that first show. You're probably worried that we won't like the topic. Well don't be, have a look at our <a href="<!--% absolute_path(baseurl) %-->eps/index.html">archive</a> to see how diverse the contributions have been. You're probably worried about the quality of your audio, that you sound funny, that English isn't your native language, that you suffer from a speech impediment, that your show has loads of ummms and awws in it, well don't be. We have plenty of hosts that fall into all these categories but continue to produce great shows.
+  </p>
+  <p>
+  At the end of the day the show is about the content and not the quality of the audio. That's not to say we won't help you with ways to improve the audio if you wish, or narrate your script if you can't or won't record it yourself. Drop into the IRC channel <a href="https://web.libera.chat/gamja/?channels=oggcastplanet">#oggcastplanet</a> where there are people who will help.<br />
+  </p>
+  
+  <h2 id="motto">Our Mottos</h2>
+  <blockquote>Any audio is better than no audio.</blockquote>
+  <blockquote>Any topic of intrest to hackers.</blockquote>
+  <blockquote>It ain't a show unless it's on the server.</blockquote>
+  <blockquote>If you tell us you are doing a show, then you owe us a show.</blockquote>
+
+  <p>You don't need anyones permission to upload a show, but if you have any questions then drop into the <a href="https://web.libera.chat/gamja/?channels=oggcastplanet">#oggcastplanet</a> channel on freenode and chat with a live person 24/7.
+  </p>
+  
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@ -1,70 +1,50 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-correspondent-${constants.database}.tpl.html" %-->
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% results_hpr_shows = DBI.prepare(query_hpr_shows)
-%-->
-<!--% results_hpr_show_count = DBI.prepare(query_hpr_show_count) %-->
-<!--% hpr_shows_to_count = results_hpr_show_count.execute(id); %-->
-<!--% hpr_shows = results_hpr_shows.execute(id); %-->
-<!--% hpr_show_count = 0 %-->
-<!--% FOREACH show IN hpr_shows_to_count %-->
-<!--% hpr_show_count = hpr_show_count +1; %-->
-<!--% END %-->
-
-<!--% query_twat_show_count = DBI.prepare('
+<!--% query_show_count = DBI.prepare('
 		SELECT id
-		FROM twat_eps AS eps
-		WHERE eps.hostid = ?
-		')
+		FROM eps
+		WHERE eps.hostid = ? ')
 %-->
-<!--% query_twat_shows = DBI.prepare('
-		SELECT
-		eps.id,
-		CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
+<!--% query_shows = DBI.prepare('
+		SELECT 
+		eps.id, 
+		CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit , 
 		eps.date, eps.license, eps.duration,
-		eps.title, eps.summary, eps.tags,
+		eps.title, eps.summary, eps.tags, 
 		eps.notes,
 		hosts.local_image,
-		hosts.hostid,
-		hosts.host, hosts.email, hosts.profile,
+		hosts.hostid, 
+		hosts.host, hosts.email,
 		miniseries.name AS series, miniseries.id AS seriesid
-	FROM twat_eps AS eps
-	INNER JOIN hosts ON eps.hostid = hosts.hostid
+	FROM eps 
+	INNER JOIN hosts ON eps.hostid = hosts.hostid 
 	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE hosts.hostid = ?
-	ORDER BY eps.id DESC
-	')
+	WHERE hosts.hostid = ? AND eps.date < date(\'now\', \'+1 days\') 
+	ORDER BY date DESC	')
 %-->
-<!--% twat_shows_to_count = query_twat_show_count.execute(id); %-->
-<!--% twat_shows = query_twat_shows.execute(id); %-->
-<!--% twat_show_count = 0 %-->
-<!--% FOREACH show IN twat_shows_to_count %-->
-<!--% twat_show_count = twat_show_count +1; %-->
+<!--% shows_to_count = query_show_count.execute(id); %-->
+<!--% shows = query_shows.execute(id); %-->
+<!--% show_count = 0 %-->
+<!--% FOREACH show IN shows_to_count %-->
+<!--% show_count = show_count +1; %-->
 <!--% END %-->
-
 <!--% hosts = DBI.tie('hosts', 'hostid') %-->

 	<article>
 		<!--% this_host = hosts.$id %-->
 		<h2 class="title">Correspondent</h2>
 		<h2><!--% this_host.host %--></h2>
-		<p><!--% get_avatar(this_host.hostid, this_host.host) %--><br>
+		<p><img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(this_host.hostid) %-->" 
+				height="80" alt="Host Image" /><br>
 		<label>Host ID</label>: <!--% this_host.hostid %--><br><br>
 		<label>email:</label> <u><!--% this_host.email %--></u><br>
-		<label>profile:</label> <!--% this_host.profile %--><br><br>
-		<label>episodes:</label> <strong><!--% hpr_show_count + twat_show_count %--></strong>
+		<label>episodes:</label> <strong><!--% show_count %--></strong>
 		</p>
-	<!--% FOREACH hpr_show IN hpr_shows; %-->
+	<!--% FOREACH show IN shows; %-->

-	<!--% show_summary(hpr_show, 'hide_host') %-->
-    <p class="listen-in"><!--% display_listen_in(hpr_show.id) %--></p>
-	<!--% END %-->
-	<!--% FOREACH twat_show IN twat_shows; %-->
-
-		<!--% twat_show_summary(twat_show, 'hide_host') %-->
-		<p class="listen-in"><!--% display_listen_in(twat_show.id,"twat") %--></p>
+		<!--% show_summary(show, 'hide_host') %-->
    <!--% END %-->
 	</article>
-	<p><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Become a Correspondent</a></p>
+	<p><a href="contribute.html">Become a Correspondent</a></p>
--- a/templates/content-correspondents.tpl.html
+++ b/templates/content-correspondents.tpl.html
@ -1,33 +1,31 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'shared-avatar.tpl.html' %-->
 <article>
 	<h2 class="title">Correspondents</h2>
-	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
+	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_path(baseurl) %-->contribute.html">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% host_cnt = 0 %-->
-	<table class="hosts">
+<!--% PROCESS 'shared-avatar.tpl.html' %-->
+	<table>
 	<th >Avatar</th>
 	<th >Name &amp; Host ID</th>
-	<th >License</th>
+	<th >license</th>
 	<th >Last Show</th>
 	<!--% FOREACH host IN DBI.query(
 		'select h.hostid, h.host, h.license, e.date, 
 		h.local_image 
 		from hosts as h 
 		inner join (select hostid, max(date) as date from eps group by hostid) as e 
-		on h.hostid = e.hostid
-		order by h.host'
+		on h.hostid = e.hostid '
 	) %-->
-	<tr>
-	<td><!--% get_avatar(host.hostid, host.host, host_cnt > 8) %--></td>
+	<tr height="80" bgcolor="#CCCCCC">
+	<td><img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(host.hostid) %-->" height="80" width="80" alt="avatar" /></td>

 		<td><strong><!--% host.host %--></strong><br>

 			Host ID: <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(host.hostid) %-->.html"><!--% host.hostid %--></a></td>
 		<td><!--% host.license %--></td>
 		<td><!--% host.date %--></td>
-	</tr><!--% host_cnt = host_cnt + 1 %-->
+	</tr>
 	<!--% END %-->
 	</table>
-	<p><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Become a Correspondent</a></p>
+	<p><a href="<!--% absolute_path(baseurl) %-->contribute.html">Become a Correspondent</a></p>
 </article>
--- a/templates/content-download.tpl.html
+++ b/templates/content-download.tpl.html
@ -1,12 +1,13 @@
-<article>
-	<header>
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+  <article>
+    <header>
        <h1>Download Archive</h1>
        <p>Please be aware that our Archive exceeds <strong>62Gb</strong> <em>(Ogg: 21Gb, Spx: 16Gb, mp3: 25Gb)</em>. We are happy for you to download them, but please make sure that you are not going to incur additional bandwidth charges on your side.</p>
        <p>We will be happy to post you DVD's of the episodes anywhere in the world if bandwidth is an issue.</p>
    </header>
        <h2>Full Episode Guide</h2>
        <p>
-        The <a href="./eps/index.html">compete episode guide</a> is available to you, and it lists all the shows on one page going right back to the very first episode.
+        The <a href="<!--% absolute_path(baseurl) %-->eps/index.html">compete episode guide</a> is available to you, and it lists all the shows on one page going right back to the very first episode.
        </p>
        <h2>Command line download</h2>
        <p>
@ -53,4 +54,4 @@
      <footer>
      <p>Big to DeepGeek and the team for providing the BitTorrent service.</p>
      </footer>
-</article>
+  </article>
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@ -1,138 +1,60 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'shared-listen-now.tpl.html' %-->
-<!--% PROCESS 'shared-show-transcript.tpl.html' %-->
-<!--% PROCESS "queries-episode-${constants.database}.tpl.html" %-->
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% query_episodes = DBI.prepare(query_episode_maxmin) %-->
-<!--% episode_result = query_episodes.execute(id, id, id, id, id) %-->
-<!--% FOREACH episode IN episode_result %-->
-    <!--% in_window = ( episode.id > episode.latest || episode.id < ( episode.latest - 20 ) ? 0 : 1 ) %-->
-<!--% episode_navigation = step_navigation(baseurl,episode) %-->
-<article>
-	<header>
-		<h1>hpr<!--% zero_pad_left(episode.id) %--> :: <!--% episode.title %--></h1>
-		<h3><!--% episode.summary %--></h3>
-		<p class="meta"><!--% episode_navigation %-->
-		</p>
-<p><!--% show_avatar(episode.hostid, episode.host) %-->
-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) %-->
-
-<label>Comments: </label><!--% display_comments_tally(episode.id, episode.eps_tally) %--> <br>
-The show is available on the Internet Archive at: <a href="https://archive.org/details/hpr<!--% zero_pad_left(episode.id) %-->">https://archive.org/details/hpr<!--% zero_pad_left(episode.id) %--></a>
-<!--% listen_now(episode, "hpr", baseurl, media_baseurl) %-->
-</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>
-<!--% show_transcript(episode, "hpr", baseurl, media_baseurl) %-->
-<p>
-<!--% episode_navigation %-->
-</p>
-    </footer></article>
-<!--% END %-->
-<hr />
-<h1>Comments</h1>
-<p id="comments">
-Subscribe to the comments <a href="<!--% absolute_path(baseurl) %-->comments.rss">RSS</a> feed.
-</p>
-<!--% query_comments = DBI.prepare('
-	SELECT 
-		id,
-		comment_timestamp, 
-		comment_author_name, 
-		comment_title, 
-		comment_text
-	FROM comments
-	WHERE eps_id = ?
+<!--% query_episodes = DBI.prepare('
+		WITH episode_maxmin AS (
+					SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
+					FROM eps
+					WHERE eps.date < date (\'now\', \'+1 days\')
+		),
+		episode_date AS (
+			SELECT eps.date 
+			FROM eps
+			WHERE eps.id = ?
+		),
+		episode_previous AS (
+			SELECT MAX(id) AS \'previous\', ? AS \'id\'
+			FROM eps
+			INNER JOIN episode_date
+			ON eps.date < episode_date.date
+			WHERE eps.id > 1
+		),
+		episode_next AS (
+			SELECT MIN(id) AS \'next\', ? AS \'id\'
+			FROM eps
+			INNER JOIN episode_date
+				ON eps.date > episode_date.date
+			WHERE eps.date < date (\'now\')
+		)
+		SELECT eps.id, eps.date, eps.title, eps.duration, 
+			   eps.summary, eps.notes, eps.explicit, eps.license, 
+			   eps.tags, eps.version, eps.downloads, eps.valid,
+			   episode_maxmin.latest, episode_maxmin.earliest,
+			   episode_previous.previous, episode_next.next,
+			   hosts.hostid, hosts.host,
+			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\'
+		FROM eps
+		INNER JOIN hosts ON eps.hostid = hosts.hostid
+		INNER JOIN miniseries ON eps.series = miniseries.id
+		INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
+		INNER JOIN episode_previous ON eps.id = episode_previous.id
+		INNER JOIN episode_next ON eps.id = episode_next.id
+		WHERE eps.id = ?
 	')
 %-->
-<!--% comment_index = 1 %-->
-<!--% comments_result = query_comments.execute(id) %-->
-<!--% FOREACH comment IN comments_result %-->
-<h5 id="comment_<!--% comment.id %-->"><a href="/eps/hpr<!--% zero_pad_left(episode.id) %-->/index.html#comment_<!--% comment.id %-->">Comment #<!--% comment_index %--></a> posted on <!--% comment.comment_timestamp %--> by <!--% comment.comment_author_name %--></h5>
-<h4><!--% comment.comment_title %--></h4>
-<p class="comment"><!--% comment.comment_text FILTER html_line_break %--></p>
-<!--% comment_index = comment_index + 1 %--> 
+<!--% episode_result = query_episodes.execute(id, id, id, id, id) %-->
+<!--% FOREACH episode IN episode_result %-->
+<article>
+	<header>
+		<h1>hpr<!--% episode.id %--> :: <!--% episode.title %--></h1>
+		<h3><!--% episode.summary %--></h3>
+		<p class="meta"><!--% step_navigation(baseurl,episode) %-->
+		</p>
+<p><!--% IF get_avatar(episode.hostid) != 'hpr_logo.png' %-->
+<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>. <!--% show_meta(episode) %--></p>
+	</header>
+	<div><!--% episode.notes %--></div>
+</article>
 <!--% END %-->
-
-        <h2>Leave Comment</h2>
-        <p>
-        <strong>Note to Verbose Commenters</strong><br />
-        If you can't fit everything you want to say in the comment below then you really should <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> a response show instead.
-        </p>
-        <p>
-        <strong>Note to Spammers</strong><br />
-		All comments are moderated. All links are checked by humans. We strip out all html. Feel free to <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> a show about yourself, or your industry, or any other topic we may find interesting. <em>We also check shows for spam :)</em>.
-        </p>
-        <form method="POST" action="<!--% hub_baseurl %-->comment_confirm.php">
-        <fieldset>
-        <legend>Provide feedback</legend>
-        <table>
-        <tr>
-            <td>Your Name/Handle:</td>
-            <td><input required type="text" name="comment_author_name" size="40" maxlength="40" placeholder="Enter your name" ></td>
-        </tr>
-        <tr>
-            <td>Title:</td>
-            <td><input required type="text" name="comment_title" size="50" maxlength="100" placeholder="What is your comment about?"></td>
-        </tr>
-        <tr>
-            <td>Comment:</td>
-            <td><textarea required name="comment_text" maxlength="2000" rows="10" cols="50" placeholder="Place the comment here."></textarea></td>
-        </tr>
-        <tr>
-            <td>Anti Spam Question:</td>
-            <td>
-            What does the letter <strong>P</strong> in <em>HPR</em> stand for? <br />
-            <input required type="text" name="anti_spam_question" size="50" maxlength="100" placeholder="Type out what the P in HPR stands for."></td>
-	</tr>
-	<!--% IF in_window %-->
-	<tr><td>
-        <input type="hidden" name="spammer" value="No">
-        <input type="hidden" name="hostid" value="<!--% episode.hostid %-->">
-        <input type="hidden" name="justification" value="No justification is asked for or required.">
-	</td></tr>
-	<!--% ELSE %-->
-<!-- . -->
-	<tr>
-	<td>Are you a spammer?</td>
-	<td>
-	<input required checked="checked" type="radio" name="spammer" id="spammer_yes" value="Yes">
-	<label for="spammer_yes">Yes</label>
-	<input required type="radio" name="spammer" id="spammer_no" value="No">
-	<label for="spammer_no">No</label>
-	</td>
-	</tr>
-<!-- . -->
-	<tr>
-	<td>Who is the <strong>host</strong> of this show?</td>
-	<td>
-	<select required name="hostid" id="hostid">
-		<option value="Spammer" selected="selected">Spammer</option>
-		<option value="Spammer">Linus Torvalds</option>
-		<option value="Spammer">Marie Curie</option>
-		<option value="<!--% episode.hostid %-->"><!--% episode.host %--></option>
-		<option value="Spammer">Alan Turing</option>
-		<option value="Spammer">Terry Pratchett</option>
-		<option value="Spammer">Yuri Gagarin</option>
-	</select>
-		<td>
-	<td>
-<!-- . -->
-	<tr>
-	<td>What does HPR mean to you?</td>
-	<td><textarea required name="justification" maxlength="200" rows="4" cols="50" placeholder="Convince us you are part of the community."></textarea></td>
-	</tr>
-	<!--% END %-->
-	<tr><td>
-        <input type="hidden" name="eps_id" value="<!--% episode.id %-->">
-	</td></tr>
-        </table>
-        <input type="submit" value="Next">
-        </fieldset>
-        </form>
--- a/templates/content-episodes.tpl.html
+++ b/templates/content-episodes.tpl.html
@ -1,5 +1,4 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
- <!--% PROCESS "queries-episodes-${constants.database}.tpl.html" %-->
 <article>
    <header>
        <h1>Complete Archive of Shows.</h1>
@ -8,17 +7,7 @@
        </p>
    </header>
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% FOREACH episodes IN DBI.query(query_episodes) 
-%-->
-	<!--% show_summary(episodes) %-->
-	<p class="listen-in"><!--% display_listen_in(episodes.id) %--></p>
-<!--% END %-->
-<h2 id="twat_episodes">Today With a Techie Archived Shows</h2>
-	<p>
-		<!-- Creative Commons License -->
-		<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="https://creativecommons.org/images/public/somerights20.png" width="88" height="31" /></a><br>The following work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/">Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License</a>.</p>
-	<p>Today With a Techie Radio was brought to you by <a href="https://en.wikipedia.org/wiki/Infonomicon">The Infonomicon Computer Club</a></p>
-<!--% FOREACH twat_episode IN DBI.query('
+<!--% FOREACH episodes IN DBI.query('
 	SELECT 
        eps.id, 
        eps.explicit, 
@ -27,14 +16,13 @@
        hosts.hostid, 
        hosts.host, hosts.email, hosts.local_image, 
 		miniseries.name AS series, miniseries.id AS seriesid
-    FROM twat_eps as eps
+    FROM eps 
 	INNER JOIN hosts ON eps.hostid = hosts.hostid 
 	INNER JOIN miniseries ON eps.series = miniseries.id
-	ORDER BY eps.id DESC
+ 	WHERE eps.date < date(\'now\', \'+1 days\')
+	ORDER BY date DESC
 	') 
 %-->
-	<!--% twat_show_summary(twat_episode) %-->
+	<!--% show_summary(episodes) %-->
 <!--% END %-->
-
 </article>
-
--- a/templates/content-help_out.tpl.html
+++ b/templates/content-help_out.tpl.html
@ -0,0 +1,11 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<h1>Help Out.</h1>
+	<h2>Submit a show</h2>
+	<p>One of the best ways to help out is to <a href="<!--% absolute_path(baseurl) %-->contribute.html">contribute a show</a>. You can find out <a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">everything you need to know here</a>. </p>
+	<h2>Suggest Topics</h2>
+	<p>If there is a technical topic you would like us to cover, or if you are looking for topics to record a show on, then look no further than our <a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Requested topics</a> page.</p>
+	<h2>Podcatcher Support</h2>
+	<p>
+	Please report your experiences with our feeds to admin@hpr. We maintain a podcatcher <a href="<!--% absolute_path(baseurl) %-->podcatchers.html">compatibility list.</a>
+	</p>
+
--- a/templates/content-index-announcement.tpl.html
+++ b/templates/content-index-announcement.tpl.html
@ -1 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@ -1,83 +1,96 @@
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'shared-listen-now.tpl.html' %-->
-<!--% PROCESS 'shared-show-transcript.tpl.html' %-->
-<!--% PROCESS 'shared-call_for_shows.tpl.html' %-->
-<!--% INCLUDE 'content-index-announcement.tpl.html' %-->
-<!--% PROCESS "queries-index-${constants.database}.tpl.html" %-->
-<!--% MACRO tidy_notes(all_lines) BLOCK %-->
-<!--% lines = all_lines %-->
-<!--% after_html = all_lines %-->
-<!--% img_re = '(?six)^(.*?)\<img ([^\>]+\>)(.+)$' %-->
-<!--% lazy_re = '(?i)loading="lazy"' %-->
-<!--% WHILE (matches = lines.match(img_re)) %-->
-<!--% 	img_tag = matches.1 %-->
-<!--% 	after_html = matches.2 %-->
-<!--% 	matches.0 %-->
-<!--% 	IF (img_tag.search(lazy_re)) %-->
-    <img <!--% img_tag %-->
-<!--% 	ELSE %-->
-    <img loading="lazy" <!--% img_tag %-->
-<!--% 	END %-->
-<!--% 	lines = after_html %-->
-<!--% END %-->
-<!--% after_html %-->
-<!--% END %-->
 <hr>
  <article>
    <header>
-        <h3>Welcome to HPR, the Community Podcast</h3>
+        <h3>Welcome to HPR the Community Podcast</h3>
    </header>
-	<!--% days_till_next_episode = 0 %-->
-	<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-	<!--% USE date %-->
-	<!--% calc = date.calc %-->
-	<!--% episodes = DBI.query(query_next_available_episode).get_all() %-->
-	<!--% last_date = episodes.0.date.split('-') %-->
-	<!--% offset = (calc.Day_of_Week(last_date.0,last_date.1,last_date.2) == 5 ? 3 : 1) %-->
-	<!--% slot_date = calc.Add_Delta_Days(last_date.0,last_date.1,last_date.2,offset) %-->
-	<!--% now = calc.Today() %-->
-	<!--% days_till_next_episode = calc.Delta_Days(now.0,now.1,now.2,slot_date.0,slot_date.1,slot_date.2) %-->
-
+	<!--% USE date %-->  
 	<!--% delta = date.calc.N_Delta_YMD(2005,9,19, date.format(date.now, '%Y'),date.format(date.now, '%m'),date.format(date.now, '%d')) %-->
-	<p>We started producing shows as <a href="<!--% absolute_path(baseurl) %-->eps/index.html#twat_episodes"><em>Today with a Techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. Our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topics</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)">hackers</a>"</strong>. If you listen to HPR then please consider contributing one show a year. If you <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">record</a> your show now it could be <a href="<!--% hub_baseurl %-->calendar.php">released</a> in <strong><!--% days_till_next_episode %--></strong> days.</p>
+	<p>We started producing shows as <a href="https://www.hackerpublicradio.org/twat.php"><em>Today with a Techie</em></a> on 2005-09-19, <!--% delta.0 %--> years, <!--% delta.1 %--> months, <!--% delta.2 %--> days ago. our shows are produced by <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">listeners</a> like you and can be on any <a href="<!--% absolute_path(baseurl) %-->eps/index.html">topic</a> that <strong>"are of interest to <a href="https://en.wikipedia.org/wiki/hacker_(hobbyist)">hackers</a>"</strong>. if you listen to HPR then please consider contributing one show a year. if you <a href="<!--% absolute_path(baseurl) %-->contribute.html">record</a> your show now it could be <a href="https://www.hackerpublicradio.org/calendar.php">released</a> in <strong>13</strong> days.</p>
+    <h4>Meet the team</h4>
+    <p>
+    <audio controls preload="none">";
+        <source src="<!--% absolute_path(baseurl) %-->media/promos/all-hpr-hosts.ogg" type="audio/ogg" >
+        <source src="<!--% absolute_path(baseurl) %-->media/promos/all-hpr-hosts.mp3" type="audio/mpeg" >
+    </audio>
+    </p>
  </article>
-  <!--% display_call_for_shows() %-->
  <hr>
  <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <h1>Latest Shows</h1>
-<!--% host_cnt = 0 %-->
-<!--% FOREACH latest_episodes IN DBI.query(query_latest_episodes)
+<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% FOREACH latest_episodes IN DBI.query('
+	SELECT 
+	eps.id, 
+	eps.explicit, 
+	eps.date, eps.license, eps.duration,
+	eps.title, eps.summary, eps.tags, 
+	eps.notes,
+	hosts.local_image,
+	hosts.hostid, 
+	hosts.host, hosts.email,
+	miniseries.name AS series, miniseries.id AS seriesid
+	FROM eps 
+	INNER JOIN hosts ON eps.hostid = hosts.hostid
+	INNER JOIN miniseries ON eps.series = miniseries.id
+	WHERE eps.date < date(\'now\', \'+1 days\')
+	ORDER BY date DESC 
+	LIMIT 10
+	')
 %-->
 <hr>
 <article>
 	<header>
 			<h1><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></h1>
 		<h3><!--% latest_episodes.summary%--></h3>
-		<p class="meta"$><!--% show_avatar(latest_episodes.hostid, latest_episodes.host, host_cnt) %-->
-	Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
-	<!--% display_tags(latest_episodes.tags) %-->
-	<span><!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--></span>
-	<span><label>Comments: </label><!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></span><br>
-<!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
+		<p class="meta"$><!--% IF get_avatar(latest_episodes.hostid) != 'hpr_logo.png' %-->
+		<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><!--% END %-->
+	<br>Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
+<strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br>
+<small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %-->
+ <a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html#comments">View comments.</a></small>
 		</p>
 	</header>
-		<!--% tidy_notes(latest_episodes.notes) %-->
+		<!--% latest_episodes.notes %-->
 	<footer>
-	<!--% show_transcript(latest_episodes, "hpr", baseurl, media_baseurl) %-->
+		<h2>listen now</h2>
+		<p>Duration: <!--% latest_episodes.duration %--></p>
+		<audio controls preload="none">
+			<source src="local/hpr<!--% latest_episodes.id %-->.ogg" type="audio/ogg" >
+			<source src="local/hpr<!--% latest_episodes.id %-->.mp3" type="audio/mpeg" >
+		</audio>
+			<ul>
+				<li>ogg: <a href="local/hpr<!--% latest_episodes.id %-->.ogg">/local/hpr<!--% latest_episodes.id %-->.ogg</a></li>
+				<li>spx: <a href="local/hpr<!--% latest_episodes.id %-->.spx">/local/hpr<!--% latest_episodes.id %-->.spx</a></li>
+				<li>mp3: <a href="local/hpr<!--% latest_episodes.id %-->.mp3">/local/hpr<!--% latest_episodes.id %-->.mp3</a></li>
+			</ul>
 	</footer>
 </article>
-<!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->
-<article id="previous_five_weeks">
+<article>
    <header>
        <hr>
        <h1>Previous five weeks</h1>
    </header>
-<!--% FOREACH last_5_weeks_episodes IN DBI.query(query_last_5_weeks_episodes)
+<!--% FOREACH last_5_weeks_episodes IN DBI.query('
+	SELECT 
+        eps.id, 
+        CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit , 
+        eps.date, eps.license, eps.title, eps.summary, 
+		eps.duration, eps.notes, eps.tags,
+        hosts.hostid, 
+        hosts.host, hosts.email, hosts.local_image, 
+		miniseries.name AS series, miniseries.id AS seriesid
+    FROM eps 
+	INNER JOIN hosts ON eps.hostid = hosts.hostid 
+	INNER JOIN miniseries ON eps.series = miniseries.id
+	WHERE eps.date < date(\'now\', \'+1 days\')
+    ORDER BY date DESC
+	LIMIT 30 OFFSET 10
+	') 
 %-->
 	<!--% show_summary(last_5_weeks_episodes) %-->
-	<p class="listen-in"><!--% display_listen_in(last_5_weeks_episodes.id) %--></p>
 <!--% END %-->
 </article>
 <h1>Older Shows</h1>
--- a/templates/content-mumble-howto.tpl.html
+++ b/templates/content-mumble-howto.tpl.html
@ -1,189 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<p>In this article we will show you how to connect to the HPR Community Room on Mumble.</p>
-
-<p>You can think of Mumble like visiting a hotel that has different meeting rooms. Some are locked to you, some only allow you access if you are registered, some you can join but only listen to. In most, like the HPR room, you can hear the other people in the room talking. If you talk they can also hear you. There is a chat section where text can be shared as well.</p>
-
-<p>When using Mumble <strong><em>you should always use a microphone and headset</em></strong> positioned close to your mouth but slightly off to the side.</p>
-<h2>Install the software</h2>
-
-<p>The <a href="https://www.mumble.info/downloads/">Mumble website offers download and install instructions</a> for different operating systems.
-</p> 
-
-<p>Once you have installed the client then connect to the <a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0">HPR Room on Mumble</a>.
-
-<p>There is a first run wizard that will step you through the process of configuring Mumble the first time. This will open up a series of configuration options.</p>
-
-<p>Press <strong>Next</strong> on the introduction.</p>
-
-<p><img alt="intro screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/01-intro.png" ></p>
-
-<p>The device selection page will allow you to select which audio to use. As this will be different for everyone we can't offer you much help here other than to say that the defaults are usually fine.</p>
-
-<p>When you are done press <strong>Next</strong>.</p>
-
-<p><img alt="device selection screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/02-device-selection.png" ></p>
-
-<p>The device tuning page will allow you to fine tune the latency. Normally the defaults are usually fine.</p>
-
-<p>When you are done press <strong>Next</strong>.</p>
-
-<p><img alt="device tuning screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/03-device-tuning.png" ></p>
-
-<p>The Volume Tuning page will allow you to set your audio levels. Normally the defaults are usually fine.</p>
-
-<p>Then press <strong>Next</strong>.</p>
-
-<p><img alt="volume tuning screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/04-volume.png" ></p>
-
-<p>It is <strong>very important</strong> that you set <strong>Push to Talk (PTT)</strong>, as you will disturb the other people in the room if you select the other methods. It may seem to be working fine to you, but it <em>will</em> result in issues for the others.
-</p> 
-<ul>
-	<li>Click "Push to Talk:"</li>
-	<li>Click in the area next to it and press the key you intend to use as the Push To Talk (PTT) Key</li>
-</ul>
-
-<p>Try and pick a key that you don't normally use or need. You may have to disable that key mapping in the operating system you are using.</p>
-
-<p>Then press <strong>Next</strong>.</p>
-
-<p><img alt="ptt screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/05-ptt.png" ></p>
-
-<p>The Quality Settings page will allow you to adjust the bandwidth. Normally the defaults are usually fine.</p>
-
-<p>It is <strong>very important</strong> that you <strong>Disable Text-To-Speech</strong>, as all notifications will be read back and will disturb the other people in the room. It may seem to be working fine to you, but it <em>will</em> result in issues for the others.</p>
-<ul>
-<li>Click "Disable Text-To-Speech and use sounds instead"</li>
-</ul>
-
-<p>Then press <strong>Next</strong>.</p>
-
-<p><img alt="no tts screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/06-notts.png" ></p>
-
-<p>The positional audio page will allow you to fine tune the latency. Normally the defaults are usually fine.</p>
-
-<p>Just press <strong>Next</strong>.</p>
-
-<p><img alt="positional audio screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/07-positional-audio.png" ></p>
-
-<p>That's it the initial configuration is done.</p>
-
-<p>Then press <strong>Finish</strong>.</p>
-
-<p><img alt="stats screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/08-stats.png" ></p>
-
-<p>You are expected to have a digital certificate when connecting to Mumble servers.</p>
-
-<p>This screen will allow you to Automatically create one.</p>
-
-<p>Just press <strong>Next</strong>.</p>
-
-<p><img alt="cert screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/09-cert.png" ></p>
-
-<p>That completes the first setup of Mumble.</p>
-
-<p>Then press <strong>Finish</strong>.</p>
-
-<p><img alt="finished screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/10-finished.png" ></p>
-<hr>
-
-<p>Now that you have the Mumble client set up we can now start the process of connecting to the <a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0">HPR Room on Mumble</a>.</p>
-
-<p>If you opened Mumble by clicking the link above, then you may not see the following options, but we'll cover them here if at any time you need to add the HPR server again</p>
-
-<p>Just open mumble and press <strong>Server - Connect</strong></p>
-
-<p>Then press <strong>Add New...</strong>.</p>
-
-<p><img alt="add new connection screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/20-add-new.png" ></p>
-
-<p>You will need to enter the information for the HPR server:</p>
-<ul>
-<li>Address: <strong>chatter.skyehaven.net</strong></li>
-<li>Port: 64738</li>
-<li>Username: <strong><em>Your Username</em></strong></li>
-<li>Label: chatter.skyehaven.net</li>
-</ul>
-
-<p>Think about your username a bit as if you register it on the server you will not be able to change it again.</p>
-
-<p>Then press <strong>Next</strong>.</p>
-
-<p><img alt="add new server screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/21-add-server.png" ></p>
-
-<p>If you clicked the link to the <a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0">HPR Room on Mumble</a>, then you may be brought to the option to enter a username. Think about this a bit as if you register it on the server you will not be able to change it again.</p>
-
-<p>Then press <strong>Next</strong>.</p>
-
-<p><img alt="username screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/11-username.png" ></p>
-
-<p>You will need to confirm the servers Certificate matches this:</p>
-
-<p>
-<pre>Digest (SHA-1): 09:22:05:88:D6:60:17:FD:39:8F:55:B0:F5:A0:45:DA:96:32:9C:23</pre>
-</p>
-
-<p>If it matches then press <strong>Yes</strong>.</p>
-
-<p><img alt="accept cert screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/12-accept-cert.png" ></p>
-
-<p>All going well you will be connected to the server. By default you will end up in the <strong>Root</strong> - think the lobby of an hotel !</p>
-
-<p>You will see a lot of rooms with names of other podcasts that use the server.</p>
-
-<p>Before connecting to any room it's good etiquette to make sure your audio is working correctly.</p>
-
-<p>The room <strong>Audio Test</strong> will allow you to speak and the <strong>OpieTheRepeatherBot</strong> will record your speech and after 10 seconds will play it back for you.</p>
-
-<p><em>Click and hold</em> on your username (<em>ken1</em> in this example) and <em>drag</em> yourself into the <strong>Audio Test</strong> room.</p>
-
-<p><img alt="audio test screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/13-audio-test.png" ></p>
-
-<p>You now know how to switch from room to room.</p>
-
-<p>Try to say something. Remember to press the <strong>Push to talk (PTT)</strong>. Everyone forgets to do this but it will become second nature after a while.</p>
-
-<p>A good test is to count to ten slowly.</p>
-
-<p>When you are talking the server should change your icon from a green person to a <em>blue</em> one with <em>sound circles</em> around the head.</p>
-
-<p><img alt="audio ping screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/14-audio-ping.png" ></p>
-
-<p>The <strong>OpieTheRepeatherBot</strong> will create another client with the prefix <strong>Mimic-</strong> followed by your username.</p>
-
-<p>In this example it is <em>Mimic-ken1</em>.</p>
-
-<p>You should hear your audio back.</p>
-
-<p><img alt="audio pong screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/15-audio-pong.png" ></p>
-
-<p>If your audio is poor - as is often the case - then this gives you the opportunity to fix it before interrupting other people.</p>
-
-<p>How you fix it will depend on the operating system that you are using and the exact nature of the problem.</p>
-
-<p>A common problem is that the operating system uses the built in speaker and microphone from the laptop instead of your headset. A tip would be to press the <strong>Push to talk (PTT)</strong> button and tap the microphone of your head set lightly. If you don't hear the tapping then Mumble is probably getting the wrong microphone as input.</p>
-
-<p>In the example below I clicked the Microphone icon in my taskbar and a application (<em>pavucontrol</em>) opened allowing me to set the correct microphone.</p>
-
-<p><img alt="hpr room screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/22-pavucontrol-recording.png" ></p>
-
-<p>While I was there I also checked to make sure that Mumble was playing audio to my headset.</p>
-
-<p><img alt="hpr room screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/23-pavucontrol-playback.png" ></p>
-
-<p>Satisfied that the audio is good, you can <em>click and drag</em> your icon to the <strong>HPR</strong> room.</p>
-
-<p><img alt="hpr room screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/16-hpr-room.png" ></p>
-
-<p>Some rooms require you to be registered to enter a room, to speak, to record, or to chat in the room.</p>
-
-<p>To register first <em>Right Click</em> on your icon and a menu will open.</p>
-
-<p>Press <strong>Register....</strong></p>
-
-<p><img alt="register screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/17-register.png" ></p>
-
-<p>Then press <strong>Yes</strong></p>
-
-<p><img alt="register confirm screenshot" src="<!--% absolute_path(baseurl) %-->images/mumble-howto/18-register-confirm.png" ></p>
-
-<p>That's it - you are now all set to use mumble.</p>
--- a/templates/content-podcatchers.tpl.html
+++ b/templates/content-podcatchers.tpl.html
@ -0,0 +1,151 @@
+  <h1>Podcast Clients Test Status</h1>
+<table style="width:100%">
+  <caption></caption>
+  <tr>
+    <th>Name</th>
+    <th>MP3</th>
+    <th>OGG</th>
+    <th>SPX</th>
+    <th>HTML</th>
+  </tr>
+  <tr>
+    <td>gPodder</td>
+    <td>OK</td>
+    <td>OK</td>
+    <td>OK</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>Bashpodder</td>
+    <td>OK</td>
+    <td>OK</td>
+    <td>OK</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>podget</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>Akregator</td>
+    <td>?</td>
+    <td>OK</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>BeyondPod</td>
+    <td>?</td>
+    <td>OK</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>AntennaPod, Version 1.5.2.0</td>
+    <td>OK</td>
+    <td>?</td>
+    <td>?</td>
+    <td>Reading the itunes:summary which has no html.<br />Should we also enable html here as well - how to fix the 4k limit ?</td>
+  </tr>
+  <tr>
+    <td>PodKicker Pro for Android</td>
+    <td>?</td>
+    <td>FAIL</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>pocketcasts</td>
+    <td>?</td>
+    <td>FAIL</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>Podlisten</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>Soundwaves</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>Podax</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>PodKicker Pro</td>
+    <td>OK</td>
+    <td>FAIL</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>RssDemon</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>newsbeuter</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>iTunes</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr> 
+    <td>VLC</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/jgoerzen/hpodder/wiki">hpodder</a></td>
+    <td>OK</td>
+    <td>OK</td>
+    <td>OK</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td><a href="https://play.google.com/store/apps/details?id=com.podkicker">PodKicker Pro for Android</a></td>
+    <td>OK</td>
+    <td>?</td>
+    <td>?</td>
+    <td>OK</td>
+  </tr>
+  <tr>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+  <tr>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
+  </tr>
+</table>
--- a/templates/content-promote.tpl.html
+++ b/templates/content-promote.tpl.html
@ -1,11 +1,12 @@
-<article>
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+ <article>
    <header>
        <h1>Please promote HPR</h1>
    </header>
 <p>Feel free to use the promotional material to spread the word in your podcasts, or have them played on to other shows.</p>
 <h2>General HPR promotion</h2>
 <ul>
-<li><a href="./media/promos/HPRpromoKlaatu.ogg">Klaatu explains HPR Daily podcast by the www.hackerpublicradio.org Community for the www.hackerpublicradio.org Community</a></li>
+<li><a href="<!--% absolute_path(baseurl) %-->media/promos/HPRpromoKlaatu.ogg">Klaatu explains HPR Daily podcast by the www.hackerpublicradio.org Community for the www.hackerpublicradio.org Community</a></li>
 <!--<li><a href="../media/promos/HPRpromoNewsCast.ogg">A News Caster tells us about HPR</a></li> 
 <li><a href="../media/promos/HPRpromoSkirlet.ogg">Skirlet tells us we need to listen to HPR</a></li>-->
 </ul>
@ -13,10 +14,10 @@
 <h2>Requests for contributions</h2>
 <p>
 <ul>
-<li><a href="./media/promos/Jude-aka-Mrs_Peter64_HPR-needs-shows.flac">Jude Mrs. Peter64 HPR needs shows</a></li>
-<li><a href="./media/promos/hpr-contributor-promo-sax.ogg">slick0 basenet theme</a></li>
-<li><a href="./media/promos/hpr-contributor-promo-basenettheme.ogg">slick0 sax roll</a></li>
+<li><a href="<!--% absolute_path(baseurl) %-->media/promos/Jude-aka-Mrs_Peter64_HPR-needs-shows.flac">Jude Mrs. Peter64 HPR needs shows</a></li>
+<li><a href="<!--% absolute_path(baseurl) %-->media/promos/hpr-contributor-promo-sax.ogg">slick0 basenet theme</a></li>
+<li><a href="<!--% absolute_path(baseurl) %-->media/promos/hpr-contributor-promo-basenettheme.ogg">slick0 sax roll</a></li>
 </ul>
 </p>

-</article>
+  </article>
--- a/templates/content-recording.tpl.html
+++ b/templates/content-recording.tpl.html
@ -35,7 +35,7 @@
  Many of today's <a href="http://wiki.xiph.org/PortablePlayers">portable media players</a> support recording audio out of the box. Search for "Voice Recorder", to see if there is an application for your smartphone. Whichever option you have close to hand, try and set the recording to the best quality format (<a href="http://en.wikipedia.org/wiki/WAV">WAV</a> or <a href="http://en.wikipedia.org/wiki/FLAC">FLAC</a>), and set everything else to the highest setting. It's always the goal to get the best quality audio but here at Hacker Public Radio we value content over quality and so long as it's audible we'll take it. 
  </p>
  <p>
-  Then just record your show, <a href="<!--% absolute_url(baseurl,'request_a_slot.html') %-->">request a slot</a>, and we'll do the rest.
+  Then just record your show, <a href="r<!--% absolute_url(baseurl) %-->equest_a_slot.html">request a slot</a>, and we'll do the rest.
  </p>
  
  <h2 id="smart_phone">Recording with a portable media player<a href="#smart_phone">.</a></h2>
@ -55,7 +55,7 @@
  The majority of podcasters use <a href="http://audacity.sourceforge.net/download/">Audacity</a>. First set the Project Rate to 44100Hz, then you can either record your show in Audacity itself or import the file you recorded earlier and edit it as you wish.
  </p>
  <p>
-  <img width="600" src="<!--% absolute_url(baseurl,'images/contribute-audacity-record.png') %-->" alt="Audacity Can Record" title="Audacity Screenshot of Recording" >
+  <img width="600" src="<!--% absolute_url(baseurl) %-->images/contribute-audacity-record.png" alt="Audacity Can Record" title="Audacity Screenshot of Recording" >
  </p>
  <blockquote>Audacity is a free, easy-to-use and multilingual audio editor and recorder for Windows, Mac OS X, GNU/Linux and other operating systems.</blockquote>
  <iframe width="640" height="390" src="//www.youtube.com/embed/ss8CyTwBOPY" style="border: none"></iframe>
@ -70,7 +70,7 @@
    <li>Set <em>Bit depth</em> to <strong>24</strong>.</li>
  </ol>
  <p>
-  <img width="600" src="<!--% absolute_url(baseurl,'images/contribute-audacity-export.png') %-->" alt="Audacity Export Settings" title="Audacity Screenshot of an Export" >
+  <img width="600" src="<!--% absolute_url(baseurl) %-->images/contribute-audacity-export.png" alt="Audacity Export Settings" title="Audacity Screenshot of an Export" >
  </p>
  
  <h2 id="phone_interviews">Recording Interviews with the Phone<a href="#phone_interviews">.</a></h2>
@ -83,10 +83,10 @@
  If you would like to record with multiple participants then you can use <a href="http://www.mumble.com/">Mumble</a>. Connect to <strong>chatter.skyehaven.net</strong> Port: <strong>64738 </strong>.<br />
  Walk through the audio wizard and then pop into the <strong>Hacker Public Radio</strong> room. Once you are ready press the <strong>recording</strong> button, select <em>multichannel</em> and then <em>start</em>. That will record multiple tracks, one for each participant which you can edit and then submit.
  <br />
-  Kwisher made a <a href="<!--% absolute_url(baseurl,'Mumble-How-To.pdf') %-->">Mumble tutorial</a> which you might find useful and Delwin has produced a number of short <a href="<!--% absolute_url(baseurl,'correspondents/0228.html') %-->">shows</a> on how to configure the audio quality.
+  Kwisher made a <a href="<!--% absolute_url(baseurl) %-->Mumble-How-To.pdf">Mumble tutorial</a> which you might find useful and Delwin has produced a number of short <a href="<!--% absolute_url(baseurl) %-->correspondents/0228.html">shows</a> on how to configure the audio quality.
  </p>
  <p>
-  <img width="600" src="<!--% absolute_url(baseurl,'images/contribute-mumble-record.png') %-->" alt="Audacity Can Record" title="Audacity Screenshot of Recording" >
+  <img width="600" src="<!--% absolute_url(baseurl) %-->images/contribute-mumble-record.png" alt="Audacity Can Record" title="Audacity Screenshot of Recording" >
  </p>

  <h2 id="background_music">Avoid Bedding/background music<a href="#background_music">.</a></h2>
--- a/templates/content-request_a_slot.tpl.html
+++ b/templates/content-request_a_slot.tpl.html
@ -1,16 +1,16 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
  <h1 id="requesting_slot">Picking a slot for your show</h1>
  <p>
-  Any host can select any free slot a up to year in advance, by recording their show and uploading it to the desired slot. In exceptional circumstances it may be necessary to reserve a slot while not having the audio available, but this must be approved by the <a href="<!--% absolute_url(baseurl,'/maillist') %-->">HPR mailing list</a> in advance. Be sure to allow as much time as possible, and include a reason why you feel it is necessary to reserve the slot.
+  Any host can select any free slot a up to year in advance, by recording their show and uploading it to the desired slot. In exceptional circumstances it may be necessary to reserve a slot while not having the audio available, but this must be approved by the <a href="http://hackerpublicradio.org/mailman/listinfo/hpr_hackerpublicradio.org">HPR mailing list</a> in advance. Be sure to allow as much time as possible, and include a reason why you feel it is necessary to reserve the slot.
  </p>
  <p>
-  This is intended only for exceptional circumstances, such as a scheduled interview where we would like the audio to be released as soon after the event as possible, or to cover an important topical situation that has occurred. Due to the extended time now needed to post shows to external sites, the extra work this entails and the disruptive effect of reservations, we will no longer be allowing them except in very rare cases of the type mentioned above. [<a href="https://lists.hackerpublicradio.com/pipermail/hpr/2018-February/003482.html">?</a>]
+  This is intended only for exceptional circumstances, such as a scheduled interview where we would like the audio to be released as soon after the event as possible, or to cover an important topical situation that has occurred. Due to the extended time now needed to post shows to external sites, the extra work this entails and the disruptive effect of reservations, we will no longer be allowing them except in very rare cases of the type mentioned above. [<a href="http://hackerpublicradio.org/pipermail/hpr_hackerpublicradio.org/2018-February/014260.html">?</a>]
  </p>
  <p>
-  You can post your show by going to the <a href="<!--% hub_baseurl %-->calendar.php">Calendar</a> page. Once you have selected a date you will be redirected to the <a href="<!--% absolute_url(baseurl,'request.html') %-->">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and therefore it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers. 
+  You can post your show by going to the <a href="http://www.hackerpublicradio.org/calendar.php">Calendar</a> page. Once you have selected a date you will be redirected to the <a href="<!--% absolute_url(baseurl) %-->request.html">request page</a>, where you will be asked to select your show and email address. We will send a link to where you can upload your show to this address and therefore it must be a valid working address that you can access quickly. We intend to use <a href="https://www.gnupg.org/">GPG</a> to speed up the validation of hosts, so you may wish to use an email address that has an associated public key available on public key servers. 
  </p>
  <p>
-  The audio of your show will not be moderated, however <em>the information provided in the upload form <strong>may be moderated</strong></em>. All publicly facing material is managed by the HPR Community as a whole, and not just the host providing the show. The show <a href="<!--% absolute_url(baseurl,'eps/hpr2210/index.html') %-->">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
+  The audio of your show will not be moderated, however <em>the information provided in the upload form <strong>may be moderated</strong></em>. All publicly facing material is managed by the HPR Community as a whole, and not just the host providing the show. The show <a href="<!--% absolute_url(baseurl) %-->eps/hpr2210/index.html">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
  </p>
  <p><strong>Note:</strong> This email address will be published on the HPR website and will be given out in the feeds, so please use a <strong>public email</strong> address for this purpose. Where we publish it we pad it with dot nospam at-sign nospam dot. <br />
  i.e. <em>hpr@example.com</em> becomes <em>hpr.nospam@nospam.example.com</em>. If you do not want to have your email exposed, please contact the admin@hpr team to arrange a alias.
@ -52,7 +52,7 @@
    <li id="Short_Summary"><strong>Summary:</strong> <em>Mandatory</em><br />
    This is a short 100 character summary of what your show is about. Please fill this out as it is used once the show has gone off the main page, on the mobile site, on printed brochures, on text to speech announcements, on twitter, mastodon etc.</li>
    <li id="Theme"><strong>Theme:</strong> <em>Automatic</em><br />
-    The <a href="<!--% absolute_url(baseurl,'theme.html#intro') %-->">Intro</a>, and the <a href="<!--% absolute_url(baseurl,'theme.html#outro') %-->">Outro</a> will be added automatically. Please do not add it.
+    The <a href="<!--% absolute_url(baseurl) %-->theme.html#intro">Intro</a>, and the <a href="<!--% absolute_url(baseurl) %-->theme.html#outro">Outro</a> will be added automatically. Please do not add it.
    </li>
    <li id="Explicit"><strong>Explicit:</strong> <em>Mandatory</em><br />
    See <a href="http://www.apple.com/uk/itunes/podcasts/specs.html#submitting">iTunes</a> for more information.</li>
@ -104,7 +104,7 @@
    </li>
    
    <li id="series"><strong>Series:</strong> <em>Optional</em><br />
-    Select the <a href="<!--% absolute_url(baseurl,'series.html') %-->">series</a> if any that your show is a part of.
+    Select the <a href="<!--% absolute_url(baseurl) %-->series.html">series</a> if any that your show is a part of.
    </li>
    <li id="tags"><strong>Tags:</strong> <em>Optional</em><br />
    Add a list of comma separated tags. Pick the most important words from the shownotes. These are used to <a href="http://hackerpublicradio.org/tags.php">find shows via the tags page</a>.
@ -134,6 +134,6 @@
    </li>
  </ul>
  <p>
-  Press submit and your show will be sent to the HPR Volunteers to be processed. Keep an eye on the <a href="<!--% hub_baseurl %-->calendar.php">calendar</a> for when it is posted.
+  Press submit and your show will be sent to the HPR Volunteers to be processed. Keep an eye on the <a href="http://www.hackerpublicradio.org/calendar.php">calendar</a> for when it is posted.
  Your show information is used to process the media files, on the website, in the RSS feeds, and on social media sites.
  </p>
--- a/templates/content-requested_topics.tpl.html
+++ b/templates/content-requested_topics.tpl.html
@ -15,16 +15,16 @@
 		<li>Music Theory</li>
 		<li>Installing a VPN to your home network</li>
 		<li>Init and System.d</li>
-		<li>Episodes for the <a href="<!--% absolute_url(baseurl,'series/0007.html') %-->">LPI</a>, or the Networking series.</li>
-		<li><a href="https://web.archive.org/web/20160629174556/opensourcemusician.com/index.php/Beginning_Audio_Series_for_HPR_and_OSMP_Release">Beginning Audio Series for HPR and OSMP Release</a></li>
+		<li>Episodes for the <a href="<!--% absolute_url(baseurl) %-->series/0007.html">LPI</a>, or the Networking series.</li>
+		<li><a href="http://opensourcemusician.com/index.php/Beginning_Audio_Series_for_HPR_and_OSMP_Release">Beginning Audio Series for HPR and OSMP Release</a></li>
 		<li>Hackintosh computers - what are they, why would you want one.</li>
 		<li>Grub 2.0 introduction and customization.</li>
 		<li>FM Transmitter hack to listen into internet streams</li>
 		<li>How I Got Into Accessible Computing</li>
 		<li>How to do knitting</li>
 		<li>How to build a house</li>
-		<li>Bitcoin howto <a href="<!--% absolute_url(baseurl,'eps/hpr0788/index.html') %-->">hpr0788</a></li>
-		<li>How to solder <a href="<!--% absolute_url(baseurl,'eps/hpr1037/index.html') %-->">hpr1037</a>, <a href="<!--% absolute_url(baseurl,'eps/hpr1047/index.html') %-->">hpr1047</a></li>
+		<li>Bitcoin howto <a href="<!--% absolute_url(baseurl) %-->eps/hpr0788/index.html">hpr0788</a></li>
+		<li>How to solder <a href="<!--% absolute_url(baseurl) %-->eps/hpr1037/index.html">hpr1037</a>, <a href="<!--% absolute_url(baseurl) %-->eps/hpr1047/index.html">hpr1047</a></li>
 		<li>How to weld</li>
 		<li>How to fix a car</li>
 		<li>Reviews of stream playing software, (for linuxheads who don't want to keep a browser tab open all the time)</li>
--- a/templates/content-search.tpl.html
+++ b/templates/content-search.tpl.html
@ -5,41 +5,35 @@
 <hr />
 <h2>Search Show Tags</h2>
 <p>
-<a href="<!--% absolute_path(baseurl) %-->tags.html">Complete list of all the Tags</a></p>
+<a href="http://www.hackerpublicradio.org/tags.php">Complete list of all the Tags</a></p>
 <hr />
 <h2>Google</h2>
-<form name="google-search" method="get" action="https://www.google.com/search">
-  <input type="hidden" name="sitesearch" value="https://www.hackerpublicradio.org/" />
-  <input name="q" type="text" placeholder="Search HPR with Google"/>
+<form name="google-search" method="get" action="http://www.google.com/search">
+  <input type="hidden" name="sitesearch" value="http://www.hackerpublicradio.org/" />
+  <input name="q" type="text" />
  <input type="submit" name="sa" value="Search HPR with Google" />
 </form>
 <br />
-<a href="https://www.google.com/policies/privacy/">privacy policy</a>
+<a href="http://www.google.com/policies/privacy/">privacy policy</a>
 </p>
 <hr />
 <h2>DuckDuckGo</h2>
-<form method="get" id="search" action="https://duckduckgo.com/">
-  <input type="hidden" name="sites" value="https://www.hackerpublicradio.org/"/>
-  <input type="hidden" name="k8" value="#444444"/>
-  <input type="hidden" name="k9" value="#D51920"/>
-  <input type="hidden" name="kt" value="h"/>
-  <input type="text" name="q" maxlength="255" placeholder="Search HPR with DuckDuckGo"/>
-  <input type="submit" value="Search HPR with DuckDuckGo" />
-</form>
+<p>
+<iframe src="http://duckduckgo.com/search.html?site=www.hackerpublicradio.org&prefill=Search DuckDuckGo" style="overflow:hidden;margin:0;padding:0;width:408px;height:40px;" frameborder="0"></iframe>
 <br />
 <a href="https://duckduckgo.com/privacy">privacy policy</a>
 </p>
 <hr />
 <h2>Bing</h2>
 <p>
-<form method="get" action="https://www.bing.com/search">
+<form method="get" action="http://www.bing.com/search">
 <input type="hidden" name="cp" value="utf-8" />
 <input type="hidden" name="FORM" value="FREESS" />
-<input type="text" name="q" size="30" placeholder="Search HPR with Bing"/>
-<input type="submit" value="Search HPR with Bing" />
+<input type="text" name="q" size="30" />
+<input type="submit" value="Search with Bing" />
 <input type="hidden" name="q1" value="site:www.hackerpublicradio.org" />
 </form>
 <br />
-<a href="https://www.microsoft.com/privacystatement/en-us/bing/default.aspx">privacy policy</a>
+<a href="http://www.microsoft.com/privacystatement/en-us/bing/default.aspx">privacy policy</a>
 </p>
  </article>
--- a/templates/content-series.tpl.html
+++ b/templates/content-series.tpl.html
@ -1,16 +1,28 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-series-${constants.database}.tpl.html" %-->
  <article>
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 <h1 class="title">In-Depth Series</h1>
-<!--% FOREACH series IN DBI.query(query_episodes) %-->
+	<!--% FOREACH series IN DBI.query(
+		'SELECT miniseries.id, miniseries.name, miniseries.description, 
+			miniseries.private, miniseries.image, miniseries.valid,
+			ep.number_of_episodes, ep.latest_show, ep.earliest_show
+		 FROM miniseries
+		 INNER JOIN 
+			(SELECT series, 
+				COUNT(eps.id) AS number_of_episodes,
+				MAX(eps.date) AS latest_show,
+				MIN(eps.date) AS earliest_show
+			 FROM eps 
+			 GROUP BY series) AS ep ON ep.series = miniseries.id
+		 ORDER BY name'
+	) %-->
 	<h2><a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series.id) %-->.html"><!--% series.name %--></a></h2>
 <ul>
 	<li>Number of episodes: <!--% series.number_of_episodes %--></li>
 	<li>Open/closed: <!--% display_choice(series.private, 'closed', 'open') %--></li>
 	<li>Date of earliest show: <!--% series.earliest_show %--></li>
 	<li>Date of latest show: <!--% series.latest_show %--></li>
-	<li>Series RSS feeds: <a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=<!--% series.id %-->">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=<!--% series.id %-->">spx</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=<!--% series.id %-->">mp3</a></li>
+	<li>Series RSS feeds: <a href="hpr_ogg_rss.php?series=38">ogg</a>, <a href="hpr_spx_rss.php?series=38">spx</a>, <a href="hpr_mp3_rss.php?series=38">mp3</a></li>
 </ul>
 <em><!--% series.description %--></em>
 <!--% END %-->
--- a/templates/content-series_episode.tpl.html
+++ b/templates/content-series_episode.tpl.html
@ -1,8 +1,20 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
-<!--% PROCESS "queries-series_episodes-${constants.database}.tpl.html" %-->
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% query_series = DBI.prepare(query_series_sql)
+<!--% query_series = DBI.prepare('SELECT miniseries.id, miniseries.name, 
+			miniseries.description, 
+			miniseries.private, miniseries.image, miniseries.valid,
+			ep.number_of_episodes, ep.latest_show, ep.earliest_show
+		 FROM miniseries
+		 INNER JOIN 
+			(SELECT series, 
+				COUNT(eps.id) AS number_of_episodes,
+				MAX(eps.date) AS latest_show,
+				MIN(eps.date) AS earliest_show
+			 FROM eps 
+			 GROUP BY series) AS ep ON ep.series = miniseries.id
+		 WHERE miniseries.id = ?
+		 ORDER BY name')
 %-->
 <!--% series_result = query_series.execute(id) %-->
 <article>
@ -13,15 +25,24 @@
 	<li>Open/closed: open</li>
 	<li>Date of earliest show: <!--% series.earliest_show %--></li>
 	<li>Date of latest show: <!--% series.latest_show %--></li>
-	<li>Series RSS feeds: <a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=<!--% series.id %-->&full=1&gomax=1">ogg</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=<!--% series.id %-->&full=1&gomax=1">spx</a>, <a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=<!--% series.id %-->&full=1&gomax=1">mp3</a></li>
+	<li>Series RSS feeds: <a href="hpr_ogg_rss.php?series=79&full=1&gomax=1">ogg</a>, <a href="hpr_spx_rss.php?series=79&full=1&gomax=1">spx</a>, <a href="hpr_mp3_rss.php?series=79&full=1&gomax=1">mp3</a></li>
 </ul>
 <div><em><!--% series.description %--></em></div>
 <!--% END %-->
-<!--% query_shows = DBI.prepare(query_shows_sql)
+<!--% query_shows = DBI.prepare('SELECT
+	id, date, title,
+	duration, summary, notes,
+	explicit, eps.license, tags,
+	hosts.host, hosts.hostid
+	FROM eps
+	INNER JOIN hosts
+	ON eps.hostid = hosts.hostid
+	WHERE series = ?
+	ORDER BY date DESC
+	')
 %-->
 <!--% show_results = query_shows.execute(id) %-->
 <!--% FOREACH show IN show_results %-->
 <!--% show_summary(show) %-->
-<p class="listen-in"><!--% display_listen_in(show.id) %--></p>
 <!--% END %-->
 </article>
--- a/templates/content-sitemap.tpl.html
+++ b/templates/content-sitemap.tpl.html
@ -1,31 +1,33 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <h1>Sitemap</h1>
  <ul>
-    <li><a href="<!--% hub_baseurl %-->calendar.php"><strong>⇧Upload⇧</strong></a> ← Upload Your Show</li>
+    <li><a href="https://www.hackerpublicradio/calendar.php"><strong>⇧Upload⇧</strong></a> ← Upload Your Show</li>
    <li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a> ← The HPR Homepage</li>
    <li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a> ← The RSS Syndication Feeds</li>
    <ul>
 		<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Full Episode Guide</a> ← Complete list of all the Shows.</li>
      <li><a href="<!--% absolute_path(baseurl) %-->series/index.html">In-Depth Series</a> ← Overview of the In-Depth Series.</li>
-      <li><a href="<!--% absolute_url(baseurl) %-->about.html#download">Download Options</a> ← How to download the entire archive.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->download.html">Download Options</a> ← How to download the entire archive.</li>
    </ul>
-    <li><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Give Shows</a> ← Upload your podcast show here.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a> ← Upload your podcast show here.</li>
    <ul>
-      <li><a href="<!--% absolute_url(baseurl) %-->about.html#requested_topics">Topics</a> ← Requested topics.</li>
-      <li><a href="<!--% absolute_url(baseurl) %-->about.html#recording_a_podcast">Recording</a> ← How to record a podcast.</li>
-      <li><a href="<!--% absolute_url(baseurl) %-->about.html#requesting_slot">Scheduling</a> ← Picking a slot for your show.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a> ← Stuff you need to know before uploading a show.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->theme.html">Theme</a> ← Information about HPR Theme Music.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a> ← Requested topics.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->recording.html">Recording</a> ← How to record a podcast.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->request_a_slot.html">Scheduling</a> ← Picking a slot for your show.</li>
    </ul>
-    <li><a href="<!--% absolute_url(baseurl) %-->about.html#how_to_help">Contribute</a> ← How you can help HPR.</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute</a> ← How you can help HPR.</li>
    <ul>
-      <li><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Submit Show</a> ← Upload your podcast show here.</li>
-      <li><a href="<!--% absolute_url(baseurl) %-->about.html#requested_topics">Topics</a> ← Requested topics.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a> ← Upload your podcast show here.</li>
+      <li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a> ← Requested topics.</li>
    </ul>
    <li><a href="<!--% absolute_path(baseurl) %-->about.html">About</a> ← Information about the History and Governance of HPR.</li>
    <ul>
      <li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Hosts</a> ← A list of all our Hosts.</li>
      <li><a href="<!--% absolute_path(baseurl) %-->contact.html">Contact</a> ← How to get in touch with us.</li>
      <li><a href="<!--% absolute_path(baseurl) %-->promote.html">Promote HPR</a> ← Ways you can spread the word.</li>
-      <li><a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">Show Comments</a> ← Read the latest comments left on shows.</li>
+	  <li><a href="https://www.hackerpublicradio.org/comments_viewer.php">Show Comments</a> ← Read the latest comments left on shows.</li>
    </ul>
    <li><a href="<!--% absolute_path(baseurl) %-->search.html">Search</a> ← Search HPR</li>
  </ul>
--- a/templates/content-stuff_you_need_to_know.tpl.html
+++ b/templates/content-stuff_you_need_to_know.tpl.html
@ -0,0 +1,162 @@
+<h1 id="agreement">Stuff you need to know<a href="#agreement">.</a></h1>
+<p>
+This is some important information that you will need to know before uploading to HPR.
+</p>
+
+<h2 id="wikipedia">You will no longer be allowed to edit HPR pages on Wikipedia<a href="#wikipedia">.</a></h2>
+<p>
+Once you upload a show, you will no longer be allowed to edit pages relating to <a href="https://en.wikipedia.org/wiki/Hacker_Public_Radio">Hacker Public Radio</a> in <a href="https://en.wikipedia.org/wiki/Wikipedia:FAQ/Organizations">Wikipedia</a>.
+</p>
+
+<h2 id="mailinglist">All policy decisions are made by the HPR Community<a href="#mailinglist">.</a></h2>
+<p>
+The community decides the HPR policies.
+Please join the <a href="https://hackerpublicradio.org/mailman/listinfo/hpr_hackerpublicradio.org">HPR Mailing List</a> to participate.
+</p>
+
+<h2 id="no_shows_no_hpr">HPR will stop as a project if there are not enough shows<a href="#no_shows_no_hpr">.</a></h2>
+<p>
+Hacker Public Radio is dedicated to sharing knowledge.
+We release about 260 shows a year, which is probably more than all of the other FOSS podcasts put together.
+If you listen to HPR, then we would love you to <a target="_blank" href="<!--% absolute_path(baseurl) %-->contribute.html">contribute</a> one show a year.
+Remember once that all the emergency shows have been used up and there are no more shows in the queue, HPR as a project will stop.
+
+</p>
+<h2 id="patrons">Support our Patrons<a href="#patrons">.</a></h2>
+<p>
+Our hosting is kindly provided to us by <a href="<!--% absolute_path(baseurl) %-->correspondents/0174.html">Josh Knapp</a> from <a href="https://anhonesthost.com/hosting/shared-hosting">AnHonestHost.com</a>, and The Internet Archive at <a href="https://archive.org/donate/">Archive.org</a>.
+We encourage you to support our Patrons.
+Over the years kind people have donated services and supported equipment for our conferences.
+
+</p>
+<h2 id="syndication">We do not syndicate non HPR Shows<a href="#syndication">.</a></h2>
+<p>
+HPR is founded on the principle of Hackers sharing knowledge.
+For this reason we are only releasing material created exclusively for HPR.
+We will continue to promote new podcasts and other creative commons material, but if you wish to have your show promoted, then please contact our sister site <a href="https://freeculturepodcasts.org/">Free Culture Podcasts</a>.
+</p>
+<p>
+That said, if there is a piece of creative commons content that you would like to promote, then feel free to record a regular show.
+There you can introduce the content and explain why it is important, providing links to where we can get more information etc.,  and then include one example episode.
+</p>
+
+<h2 id="license">You are agreeing to license your show CC-BY-SA<a href="#license">.</a></h2>
+<p>
+All our shows are now released under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license, which means that while you continue to retain the copyright to your show, you are allowing us (and everyone else) to use it provided we give you attribution and that we release it under the same license.
+Click the <a href="https://creativecommons.org/licenses/by-sa/4.0/">link</a> for more information.
+</p>
+
+<h2 id="permission">You have permission to redistribute your show in its entirety<a href="#permission">.</a></h2>
+<p>
+Never include content, for example music, in your show that you do not have permission to redistribute.
+Try to avoid using any content in your show that can not be redistributed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) </a> license.
+If you are redistributing under  another Creative Commons license, GNU Free Documentation License, public domain, or FLOSS software license, then please signal that when you upload your show. We do not post other copyrighted content, even if it is made available under fair use, or by arranged permission.
+</p>
+
+<h2 id="not_moderated">The audio of your show will not be moderated<a href="#not_moderated">.</a></h2>
+<p>
+We do not vet, edit, moderate or in any way censor any of the audio you submit, we trust you to do that.
+Aside from checking snippets for audio quality/spam checking, we have a policy that we don't listen to the shows before they are aired.
+This is a long standing tradition arising from the fact that HPR is a community of peers who believe that any host has as much right to submit shows as any other.
+<br />
+We <strong>do</strong> transcode the audio into different formats.
+</p>
+<p>
+Please note that this only relates to the audio you upload.
+The rest of the meta-data (branding/summaries/tags/show notes/etc.), are managed by the HPR Community, and <strong>may</strong> be edited.
+The show <a href="<!--% absolute_path(baseurl) %-->eps/hpr2210/index.html">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
+</p>
+
+</p>
+
+<h2 id="explicit">Your show will be signaled as containing explicit content<a href="#explicit">.</a></h2>
+<p>
+Given that we are an open forum for free speech we signal all our shows as "explicit" with the assumption that the listeners will apply the required discretion when playing the shows in public.
+That said the majority of our content is technical in nature and therefore is often considered appropriate for any audience.
+If you feel that your show will be considered <strong>inoffensive in every region of the world</strong> then you can signal that when you upload the show.
+</p>
+
+<p>
+When dealing with content that is "explicit" or contains material that would best be suited for a mature audience, it has become traditional to include a short warning at the very beginning of the show before the intro, to allow listeners time to switch off the episode should they so desire.
+</p>
+
+<p>
+<a href="<!--% absolute_path(baseurl) %-->eps/hpr2210/index.html">hpr2210 :: On Freedom of Speech and Censorship</a> describes the agreed approach to this topic.
+</p>
+
+<h2 id="schedule">You determine when your show will be released<a href="#schedule">.</a></h2>
+<p>
+The HPR Schedule is entirely community driven and we recommend that <strong>you</strong> pick the date or show number as then you know when your show will be released.
+However the slots will only be allocated once the shows have been successfully processed.
+Any missing information can result in a show missing the requested slot.
+Once the slots have been allocated it is not possible to move them.
+</p>
+
+<h2 id="reserving">All reservations need to be approved<a href="#reserving">.</a></h2>
+<p>
+Any host can select any free slot a up to year in advance, by recording their show and uploading it to the desired slot.
+In exceptional circumstances it may be necessary to reserve a slot while not having the audio available, but this must be approved by the <a href="https://hackerpublicradio.org/mailman/listinfo/hpr_hackerpublicradio.org">HPR Mailing List</a> in advance.
+Be sure to allow as much time as possible, and include a reason why you feel it is necessary to reserve the slot.
+<br />
+This is intended only for exceptional circumstances, such as a scheduled interview where we would like the audio to be released as soon after the event as possible, or to cover an important topical situation that has occurred.
+Due to the extended time now needed to post shows to external sites, the extra work this entails and the disruptive effect of reservations, we will no longer be allowing them except in very rare cases of the type mentioned above.
+</p>
+<p>
+The following are standing reservations:
+<ul>
+<li>Anniversary episodes.</li>
+<li>HPR Community News on the first Monday of the month.</li>
+<li>The first day of the fourth month.</li>
+<li>The days following new year.</li>
+</ul>
+</p>
+
+<h2 id="utf8">We use UTF-8 end to end<a href="#utf8">.</a></h2>
+<blockquote>See the video "<a href="https://www.youtube.com/watch?v=MijmeoH9LT4">Characters, Symbols and the Unicode Miracle - Computerphile</a>" for an interesting background to ASCII and <a href="https://en.wikipedia.org/wiki/UTF-8">UTF-8</a>.
+</blockquote>
+
+<h2 id="accessibility">Keep accessibility in mind<a href="#accessibility">.</a></h2>
+<p>
+When you includes output from the command line in the show notes, posting screen-shots of console or terminal output makes it impossible for screen readers to access the text.
+Always try to include the raw output ( eg: embedded in &lt;pre&gt; tags) 
+<br />
+Include descriptive language in any link texts. 
+<br />
+Avoid structures like: <em>"For accessibility information click <a href="#accessibility">here</a>"</em><br />
+Rather use: <em>"For more information click our <a href="#accessibility">accessibility page</a>"</em><br />
+</p>
+
+<h2 id="international">Your show will be heard by an International Audience<a href="#international">.</a></h2>
+<p>
+We have people listening from all over the world, who may not have the same cultural background as yourself, therefore you should be as clear as possible when giving details.
+For example always give temperatures in both Celsius and Fahrenheit, measurements in Metric and Imperial, dates in <strong>YYYY-MM-DD</strong> <a href="https://en.wikipedia.org/wiki/ISO_8601">iso8601</a> format, and abbreviations using the <a href="https://en.wikipedia.org/wiki/NATO_phonetic_alphabet">NATO phonetic alphabet</a>.
+Never assume that your audience knows what age a sixth grader is, or how big a 20 Cent Euro coin is.
+Keep in mind that keyboard layouts are also different so make sure to specify the key shape or the position inrelation to a common known standard.
+For example:
+</p>
+<blockquote>The at sign normally situated above the 2 key on a US keyboard, and has a unicode number of U+0040.
+For more information see <a href="https://en.wikipedia.org/wiki/At_sign">Wikipedia</a></blockquote>
+<p>
+<a href="https://xkcd.com/1179/"><img src="../images/iso_8601.png" title="ISO 8601 was published on 06/05/88 and most recently amended on 12/01/04." alt="An xkcd cartoon showing ISO 8601" /></a>
+</p>
+
+<h2 id="emergency_queue">Feed the emergency queue<a href="#emergency_queue">.</a></h2>
+<p>
+The emergency queue is intended only to be used in the cases where there is still a gap in the schedule 24 hours prior to release.
+The shows will by their very nature need to be "timeless".
+That means your topic should still be relevant in four years or more.
+People will be able to hear the show on the website but they will not be included in any feeds until release.
+</p>
+<p>
+Please begin all shows with text similar to:
+<br />
+<em>
+"This is an emergency show, if you are hearing this then HPR needs shows ASAP.
+Please consider contributing a show.
+Email admin at hacker public radio dot org for more information."
+</em>
+</p>
+<p>
+We expect that we need at least 10 shows in the emergency queue in order to give people enough time to record and submit shows.
+Please contact admin at hpr if you want to submit an emergency show.
+</p>
--- a/templates/content-syndication.tpl.html
+++ b/templates/content-syndication.tpl.html
@ -1,50 +1,3 @@
-<h1>RSS Syndication</h1>
-
-<article>
-  <header>
-    <h2>Subscribe to our Feeds</h2>
-  </header>
-  <p>
-  Great that you want to listen. Have a look below at the feeds that best suite your listening habits.
-  </p>
-</article>
-<article>
-  <header>
-    <h2><img src="<!--% absolute_path(baseurl) %-->images/feed.png" alt="rss logo"> The Community News Summary</h2>
-    <h3>One show a month</h3>
-  </header>
-  <p>
-  If you get overwhelmend by the amount of shows we produce, then this is a good place to start.
-  </p>
-  <p>
-  Every month, the HPR Janitors put down their mops had have a chat about all the shows, and what else has been going on in the HPR community. This is a regular show scheduled for the first Monday of the month. 
-  </p>
-  <ul>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php?series=47">ogg</a> Larger file size higher quality feed.</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php?series=47">mp3</a> Larger file size regular quality feed in a common format.</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php?series=47">spx</a> Small file size lower quality feed. <br/>Ideal for dial-up/mobile connections.</li>
-  </ul>
-  <p>
-  We also maintain an <a href="https://archive.org/details/hackerpublicradio?and[]=subject%3A%22Community+News%22">Archive.org</a> page where you can get the shows in even more formats.
-  </p>
-</article>
-<article>
-  <header>
-    <h2><img src="<!--% absolute_path(baseurl) %-->images/feed.png" alt="rss logo"> Two week Audio feed</h2>
-    <h3>5 shows a week</h3>
-  </header>
-  <p>
-  Use these feeds to keep up to date with the latest HPR Episodes.
-  </p>
-  <ul>
-    <li><a href="<!--% absolute_url(baseurl) %-->hpr_ogg_rss.php">ogg</a> Larger file size higher quality feed.</li>
-    <li><a href="<!--% absolute_url(baseurl) %-->hpr_rss.php">mp3</a> Larger file size regular quality feed in a common format.</li>
-    <li><a href="<!--% absolute_url(baseurl) %-->hpr_spx_rss.php">spx</a> Small file size lower quality feed. <br/>Ideal for dial-up/mobile connections.</li>
-  </ul>
-  <p>
-  We also maintain an <a href="https://archive.org/details/hackerpublicradio">Archive.org</a> page where you can get the shows in even more formats. For more recent shows we are now including the original upload as delivered.
-  </p>
-</article>
 <article>
  <header>
    <h2><img src="<!--% absolute_path(baseurl) %-->images/feed.png" alt="rss logo"> Entire Archive Audio feed</h2>
@ -53,9 +6,9 @@
    Use this feed to get the archived episodes. The feed themselves run over 15Mb in size and so use them to download the archived episodes and when you are up to date switch back to the Two Week Feeds listed above.
  </p>
  <ul>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_ogg_rss.php">ogg feed</a> Warning over 50G</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_spx_rss.php">spx feed</a> Warning over 22G</li>
-    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_rss.php">mp3 feed</a> Warning over 36G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_ogg.rss">ogg feed</a> Warning over 50G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_spx.rss">spx feed</a> Warning over 22G</li>
+    <li><a href="<!--% absolute_path(baseurl) %-->hpr_total_mp3.rss">mp3 feed</a> Warning over 36G</li>
  </ul>
 </article>
 <article>
@ -66,7 +19,7 @@
    Use this feed to get the shows as they are posted. The shows will be posted out of order as they come in and may be replaced/reposted if errors are found. This is intended as a means to provide find issues with metadata or the audio quality of new shows before they hit the main feed. 
  </p>
  <ul>
-    <li><a href="<!--% absolute_path(baseurl) %-->rss-future.php">Shows as they are posted.</a> OGG Only</li>
+    <li><a href="rss-future.php">Shows as they are posted.</a> OGG Only</li>
  </ul>
 </article>
 <article>
@ -74,62 +27,6 @@
    <h2><img src="<!--% absolute_path(baseurl) %-->images/feed.png" alt="rss logo"> Comment feed</h2>
  </header>
  <ul>
-    <li><a href="<!--% absolute_path(baseurl) %-->comments.rss">Listener contributed comments to the episodes</a></li>
+    <li><a href="http://www.hackerpublicradio.org/comments_rss.php">Listener contributed comments to the episodes</a></li>
  </ul>
 </article>
-<hr />
-<h1>Other Download Options</h1>
-<article>
-  <header>
-    <h2>Site Replication Sources</h2>
-  </header>
-  <ul>
-  <li><a href="<!--% absolute_path(baseurl) %-->hpr.sql">Daily Database Dump in SQL Format</a></li>
-  <li><a href="https://repo.anhonesthost.net/explore/repos">All the HPR Source Code is on GitTea</a></li>
-  <li><a href="https://hub.hackerpublicradio.org/stats.json">Current Statistics on the HPR Project (updated every 15 mins)</a></li>
-  <ul>
-</article>
-<article>
-  <header>
-    <h2>External Sources</h2>
-  </header>
-  <ul>
-    <li><a href="https://archive.org/details/hackerpublicradio">Archive.org</a></li>
-    <li><a href="https://music.amazon.fr/podcasts/9d9e6211-ff78-4501-93b6-6a9e560c4dbd/hacker-public-radio">Amazon Music</a></li>
-    <li><a href="https://nl.radio.net/podcast/hacker-public-radio">Radio.net</a></li>
-    <li><a href="https://open.spotify.com/show/7e2hYcnHj9vKgUzsIOf4r3">Spotify</a></li>
-    <li><a href="https://player.fm/series/hacker-public-radio">PlayerFM</a></li>
-    <li><a href="https://podcasts.apple.com/us/podcast/hacker-public-radio/id281699640">iTunes</a></li>
-    <li><a href="https://podcasts.google.com/feed/aHR0cDovL2hhY2tlcnB1YmxpY3JhZGlvLm9yZy9ocHJfcnNzLnBocA">Google Podcasts</a></li>
-    <li><a href="https://toppodcast.com/podcast_feeds/hacker-public-radio/">Top Podcasts</a></li>
-    <li><a href="https://www.iheart.com/podcast/256-hacker-public-radio-30994513/" target="_blank">iHeart Radio</a></li>
-    <li><a href="https://www.listennotes.com/de/podcasts/hacker-public-radio-hacker-public-radio-mNH-jsI7LcJ/">Listen Notes</a></li>
-    <li><a href="https://www.mixcloud.com/hackerpublicradio/">MixCloud</a></li>
-    <li><a href="https://www.podchaser.com/podcasts/hacker-public-radio-76781">Podchaser</a></li>
-  <ul>
-</article>
-
-<article>
-  <header>
-  <h1>Download Archive</h1>
-  <p>Please be aware that our Archive exceeds <strong>62Gb</strong> <em>(Ogg: 21Gb, Spx: 16Gb, mp3: 25Gb)</em>. We are happy for you to download them, but please make sure that you are not going to incur additional bandwidth charges on your side.</p>
-  <p>We will be happy to post you DVD's of the episodes anywhere in the world if bandwidth is an issue.</p>
-  </header>
-  <h2>Full Episode Guide</h2>
-  <p>
-  The <a href="<!--% absolute_path(baseurl) %-->eps/index.html">compete episode guide</a> is available to you, and it lists all the shows on one page going right back to the very first episode.
-  </p>
-  <h2>Command line download</h2>
-  <p>
-  You can download the audio of the episodes directly from the command line using the following commands:
-  </p>
-  <ul>
-  <li>ogg:<br />
-  <span style="font-family:monospace;">curl '<!--% absolute_path(baseurl) %-->eps/hpr[0001-<!--% episode.latest %-->].ogg' -o "hpr#1.ogg"</span></li>
-  <li>spx:<br />
-  <span style="font-family:monospace;">curl '<!--% absolute_path(baseurl) %-->eps/hpr[0001-<!--% episode.latest %-->].spx' -o "hpr#1.spx"</span></li>
-  <li>mp3:<br />
-  <span style="font-family:monospace;">curl '<!--% absolute_path(baseurl) %-->eps/hpr[0001-<!--% episode.latest %-->].mp3' -o "hpr#1.mp3"</span></li>
-  </ul>
-
-</article>
--- a/templates/content-tags.tpl.html
+++ b/templates/content-tags.tpl.html
@ -1,86 +0,0 @@
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-tags-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% PERL %-->
-$Template::Stash::PRIVATE = undef; # Allow . in tag
-<!--% END %-->
-<!--% USE String %-->
-<!--% uniq_tag_count = 0 %-->
-<!--% FOREACH episode IN DBI.query(query_tags);
-    ep_id = episode.id;
-    ep_tags = episode.tags;
-    FOREACH tag_str IN ep_tags.csv_parse;
-        NEXT UNLESS tag_str;
-        NEXT IF tag_str == '';
-        tag = tag_str.lower;
-		tag_index = String.new(tag).push('_');
-        first_char = tag.substr(0,1);
-        IF first_char == '.';
-            first_char = '&#x0002E;'; # Unicode .
-        END;
-        IF all_tags.${first_char}.exists(tag_index);
-            all_tags.${first_char}.${tag_index}.count = all_tags.${first_char}.${tag_index}.count + 1;
-            all_tags.${first_char}.${tag_index}.urls.push(ep_id);
-        ELSE;
-            all_tags.${first_char}.${tag_index}.count = 1;
-            uniq_tag_count = uniq_tag_count + 1;
-            all_tags.${first_char}.${tag_index}.urls = [ep_id];
-        END;
-    END;
-END %-->
-<!--% USE date %-->
-<!--% all_first = ['#','&#x0002E;','/','0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z'] %-->
-
-<style>
-    .columns3 { columns: 3 auto; list-style-type: none }
-    hr.thin {
-        border: 0;
-        height: 0;
-        border-top: 1px solid rgba(0, 0, 0, 0.1);
-        border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-    }
-    p.ralign { text-align: right }
-</style>
-<article>
-	<a id="TOP"><h1 class="title">Tag summary</h1></a>
-	<h4 class="date">Page generated on <!--% date.format(date.now, format => '%Y-%m-%d at %H:%M:%S UTC', gmt => 1) %--></h4>
-	<p>This section summarises all of the tags currently used throughout the
-	database. The tags are in alphabetical order and each is followed by links to
-	the show numbers where it is used so you can see the context the author used
-	it in. There are currently <!--% uniq_tag_count %--> unique tags in the system.</p>
-	<h4>Alphabetical index</h4>
-	<p>This is an index to the initial letters of the tags below.</p>
-	<ul class="columns3">
-    <!--% FOREACH first_char IN all_first %-->
-        <!--% IF all_tags.${first_char} %-->
-            <li><a href="<!--% absolute_path(baseurl) %-->tags.html#<!--% tag_to_id(String.new(all_tags.${first_char}.keys.sort.first).chop) %-->"><strong><!--% first_char %--></strong></a></li>
-        <!--% END %-->
-    <!--% END %-->
-	</ul>
-	<hr>
-    <!--% FOREACH first_char IN all_first %-->
-        <!--% IF all_tags.${first_char} %-->
-		<p class="ralign"><a href="<!--% absolute_path(baseurl) %-->tags.html#TOP">&UpArrow; Go to index</a></p>
-	        <h3>Tags beginning with '<!--% first_char %-->'</h3>
-	        <ul>
-                <!--% FOREACH tag_index IN all_tags.${first_char}.keys.sort %-->
-				<!--% tag = String.new(tag_index).chop; tag_id = String.new(tag_index).chop; %-->
-    	        	<li>
-    	        		<a id="<!--% tag_to_id(tag_id) %-->"><strong><!--% tag %--></strong></a>: 
-                        <!--% ep_links = [] %-->
-                        <!--% FOREACH ep_id IN all_tags.${first_char}.${tag_index}.urls.nsort;
-							ep_links.push("<a href=\"${absolute_path(baseurl)}eps/hpr" _ zero_pad_left(ep_id) _ '/index.html"'
-                                ' target="_blank" aria-label="' _ tag _
-                                ' - show ' _ ep_id _ '">' _ ep_id _ '</a>');
-                        END %-->
-                        <!--% ep_links.join(', ') %-->
-    	        	</li>
-                <!--% END %-->
-	        </ul>
-        <!--% END %-->
-    <!--% END %-->
-	<p><a href="#TOP">Go to TOP of page</a></p>
-</article>
-<!--% PERL %-->
-$Template::Stash::PRIVATE = 1;
-<!--% END %-->
--- a/templates/content-theme.tpl.html
+++ b/templates/content-theme.tpl.html
@ -0,0 +1,42 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<h1>HPR Theme Music</h1>
+  <p>
+  An HPR episode is composed of a few parts which are all now added automatically.
+  </p>
+  <ol>
+    <li>
+      <h3 id="Synopsis">Show Synopsis</h3>
+      <p>
+      We will take the <a href="<!--% absolute_path(baseurl) %-->contribute.html#show_notes_file_format">fields</a> from the Show Notes and use those to create a short summary of what the show is about.<br />
+      The format is:
+      </p>
+      <blockquote>
+      This is HPR episode ${show_number) entitled "${title}". It is hosted by ${hostname} and is ${duration} minutes long. The Summary: "${summary}"
+      </blockquote>
+      <p>Most of the information is taken from the <a href="<!--% absolute_path(baseurl) %-->request_a_slot.html">Show Notes</a><br />
+          <strong>Note:</strong> <em>This is automatically added after you upload your show.</em>
+      </p>
+    </li>
+    <li>
+      <h3 id="show">The Show</h3>
+      <p>
+        The most important bit. As long as you like, on any topic you like as long as it is <em>"of interest to Hackers"</em>.
+      </p>
+    </li>
+    <li>
+      <h3 id="outro">HPR Outro Music </h3>
+      <p>
+        This can be added is automatically added after you upload your show.
+      </p>
+    </li>
+  </ol>
+
+  <h2>Media Files</h2>
+  <ol>
+    <li><a href="http://www.hackerpublicradio.org/media/theme-music/">outro-music-MrX-ccbysa-accordion.wav</a> (2.8M)</li>
+    <li><a href="http://www.hackerpublicradio.org/media/theme-music/">outro-music-rollercostermusic.com-ccbysa-v1-ccbysa.wav</a> (31M)</li>
+    <li><a href="http://www.hackerpublicradio.org/media/theme-music/">outro-music-rollercostermusic.com-ccbysa-v2-ccbysa.wav</a> (26M)</li>
+    <li><a href="http://www.hackerpublicradio.org/media/theme-music/">outro-music-rollercostermusic.com-ccbysa-v3-ccbysa.wav</a> (31M)</li>
+    <li><a href="http://www.hackerpublicradio.org/media/theme-music/">outro-music-slick0-cc0.flac</a> (12M)</li>
+    <li><a href="http://www.hackerpublicradio.org/media/theme-music/">outro-speech-manon_fallon-cc0.flac</a> (4.6M)</li>
+  </ol>
--- a/templates/content-twat_episode.tpl.html
+++ b/templates/content-twat_episode.tpl.html
@ -1,71 +0,0 @@
-<!--% PROCESS 'shared-episode-summary.tpl.html' %-->
-<!--% PROCESS 'shared-avatar.tpl.html' %-->
-<!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS 'shared-listen-now.tpl.html' %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% query_episodes = DBI.prepare('
-		WITH episode_maxmin AS (
-					SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
-					FROM twat_eps AS eps
-		),
-		episode_date AS (
-			SELECT eps.date 
-			FROM twat_eps AS eps
-			WHERE eps.id = ?
-		),
-		episode_previous AS (
-			SELECT MAX(id) AS \'previous\', ? AS \'id\'
-			FROM twat_eps AS eps
-			INNER JOIN episode_date
-			ON eps.date < episode_date.date
-			WHERE eps.id > 1
-		),
-		episode_next AS (
-			SELECT MIN(id) AS \'next\', ? AS \'id\'
-			FROM twat_eps AS eps
-			INNER JOIN episode_date
-				ON eps.date > episode_date.date
-		)
-		SELECT eps.id, eps.date, eps.title, eps.duration, 
-			   eps.summary, eps.notes, eps.explicit, eps.license, 
-			   eps.tags, eps.version, eps.downloads, eps.valid,
-			   episode_maxmin.latest, episode_maxmin.earliest,
-			   episode_previous.previous, episode_next.next,
-			   hosts.hostid, hosts.host,
-			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
-			   miniseries.description AS \'series_description\'
-		FROM twat_eps AS eps
-		INNER JOIN hosts ON eps.hostid = hosts.hostid
-		INNER JOIN miniseries ON eps.series = miniseries.id
-		INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
-		INNER JOIN episode_previous ON eps.id = episode_previous.id
-		INNER JOIN episode_next ON eps.id = episode_next.id
-		WHERE eps.id = ?
-	')
-%-->
-<!--% episode_result = query_episodes.execute(id, id, id, id, id) %-->
-<!--% FOREACH episode IN episode_result %-->
-<!--% episode_navigation = step_navigation(baseurl,episode,"twat") %-->
-<article>
-	<header>
-		<h1><!--% episode.id %--> :: <!--% episode.title %--></h1>
-		<h3><!--% episode.summary %--></h3>
-		<p class="meta"><!--% episode_navigation %-->
-		</p>
-<p><!--% show_avatar(episode.hostid, episode.host) %-->
-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>
-<!--% listen_now(episode, "twat", baseurl, media_baseurl) %-->
-<!--% 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>
-<p>
-<!--% episode_navigation %-->
-</p>
-    </footer></article>
-<!--% END %-->
-
--- a/templates/ids-episode.tpl.html
+++ b/templates/ids-episode.tpl.html
@ -1,6 +1,8 @@
-<!--% PROCESS "queries-ids-episode-${constants.database}.tpl.html" %-->
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% FOREACH episode IN DBI.query(query_ids_episode) %-->
+<!--% FOREACH episode IN DBI.query(
+	'select eps.id from eps
+	 where eps.date < date (\'now\', \'+1 days\') '
+) %-->
 ,<!--% episode.id %-->
 <!--% END %-->

--- a/templates/ids-twat_episode.tpl.html
+++ b/templates/ids-twat_episode.tpl.html
@ -1,7 +0,0 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% FOREACH episode IN DBI.query(
-	'select eps.id from twat_eps AS eps'
-) %-->
-,<!--% episode.id %-->
-<!--% END %-->
-
--- a/templates/navigation-about.tpl.html
+++ b/templates/navigation-about.tpl.html
@ -1,10 +1,10 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% hub_baseurl %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">Hosts</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contact.html">Contact</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->promote.html">Promote HPR</a></li>
-			<li><a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">Show Comments</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->comments_viewer.php">Show Comments</a></li>
 		</ul>
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@ -1,8 +1,8 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% hub_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute »</strong></a></li>
-			<li><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Submit Show</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a></li>
 		</ul>
--- a/templates/navigation-get-shows.tpl.html
+++ b/templates/navigation-get-shows.tpl.html
@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% hub_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html"><strong>Get Shows »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->eps/index.html">Full Episode Guide</a></li>
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@ -1,11 +1,11 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% hub_baseurl %-->"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home</a></li>
-			<li><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Give Shows »</strong></a>
+			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows »</strong></a>
 			<li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->theme.html">Theme</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->requested_topics.html">Topics</a></li>
-			<li><a href="<!--% absolute_url(baseurl) %-->about.html#recording_a_podcast">Recording</a></li>
-			<li><!--% absolute_url(baseurl) %-->about.html#requesting_slot">Scheduling</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->recording.html">Recording</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->request_a_slot.html">Scheduling</a></li>
 		</ul>
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@ -1,10 +1,10 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>	
-			<li><a href="<!--% hub_baseurl %-->calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="https://www.hackerpublicradio.org/calendar.php"><strong>⇧Upload⇧</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->index.html"><strong>Home »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->syndication.html">Get Shows</a></li>
-			<li><a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">Give Shows</a></li>
-			<li><a href="<!--% absolute_path(baseurl) %-->about.html#how_to_help">Contribute</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Give Shows</a></li>
+			<li><a href="<!--% absolute_path(baseurl) %-->help_out.html">Contribute</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->tags.html">Tags</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->about.html">About</a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->search.html">Search</a></li>
--- a/templates/page.tpl.html
+++ b/templates/page.tpl.html
@ -1,5 +1,4 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% USE date %-->
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
@ -9,10 +8,8 @@
  <!--% END %-->
  <meta charset="utf-8" />
  <meta http-equiv="X-Clacks-Overhead" content="GNU Terry Pratchett" />
-  <meta http-equiv="last-modified" content="<!--% format_feed_date(date.now) %-->">
  <meta name="keywords" content="Technology, Tech News, Education, Training" />
-  <meta name="description" content="Hacker Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to hackers and hobbyists." />
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="Hacker Public Radio is an podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that are of interest to hackers and hobbyists." />
  <!-- Internal CSS -->
  <style type="text/css">
  article, aside, dialog, figure, footer, header, hgroup, menu, nav, section {
@ -22,12 +19,12 @@
          display:none;
  }
  </style>
-  <link rel="shortcut icon" href="<!--% absolute_url(baseurl) %-->hpr.ico" >
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Speex RSS" href="<!--% absolute_path(baseurl) %-->hpr_spx_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3_rss.php" />
-  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="<!--% absolute_path(baseurl) %-->comments.rss" />
-  <link rel="license" title="CC BY-SA 4.0"  href="https://creativecommons.org/licenses/by-sa/4.0/" />
+  <link rel="shortcut icon" href="hpr.ico" >
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Ogg Vorbis RSS" href="<!--% absolute_path(baseurl) %-->hpr_ogg.rss" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Speex RSS" href="<!--% absolute_path(baseurl) %-->hpr_spx.rss" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio MP3 RSS" href="<!--% absolute_path(baseurl) %-->hpr_mp3.rss" />
+  <link rel="alternate" type="application/rss+xml" title="Hacker Public Radio Comments RSS" href="/comments_rss.php" />
+  <link rel="license" title="cc by 3.0"  href="https://creativecommons.org/licenses/by-sa/3.0/" />
  <link href="<!--% absolute_path(baseurl) %-->css/hpr.css" rel="stylesheet" />
  <!--[if IE]>
  <link rel="stylesheet" href="<!--% absolute_path(baseurl) %-->css/hpr.css" media="screen" type="text/css" />
@ -39,27 +36,21 @@
 <body id="give">
 <div id="container" class="shadow">
 <header>
-  <a href="<!--% absolute_path(baseurl) %-->"><img id="hprlogo" src="<!--% absolute_path(baseurl) %-->images/hpr_logo.png" alt="hprlogo"></a>
-  <div id="hpr_banner">
-    <p id="accessible_menu">
-      <a href="<!--% absolute_path(baseurl) %-->sitemap.html">Site Map</a>
-      - <a href="#maincontent">skip to main content</a>
-      </p>
-      <h1 id="sitename">
-        <a href="<!--% absolute_path(baseurl) %-->correspondents/index.html">H</a>acker
-        <a href="<!--% absolute_path(baseurl) %-->comments_viewer.html">P</a>ublic
-        <a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio
-      </h1>
-    <h2>Your ideas, projects, opinions - podcasted.</h2>
-    <h3>New episodes every weekday Monday through Friday.<br />
-    <em><small>This page was <a href="https://repo.anhonesthost.net/HPR/hpr_generator">generated</a> by <a href="mailto:<!--% generator_email %-->"><!--% generator_name %--></a> at <time dateTime="<!--% format_iso8601_date(date.now) %-->"><!--% format_feed_date(date.now) %--></time></small></em></h3>
-
-  </div>
-  <hr />
-  
-  <nav class="menu" role="navigation">
+	<a href=""><img id="hprlogo" src="<!--% absolute_path(baseurl) %-->images/hpr_logo.png" alt=""></a>
+	<div id="hpr_banner">
+		<p id="accessible_menu">
+			<a href="<!--% absolute_path(baseurl) %-->sitemap.html">Site Map</a>
+			- <a href="#maincontent">skip to main content</a>
+			</p>
+		<h1 id="sitename">Hacker <a href="https://www.hackerpublicradio.org/comments_viewer.php">P</a>ublic <a href="<!--% absolute_path(baseurl) %-->syndication.html">R</a>adio</h1>
+		<h2>Your ideas, projects, opinions - podcasted.</h2>
+		<h3>New episodes Monday through Friday.</h3>
+	</div>
+	<hr />
+	
+	<nav class="menu" role="navigation">
 <!--% INCLUDE $navigation %-->
-  </nav>
+	</nav>
 </header>

 <main id="maincontent">
@ -67,7 +58,7 @@
 </main>

 <footer id="footer_page">
-  <h1 class="thick_bar">More Information...</h1>
+  <h1 class="thick_bar"><span style="padding-left: 1em;">More Information...</span></h1>
  <div id="more_info">
    <nav class="column">
      <h2>Ancestry</h2>
@ -75,52 +66,43 @@
        <li><a href="http://audio.textfiles.com/shows/radiofreekamerica/">Radio Freek America</a></li>
        <li><a href="http://audio.textfiles.com/shows/binrev/">BinRev Radio</a></li>
        <li><a href="http://audio.textfiles.com/shows/infonomicon/">Infonomicon</a></li>
-        <li><a href="http://audio.textfiles.com/shows/twat/">Today With a Techie</a></li>
+        <li><a href="http://audio.textfiles.com/shows/twat/">Talk With a Techie</a></li>
      </ul>
    </nav>
    <nav class="column">
      <h2>Social</h2>
      <ul>
-        <li><a href="<!--% absolute_url(baseurl,'/maillist') %-->" >Mailing list</a></li>
-        <li><a href="https://botsin.space/@hpr" >Mastodon</a></li>
-        <li><a href="https://matrix.to/#/#hpr:matrix.org" >Matrix</a></li>
-        <li><a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0" >Mumble</a></li>
+        <li><a href="http://hackerpublicradio.org/mailman/listinfo/hpr_hackerpublicradio.org" target="_blank">Maillist</a></li>
        <li><a href="https://web.libera.chat/gamja/?channels=oggcastplanet" target="_blank">#oggcastplanet</a></li>
-        <li><a href="https://t.me/+6fEhQrf5IEc4ZGU8">Telegram</a></li>
        <li><a href="https://twitter.com/HPR">Twitter.com</a></li>
-        <li><a href="https://www.facebook.com/HenryPartickReilly" target="_blank">Facebook</a></li>
+        <li><a href="https://plus.google.com/u/0/s/hacker%20public%20radio" target="_blank">Google+</a></li>
+        <li><a href="https://www.facebook.com/home.php?sk=group_130169220378872¬if_t=group_r2j" target="_blank">Facebook</a></li>
        <li><a href="https://www.linkedin.com/company/hackerpublicradio/" target="_blank">Linked-In</a></li>
+        <li><a href="http://itunes.apple.com/us/podcast/hacker-public-radio/id281699640" target="_blank">iTunes</a></li>
+        <li><a href="https://play.google.com/music/m/Igrhzh3izdb5qxv536ii6qpbgv4?t=Hacker_Public_Radio" target="_blank">Google Play</a></li>
      </ul>
-    </nav>    
+    </nav>
    <nav class="column">
-      <h2>Unaffiliates</h2>
+      <h2>Affiliates</h2>
      <ul>
-        <li><a href="https://archive.org/details/hackerpublicradio">Archive.org</a></li>
-        <li><a href="https://music.amazon.fr/podcasts/9d9e6211-ff78-4501-93b6-6a9e560c4dbd/hacker-public-radio">Amazon Music</a></li>
-        <li><a href="https://podcasts.google.com/feed/aHR0cDovL2hhY2tlcnB1YmxpY3JhZGlvLm9yZy9ocHJfcnNzLnBocA">Google Podcasts</a></li>
-        <li><a href="https://www.iheart.com/podcast/256-hacker-public-radio-30994513/" target="_blank">iHeart Radio</a></li>
-        <li><a href="https://podcasts.apple.com/us/podcast/hacker-public-radio/id281699640">iTunes</a></li>
-        <li><a href="https://www.listennotes.com/de/podcasts/hacker-public-radio-hacker-public-radio-mNH-jsI7LcJ/">Listen Notes</a></li>
-        <li><a href="https://www.mixcloud.com/hackerpublicradio/">MixCloud</a></li>
-        <li><a href="https://player.fm/series/hacker-public-radio">PlayerFM</a></li>
-        <li><a href="https://www.podchaser.com/podcasts/hacker-public-radio-76781">Podchaser</a></li>
-        <li><a href="https://nl.radio.net/podcast/hacker-public-radio">Radio.net</a></li>
-        <li><a href="https://open.spotify.com/show/7e2hYcnHj9vKgUzsIOf4r3">Spotify</a></li>
-        <li><a href="https://toppodcast.com/podcast_feeds/hacker-public-radio/">Top Podcasts</a></li>
+        <li><a href="http://www.hackradiolive.org/">Hack Radio Live</a></li>
+        <li><a href="http://www.binrev.com/">Binary Revolution</a></li>
+        <li><a href="http://hackermedia.org">Hackermedia</a></li>
+        <li><a href="http://www.nomicon.info/">Infonomicon</a></li>
+        <li><a href="http://www.packetsniffers.org/">Packetsniffers</a></li>
      </ul>
    </nav>
    <nav class="column">
      <h2>Commons</h2>
      <ul>
-        <li><a href="https://freeculturepodcasts.org/">Free Culture Podcasts</a></li>
        <li><a href="https://archive.org/details/hackerpublicradio">archive.org</a></li>
-        <li><a href="https://repo.anhonesthost.net/explore/repos" >HPR Source Code</a></li>
-        <li><a href="https://cchits.net/">cchits.net</a></li>
-        <li><a href="https://freesound.org/">freesound.org</a></li>
+        <li><a href="http://cchits.net/">cchits.net</a></li>
+        <li><a href="http://freemusi.cc/">FreeMusi.cc</a></li>
+        <li><a href="http://freesound.org/">freesound.org</a></li>
        <li><a href="https://librivox.org/">librivox.org</a></li>
-        <li><a href="https://openclipart.org/">openclipart.org</a></li>
-        <li><a href="https://openfontlibrary.org/">openfontlibrary.org</a></li>
-        <li><a href="https://www.openrouteservice.org/">openrouteservice.org/</a></li>
+        <li><a href="http://openclipart.org/">openclipart.org</a></li>
+        <li><a href="http://openfontlibrary.org/">openfontlibrary.org</a></li>
+        <li><a href="http://www.openrouteservice.org/">openrouteservice.org/</a></li>
        <li><a href="https://pixabay.com/">pixabay.com/</a></li>
      </ul>
    </nav>
@ -129,18 +111,18 @@
      <ul>
        <li><a href="https://anhonesthost.com/hosting/shared-hosting">AnHonestHost.com</a></li>
        <li><a href="https://archive.org/donate/">Archive.org</a></li>
-        <li><a href="https://rsync.net/">rsync.net</a></li>
      </ul>
    </nav>
  </div><!-- more_info -->
-  <h1 class="thick_bar">Copyright Information</h1>  
+  <h1 class="thick_bar"><span style="padding-left: 1em;">Copyright Information</span></h1>  
  <div id="copyright">
    <p>
-    Unless otherwise stated, our shows are released under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
-    Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license.</p>
+    Unless otherwise stated, our shows are released under a Creative Commons <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
+  Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)</a> license.</p>
    <p>
-    The <span property="dct:title">HPR Website Design</span> is released to the <a rel="license" href="https://creativecommons.org/publicdomain/mark/1.0/">Public Domain</a>.
+    The <span property="dct:title">HPR Website Design</span> is released to the <a rel="license" href="http://creativecommons.org/publicdomain/mark/1.0/">Public Domain</a>.
    </p>
+    <hr />
  </div><!-- copyright -->
  <hr />
 </footer>
--- a/templates/queries-call_for_shows-mysql.tpl.html
+++ b/templates/queries-call_for_shows-mysql.tpl.html
@ -1,6 +0,0 @@
-<!--% query_call_for_shows = '
-	SELECT CASE WHEN COUNT(id) < 6 THEN True ELSE False END AS `request_for_shows`
-	FROM eps
-	WHERE eps.date > NOW() AND eps.date <= DATE_ADD(NOW(), INTERVAL 10 DAY)
-	'
-%-->
--- a/templates/queries-call_for_shows-sqlite.tpl.html
+++ b/templates/queries-call_for_shows-sqlite.tpl.html
@ -1,6 +0,0 @@
-<!--% query_call_for_shows = '
-	SELECT CASE WHEN COUNT(id) < 6 THEN True ELSE False END AS `request_for_shows`
-	FROM eps
-	WHERE eps.date > date(\'now\') AND eps.date <= date(\'now\', \'+10 days\')
-	'
-%-->
--- a/templates/queries-correspondent-mysql.tpl.html
+++ b/templates/queries-correspondent-mysql.tpl.html
@ -1,24 +0,0 @@
-<!--% query_hpr_shows = '
-	SELECT
-		eps.id,
-		eps.explicit,
-		eps.date, eps.license, eps.duration,
-		eps.title, eps.summary, eps.tags,
-		eps.notes,
-		hosts.local_image,
-		hosts.hostid,
-		hosts.host, hosts.email, hosts.profile,
-		miniseries.name AS series, miniseries.id AS seriesid
-	FROM eps
-	INNER JOIN hosts ON eps.hostid = hosts.hostid
-	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE hosts.hostid = ? AND eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-	ORDER BY eps.id DESC
-	'
-%-->
-<!--% query_hpr_show_count = '
-	SELECT id
-	FROM eps
-	WHERE eps.hostid = ? AND eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-	'
-%-->
--- a/templates/queries-correspondent-sqlite.tpl.html
+++ b/templates/queries-correspondent-sqlite.tpl.html
@ -1,24 +0,0 @@
-<!--% query_hpr_shows = '
-		SELECT
-		eps.id,
-		eps.explicit,
-		eps.date, eps.license, eps.duration,
-		eps.title, eps.summary, eps.tags,
-		eps.notes,
-		hosts.local_image,
-		hosts.hostid,
-		hosts.host, hosts.email, hosts.profile,
-		miniseries.name AS series, miniseries.id AS seriesid
-	FROM eps
-	INNER JOIN hosts ON eps.hostid = hosts.hostid
-	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE hosts.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
-	ORDER BY eps.id + 0 DESC
-	'
-%-->
-<!--% query_hpr_show_count = '
-	SELECT id
-	FROM eps
-	WHERE eps.hostid = ? AND eps.date < date(\'now\', \'+1 days\')
-	'
-%-->
--- a/templates/queries-episode-mysql.tpl.html
+++ b/templates/queries-episode-mysql.tpl.html
@ -1,51 +0,0 @@
-<!--% query_episode_maxmin = '
-		WITH episode_maxmin AS (
-			SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
-			FROM eps
-			WHERE eps.date <= UTC_DATE()
-		),
-		episode_date AS (
-			SELECT eps.date 
-			FROM eps
-			WHERE eps.id = ?
-		),
-		episode_previous AS (
-			SELECT MAX(id) AS \'previous\', ? AS \'id\'
-			FROM eps
-			INNER JOIN episode_date
-			ON eps.date < episode_date.date
-			WHERE eps.id > 1
-		),
-		episode_next AS (
-			SELECT MIN(id) AS \'next\', ? AS \'id\'
-			FROM eps
-			INNER JOIN episode_date
-				ON eps.date > episode_date.date
-			WHERE eps.date <= NOW()
-		),
-		comment_tallies AS (	
-			SELECT 
-				eps_id,
-				COUNT(eps_id) AS eps_tally
-			FROM comments
-			GROUP BY eps_id 
-		)
-		SELECT eps.id, eps.date, eps.title, eps.duration, 
-			   eps.summary, eps.notes, eps.explicit, eps.license, 
-			   eps.tags, eps.version, eps.downloads, eps.valid,
-			   episode_maxmin.latest, episode_maxmin.earliest,
-			   episode_previous.previous, episode_next.next,
-			   hosts.hostid, hosts.host,
-			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
-			   miniseries.description AS \'series_description\',
-			   COALESCE (comment_tallies.eps_tally, 0) AS eps_tally 
-		FROM eps
-		INNER JOIN hosts ON eps.hostid = hosts.hostid
-		INNER JOIN miniseries ON eps.series = miniseries.id
-		INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
-		INNER JOIN episode_previous ON eps.id = episode_previous.id
-		INNER JOIN episode_next ON eps.id = episode_next.id
-		LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
-		WHERE eps.id = ?
-	'
-%-->
--- a/templates/queries-episode-sqlite.tpl.html
+++ b/templates/queries-episode-sqlite.tpl.html
@ -1,51 +0,0 @@
-<!--% query_episode_maxmin = '
-		WITH episode_maxmin AS (
-			SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
-			FROM eps
-			WHERE eps.date <= date(\'now\')
-		),
-		episode_date AS (
-			SELECT eps.date 
-			FROM eps
-			WHERE eps.id = ?
-		),
-		episode_previous AS (
-			SELECT MAX(id) AS \'previous\', ? AS \'id\'
-			FROM eps
-			INNER JOIN episode_date
-			ON eps.date < episode_date.date
-			WHERE eps.id > 1
-		),
-		episode_next AS (
-			SELECT MIN(id) AS \'next\', ? AS \'id\'
-			FROM eps
-			INNER JOIN episode_date
-				ON eps.date > episode_date.date
-			WHERE eps.date <= date(\'now\')
-		),
-		comment_tallies AS (	
-			SELECT 
-				eps_id,
-				COUNT(eps_id) AS eps_tally
-			FROM comments
-			GROUP BY eps_id 
-		)
-		SELECT eps.id, eps.date, eps.title, eps.duration, 
-			   eps.summary, eps.notes, eps.explicit, eps.license, 
-			   eps.tags, eps.version, eps.downloads, eps.valid,
-			   episode_maxmin.latest, episode_maxmin.earliest,
-			   episode_previous.previous, episode_next.next,
-			   hosts.hostid, hosts.host,
-			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
-			   miniseries.description AS \'series_description\',
-			   COALESCE (comment_tallies.eps_tally, 0) AS eps_tally 
-		FROM eps
-		INNER JOIN hosts ON eps.hostid = hosts.hostid
-		INNER JOIN miniseries ON eps.series = miniseries.id
-		INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
-		INNER JOIN episode_previous ON eps.id = episode_previous.id
-		INNER JOIN episode_next ON eps.id = episode_next.id
-		LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
-		WHERE eps.id = ?
-	'
-%-->
--- a/templates/queries-episodes-mysql.tpl.html
+++ b/templates/queries-episodes-mysql.tpl.html
@ -1,15 +0,0 @@
-<!--% query_episodes = 'SELECT 
-        eps.id, 
-        eps.explicit, 
-        eps.date, eps.license, eps.title, eps.summary, 
-		eps.duration, eps.notes, eps.tags,
-        hosts.hostid, 
-        hosts.host, hosts.email, hosts.local_image, 
-		miniseries.name AS series, miniseries.id AS seriesid
-    FROM eps 
-	INNER JOIN hosts ON eps.hostid = hosts.hostid 
-	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE eps.date <= UTC_DATE()
-	ORDER BY eps.id DESC'
-%-->
-
--- a/templates/queries-episodes-sqlite.tpl.html
+++ b/templates/queries-episodes-sqlite.tpl.html
@ -1,15 +0,0 @@
-<!--% query_episodes = 'SELECT
-        eps.id,
-        eps.explicit,
-        eps.date, eps.license, eps.title, eps.summary,
-        eps.duration, eps.notes, eps.tags,
-        hosts.hostid,
-        hosts.host, hosts.email, hosts.local_image,
-        miniseries.name AS series, miniseries.id AS seriesid
-    FROM eps
-        INNER JOIN hosts ON eps.hostid = hosts.hostid
-        INNER JOIN miniseries ON eps.series = miniseries.id
-        WHERE eps.date <= date(\'now\')
-        ORDER BY eps.id + 0 DESC'
-%-->
-
--- a/templates/queries-ids-episode-mysql.tpl.html
+++ b/templates/queries-ids-episode-mysql.tpl.html
@ -1,2 +0,0 @@
-<!--% query_ids_episode = 'select eps.id from eps order by eps.id' %-->
-
--- a/templates/queries-ids-episode-sqlite.tpl.html
+++ b/templates/queries-ids-episode-sqlite.tpl.html
@ -1,2 +0,0 @@
-<!--% query_ids_episode = 'select eps.id from eps order by eps.id' %-->
-
--- a/Show More
+++ b/Show More
				`@ -1,2 +0,0 @@`
				`<!--% query_ids_episode = 'select eps.id from eps order by eps.id' %-->`