diff --git a/inc/h5bp-htaccess b/inc/h5bp-htaccess
index ca959a9..8736cd4 100644
--- a/inc/h5bp-htaccess
+++ b/inc/h5bp-htaccess
@@ -1,20 +1,23 @@
-# Apache configuration file
-# httpd.apache.org/docs/2.2/mod/quickreference.html
 
-# Note .htaccess files are an overhead, this logic should be in your Apache config if possible
-# httpd.apache.org/docs/2.2/howto/htaccess.html
-
-# Techniques in here adapted from all over, including:
-#   Kroc Camen: camendesign.com/.htaccess
-#   perishablepress.com/press/2006/01/10/stupid-htaccess-tricks/
-#   Sample .htaccess file of CMS MODx: modxcms.com
 
+# BEGIN HTML5 Boilerplate .htaccess
 
 ###
-### If you run a webserver other than apache, consider:
-### github.com/paulirish/html5-boilerplate-server-configs
+### This contains the HTML5 Boilerplate .htaccess that can be found at:
+###  github.com/paulirish/html5-boilerplate/blob/master/.htaccess
+###
+### Commented out by default:
+###  Expires headers:      Use WP Super Cache or W3 Total Cache (unless using the H5BP build script)
+###  ETag removal:         Use WP Super Cache or W3 Total Cache (unless using the H5BP build script)
+###  Start rewrite engine: Handled by WordPress
+###  Suppress/force www:   Handled by WordPress
+###  Options -MultiViews:  Causes a server 500 error on most shared hosts
+###  Custom 404 page:      Handled by WordPress
+###
+### Anytime you update this file the .htaccess file in the root of your
+### WordPress install is automatically updated with the changes whenever
+### the admin is refreshed (see roots-htaccess.php)
 ###
-
 
 
 # ----------------------------------------------------------------------
@@ -26,11 +29,11 @@
 # Use ChromeFrame if it's installed for a better experience for the poor IE folk
 
 <IfModule mod_headers.c>
-    Header set X-UA-Compatible "IE=Edge,chrome=1"
-    # mod_headers can't match by content-type, but we don't want to send this header on *everything*...
-    <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|xpi|safariextz|vcf)$" >
-      Header unset X-UA-Compatible
-    </FilesMatch>
+  Header set X-UA-Compatible "IE=Edge,chrome=1"
+  # mod_headers can't match by content-type, but we don't want to send this header on *everything*...
+  <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|xpi|safariextz|vcf)$" >
+    Header unset X-UA-Compatible
+  </FilesMatch>
 </IfModule>
 
 
@@ -38,7 +41,7 @@
 # Cross-domain AJAX requests
 # ----------------------------------------------------------------------
 
-# Serve cross-domain ajax requests, disabled.   
+# Serve cross-domain ajax requests, disabled.
 # enable-cors.org
 # code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
 
@@ -56,11 +59,11 @@
 # Alternatively you could only whitelist your
 # subdomains like "subdomain.example.com".
 
-<FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
-  <IfModule mod_headers.c>
+<IfModule mod_headers.c>
+  <FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
     Header set Access-Control-Allow-Origin "*"
-  </IfModule>
-</FilesMatch>
+  </FilesMatch>
+</IfModule>
 
 
 
@@ -70,7 +73,7 @@
 
 
 # JavaScript
-#   Normalize to standard type (it's sniffed in IE anyways) 
+#   Normalize to standard type (it's sniffed in IE anyways)
 #   tools.ietf.org/html/rfc4329#section-7.2
 AddType application/javascript         js
 
@@ -86,16 +89,16 @@ AddType video/webm                     webm
 # SVG.
 #   Required for svg webfonts on iPad
 #   twitter.com/FontSquirrel/status/14855840545
-AddType     image/svg+xml              svg svgz 
+AddType     image/svg+xml              svg svgz
 AddEncoding gzip                       svgz
-                                       
-# Webfonts                             
+
+# Webfonts
 AddType application/vnd.ms-fontobject  eot
 AddType application/x-font-ttf    ttf ttc
 AddType font/opentype                  otf
 AddType application/x-font-woff        woff
 
-# Assorted types                                      
+# Assorted types
 AddType image/x-icon                   ico
 AddType image/webp                     webp
 AddType text/cache-manifest            appcache manifest
@@ -107,51 +110,163 @@ AddType text/x-vcard                   vcf
 
 
 
