diff --git a/.gitignore b/.gitignore
index 734ece0..df8ac1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,12 +12,12 @@
 
 # OS or Editor folders
 .DS_Store
+._*
 Thumbs.db
 .cache
 .project
 .settings
 .tmproj
-*.esproj
 nbproject
 *.sublime-project
 *.sublime-workspace
@@ -30,6 +30,13 @@ dwsync.xml
 *.komodoproject
 .komodotools
 
+# Espresso
+*.esproj
+*.espressostorage
+
+# Rubinius
+*.rbc
+
 # Folders to ignore
 .hg
 .svn
diff --git a/css/style.css b/css/style.css
index 326cdaf..5ad9a63 100644
--- a/css/style.css
+++ b/css/style.css
@@ -19,10 +19,11 @@ html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 10
 html, button, input, select, textarea { font-family: sans-serif; color: #222; }
 body { margin: 0; font-size: 1em; line-height: 1.4; }
 
-::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
-::selection { background: #fe57a1; color: #fff; text-shadow: none; }
+::-moz-selection { background: #b3d4fc; text-shadow: none; }
+::selection { background: #b3d4fc; text-shadow: none; }
 
 a { color: #00e; }
+a:visited { color: #551a8b; }
 a:hover { color: #06e; }
 a:focus { outline: thin dotted; }
 a:hover, a:active { outline: 0; }
@@ -104,8 +105,7 @@ td { vertical-align: top; }
 
 /* ==|== non-semantic helper classes ======================================== */
 
-.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; *line-height: 0; }
-.ir br { display: none; }
+.ir { border: 0; font: 0/0 a; text-shadow: none; color: transparent; background-color: transparent; }
 .hidden { display: none !important; visibility: hidden; }
 .visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
 .visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
@@ -119,7 +119,7 @@ td { vertical-align: top; }
 /* ==|== print styles ======================================================= */
 
 @media print {
-  * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; }
+  * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; }
   a, a:visited { text-decoration: underline; }
   a[href]:after { content: " (" attr(href) ")"; }
   abbr[title]:after { content: " (" attr(title) ")"; }
diff --git a/header.php b/header.php
index 1f6d3d6..05b25b3 100644
--- a/header.php
+++ b/header.php
@@ -10,10 +10,10 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <script src="<?php echo get_template_directory_uri(); ?>/js/libs/modernizr-2.5.3.min.js"></script>
+  <script src="<?php echo get_template_directory_uri(); ?>/js/vendor/modernizr-2.5.3.min.js"></script>
 
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/js/libs/jquery-1.7.2.min.js"><\/script>')</script>
+  <script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/js/vendor/jquery-1.7.2.min.js"><\/script>')</script>
 
   <?php roots_head(); ?>
   <?php wp_head(); ?>
diff --git a/inc/h5bp-htaccess b/inc/h5bp-htaccess
index 5d95f30..cab6e04 100644
--- a/inc/h5bp-htaccess
+++ b/inc/h5bp-htaccess
@@ -1,5 +1,3 @@
-# BEGIN HTML5 Boilerplate
-
 ###
 ### This contains the HTML5 Boilerplate .htaccess that can be found at:
 ###  github.com/h5bp/html5-boilerplate/blob/master/.htaccess
@@ -96,16 +94,18 @@
 # JavaScript
 #   Normalize to standard type (it's sniffed in IE anyways)
 #   tools.ietf.org/html/rfc4329#section-7.2
-AddType application/javascript         js
+AddType application/javascript         js jsonp
+AddType application/json               json
 
 # Audio
 AddType audio/ogg                      oga ogg
-AddType audio/mp4                      m4a
+AddType audio/mp4                      m4a f4a f4b
 
 # Video
 AddType video/ogg                      ogv
-AddType video/mp4                      mp4 m4v
+AddType video/mp4                      mp4 m4v f4v f4p
 AddType video/webm                     webm
+AddType video/x-flv                    flv
 
 # SVG
 #   Required for svg webfonts on iPad
@@ -124,12 +124,14 @@ AddType image/x-icon                        ico
 AddType image/webp                          webp
 AddType text/cache-manifest                 appcache manifest
 AddType text/x-component                    htc
+AddType application/xml                     rss atom xml rdf
 AddType application/x-chrome-extension      crx
 AddType application/x-opera-extension       oex
 AddType application/x-xpinstall             xpi
 AddType application/octet-stream            safariextz
 AddType application/x-web-app-manifest+json webapp
 AddType text/x-vcard                        vcf
+AddType application/x-shockwave-flash       swf
 
 
 
@@ -213,8 +215,7 @@ AddType text/x-vcard                        vcf
 # ----------------------------------------------------------------------
 
 # These are pretty far-future expires headers.
-# They assume you control versioning with cachebusting query params like
-#   <script src="application.js?20100608">
+# They assume you control versioning with filename-based cache busting
 # Additionally, consider that outdated proxies may miscache
 #   www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
 
@@ -269,11 +270,7 @@ AddType text/x-vcard                        vcf
 #   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>
+</IfModule>
 
 
 
@@ -327,10 +324,14 @@ AddType text/x-vcard                        vcf
 
 # Turning on the rewrite engine is necessary for the following rules and features.
 # FollowSymLinks must be enabled for this to work.
+#
+# Some cloud hosting services require RewriteBase to be set: goo.gl/HOcPN
+# If using the h5bp in a subdirectory, use `RewriteBase /foo` instead where 'foo' is your directory.
 
 # <IfModule mod_rewrite.c>
 #   Options +FollowSymlinks
 #   RewriteEngine On
+# # RewriteBase /
 # </IfModule>
 
 
@@ -385,7 +386,7 @@ AddType text/x-vcard                        vcf
 # /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/h5bp/html5-boilerplate/wiki/Version-Control-with-Cachebusting
+# read: github.com/h5bp/html5-boilerplate/wiki/cachebusting
 
 # Uncomment to enable.
 # <IfModule mod_rewrite.c>
@@ -427,6 +428,8 @@ AddType text/x-vcard                        vcf
 # ----------------------------------------------------------------------
 
 # You can add custom pages to handle 500 or 403 pretty easily, if you like.
+# If you are hosting your site in subdirectory, adjust this accordingly
+#    e.g. ErrorDocument 404 /subdir/404.html
 # ErrorDocument 404 /404.html
 
 
@@ -509,6 +512,9 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
 # Rename session cookie to something else, than PHPSESSID
 # php_value session.name sid
 
+# Disable magic quotes (This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.)
+# php_flag magic_quotes_gpc Off
+
 # Do not show you are using PHP
 # Note: Move this line to php.ini since it won't work in .htaccess
 # php_flag expose_php Off
@@ -547,6 +553,4 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
 # Increase cookie security
 <IfModule php5_module>
   php_value session.cookie_httponly true
-</IfModule>
-
-# END HTML5 Boilerplate
\ No newline at end of file
+</IfModule>
\ No newline at end of file
diff --git a/inc/roots-scripts.php b/inc/roots-scripts.php
index 74bd295..24dc333 100644
--- a/inc/roots-scripts.php
+++ b/inc/roots-scripts.php
@@ -24,7 +24,7 @@ function roots_scripts() {
   }
 
   wp_register_script('roots_plugins', get_template_directory_uri() . '/js/plugins.js', false, null, false);
-  wp_register_script('roots_script', get_template_directory_uri() . '/js/script.js', false, null, false);
+  wp_register_script('roots_main', get_template_directory_uri() . '/js/main.js', false, null, false);
   wp_enqueue_script('roots_plugins');
   wp_enqueue_script('roots_script');
 }
diff --git a/js/script.js b/js/main.js
similarity index 100%
rename from js/script.js
rename to js/main.js
diff --git a/js/libs/jquery-1.7.2.min.js b/js/vendor/jquery-1.7.2.min.js
similarity index 100%
rename from js/libs/jquery-1.7.2.min.js
rename to js/vendor/jquery-1.7.2.min.js
diff --git a/js/libs/modernizr-2.5.3.min.js b/js/vendor/modernizr-2.5.3.min.js
similarity index 100%
rename from js/libs/modernizr-2.5.3.min.js
rename to js/vendor/modernizr-2.5.3.min.js