diff --git a/.htaccess b/.htaccess
index 9fded1e..c7455ce 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,45 @@
-ErrorDocument 404 /404.html
\ No newline at end of file
+ErrorDocument 404 /404.html
+
+<IfModule mod_expires.c>
+
+  ExpiresActive on
+  
+  ExpiresDefault  "access plus 1 month"
+  
+  # JavaScript
+
+  ExpiresByType application/javascript                "access plus 1 year"
+  ExpiresByType application/x-javascript              "access plus 1 year"
+  ExpiresByType text/javascript                       "access plus 1 year"
+
+  ExpiresByType text/html                             "modification"
+  
+</IfModule>
+
+<IfModule mod_headers.c>
+  <filesmatch "\.(js)$">
+    Header set Cache-Control "max-age=31536000, public"
+  </filesmatch>
+  <filesmatch "\.(html|xml)$">
+    Header set Cache-Control "no-store, max-age=0"
+  </filesmatch>
+</IfModule>
+
+
+# ----------------------------------------------------------------------
+# ETag removal
+# ----------------------------------------------------------------------
+
+# FileETag None is not enough for every server.
+<IfModule mod_headers.c>
+  Header unset ETag
+</IfModule>
+
+# Since we're sending far-future expires, we don't need ETags for
+# static content.
+#   developer.yahoo.com/performance/rules.html#etags
+FileETag None
+
+<IfModule mod_headers.c>
+    Header unset Server
+</IfModule>
diff --git a/assets/js/lib/.htaccess b/assets/js/lib/.htaccess
deleted file mode 100644
index 655d70b..0000000
--- a/assets/js/lib/.htaccess
+++ /dev/null
@@ -1,39 +0,0 @@
-<IfModule mod_expires.c>
-
-  ExpiresActive on
-  
-  ExpiresDefault  "access plus 1 month"
-  
-  # JavaScript
-
-  ExpiresByType application/javascript                "access plus 1 year"
-  ExpiresByType application/x-javascript              "access plus 1 year"
-  ExpiresByType text/javascript                       "access plus 1 year"
-  
-</IfModule>
-
-<IfModule mod_headers.c>
-  <filesmatch "\.(js)$">
-  Header set Cache-Control "max-age=31536000, public"
-  </filesmatch>
-</IfModule>
-
-
-# ----------------------------------------------------------------------
-# ETag removal
-# ----------------------------------------------------------------------
-
-# FileETag None is not enough for every server.
-<IfModule mod_headers.c>
-  Header unset ETag
-</IfModule>
-
-# Since we're sending far-future expires, we don't need ETags for
-# static content.
-#   developer.yahoo.com/performance/rules.html#etags
-FileETag None
-
-<IfModule mod_headers.c>
-    Header unset Server
-</IfModule>
-