+# ----------------------------------------------------------------------
+# Allow concatenation from within specific js and css files
+# ----------------------------------------------------------------------
+
+# e.g. Inside of script.combined.js you could have
+#   <!--#include file="libs/jquery-1.5.0.min.js" -->
+#   <!--#include file="plugins/jquery.idletimer.js" -->
+# and they would be included into this single file.
+
+# This is not in use in the boilerplate as it stands. You may
+# choose to name your files in this way for this advantage or
+# concatenate and minify them manually.
+# Disabled by default.
+
+#<FilesMatch "\.combined\.js$">
+#  Options +Includes
+#  AddOutputFilterByType INCLUDES application/javascript application/json
+#  SetOutputFilter INCLUDES
+#</FilesMatch>
+#<FilesMatch "\.combined\.css$">
+#  Options +Includes
+#  AddOutputFilterByType INCLUDES text/css
+#  SetOutputFilter INCLUDES
+#</FilesMatch>
+
+
 # ----------------------------------------------------------------------
 # Gzip compression
 # ----------------------------------------------------------------------
 
 <IfModule mod_deflate.c>
 
-# Force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/
-<IfModule mod_setenvif.c>
-  <IfModule mod_headers.c>
-    SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
-    RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
+  # Force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/
+  <IfModule mod_setenvif.c>
+    <IfModule mod_headers.c>
+      SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
+      RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
+    </IfModule>
   </IfModule>
+
+  # HTML, TXT, CSS, JavaScript, JSON, XML, HTC:
+  <IfModule filter_module>
+    FilterDeclare   COMPRESS
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/html
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/css
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/plain
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/xml
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/x-component
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/javascript
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/json
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/xml
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/xhtml+xml
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/rss+xml
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/atom+xml
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/vnd.ms-fontobject
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $image/svg+xml
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $image/x-icon
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/x-font-ttf
+    FilterProvider  COMPRESS  DEFLATE resp=Content-Type $font/opentype
+    FilterChain     COMPRESS
+    FilterProtocol  COMPRESS  DEFLATE change=yes;byteranges=no
+  </IfModule>
+
+  <IfModule !mod_filter.c>
+    # Legacy versions of Apache
+    AddOutputFilterByType DEFLATE text/html text/plain text/css application/json
+    AddOutputFilterByType DEFLATE application/javascript
+    AddOutputFilterByType DEFLATE text/xml application/xml text/x-component
+    AddOutputFilterByType DEFLATE application/xhtml+xml application/rss+xml application/atom+xml
+    AddOutputFilterByType DEFLATE image/x-icon image/svg+xml application/vnd.ms-fontobject application/x-font-ttf font/opentype
+  </IfModule>
+
 </IfModule>
 
-# HTML, TXT, CSS, JavaScript, JSON, XML, HTC:
-<IfModule filter_module>
-  FilterDeclare   COMPRESS
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/html
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/css
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/plain
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/xml
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/x-component
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/javascript
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/json
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/xml
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/xhtml+xml
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/rss+xml
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/atom+xml
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/vnd.ms-fontobject
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $image/svg+xml
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/x-font-ttf
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $font/opentype
-  FilterChain     COMPRESS
-  FilterProtocol  COMPRESS  DEFLATE change=yes;byteranges=no
-</IfModule>
 
-<IfModule !mod_filter.c>
-  # Legacy versions of Apache
-  AddOutputFilterByType DEFLATE text/html text/plain text/css application/json
-  AddOutputFilterByType DEFLATE application/javascript
-  AddOutputFilterByType DEFLATE text/xml application/xml text/x-component
-  AddOutputFilterByType DEFLATE application/xhtml+xml application/rss+xml application/atom+xml
-  AddOutputFilterByType DEFLATE image/x-icon image/svg+xml application/vnd.ms-fontobject application/x-font-ttf font/opentype
-</IfModule>
-</IfModule>
+# ----------------------------------------------------------------------
+# Expires headers (for better cache control)
+# ----------------------------------------------------------------------
+
+# These are pretty far-future expires headers.
+# They assume you control versioning with cachebusting query params like
+#   <script src="application.js?20100608">
+# Additionally, consider that outdated proxies may miscache
+#   www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
+
+# If you don't use filenames to version, lower the CSS  and JS to something like
+#   "access plus 1 week" or so.
+
+#<IfModule mod_expires.c>
+#  ExpiresActive on
+
+# Perhaps better to whitelist expires rules? Perhaps.
+#  ExpiresDefault                          "access plus 1 month"
+
+# cache.appcache needs re-requests in FF 3.6 (thanks Remy ~Introducing HTML5)
+#  ExpiresByType text/cache-manifest       "access plus 0 seconds"
+
+# Your document html
+#  ExpiresByType text/html                 "access plus 0 seconds"
+
+# Data
+#  ExpiresByType text/xml                  "access plus 0 seconds"
+#  ExpiresByType application/xml           "access plus 0 seconds"
+#  ExpiresByType application/json          "access plus 0 seconds"
+
+# Feed
+#  ExpiresByType application/rss+xml       "access plus 1 hour"
+#  ExpiresByType application/atom+xml      "access plus 1 hour"
+
+# Favicon (cannot be renamed)
+#  ExpiresByType image/x-icon              "access plus 1 week"
+
+# Media: images, video, audio
+#  ExpiresByType image/gif                 "access plus 1 month"
+#  ExpiresByType image/png                 "access plus 1 month"
+#  ExpiresByType image/jpg                 "access plus 1 month"
+#  ExpiresByType image/jpeg                "access plus 1 month"
+#  ExpiresByType video/ogg                 "access plus 1 month"
+#  ExpiresByType audio/ogg                 "access plus 1 month"
+#  ExpiresByType video/mp4                 "access plus 1 month"
+#  ExpiresByType video/webm                "access plus 1 month"
+
+# HTC files  (css3pie)
+#  ExpiresByType text/x-component          "access plus 1 month"
+
+# Webfonts
+#  ExpiresByType application/x-font-ttf    "access plus 1 month"
+#  ExpiresByType font/opentype             "access plus 1 month"
+#  ExpiresByType application/x-font-woff   "access plus 1 month"
+#  ExpiresByType image/svg+xml             "access plus 1 month"
+#  ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
+
+# CSS and JavaScript
+#  ExpiresByType text/css                  "access plus 1 year"
+#  ExpiresByType application/javascript    "access plus 1 year"
+
+#  <IfModule mod_headers.c>
+#    Header append Cache-Control "public"
+#  </IfModule>
+
+#</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
 
 
 
