diff --git a/user/themes/church/minify.sh b/user/themes/church/build.sh
similarity index 60%
rename from user/themes/church/minify.sh
rename to user/themes/church/build.sh
index 53c96cd..357f61d 100644
--- a/user/themes/church/minify.sh
+++ b/user/themes/church/build.sh
@@ -6,4 +6,13 @@ yui-compressor css/css-only-navigation-inline.css > css/css-only-navigation-inli
 yui-compressor css/css-only-navigation-lazy.css > css/css-only-navigation-lazy.min.css
 yui-compressor css/css-only-lightbox-inline.css > css/css-only-lightbox-inline.min.css
 yui-compressor css/css-only-lightbox-lazy.css > css/css-only-lightbox-lazy.min.css
+yui-compressor css/footer-lazy.css > css/footer-lazy.min.css
+#yui-compressor js/deobfuscate-href.js -o js/deobfuscate-href.min.js
+#yui-compressor js/navbar-keyboard-interaction.js -o js/navbar-keyboard-interaction.min.js
 
+
+rm css/all-lazy.min.css
+cat css/*-lazy.min.css > css/all-lazy.min.css
+rm js/all.min.js
+cat js/*.js > js/all.min.js #compressor not working
+#cat js/*.min.js > js/all.min.js
diff --git a/user/themes/church/css/bootstrap-critical-trim.css b/user/themes/church/css/bootstrap-critical-trim.css
index 8762967..dae8c93 100644
--- a/user/themes/church/css/bootstrap-critical-trim.css
+++ b/user/themes/church/css/bootstrap-critical-trim.css
@@ -383,7 +383,7 @@ ul ul {
 /*override bootstraps default column ordering -> sidebar on left moves down on small screen*/                                                                                                                                                                                  
 @media (min-width: 768px){
   .blog-main {
-    float: right;
+    float: right !important;
   }
 }                                                                                                                                                                                                                                                                              
 /*spam protection in mailto links*/
diff --git a/user/themes/church/css/bapho.css b/user/themes/church/css/footer-lazy.css
similarity index 66%
rename from user/themes/church/css/bapho.css
rename to user/themes/church/css/footer-lazy.css
index 8a98659..4cbdeaa 100644
--- a/user/themes/church/css/bapho.css
+++ b/user/themes/church/css/footer-lazy.css
@@ -1,20 +1,3 @@
-/*override bootstraps default column ordering -> sidebar on left moves down on small screen*/
-@media (min-width: 768px){
-  .blog-main {
-    float: right;
-  }
-}
-/*custom content style*/
-//for spam protection in mailto links // doesn't work for some reason
-span.displaynone { display:none; }
-
-//for list in links page
-ul{list-style: none;}
-
-.shiftRight
-{
-margin-left: 40px;
-}
 /*footer stuff*/
 #footer
 {
diff --git a/user/themes/church/js/custom.js b/user/themes/church/js/deobfuscate-href.js
similarity index 100%
rename from user/themes/church/js/custom.js
rename to user/themes/church/js/deobfuscate-href.js
diff --git a/user/themes/church/js/bootstrap-native-all.js b/user/themes/church/js/old/bootstrap-native-all.js
similarity index 100%
rename from user/themes/church/js/bootstrap-native-all.js
rename to user/themes/church/js/old/bootstrap-native-all.js
diff --git a/user/themes/church/js/bootstrap-native-collapse.js b/user/themes/church/js/old/bootstrap-native-collapse.js
similarity index 100%
rename from user/themes/church/js/bootstrap-native-collapse.js
rename to user/themes/church/js/old/bootstrap-native-collapse.js
diff --git a/user/themes/church/js/bootstrap-native-dropdown.js b/user/themes/church/js/old/bootstrap-native-dropdown.js
similarity index 100%
rename from user/themes/church/js/bootstrap-native-dropdown.js
rename to user/themes/church/js/old/bootstrap-native-dropdown.js
diff --git a/user/themes/church/js/bootstrap-native.min.js b/user/themes/church/js/old/bootstrap-native.min.js
similarity index 100%
rename from user/themes/church/js/bootstrap-native.min.js
rename to user/themes/church/js/old/bootstrap-native.min.js
diff --git a/user/themes/church/js/bootstrap.js b/user/themes/church/js/old/bootstrap.js
similarity index 100%
rename from user/themes/church/js/bootstrap.js
rename to user/themes/church/js/old/bootstrap.js
diff --git a/user/themes/church/js/bootstrap.min.js b/user/themes/church/js/old/bootstrap.min.js
similarity index 100%
rename from user/themes/church/js/bootstrap.min.js
rename to user/themes/church/js/old/bootstrap.min.js
diff --git a/user/themes/church/js/html5shiv-printshiv.min.js b/user/themes/church/js/old/html5shiv-printshiv.min.js
similarity index 100%
rename from user/themes/church/js/html5shiv-printshiv.min.js
rename to user/themes/church/js/old/html5shiv-printshiv.min.js
diff --git a/user/themes/church/js/modernizr.custom.71422.js b/user/themes/church/js/old/modernizr.custom.71422.js
similarity index 100%
rename from user/themes/church/js/modernizr.custom.71422.js
rename to user/themes/church/js/old/modernizr.custom.71422.js
diff --git a/user/themes/church/js/singlePageNav.min.js b/user/themes/church/js/old/singlePageNav.min.js
similarity index 100%
rename from user/themes/church/js/singlePageNav.min.js
rename to user/themes/church/js/old/singlePageNav.min.js
diff --git a/user/themes/church/templates/partials/base.html.twig b/user/themes/church/templates/partials/base.html.twig
index 3decfc0..4a61590 100644
--- a/user/themes/church/templates/partials/base.html.twig
+++ b/user/themes/church/templates/partials/base.html.twig
@@ -52,15 +52,8 @@
         {% block bottom %}{% endblock %}
 
         {% block javascripts %}
-            {# do assets.add('jquery', 101) #}
-            {# do assets.add('theme://js/modernizr.custom.71422.js', 100) #}
-            {% do assets.add('theme://js/custom.js', 99) %}
-            {% do assets.add('theme://js/navbar-keyboard-interaction.js', 99) %}
-            {# do assets.add('theme://js/bootstrap.min.js', 100) #}
-            {% if browser.getBrowser == 'msie' and browser.getVersion >= 8 and browser.getVersion <= 9 %}
-                {% do assets.add('https://oss.maxcdn.com/respond/1.4.2/respond.min.js') %}
-                {% do assets.add('theme://js/html5shiv-printshiv.min.js') %}
-            {% endif %}
+            {% do assets.add('theme://js/all.min.js', 99) %}
+        {% endif %}
 
         {% endblock %}
         {{ assets.js() }}
@@ -68,10 +61,7 @@
     <noscript id="deferred-styles">
         {% block stylesheets %}
             {% do assets.addCss('theme://css/bootstrap_16px.min.css', 100) %}
-            {% do assets.addCss('theme://css/bapho.css', 99) %}
-            {% do assets.addCss('theme://css/css-only-lightbox-lazy.min.css', 99) %}
-            {% do assets.addCss('theme://css/css-only-navigation-lazy.min.css', 101) %}
-            {# do assets.add('theme://css/font-awesome.min.css',99) #}
+            {% do assets.addCss('theme://css/all-lazy.min.css', 101) %}
         {% endblock %}
         {{ assets.css() }}
     </noscript>