diff --git a/themes/bootstrap4/css/meissa.css b/themes/bootstrap4/custom/css/custom.css
similarity index 100%
rename from themes/bootstrap4/css/meissa.css
rename to themes/bootstrap4/custom/css/custom.css
diff --git a/themes/bootstrap4/html/custom/footer.inc b/themes/bootstrap4/custom/html/includes/footer.inc
similarity index 100%
rename from themes/bootstrap4/html/custom/footer.inc
rename to themes/bootstrap4/custom/html/includes/footer.inc
diff --git a/themes/bootstrap4/html/custom/logo.inc b/themes/bootstrap4/custom/html/includes/logo.inc
similarity index 100%
rename from themes/bootstrap4/html/custom/logo.inc
rename to themes/bootstrap4/custom/html/includes/logo.inc
diff --git a/themes/bootstrap4/custom/html/includes/site-navigation.inc b/themes/bootstrap4/custom/html/includes/site-navigation.inc
new file mode 100644
index 0000000..3d3b237
--- /dev/null
+++ b/themes/bootstrap4/custom/html/includes/site-navigation.inc
@@ -0,0 +1,8 @@
+<p>&nbsp;</p>
+{% include "/custom/html/meissa/site-navigation.inc" %}
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+{% include "/custom/html/meissa/partner.inc" %}
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+{% include "/custom/html/meissa/we-support.inc" %}
\ No newline at end of file
diff --git a/themes/bootstrap4/html/custom/social.inc b/themes/bootstrap4/custom/html/includes/social.inc
similarity index 100%
rename from themes/bootstrap4/html/custom/social.inc
rename to themes/bootstrap4/custom/html/includes/social.inc
diff --git a/themes/bootstrap4/html/custom/tracking.inc b/themes/bootstrap4/custom/html/includes/tracking.inc
similarity index 100%
rename from themes/bootstrap4/html/custom/tracking.inc
rename to themes/bootstrap4/custom/html/includes/tracking.inc
diff --git a/themes/bootstrap4/html/meissa/partner.inc b/themes/bootstrap4/custom/html/meissa/partner.inc
similarity index 100%
rename from themes/bootstrap4/html/meissa/partner.inc
rename to themes/bootstrap4/custom/html/meissa/partner.inc
diff --git a/themes/bootstrap4/html/meissa/site-navigation.inc b/themes/bootstrap4/custom/html/meissa/site-navigation.inc
similarity index 100%
rename from themes/bootstrap4/html/meissa/site-navigation.inc
rename to themes/bootstrap4/custom/html/meissa/site-navigation.inc
diff --git a/themes/bootstrap4/html/meissa/we-support.inc b/themes/bootstrap4/custom/html/meissa/we-support.inc
similarity index 100%
rename from themes/bootstrap4/html/meissa/we-support.inc
rename to themes/bootstrap4/custom/html/meissa/we-support.inc
diff --git a/themes/bootstrap4/html/base.html b/themes/bootstrap4/html/base.html
index eb4630e..8255a90 100644
--- a/themes/bootstrap4/html/base.html
+++ b/themes/bootstrap4/html/base.html
@@ -12,7 +12,7 @@
 
 
     {% style "/css/bootstrap.min.css" %}
-    {% style "/css/meissa.css" %}
+    {% style "/custom/css/custom.css" %}
     {% block additional_styles %}
 	{% endblock %}
   </head>
@@ -22,7 +22,7 @@
 	    <span class="navbar-toggler-icon"></span>
 	  </button>
 	  <a class="navbar-brand" href="/">
-	  	{% include "/html/custom/logo.inc" %}
+	  	{% include "/custom//html/includes/logo.inc" %}
 	  </a>
 	  <div class="collapse navbar-collapse" id="navbarNavDropdown">
 	    <ul class="navbar-nav">
@@ -67,7 +67,7 @@
 	    </ul>
 	  </div>
 
-	  {% include "/html/custom/social.inc" %}
+	  {% include "/custom/html/includes/social.inc" %}
 
 	</nav>
 
@@ -77,8 +77,8 @@
 	{% endblock %}
 	</div>
 
-	{% include "/html/custom/footer.inc" %}
-	{% include "/html/custom/tracking.inc" %}
+	{% include "/custom/html/includes/footer.inc" %}
+	{% include "/custom/html/includes/tracking.inc" %}
 
   <!-- Bootstrap core JavaScript
   ================================================== -->
diff --git a/themes/bootstrap4/html/custom/site-navigation.inc b/themes/bootstrap4/html/custom/site-navigation.inc
deleted file mode 100644
index bd69bd4..0000000
--- a/themes/bootstrap4/html/custom/site-navigation.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>&nbsp;</p>
-{% include "/html/meissa/site-navigation.inc" %}
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-{% include "/html/meissa/partner.inc" %}
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-{% include "/html/meissa/we-support.inc" %}
\ No newline at end of file
diff --git a/themes/bootstrap4/html/page-three-column.html b/themes/bootstrap4/html/page-three-column.html
index 2a6c361..334c4ee 100644
--- a/themes/bootstrap4/html/page-three-column.html
+++ b/themes/bootstrap4/html/page-three-column.html
@@ -24,7 +24,7 @@
 			{% endblock %}
 		</div>
 		<div class="col-lg-3 hidden-md-down">
-			{% include "/html/custom/site-navigation.inc" %}
+			{% include "/custom/html/includes/site-navigation.inc" %}
 		</div>
 	</div>
 	
diff --git a/themes/bootstrap4/html/page-two-column.html b/themes/bootstrap4/html/page-two-column.html
index 438e4b5..184c81e 100644
--- a/themes/bootstrap4/html/page-two-column.html
+++ b/themes/bootstrap4/html/page-two-column.html
@@ -19,7 +19,7 @@
 				{% endblock %}
 			</div>
 			<div class="col-lg-3 hidden-md-down">
-				{% include "/html/custom/site-navigation.inc" %}
+				{% include "/custom/html/includes/site-navigation.inc" %}
 			</div>
 		</div>