@@ -185,11 +300,86 @@ AddType text/x-vcard                   vcf
 
 
 
+# ----------------------------------------------------------------------
+# Start rewrite engine
+# ----------------------------------------------------------------------
+
+# Turning on the rewrite engine is necessary for the following rules and features.
+# FollowSymLinks must be enabled for this to work.
+
+#<IfModule mod_rewrite.c>
+#  Options +FollowSymlinks
+#  RewriteEngine On
+#</IfModule>
+
+
+
+# ----------------------------------------------------------------------
+# Suppress or force the "www." at the beginning of URLs
+# ----------------------------------------------------------------------
+
+# The same content should never be available under two different URLs - especially not with and
+# without "www." at the beginning, since this can cause SEO problems (duplicate content).
+# That's why you should choose one of the alternatives and redirect the other one.
+
+# By default option 1 (no "www.") is activated. Remember: Shorter URLs are sexier.
+# no-www.org/faq.php?q=class_b
+
+# If you rather want to use option 2, just comment out all option 1 lines
+# and uncomment option 2.
+# IMPORTANT: NEVER USE BOTH RULES AT THE SAME TIME!
+
+# ----------------------------------------------------------------------
+
+# Option 1:
+# Rewrite "www.example.com -> example.com"
+
+#<IfModule mod_rewrite.c>
+#  RewriteCond %{HTTPS} !=on
+#  RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+#  RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
+#</IfModule>
+
+# ----------------------------------------------------------------------
+
+# Option 2:
+# To rewrite "example.com -> www.example.com" uncomment the following lines.
+# Be aware that the following rule might not be a good idea if you
+# use "real" subdomains for certain parts of your website.
+
+# <IfModule mod_rewrite.c>
+#   RewriteCond %{HTTPS} !=on
+#   RewriteCond %{HTTP_HOST} !^www\..+$ [NC]
+#   RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+# </IfModule>
+
+
+
+# ----------------------------------------------------------------------
+# Built-in filename-based cache busting
+# ----------------------------------------------------------------------
+
+# If you're not using the build script to manage your filename version revving,
+# you might want to consider enabling this, which will route requests for
+# /css/style.20110203.css to /css/style.css
+
+# To understand why this is important and a better idea than all.css?v1231,
+# read: github.com/paulirish/html5-boilerplate/wiki/Version-Control-with-Cachebusting
+
+# Uncomment to enable.
+# <IfModule mod_rewrite.c>
+#   RewriteCond %{REQUEST_FILENAME} !-f
+#   RewriteCond %{REQUEST_FILENAME} !-d
+#   RewriteRule ^(.+)\.(\d+)\.(js|css|png|jpg|gif)$ $1.$3 [L]
+# </IfModule>
+
+
+
 # ----------------------------------------------------------------------
 # Prevent SSL cert warnings
 # ----------------------------------------------------------------------
 
-# Rewrite secure requests properly to prevent SSL cert warnings, e.g. prevent 
+# Rewrite secure requests properly to prevent SSL cert warnings, e.g. prevent
 # https://www.example.com when your cert only allows https://secure.example.com
 # Uncomment the following lines to use this feature.
 
@@ -204,10 +394,19 @@ AddType text/x-vcard                   vcf
 # Prevent 404 errors for non-existing redirected folders
 # ----------------------------------------------------------------------
 
