diff --git a/src/css/components/_default-modules.css b/src/css/components/_default-modules.hubl.css
similarity index 100%
rename from src/css/components/_default-modules.css
rename to src/css/components/_default-modules.hubl.css
diff --git a/src/css/components/_header.css b/src/css/components/_header.hubl.css
similarity index 100%
rename from src/css/components/_header.css
rename to src/css/components/_header.hubl.css
diff --git a/src/css/elements/_buttons.css b/src/css/elements/_buttons.hubl.css
similarity index 100%
rename from src/css/elements/_buttons.css
rename to src/css/elements/_buttons.hubl.css
diff --git a/src/css/elements/_forms.css b/src/css/elements/_forms.hubl.css
similarity index 100%
rename from src/css/elements/_forms.css
rename to src/css/elements/_forms.hubl.css
diff --git a/src/css/elements/_tables.css b/src/css/elements/_tables.hubl.css
similarity index 100%
rename from src/css/elements/_tables.css
rename to src/css/elements/_tables.hubl.css
diff --git a/src/css/elements/_typography.css b/src/css/elements/_typography.hubl.css
similarity index 100%
rename from src/css/elements/_typography.css
rename to src/css/elements/_typography.hubl.css
diff --git a/src/css/generic/_normalize.css b/src/css/generic/_normalize.hubl.css
similarity index 100%
rename from src/css/generic/_normalize.css
rename to src/css/generic/_normalize.hubl.css
diff --git a/src/css/generic/_reset.css b/src/css/generic/_reset.hubl.css
similarity index 100%
rename from src/css/generic/_reset.css
rename to src/css/generic/_reset.hubl.css
diff --git a/src/css/main.css b/src/css/main.css
deleted file mode 100644
index 1e64e67ab..000000000
--- a/src/css/main.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Theme base styles */
-
-/* Tools
-Any animations, or functions used throughout the project.
-Note: _macros.css needs to be imported into each stylesheet where macros are used and not included here
-*/
-
-/* Generic
-This is where reset, normalize & box-sizing styles go.
-*/
-
-{% include './generic/_reset.css' %}
-{% include './generic/_normalize.css' %}
-
-/* Objects
-Non-cosmetic design patterns including grid and layout classes)
-*/
-
-{% include './objects/_layout.css' %}
-{% include './objects/_containers-dnd.css' %}
-
-/* Elements
-Base HMTL elements are styled in this section (<body<, <h1>, <a>, <p>, <button> etc.)
-*/
-
-{% include './elements/_typography.css' %}
-{% include './elements/_buttons.css' %}
-{% include './elements/_forms.css' %}
-{% include './elements/_tables.css' %}
-
-/* Components
-Specific pieces of UI that are stylized. Typically used for global partial styling
-*/
-
-{% include './components/_header.css' %}
-{% include './components/_default-modules.css' %}
-
-/* Utilities
-Helper classes with ability to override anything that comes before it
-*/
-
-{% include './utilities/_helper.css' %}
\ No newline at end of file
diff --git a/src/css/main.hubl.css b/src/css/main.hubl.css
new file mode 100644
index 000000000..93f672cbd
--- /dev/null
+++ b/src/css/main.hubl.css
@@ -0,0 +1,42 @@
+/* Theme base styles */
+
+/* Tools
+Any animations, or functions used throughout the project.
+Note: _macros.hubl.css needs to be imported into each stylesheet where macros are used and not included here
+*/
+
+/* Generic
+This is where reset, normalize & box-sizing styles go.
+*/
+
+{% include './generic/_reset.hubl.css' %}
+{% include './generic/_normalize.hubl.css' %}
+
+/* Objects
+Non-cosmetic design patterns including grid and layout classes)
+*/
+
+{% include './objects/_layout.hubl.css' %}
+{% include './objects/_containers-dnd.hubl.css' %}
+
+/* Elements
+Base HMTL elements are styled in this section (<body<, <h1>, <a>, <p>, <button> etc.)
+*/
+
+{% include './elements/_typography.hubl.css' %}
+{% include './elements/_buttons.hubl.css' %}
+{% include './elements/_forms.hubl.css' %}
+{% include './elements/_tables.hubl.css' %}
+
+/* Components
+Specific pieces of UI that are stylized. Typically used for global partial styling
+*/
+
+{% include './components/_header.hubl.css' %}
+{% include './components/_default-modules.hubl.css' %}
+
+/* Utilities
+Helper classes with ability to override anything that comes before it
+*/
+
+{% include './utilities/_helper.hubl.css' %}
\ No newline at end of file
diff --git a/src/css/objects/_containers-dnd.css b/src/css/objects/_containers-dnd.hubl.css
similarity index 100%
rename from src/css/objects/_containers-dnd.css
rename to src/css/objects/_containers-dnd.hubl.css
diff --git a/src/css/objects/_layout.css b/src/css/objects/_layout.hubl.css
similarity index 100%
rename from src/css/objects/_layout.css
rename to src/css/objects/_layout.hubl.css
diff --git a/src/css/templates/blog.css b/src/css/templates/blog.hubl.css
similarity index 100%
rename from src/css/templates/blog.css
rename to src/css/templates/blog.hubl.css
diff --git a/src/css/templates/system.css b/src/css/templates/system.hubl.css
similarity index 100%
rename from src/css/templates/system.css
rename to src/css/templates/system.hubl.css
diff --git a/src/css/theme-overrides.css b/src/css/theme-overrides.hubl.css
similarity index 99%
rename from src/css/theme-overrides.css
rename to src/css/theme-overrides.hubl.css
index c614a597d..32083677f 100644
--- a/src/css/theme-overrides.css
+++ b/src/css/theme-overrides.hubl.css
@@ -1,4 +1,4 @@
-{% import './tools/_macros.css' %}
+{% import './tools/_macros.hubl.css' %}
 
 {## Table of contents
 
diff --git a/src/css/tools/_macros.css b/src/css/tools/_macros.hubl.css
similarity index 100%
rename from src/css/tools/_macros.css
rename to src/css/tools/_macros.hubl.css
diff --git a/src/css/utilities/_helper.css b/src/css/utilities/_helper.hubl.css
similarity index 100%
rename from src/css/utilities/_helper.css
rename to src/css/utilities/_helper.hubl.css
diff --git a/src/js/main.js b/src/js/main.hubl.js
similarity index 100%
rename from src/js/main.js
rename to src/js/main.hubl.js
diff --git a/src/modules/blog-listings.module/module.css b/src/modules/blog-listings.module/module.hubl.css
similarity index 100%
rename from src/modules/blog-listings.module/module.css
rename to src/modules/blog-listings.module/module.hubl.css
diff --git a/src/modules/blog-listings.module/module.html b/src/modules/blog-listings.module/module.hubl.html
similarity index 100%
rename from src/modules/blog-listings.module/module.html
rename to src/modules/blog-listings.module/module.hubl.html
diff --git a/src/modules/blog-pagination.module/module.css b/src/modules/blog-pagination.module/module.hubl.css
similarity index 100%
rename from src/modules/blog-pagination.module/module.css
rename to src/modules/blog-pagination.module/module.hubl.css
diff --git a/src/modules/blog-pagination.module/module.html b/src/modules/blog-pagination.module/module.hubl.html
similarity index 100%
rename from src/modules/blog-pagination.module/module.html
rename to src/modules/blog-pagination.module/module.hubl.html
diff --git a/src/modules/button.module/module.html b/src/modules/button.module/module.hubl.html
similarity index 100%
rename from src/modules/button.module/module.html
rename to src/modules/button.module/module.hubl.html
diff --git a/src/modules/card.module/module.css b/src/modules/card.module/module.hubl.css
similarity index 100%
rename from src/modules/card.module/module.css
rename to src/modules/card.module/module.hubl.css
diff --git a/src/modules/card.module/module.html b/src/modules/card.module/module.hubl.html
similarity index 100%
rename from src/modules/card.module/module.html
rename to src/modules/card.module/module.hubl.html
diff --git a/src/modules/menu.module/module.css b/src/modules/menu.module/module.hubl.css
similarity index 100%
rename from src/modules/menu.module/module.css
rename to src/modules/menu.module/module.hubl.css
diff --git a/src/modules/menu.module/module.html b/src/modules/menu.module/module.hubl.html
similarity index 100%
rename from src/modules/menu.module/module.html
rename to src/modules/menu.module/module.hubl.html
diff --git a/src/modules/menu.module/module.js b/src/modules/menu.module/module.hubl.js
similarity index 100%
rename from src/modules/menu.module/module.js
rename to src/modules/menu.module/module.hubl.js
diff --git a/src/modules/pricing-card.module/module.css b/src/modules/pricing-card.module/module.hubl.css
similarity index 100%
rename from src/modules/pricing-card.module/module.css
rename to src/modules/pricing-card.module/module.hubl.css
diff --git a/src/modules/pricing-card.module/module.html b/src/modules/pricing-card.module/module.hubl.html
similarity index 100%
rename from src/modules/pricing-card.module/module.html
rename to src/modules/pricing-card.module/module.hubl.html
diff --git a/src/modules/social-follow.module/module.css b/src/modules/social-follow.module/module.hubl.css
similarity index 100%
rename from src/modules/social-follow.module/module.css
rename to src/modules/social-follow.module/module.hubl.css
diff --git a/src/modules/social-follow.module/module.html b/src/modules/social-follow.module/module.hubl.html
similarity index 100%
rename from src/modules/social-follow.module/module.html
rename to src/modules/social-follow.module/module.hubl.html
diff --git a/src/sections/call-to-action.html b/src/sections/call-to-action.hubl.html
similarity index 100%
rename from src/sections/call-to-action.html
rename to src/sections/call-to-action.hubl.html
diff --git a/src/sections/cards.html b/src/sections/cards.hubl.html
similarity index 100%
rename from src/sections/cards.html
rename to src/sections/cards.hubl.html
diff --git a/src/sections/hero-banner.html b/src/sections/hero-banner.hubl.html
similarity index 100%
rename from src/sections/hero-banner.html
rename to src/sections/hero-banner.hubl.html
diff --git a/src/sections/multi-column-content.html b/src/sections/multi-column-content.hubl.html
similarity index 100%
rename from src/sections/multi-column-content.html
rename to src/sections/multi-column-content.hubl.html
diff --git a/src/sections/multi-row-content.html b/src/sections/multi-row-content.hubl.html
similarity index 100%
rename from src/sections/multi-row-content.html
rename to src/sections/multi-row-content.hubl.html
diff --git a/src/sections/pricing.html b/src/sections/pricing.hubl.html
similarity index 100%
rename from src/sections/pricing.html
rename to src/sections/pricing.hubl.html
diff --git a/src/templates/about.html b/src/templates/about.hubl.html
similarity index 96%
rename from src/templates/about.html
rename to src/templates/about.hubl.html
index df2f415c1..7df4d9b21 100644
--- a/src/templates/about.html
+++ b/src/templates/about.hubl.html
@@ -4,7 +4,7 @@
   label: About
   screenshotPath: ../images/template-previews/about.png
 -->
-{% extends './layouts/base.html' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block body %}
 {% dnd_area 'dnd_area'
diff --git a/src/templates/blog-index.html b/src/templates/blog-index.hubl.html
similarity index 93%
rename from src/templates/blog-index.html
rename to src/templates/blog-index.hubl.html
index 55269ebc1..1b7259b9d 100644
--- a/src/templates/blog-index.html
+++ b/src/templates/blog-index.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - blog listing
   screenshotPath: ../images/template-previews/blog-index.png
 -->
-{% set template_css = '../../css/templates/blog.css' %}
-{% extends './layouts/base.html' %}
+{% set template_css = '../../css/templates/blog.hubl.css' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block body %}
 {% dnd_area 'dnd_area'
diff --git a/src/templates/blog-post.html b/src/templates/blog-post.hubl.html
similarity index 96%
rename from src/templates/blog-post.html
rename to src/templates/blog-post.hubl.html
index f8e2787d0..7e8078c2f 100644
--- a/src/templates/blog-post.html
+++ b/src/templates/blog-post.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - blog post
   screenshotPath: ../images/template-previews/blog-post.png
 -->
-{% set template_css = '../../css/templates/blog.css' %}
-{% extends './layouts/base.html' %}
+{% set template_css = '../../css/templates/blog.hubl.css' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block body %}
 <div class="body-container body-container--blog-post">
diff --git a/src/templates/contact.html b/src/templates/contact.hubl.html
similarity index 74%
rename from src/templates/contact.html
rename to src/templates/contact.hubl.html
index e56eaf961..72063afe5 100644
--- a/src/templates/contact.html
+++ b/src/templates/contact.hubl.html
@@ -4,7 +4,7 @@
   label: Contact
   screenshotPath: ../images/template-previews/contact.png
 -->
-{% extends './layouts/base.html' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block body %}
 {% dnd_area 'dnd_area'
@@ -14,7 +14,7 @@
 
   {# Cards #}
 
-  {% include_dnd_partial path='../sections/cards.html' %}
+  {% include_dnd_partial path='../sections/cards.hubl.html' %}
 
 {% end_dnd_area %}
 {% endblock body %}
\ No newline at end of file
diff --git a/src/templates/home.html b/src/templates/home.hubl.html
similarity index 85%
rename from src/templates/home.html
rename to src/templates/home.hubl.html
index b02ec3290..afadb2d26 100644
--- a/src/templates/home.html
+++ b/src/templates/home.hubl.html
@@ -4,7 +4,7 @@
   label: Home
   screenshotPath: ../images/template-previews/home.png
 -->
-{% extends "./layouts/base.html" %}
+{% extends "./layouts/base.hubl.html" %}
 
 {% block body %}
 
@@ -17,11 +17,11 @@
 
   {# Hero banner #}
 
-  {% include_dnd_partial path='../sections/hero-banner.html' %}
+  {% include_dnd_partial path='../sections/hero-banner.hubl.html' %}
 
   {# Two column image right #}
 
-  {% include_dnd_partial path='../sections/multi-row-content.html' %}
+  {% include_dnd_partial path='../sections/multi-row-content.hubl.html' %}
 
   {# Two column image left #}
 
@@ -54,11 +54,11 @@
 
   {# Call to action #}
 
-  {% include_dnd_partial path='../sections/call-to-action.html' %}
+  {% include_dnd_partial path='../sections/call-to-action.hubl.html' %}
 
   {# Three column image with text #}
 
-  {% include_dnd_partial path='../sections/multi-column-content.html' %}
+  {% include_dnd_partial path='../sections/multi-column-content.hubl.html' %}
 
 {% end_dnd_area %}
 {% endblock body %}
diff --git a/src/templates/hubdb.html b/src/templates/hubdb.hubl.html
similarity index 99%
rename from src/templates/hubdb.html
rename to src/templates/hubdb.hubl.html
index 7537d8371..26111fc27 100644
--- a/src/templates/hubdb.html
+++ b/src/templates/hubdb.hubl.html
@@ -9,7 +9,7 @@
 
 {# Before getting started with using HubDB we highly recommend you read through our HubDB documentation (https://developers.hubspot.com/docs/cms/features/hubdb) #}
 
-{% extends './layouts/base.html' %}
+{% extends './layouts/base.hubl.html' %}
 
 {# Testing config #}
 
diff --git a/src/templates/landing-page.html b/src/templates/landing-page.hubl.html
similarity index 75%
rename from src/templates/landing-page.html
rename to src/templates/landing-page.hubl.html
index b180ac523..06a96e4f8 100644
--- a/src/templates/landing-page.html
+++ b/src/templates/landing-page.hubl.html
@@ -4,10 +4,10 @@
   label: Landing page
   screenshotPath: ../images/template-previews/landing-page.png
 -->
-{% extends './layouts/base.html' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block header %}
-  {% global_partial path='./partials/header-no-navigation.html' %}
+  {% global_partial path='./partials/header-no-navigation.hubl.html' %}
 {% endblock header %}
 
 {% block body %}
@@ -19,7 +19,7 @@
   {# Hero banner #}
 
   {% include_dnd_partial
-    path='../sections/hero-banner.html'
+    path='../sections/hero-banner.hubl.html'
     context={
       'content': '<h1>Download your free eBook</h1><p>Use this space to tell everyone what your eBook is all about.</p>',
     }
@@ -28,7 +28,7 @@
   {# Three column image with text #}
 
   {% include_dnd_partial
-    path='../sections/multi-column-content.html',
+    path='../sections/multi-column-content.hubl.html',
     context={
       'background_color': '#FFFFFF'
     }
diff --git a/src/templates/layouts/base.html b/src/templates/layouts/base.hubl.html
similarity index 83%
rename from src/templates/layouts/base.html
rename to src/templates/layouts/base.hubl.html
index 072bafded..399a6543b 100644
--- a/src/templates/layouts/base.html
+++ b/src/templates/layouts/base.hubl.html
@@ -8,19 +8,19 @@
     {% if page_meta.html_title || pageTitle %}<title>{{ page_meta.html_title || pageTitle }}</title>{% endif %}
     {% if site_settings.favicon_src %}<link rel="shortcut icon" href="{{ site_settings.favicon_src }}" />{% endif %}
     <meta name="description" content="{{ page_meta.meta_description }}">
-    {{ require_css(get_asset_url("../../css/main.css")) }}
+    {{ require_css(get_asset_url("../../css/main.hubl.css")) }}
     {# This is intended to be used if a template requires template specific style sheets #}
     {% if template_css %}
       {{ require_css(get_asset_url(template_css)) }}
     {% endif %}
-    {{ require_css(get_asset_url("../../css/theme-overrides.css")) }}
+    {{ require_css(get_asset_url("../../css/theme-overrides.hubl.css")) }}
     {# To see a full list of what is included via standard_header_includes please reference this article: https://developers.hubspot.com/docs/cms/hubl/variables#required-page-template-variables #}
     {{ standard_header_includes }}
   </head>
   <body>
     <div class="body-wrapper {{ builtin_body_classes }}">
       {% block header %}
-        {% global_partial path='../partials/header.html' %}
+        {% global_partial path='../partials/header.hubl.html' %}
       {% endblock header %}
 
       {# The main-content ID is used for the navigation skipper in the header.html file. More information on the navigation skipper can be found here: https://github.com/HubSpot/cms-theme-boilerplate/wiki/Accessibility #}
@@ -31,10 +31,10 @@
       </main>
 
       {% block footer %}
-        {% global_partial path='../partials/footer.html' %}
+        {% global_partial path='../partials/footer.hubl.html' %}
       {% endblock footer %}
     </div>
-    {{ require_js(get_asset_url('../../js/main.js')) }}
+    {{ require_js(get_asset_url('../../js/main.hubl.js')) }}
     {# To see a full list of what is included via standard_footer_includes please reference this article: https://developers.hubspot.com/docs/cms/hubl/variables#required-page-template-variables #}
     {{ standard_footer_includes }}
   </body>
diff --git a/src/templates/partials/footer.html b/src/templates/partials/footer.hubl.html
similarity index 100%
rename from src/templates/partials/footer.html
rename to src/templates/partials/footer.hubl.html
diff --git a/src/templates/partials/header-no-navigation.html b/src/templates/partials/header-no-navigation.hubl.html
similarity index 100%
rename from src/templates/partials/header-no-navigation.html
rename to src/templates/partials/header-no-navigation.hubl.html
diff --git a/src/templates/partials/header.html b/src/templates/partials/header.hubl.html
similarity index 100%
rename from src/templates/partials/header.html
rename to src/templates/partials/header.hubl.html
diff --git a/src/templates/pricing.html b/src/templates/pricing.hubl.html
similarity index 74%
rename from src/templates/pricing.html
rename to src/templates/pricing.hubl.html
index b7fce24a5..eabd11e78 100644
--- a/src/templates/pricing.html
+++ b/src/templates/pricing.hubl.html
@@ -4,7 +4,7 @@
   label: Pricing
   screenshotPath: ../images/template-previews/pricing.png
 -->
-{% extends './layouts/base.html' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block body %}
 {% dnd_area 'dnd_area'
@@ -14,7 +14,7 @@
 
   {# Pricing #}
 
-  {% include_dnd_partial path='../sections/pricing.html' %}
+  {% include_dnd_partial path='../sections/pricing.hubl.html' %}
 
 {% end_dnd_area %}
 {% endblock body %}
diff --git a/src/templates/qa-test.html b/src/templates/qa-test.hubl.html
similarity index 97%
rename from src/templates/qa-test.html
rename to src/templates/qa-test.hubl.html
index 1be025198..96214f46f 100644
--- a/src/templates/qa-test.html
+++ b/src/templates/qa-test.hubl.html
@@ -4,7 +4,7 @@
   label: QA test
   screenshotPath: ../images/template-previews/qa-test.png
 -->
-{% extends './layouts/base.html' %}
+{% extends './layouts/base.hubl.html' %}
 
 {% block body %}
 {% dnd_area 'dnd_area'
@@ -523,7 +523,7 @@ <h3>Call to action</h3>
     {% end_dnd_column %}
   {% end_dnd_section %}
 
-  {% include_dnd_partial path='../sections/call-to-action.html' %}
+  {% include_dnd_partial path='../sections/call-to-action.hubl.html' %}
 
   {# Cards #}
 
@@ -547,7 +547,7 @@ <h3>Cards</h3>
     {% end_dnd_column %}
   {% end_dnd_section %}
 
-  {% include_dnd_partial path='../sections/cards.html' %}
+  {% include_dnd_partial path='../sections/cards.hubl.html' %}
 
   {# Hero banner #}
 
@@ -571,7 +571,7 @@ <h3>Hero banner</h3>
     {% end_dnd_column %}
   {% end_dnd_section %}
 
-  {% include_dnd_partial path='../sections/hero-banner.html' %}
+  {% include_dnd_partial path='../sections/hero-banner.hubl.html' %}
 
   {# Multi-column content #}
 
@@ -595,7 +595,7 @@ <h3>Multi-column content</h3>
     {% end_dnd_column %}
   {% end_dnd_section %}
 
-  {% include_dnd_partial path='../sections/multi-column-content.html' %}
+  {% include_dnd_partial path='../sections/multi-column-content.hubl.html' %}
 
   {# Multi-row content #}
 
@@ -619,7 +619,7 @@ <h3>Multi-row content</h3>
     {% end_dnd_column %}
   {% end_dnd_section %}
 
-  {% include_dnd_partial path='../sections/multi-row-content.html' %}
+  {% include_dnd_partial path='../sections/multi-row-content.hubl.html' %}
 
   {# Pricing #}
 
@@ -643,7 +643,7 @@ <h3>Pricing</h3>
     {% end_dnd_column %}
   {% end_dnd_section %}
 
-  {% include_dnd_partial path='../sections/pricing.html' %}
+  {% include_dnd_partial path='../sections/pricing.hubl.html' %}
 
 {% end_dnd_area %}
 {% endblock body %}
diff --git a/src/templates/system/404.html b/src/templates/system/404.hubl.html
similarity index 88%
rename from src/templates/system/404.html
rename to src/templates/system/404.hubl.html
index 1eba084a5..3122fc175 100644
--- a/src/templates/system/404.html
+++ b/src/templates/system/404.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - 404 error
   screenshotPath: ../../images/template-previews/404.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Error 404 | Page not found" %}
 
diff --git a/src/templates/system/500.html b/src/templates/system/500.hubl.html
similarity index 85%
rename from src/templates/system/500.html
rename to src/templates/system/500.hubl.html
index ef75c919a..950974d28 100644
--- a/src/templates/system/500.html
+++ b/src/templates/system/500.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - 500 error
   screenshotPath: ../../images/template-previews/500.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Error 500 | Server error" %}
 
diff --git a/src/templates/system/backup-unsubscribe.html b/src/templates/system/backup-unsubscribe.hubl.html
similarity index 84%
rename from src/templates/system/backup-unsubscribe.html
rename to src/templates/system/backup-unsubscribe.hubl.html
index 9a6a272c6..1959f679c 100644
--- a/src/templates/system/backup-unsubscribe.html
+++ b/src/templates/system/backup-unsubscribe.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - email backup unsubscribe
   screenshotPath: ../../images/template-previews/backup-unsubscribe.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Unsubscribe" %}
 
diff --git a/src/templates/system/membership-login.html b/src/templates/system/membership-login.hubl.html
similarity index 92%
rename from src/templates/system/membership-login.html
rename to src/templates/system/membership-login.hubl.html
index 3eb79989f..8a143f327 100644
--- a/src/templates/system/membership-login.html
+++ b/src/templates/system/membership-login.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - membership login
   screenshotPath: ../../images/template-previews/membership-login.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Membership | Login" %}
 
diff --git a/src/templates/system/membership-register.html b/src/templates/system/membership-register.hubl.html
similarity index 92%
rename from src/templates/system/membership-register.html
rename to src/templates/system/membership-register.hubl.html
index f0c0b4cdf..edaada17f 100644
--- a/src/templates/system/membership-register.html
+++ b/src/templates/system/membership-register.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - membership registration
   screenshotPath: ../../images/template-previews/membership-register.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Membership | Register" %}
 
diff --git a/src/templates/system/membership-reset-password-request.html b/src/templates/system/membership-reset-password-request.hubl.html
similarity index 92%
rename from src/templates/system/membership-reset-password-request.html
rename to src/templates/system/membership-reset-password-request.hubl.html
index 72cb6df15..dd69aa97b 100644
--- a/src/templates/system/membership-reset-password-request.html
+++ b/src/templates/system/membership-reset-password-request.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - reset password request
   screenshotPath: ../../images/template-previews/membership-reset-password-request.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Membership | Reset password request" %}
 
diff --git a/src/templates/system/membership-reset-password.html b/src/templates/system/membership-reset-password.hubl.html
similarity index 92%
rename from src/templates/system/membership-reset-password.html
rename to src/templates/system/membership-reset-password.hubl.html
index 155776e54..dd504d996 100644
--- a/src/templates/system/membership-reset-password.html
+++ b/src/templates/system/membership-reset-password.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - reset password
   screenshotPath: ../../images/template-previews/membership-reset-password.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Membership | Reset password" %}
 
diff --git a/src/templates/system/password-prompt.html b/src/templates/system/password-prompt.hubl.html
similarity index 87%
rename from src/templates/system/password-prompt.html
rename to src/templates/system/password-prompt.hubl.html
index 18d903452..4e2be47b2 100644
--- a/src/templates/system/password-prompt.html
+++ b/src/templates/system/password-prompt.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - password prompt
   screenshotPath: ../../images/template-previews/password-prompt.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "This page is private | Enter password" %}
 
diff --git a/src/templates/system/search-results.html b/src/templates/system/search-results.hubl.html
similarity index 88%
rename from src/templates/system/search-results.html
rename to src/templates/system/search-results.hubl.html
index 04849f8ea..7d5919632 100644
--- a/src/templates/system/search-results.html
+++ b/src/templates/system/search-results.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - search results
   screenshotPath: ../../images/template-previews/search-results.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Search results" %}
 
diff --git a/src/templates/system/subscription-preferences.html b/src/templates/system/subscription-preferences.hubl.html
similarity index 84%
rename from src/templates/system/subscription-preferences.html
rename to src/templates/system/subscription-preferences.hubl.html
index d7481e351..2301935b9 100644
--- a/src/templates/system/subscription-preferences.html
+++ b/src/templates/system/subscription-preferences.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - email subscription preferences
   screenshotPath: ../../images/template-previews/subscription-preferences.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Subscription preferences" %}
 
diff --git a/src/templates/system/subscriptions-confirmation.html b/src/templates/system/subscriptions-confirmation.hubl.html
similarity index 84%
rename from src/templates/system/subscriptions-confirmation.html
rename to src/templates/system/subscriptions-confirmation.hubl.html
index 6a7ebb4ef..4f92759a6 100644
--- a/src/templates/system/subscriptions-confirmation.html
+++ b/src/templates/system/subscriptions-confirmation.hubl.html
@@ -4,8 +4,8 @@
   label: Boilerplate - email subscriptions confirmation
   screenshotPath: ../../images/template-previews/subscriptions-confirmation.png
 -->
-{% set template_css = '../../css/templates/system.css' %}
-{% extends '../layouts/base.html' %}
+{% set template_css = '../../css/templates/system.hubl.css' %}
+{% extends '../layouts/base.hubl.html' %}
 {# pageTitle is used on system templates for setting a value for the title tag #}
 {% set pageTitle = "Confirm subscriptions" %}