diff --git a/templates/navigation-about.tpl.html b/templates/navigation-about.tpl.html
index f93c4c4..f1edb08 100644
--- a/templates/navigation-about.tpl.html
+++ b/templates/navigation-about.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(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>
diff --git a/templates/navigation-contribute.tpl.html b/templates/navigation-contribute.tpl.html
index 63c6edf..3ff2284 100644
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(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) %-->help_out.html">Contribute »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->contribute.html">Submit Show</a></li>
diff --git a/templates/navigation-get-shows.tpl.html b/templates/navigation-get-shows.tpl.html
index 5f34cbe..0adbc8b 100644
--- 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="<!--% absolute_path(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"><strong>Get Shows »</strong></a></li>
 			<li><a href="<!--% absolute_path(baseurl) %-->eps/index.html">Full Episode Guide</a></li>
diff --git a/templates/navigation-give-shows.tpl.html b/templates/navigation-give-shows.tpl.html
index 30816c0..8d72b6b 100644
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>
-			<li><a href="<!--% absolute_path(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) %-->contribute.html">Give Shows »</strong></a>
 			<li><a href="<!--% absolute_path(baseurl) %-->stuff_you_need_to_know.html">Info</a></li>
diff --git a/templates/navigation-main.tpl.html b/templates/navigation-main.tpl.html
index 34d8193..e773eec 100644
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 		<ul>	
-			<li><a href="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_path(baseurl) %-->contribute.html">Give Shows</a></li>
diff --git a/templates/page.tpl.html b/templates/page.tpl.html
index f91029c..31c9240 100644
--- a/templates/page.tpl.html
+++ b/templates/page.tpl.html
@@ -42,7 +42,7 @@
 			<a href="sitemap.php">Site Map</a>
 			- <a href="#maincontent">skip to main content</a>
 			</p>
-		<h1 id="sitename">Hacker <a href="comments_viewer.php">P</a>ublic <a href="/syndication.php">R</a>adio</h1>
+		<h1 id="sitename">Hacker <a href="https://www.hackerpublicradio.org/comments_viewer.php">P</a>ublic <a href="/syndication.php">R</a>adio</h1>
 		<h2>Your ideas, projects, opinions - podcasted.</h2>
 		<h3>New episodes Monday through Friday.</h3>
 	</div>