-# without -MultiViews, Apache will give a 404 for a rewrite if a folder of the same name does not exist 
+# without -MultiViews, Apache will give a 404 for a rewrite if a folder of the same name does not exist
 #   e.g. /blog/hello : webmasterworld.com/apache/3808792.htm
 
-Options -MultiViews 
+#Options -MultiViews
+
+
+
+# ----------------------------------------------------------------------
+# Custom 404 page
+# ----------------------------------------------------------------------
+
+# You can add custom pages to handle 500 or 403 pretty easily, if you like.
+#ErrorDocument 404 /404.html
 
 
 
@@ -307,4 +506,6 @@ AddCharset utf-8 .html .css .js .xml .json .rss .atom
 # Increase cookie security
 <IfModule php5_module>
   php_value session.cookie_httponly true
-</IfModule>
\ No newline at end of file
+</IfModule>
+
+# END HTML5 Boilerplate
\ No newline at end of file
diff --git a/inc/roots-htaccess.php b/inc/roots-htaccess.php
index ca24a73..36df638 100644
--- a/inc/roots-htaccess.php
+++ b/inc/roots-htaccess.php
@@ -1,4 +1,8 @@
-<?php  
+<?php
+
+// Using a server other than Apache? See:
+// https://github.com/retlehs/roots/wiki/Nginx
+// https://github.com/retlehs/roots/wiki/Lighttpd
 
 if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
 	function roots_htaccess_writable() {
@@ -8,20 +12,20 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
 			}
 		};
 	}
-	
+
 	add_action('admin_init', 'roots_htaccess_writable');
-	
+
 	// Rewrites DO NOT happen for child themes
 	// rewrite /wp-content/themes/roots/css/ to /css/
 	// rewrite /wp-content/themes/roots/js/  to /js/
 	// rewrite /wp-content/themes/roots/img/ to /js/
 	// rewrite /wp-content/plugins/ to /plugins/
-	
+
 	function roots_flush_rewrites() {
 		global $wp_rewrite;
 		$wp_rewrite->flush_rules();
 	}
-	
+
 	function roots_add_rewrites($content) {
 		$theme_name = next(explode('/themes/', get_stylesheet_directory()));
 		global $wp_rewrite;
@@ -33,9 +37,9 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
 		);
 		$wp_rewrite->non_wp_rules += $roots_new_non_wp_rules;
 	}
-	
+
 	add_action('admin_init', 'roots_flush_rewrites');
-	
+
 	function roots_clean_assets($content) {
 	    $theme_name = next(explode('/themes/', $content));
 	    $current_path = '/wp-content/themes/' . $theme_name;
@@ -43,45 +47,40 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
 	    $content = str_replace($current_path, $new_path, $content);
 	    return $content;
 	}
-	
+
 	function roots_clean_plugins($content) {
 	    $current_path = '/wp-content/plugins';
 	    $new_path = '/plugins';
 	    $content = str_replace($current_path, $new_path, $content);
 	    return $content;
 	}
-	
+
 	// only use clean urls if the theme isn't a child or an MU (Network) install
 	if (!is_multisite() && !is_child_theme()) {
 		add_action('generate_rewrite_rules', 'roots_add_rewrites');
-		if (!is_admin()) { 
+		if (!is_admin()) {
 			add_filter('plugins_url', 'roots_clean_plugins');
 			add_filter('bloginfo', 'roots_clean_assets');
 			add_filter('stylesheet_directory_uri', 'roots_clean_assets');
 			add_filter('template_directory_uri', 'roots_clean_assets');
-      add_filter('script_loader_src', 'roots_clean_plugins');
-      add_filter('style_loader_src', 'roots_clean_plugins');
+			add_filter('script_loader_src', 'roots_clean_plugins');
+			add_filter('style_loader_src', 'roots_clean_plugins');
 		}
 	}
-	
+
 	function roots_add_h5bp_htaccess($rules) {
 		global $wp_filesystem;
-	
+
 		if (!defined('FS_METHOD')) define('FS_METHOD', 'direct');
 		if (is_null($wp_filesystem)) WP_Filesystem(array(), ABSPATH);
-		
-		if (!defined('WP_CONTENT_DIR'))
-		define('WP_CONTENT_DIR', ABSPATH . 'wp-content');	
-	
-		$theme_name = next(explode('/themes/', get_template_directory()));
-		$filename = WP_CONTENT_DIR . '/themes/' . $theme_name . '/inc/h5bp-htaccess';
-	
+
+		$filename = __DIR__ . '/h5bp-htaccess';
 		$rules .= $wp_filesystem->get_contents($filename);
-		
+
 		return $rules;
 	}
-	
+
 	add_action('mod_rewrite_rules', 'roots_add_h5bp_htaccess');
 }
 
-?>
+?>
\ No newline at end of file