diff --git a/pinaxcon/templates/lca2017/_right_floating_image.html b/pinaxcon/templates/_right_floating_image.html
similarity index 100%
rename from pinaxcon/templates/lca2017/_right_floating_image.html
rename to pinaxcon/templates/_right_floating_image.html
diff --git a/pinaxcon/templates/lca2017/content_page.html b/pinaxcon/templates/content_page.html
similarity index 100%
rename from pinaxcon/templates/lca2017/content_page.html
rename to pinaxcon/templates/content_page.html
diff --git a/pinaxcon/templates/registrasion/base.html b/pinaxcon/templates/registrasion/base.html
index cabfdbae..724cd407 100644
--- a/pinaxcon/templates/registrasion/base.html
+++ b/pinaxcon/templates/registrasion/base.html
@@ -1,2 +1,2 @@
-{% extends "lca2017/content_page.html" %}
+{% extends "content_page.html" %}
 {% load staticfiles %}
diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html
index b63f35f4..cd19cb40 100644
--- a/pinaxcon/templates/symposion/schedule/presentation_detail.html
+++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html
@@ -46,7 +46,7 @@
   <h2>Presented by</h2>
   {% for speaker in presentation.speakers %}
     {% speaker_photo speaker 512 as speaker_photo_url %}
-    {% include "lca2017/_right_floating_image.html" with image_url=speaker_photo_url %}
+    {% include "_right_floating_image.html" with image_url=speaker_photo_url %}
 
     <h3><a href="{% url "speaker_profile" speaker.pk %}">{{ speaker }}</a></h3>
 
diff --git a/pinaxcon/templates/symposion/schedule/public_base.html b/pinaxcon/templates/symposion/schedule/public_base.html
index 520b4a86..1de13708 100644
--- a/pinaxcon/templates/symposion/schedule/public_base.html
+++ b/pinaxcon/templates/symposion/schedule/public_base.html
@@ -1,4 +1,4 @@
-{% extends "lca2017/content_page.html" %}
+{% extends "content_page.html" %}
 
 {% load staticfiles %}
 
diff --git a/pinaxcon/templates/utility_page.html b/pinaxcon/templates/utility_page.html
index 7efddd12..38964b8f 100644
--- a/pinaxcon/templates/utility_page.html
+++ b/pinaxcon/templates/utility_page.html
@@ -1,4 +1,4 @@
-{% extends "lca2017/content_page.html" %}
+{% extends "content_page.html" %}
 {% load staticfiles %}
 
 {% comment %}