diff --git a/lib/tasks/views/build.js b/lib/tasks/views/build.js
index 797242fd7..a658e72bf 100644
--- a/lib/tasks/views/build.js
+++ b/lib/tasks/views/build.js
@@ -40,10 +40,13 @@ export default (gulp, config, args) => {
       .pipe(
         minhtml({
           collapseBooleanAttributes: true,
+          customAttrCollapse: /(content)/,
+          includeAutoGeneratedTags: false,
+          minifyCSS: true,
+          minifyJS: true,
           removeComments: true,
           removeScriptTypeAttributes: true,
-          removeStyleLinkTypeAttributes: true,
-          customAttrCollapse: /(content)/
+          removeStyleLinkTypeAttributes: true
         }))
       .pipe(replace("$theme-name$", metadata.name))
       .pipe(replace("$theme-version$", metadata.version))
diff --git a/material/base.html b/material/base.html
index 67c2818e0..d2d4c8de5 100644
--- a/material/base.html
+++ b/material/base.html
@@ -111,57 +111,15 @@
         {% endif %}
       {% endfor %}
       <script src="{{ base_url }}/assets/javascripts/application-7f2d08a2e5.js"></script>
-      <script>
-        /* Configuration for application */
-        var config = {
-          url: {
-            base: "{{ base_url }}",
-          }
-        };
-        /* Initialize application */
-        var app = new Application(config);
-        app.initialize();
-      </script>
+      <script>var config={url:{base:"{{ base_url }}"}},app=new Application(config);app.initialize()</script>
       {% for path in extra_javascript %}
         <script src="{{ path }}"></script>
       {% endfor %}
     {% endblock %}
     {% block analytics %}
       {% if config.google_analytics %}
-      <script>
-        (function(i,s,o,g,r,a,m){
-          i["GoogleAnalyticsObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||
-          []).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;
-          m.parentNode.insertBefore(a,m)
-        })(window, document,
-          "script", "https://www.google-analytics.com/analytics.js", "ga");
-        /* General initialization */
-        ga("create",
-          "{{ config.google_analytics[0] }}",
-          "{{ config.google_analytics[1] }}");
-        ga("set", "anonymizeIp", true);
-        ga("send", "pageview");
-        /* Track outbound links */
-        var links = document.getElementsByTagName("a");
-        Array.prototype.map.call(links, function(item) {
-          if (item.host != document.location.host) {
-            item.addEventListener("click", function() {
-              var action = item.getAttribute("data-md-action") || "follow";
-              ga("send", "event", "outbound", action, item.href);
-            });
-          }
-        });
-        /* Register handler to log search on blur */
-        var query = document.forms.search.query;
-        query.addEventListener("blur", function() {
-          if (this.value) {
-            var path = document.location.pathname;
-            ga("send", "pageview", path + "?q=" + this.value);
-          }
-        });
-      </script>
+      <script>!function(e,t,a,n,o,c,i){e.GoogleAnalyticsObject=o,e[o]=e[o]||function(){(e[o].q=e[o].q||[]).push(arguments)},e[o].l=1*new Date,c=t.createElement(a),i=t.getElementsByTagName(a)[0],c.async=1,c.src=n,i.parentNode.insertBefore(c,i)}(window,document,"script","https://www.google-analytics.com/analytics.js","ga"),ga("create","{{ config.google_analytics[0] }}","{{ config.google_analytics[1] }}"),ga("set","anonymizeIp",!0),ga("send","pageview");var links=document.getElementsByTagName("a");Array.prototype.map.call(links,function(e){e.host!=document.location.host&&e.addEventListener("click",function(){var t=e.getAttribute("data-md-action")||"follow";ga("send","event","outbound",t,e.href)})});var query=document.forms.search.query;query.addEventListener("blur",function(){if(this.value){var e=document.location.pathname;ga("send","pageview",e+"?q="+this.value)}})</script>
       {% endif %}
     {% endblock %}
   </body>
-</body></html>
+</html>
diff --git a/material/partials/fonts.html b/material/partials/fonts.html
index d397b9549..0c3da5bbb 100644
--- a/material/partials/fonts.html
+++ b/material/partials/fonts.html
@@ -3,14 +3,7 @@
   {% set code = config.extra.get("font", {}).code | default("Roboto Mono") %}
   {% set font = text + ':300,400,400i,700|' + code | replace(' ', '+') %}
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{ font }}">
-  <style>
-    body, input {
-      font-family: "{{ text }}", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-    pre, code, kbd {
-      font-family: "{{ code }}", "Courier New", Courier, monospace;
-    }
-  </style>
+  <style>body,input{font-family:"{{ text }}","Helvetica Neue",Helvetica,Arial,sans-serif}code,kbd,pre{font-family:"{{ code }}","Courier New",Courier,monospace}</style>
 {% endif %}
 <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 {% if config.extra.social %}
diff --git a/material/partials/footer.html b/material/partials/footer.html
index a40033241..78d9ee5a4 100644
--- a/material/partials/footer.html
+++ b/material/partials/footer.html
@@ -46,9 +46,9 @@
         {% endif %}
         powered by
         <a href="http://www.mkdocs.org">MkDocs</a>
-        and the
-        <a href="http://squidfunk.github.io/mkdocs-material/">Material</a>
-        theme
+        and
+        <a href="http://squidfunk.github.io/mkdocs-material/">
+          Material for MkDocs</a>
       </div>
       {% if config.extra.social %}
         <div class="md-footer-social">
diff --git a/src/partials/footer.html b/src/partials/footer.html
index c234100aa..3039e32fe 100644
--- a/src/partials/footer.html
+++ b/src/partials/footer.html
@@ -85,9 +85,9 @@
         {% endif %}
         powered by
         <a href="http://www.mkdocs.org">MkDocs</a>
-        and the
-        <a href="http://squidfunk.github.io/mkdocs-material/">Material</a>
-        theme
+        and
+        <a href="http://squidfunk.github.io/mkdocs-material/">
+          Material for MkDocs</a>
       </div>
 
       <!-- Link to social media accounts, if any -->