diff --git a/templates/navigation-about.tpl.html b/templates/navigation-about.tpl.html
index 3156664..50478fc 100644
--- a/templates/navigation-about.tpl.html
+++ b/templates/navigation-about.tpl.html
@@ -1,9 +1,9 @@
 		<ul>
 			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.php"><strong>Home</a></li>
-			<li><a href="/about.php">About »</strong></a></li>
-			<li><a href="/correspondents.php">Hosts</a></li>
-			<li><a href="/contact.php">Contact</a></li>
-			<li><a href="/promote.php">Promote HPR</a></li>
+			<li><a href="index.html"><strong>Home</a></li>
+			<li><a href="about.html">About »</strong></a></li>
+			<li><a href="correspondents/index.html">Hosts</a></li>
+			<li><a href="contact.html">Contact</a></li>
+			<li><a href="promote.html">Promote HPR</a></li>
 			<li><a href="/comments_viewer.php">Show Comments</a></li>
 		</ul>
diff --git a/templates/navigation-contribute.tpl.html b/templates/navigation-contribute.tpl.html
index 33640e1..dbb75d7 100644
--- a/templates/navigation-contribute.tpl.html
+++ b/templates/navigation-contribute.tpl.html
@@ -1,8 +1,8 @@
 		<ul>
 			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.php"><strong>Home</a></li>
-			<li><a href="/help_out.php">Contribute »</strong></a></li>
-			<li><a href="/contribute.php">Submit Show</a></li>
-			<li><a href="/report_missing_tags.php">Fix Tags</a></li>
-			<li><a href="/requested_topics.php">Topics</a></li>
+			<li><a href="/index.html"><strong>Home</a></li>
+			<li><a href="/help_out.html">Contribute »</strong></a></li>
+			<li><a href="/contribute.html">Submit Show</a></li>
+			<li><a href="/report_missing_tags.html">Fix Tags</a></li>
+			<li><a href="/requested_topics.html">Topics</a></li>
 		</ul>
diff --git a/templates/navigation-get-shows.tpl.html b/templates/navigation-get-shows.tpl.html
index b65d8dc..b99283a 100644
--- a/templates/navigation-get-shows.tpl.html
+++ b/templates/navigation-get-shows.tpl.html
@@ -1,8 +1,8 @@
 		<ul>
 			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.php"><strong>Home</strong></a></li>
-			<li><a href="/syndication.php"><strong>Get Shows »</strong></a></li>
-			<li><a href="/index_full.php">Full Episode Guide</a></li>
-			<li><a href="/series.php">In-Depth Series</a></li>
+			<li><a href="/index.html"><strong>Home</strong></a></li>
+			<li><a href="/syndication.html"><strong>Get Shows »</strong></a></li>
+			<li><a href="/index_full.html">Full Episode Guide</a></li>
+			<li><a href="/series/index.html">In-Depth Series</a></li>
 			<li><a href="/download.php">Download Options</a></li>
 		</ul>
diff --git a/templates/navigation-give-shows.tpl.html b/templates/navigation-give-shows.tpl.html
index 13966b8..71cc8ca 100644
--- a/templates/navigation-give-shows.tpl.html
+++ b/templates/navigation-give-shows.tpl.html
@@ -1,10 +1,10 @@
 		<ul>
 			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.php"><strong>Home</a></li>
-			<li><a href="/contribute.php">Give Shows »</strong></a>
-			<li><a href="/stuff_you_need_to_know.php">Info</a></li>
-			<li><a href="/theme.php">Theme</a></li>
-			<li><a href="/requested_topics.php">Topics</a></li>
-			<li><a href="/recording.php">Recording</a></li>
+			<li><a href="/index.html"><strong>Home</a></li>
+			<li><a href="/contribute.html">Give Shows »</strong></a>
+			<li><a href="/stuff_you_need_to_know.html">Info</a></li>
+			<li><a href="/theme.html">Theme</a></li>
+			<li><a href="/requested_topics.html">Topics</a></li>
+			<li><a href="/recording.html">Recording</a></li>
 			<li><a href="/request_a_slot.php">Scheduling</a></li>
 		</ul>
diff --git a/templates/navigation-main.tpl.html b/templates/navigation-main.tpl.html
index 13966b8..4a307fe 100644
--- a/templates/navigation-main.tpl.html
+++ b/templates/navigation-main.tpl.html
@@ -1,10 +1,10 @@
-		<ul>
-			<li><a href="/calendar.php"><strong>⇧Upload⇧</strong></a></li>
-			<li><a href="/index.php"><strong>Home</a></li>
-			<li><a href="/contribute.php">Give Shows »</strong></a>
-			<li><a href="/stuff_you_need_to_know.php">Info</a></li>
-			<li><a href="/theme.php">Theme</a></li>
-			<li><a href="/requested_topics.php">Topics</a></li>
-			<li><a href="/recording.php">Recording</a></li>
-			<li><a href="/request_a_slot.php">Scheduling</a></li>
+		<ul>	
+			<li><a href="calendar.php"><strong>⇧Upload⇧</strong></a></li>
+			<li><a href="index.html"><strong>Home »</strong></a></li>
+			<li><a href="syndication.html">Get Shows</a></li>
+			<li><a href="contribute.html">Give Shows</a></li>
+			<li><a href="help_out.html">Contribute</a></li>
+			<li><a href="tags.html">Tags</a></li>
+			<li><a href="about.html">About</a></li>
+			<li><a href="search.html">Search</a></li>
 		</ul>