diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8612389
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+.gitignore              export-ignore
+.gitattributes          export-ignore
+.travis.yml             export-ignore
+codesniffer.ruleset.xml export-ignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2e01cb1..2b484cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,16 @@
-
 config.codekit
-
 node_modules/
 
 # Built Files
 style.css
 editor-style.css
+
 styles/*.css
-styles/*.map
+styles/**/*.map
 styles/src/.sass-cache/
-styles/src/reset/_normalize.scss
+
 scripts/*.js
-scripts/srcmaps/
+scripts/**/*.map
 scripts/src/modernizr.js
+
 docs/*.html
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 6376d74..2be00ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,12 +28,12 @@ env:
     - WP_VERSION=master WP_MULTISITE=1
     # WordPress 4.1
     # @link https://github.com/WordPress/WordPress/tree/4.1-branch
-    - WP_VERSION=4.1 WP_MULTISITE=0
-    - WP_VERSION=4.1 WP_MULTISITE=1
+    - WP_VERSION=4.2 WP_MULTISITE=0
+    - WP_VERSION=4.2 WP_MULTISITE=1
     # WordPress 4.0
     # @link https://github.com/WordPress/WordPress/tree/4.0-branch
-    - WP_VERSION=4.0 WP_MULTISITE=0
-    - WP_VERSION=4.0 WP_MULTISITE=1
+    - WP_VERSION=4.1 WP_MULTISITE=0
+    - WP_VERSION=4.1 WP_MULTISITE=1
 
 # Declare 5.6 beta in test matrix.
 # @link https://buddypress.trac.wordpress.org/ticket/5620
@@ -46,12 +46,15 @@ matrix:
         - php: 5.6
     fast_finish: true
 
+before_install:
+ - npm install -g npm # Update npm to latest version.
+
 # Install devDependencies and build files with Grunt.
 install:
   - npm install
   - npm install # Do it again because it goes wrong often enough to make builds error.
-  - npm install -g grunt-cli
-  - grunt build
+  - npm install -g gulp
+  - gulp build
 
 # Use this to prepare the system to install prerequisites or dependencies.
 # e.g. sudo apt-get update.
diff --git a/404.php b/404.php
index a1132cb..c4deb82 100644
--- a/404.php
+++ b/404.php
@@ -12,11 +12,11 @@
 
 			<section class="error-404 not-found">
 				<header class="page-header">
-					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'decode' ); ?></h1>
+					<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'decode' ); ?></h1>
 				</header><!-- .page-header -->
 
 				<div class="page-content">
-					<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'decode' ); ?></p>
+					<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'decode' ); ?></p>
 
 					<?php get_search_form(); ?>
 
@@ -29,7 +29,7 @@
 					
 					<?php if ( decode_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
 					<div class="widget widget_categories">
-						<h2 class="widgettitle"><?php _e( 'Most Used Categories', 'decode' ); ?></h2>
+						<h2 class="widgettitle"><?php esc_html_e( 'Most Used Categories', 'decode' ); ?></h2>
 						<ul>
 						<?php
 							wp_list_categories( array(
diff --git a/archive.php b/archive.php
index 7f2b168..2f59d5c 100644
--- a/archive.php
+++ b/archive.php
@@ -2,7 +2,7 @@
 /**
  * The template for displaying archive pages.
  *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */
diff --git a/author.php b/author.php
index bab409c..6c7f698 100644
--- a/author.php
+++ b/author.php
@@ -2,7 +2,7 @@
 /**
  * The template for displaying author pages.
  *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */
diff --git a/codesniffer.ruleset.xml b/codesniffer.ruleset.xml
index cf71bbb..9274351 100644
--- a/codesniffer.ruleset.xml
+++ b/codesniffer.ruleset.xml
@@ -7,8 +7,6 @@
 
 	<!-- Include the WordPress ruleset, with exclusions. -->
 	<rule ref="WordPress">
-		<exclude name="WordPress.XSS.EscapeOutput" />
-		<exclude name="WordPress.WhiteSpace.ScopeIndent.Incorrect" />
-		<exclude name="WordPress.VIP.PostsPerPage.posts_per_page" />
+		
 	</rule>
 </ruleset>
\ No newline at end of file
diff --git a/comments.php b/comments.php
index 91520ea..9e9975f 100644
--- a/comments.php
+++ b/comments.php
@@ -31,7 +31,7 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
 		<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
-			<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'decode' ); ?></h2>
+			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'decode' ); ?></h2>
 			<div class="nav-links">
 
 				<div class="nav-previous"><?php previous_comments_link( __( 'Older Comments', 'decode' ) ); ?></div>
@@ -55,7 +55,7 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
 		<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
-			<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'decode' ); ?></h2>
+			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'decode' ); ?></h2>
 			<div class="nav-links">
 
 				<div class="nav-previous"><?php previous_comments_link( __( 'Older Comments', 'decode' ) ); ?></div>
@@ -71,7 +71,7 @@
 		// If comments are closed and there are comments, let's leave a little note, shall we?
 		if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
 	?>
-		<p class="no-comments"><?php _e( 'Comments are closed.', 'decode' ); ?></p>
+		<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'decode' ); ?></p>
 	<?php endif; ?>
 	
 	<?php
diff --git a/content-excerpt.php b/content-excerpt.php
index b88467c..afc9099 100644
--- a/content-excerpt.php
+++ b/content-excerpt.php
@@ -30,7 +30,7 @@
 	</div><!-- .entry-summary -->
 	
 	<footer class="entry-footer">
-		<a class="read-more-link" href="<?php echo get_permalink(); ?>"><?php _e( 'Read More&hellip;', 'decode' ); ?></a>
+		<a class="read-more-link" href="<?php echo get_permalink(); ?>"><?php esc_html_e( 'Read More&hellip;', 'decode' ); ?></a>
 		
 		<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
 		
diff --git a/content-link.php b/content-link.php
index ec60fca..f8a0041 100644
--- a/content-link.php
+++ b/content-link.php
@@ -42,7 +42,7 @@
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 				<p class="date"><?php decode_posted_on(); ?></p>
diff --git a/content-none.php b/content-none.php
index 7d2bbdd..9d9a52e 100644
--- a/content-none.php
+++ b/content-none.php
@@ -2,7 +2,7 @@
 /**
  * The template part for displaying a message that posts cannot be found.
  *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */
@@ -10,22 +10,22 @@
 
 <section class="no-results not-found">
 	<header class="page-header">
-		<h1 class="page-title"><?php _e( 'Nothing Found', 'decode' ); ?></h1>
+		<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'decode' ); ?></h1>
 	</header><!-- .page-header -->
 
 	<div class="page-content">
 		<?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
 
-			<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'decode' ), admin_url( 'post-new.php' ) ); ?></p>
+			<p><?php printf( esc_html__( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'decode' ), admin_url( 'post-new.php' ) ); ?></p>
 
 		<?php elseif ( is_search() ) : ?>
 
-			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'decode' ); ?></p>
+			<p><?php esc_html_e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'decode' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php else : ?>
 
-			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'decode' ); ?></p>
+			<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'decode' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php endif; ?>
diff --git a/content-quote.php b/content-quote.php
index b9ff622..fd488f9 100644
--- a/content-quote.php
+++ b/content-quote.php
@@ -29,7 +29,7 @@
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' )  . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' )  . the_category( ', ' ); ?></p>
 			<?php endif; ?>
 			<p class="date"><?php decode_posted_on(); ?></p>
 		</div>
diff --git a/content-single.php b/content-single.php
index d26b582..62fa3a4 100644
--- a/content-single.php
+++ b/content-single.php
@@ -23,7 +23,7 @@
 			
 			<div class="entry-meta">
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 				<p class="date"><?php decode_posted_on(); ?></p>
 			</div>
 		</footer><!-- .entry-footer -->
@@ -63,7 +63,7 @@
 			
 			<div class="entry-meta">
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 				<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 					<p class="date"><?php decode_posted_on(); ?></p>
 				<?php endif; ?>
@@ -112,7 +112,7 @@
 			
 			<div class="entry-meta">
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 				<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 					<p class="date"><?php decode_posted_on(); ?></p>
 				<?php endif; ?>
diff --git a/content.php b/content.php
index 852602a..2e95daa 100644
--- a/content.php
+++ b/content.php
@@ -45,7 +45,7 @@
 				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
-				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
+				<p class="categories"><?php esc_html_e( 'Categorized in&#58; ', 'decode' ) . the_category( ', ' ); ?></p>
 			<?php endif; ?>
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 				<p class="date"><?php decode_posted_on(); ?></p>
diff --git a/docs/src/CustomCSS.md b/docs/src/CustomCSS.md
deleted file mode 100644
index d7fd1a7..0000000
--- a/docs/src/CustomCSS.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Helpful Custom CSS entries
-*A collection of CSS snippets that anyone can use in Jetpack's Custom CSS feature. [Download Jetpack](http://jetpack.me/install/) | [Get Help](http://jetpack.me/support/custom-css/)*
-
-### Change the size of the header image:
-`.site-logo { max-height: 8.5em; }`<br>
-8.5ems is the default. Raise or lower this amount to what suits you.
-
-### Fit background image to page width:
-`body.custom-background { background-size: cover; }`
-
-### Change the size of the social icons:
-`.sociallink svg { height: 2.5em; width: 2.5em; }`<br>
-I suggest that you do not change this without using media queries because the social icons are responsively sized.
-
-### Change the color of the social icons:
-`.social-icon-fill { fill: #00B0CC; }`
-
-### Change the color of the menu and menu close icons:
-`.menu-icon, .close-icon { fill: #00B0CC; }`
-
-### Change font family:
-`body, button, input, select, textarea { font-family: 'name-of-font-family'; }`
-
-### Change the font size of posts and pages:
-`.entry-content { font-size: 1em; }`<br>
-1em is the default.
-
-### Change the maximum width of the main content area:
-`.site-main, .site-footer { max-width: 45em; }`<br>
-45em is the default. It is recommended that the footer be the same width as the main content area.
-
-### Change the maximum width of the header:
-`.site-header { max-width: 60em; }`<br>
-60em is the default.
-
-### Increase size of comment box by default:
-`textarea#comment { height: 4em; }`<br>
-7em is the default.
-
-### Make the sidebar pop closed when the page loads
-`.sidebar.left {
-	animation: pop-closed 0.75s 0.75s;
-}`
-
-### Prevent current menu item from shaking on hover:
-`.menu .current-menu-item > a:hover,
-.menu .current_page_item > a:hover {
-	-webkit-animation: none;
-	animation: none;
-}`
-
-### Remove the border between the header and the main section of the site:
-`.site-header { border-bottom: none; }`
-
-### Remove the the border from below posts:
-`.post .entry-meta { border-bottom: none; }`
-
-### Remove the the border under hovered links in an entry:
-`.no-touch .entry-content a:hover { border-bottom: none; }`
-
-### Hide Page Titles on archive pages:
-`.archive .page-header { display: none; }`
-
-### Hide Page Titles on category pages:
-`.category.page-header { display: none; }`
-
-### Hide Page Titles on specific category pages:
-`.category-NAMEOFCATEGORY .page-header { display: none; }`
-
diff --git a/docs/src/CustomCSSTemplate.html b/docs/src/CustomCSSTemplate.html
deleted file mode 100644
index add6c12..0000000
--- a/docs/src/CustomCSSTemplate.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-	<title>Decode Custom CSS Snippets</title>
-	<meta charset="UTF-8">
-	
-	<style>
-		body {
-			background: #E3E5E7;
-			color: #444444;
-			margin: 0;
-			font: normal 300 100% sans-serif; }
-		
-		::selection {
-			background: rgba(0, 155, 205, 0.25); }
-		
-		::-moz-selection {
-			background: rgba(0, 155, 205, 0.25); }
-		
-		a {
-			-webkit-transition: color 0.35s ease-out;
-			-moz-transition: color 0.35s ease-out;
-			transition: color 0.35s ease-out;
-			text-decoration: none;
-			color: #009BCD; }
-		
-		a:hover {
-			color: #007EA6; }
-		
-		a:active {
-			color: #444444; }
-		
-		img {
-			border: none; }
-		
-		ul {
-			margin: 0;
-			padding: 0; }
-		
-		header p {
-			text-align: justify; }
-		
-		main {
-			margin: 0 auto 5%;;
-			width: 70%; }
-		
-		main img {
-			max-width: 100%;
-			box-shadow: 0 0 5px rgba(0,0,0,0.35); }
-						
-		main p {
-			padding-bottom: 1.5%;
-			border-bottom: 1px solid #009BCD;
-			margin-bottom: 5%; }
-			
-		main code {
-			background: #d3d3d3;
-			padding: 0.3em;
-			border-radius: 3px;
-			margin-bottom: 1em;
-			display: inline-block;; }
-		
-	</style>
-
-</head>
-
-<body>
-
-	<main>
-	
-		<%=content%>
-		
-	<main>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/src/README.md b/docs/src/README.md
deleted file mode 100644
index 86262a7..0000000
--- a/docs/src/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Decode 3.0
-[![GitHub Release](http://img.shields.io/github/release/ScottSmith95/Decode.svg?style=flat)](https://github.com/ScottSmith95/Decode/releases/latest)
-[![Built with Grunt](http://img.shields.io/badge/built_with-GRUNT-orange.svg?style=flat)](http://gruntjs.com/)
-[![devDependency Status](http://img.shields.io/david/dev/ScottSmith95/Decode.svg?style=flat)](https://david-dm.org/ScottSmith95/Decode#info=devDependencies)
-[![Build Status](http://img.shields.io/travis/ScottSmith95/Decode.svg?style=flat)](https://travis-ci.org/ScottSmith95/Decode)
-
-Changelogs for each version can be found [on GitHub](https://github.com/ScottSmith95/Decode/releases).
-
-I built Decode to be a beautifully crafted, modern theme that puts mobile devices first. 
-
-If you want to change any of the colors in your theme, enable the sidebar, social links, and more, access the Customize menu in Admin > Appearance > Customize. From here you can access all the settings available for this theme. 
-
-Decode's elegant sidebar is conveniently accessed by clicking or tapping on the menu icon. The sidebar can hold any number of widgets you choose. The side on which the sidebar and the hamburger icon are placed is customizable. You can also disable the sidebar if you choose. 
-
-Decode supports link posts, where the title can be hyperlinked. To do this, first set the post format to "Link" and then add designate where the title should link to using a custom field entitled, `title_url`, `url_title`, or `title_link`. I also have added support for quote posts. Quote marks are automatically added, so don't use them when composing a quote. 
-
-Featured Images are also supported, allowing you to display large, beautiful images at the top of your posts. A site-wide header image can also be set in the Header Options section of the theme customizer. 
-
-To add an explore page to your site, simply add a page with the title that you want and set the page template to "Explore Page" and Decode does the rest, adding an easy place for visitors to find new content on your site. 
-
-Breadcrumbs are supported via the [Breadcrumb Trail](http://wordpress.org/plugins/breadcrumb-trail/) or [Breadcrumb NavXT](http://wordpress.org/plugins/breadcrumb-navxt/) plugins. Simply activate either plugin and enjoy beautiful breadcrumbs across your site.
-
-Lastly, Decode has social icons that can link to your profiles from every side of the Internet. These can all be configured in the Customize menu and are listed below.
-- Twitter
-- Facebook
-- Google+
-- Ello
-- ADN
-- Sina Weibo
-- MySpace
-- Diaspora
-- VK
-- Dribbble
-- Behance
-- LinkedIn
-- Pinterest
-- Fancy
-- Etsy
-- Pinboard
-- Delicious
-- Instagram
-- VSCO Grid
-- 500px
-- Flickr
-- deviantART
-- SoundCloud
-- Bandcamp
-- Rdio
-- Spotify
-- Last.Fm
-- Vine
-- Vimeo
-- YouTube
-- Kickstarter
-- Gittip
-- Goodreads
-- Tumblr
-- Medium
-- Svbtle
-- WordPress.com
-- Stack Overflow
-- reddit
-- GitHub
-- Bitbucket
-- Runkeeper
-- Strava
-- Foursquare
-- Yelp
-- SlideShare
-- ResearchGate
-- YouVersion
-- Playstation Network
-- Xbox Live
-- Steam
-- Twitch
-- Skype
-- Website
-- Email
-
-To find un-minified, vendor-prefixed CSS, look no further than the .css files in the "styles" directory. No seriously, don't look any further because the styles/src directory contains un-prefixed sass files that you may not want to work with.
-
-If you desire to add Typekit fonts to your blog, I recommend the [Typekit Fonts for WordPress plugin](http://wordpress.org/plugins/typekit-fonts-for-wordpress/). In the CSS field, add: `body, button, input, select, textarea {font-family: 'name-of-font-family';}` to override the default Decode font. This allows you more flexibility and ease when adding or changing fonts. 
-
-*The font "Oxygen" is supplied via Google Fonts. It is licensed under the [SIL Open Font License, version 1.1](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL).*
\ No newline at end of file
diff --git a/docs/src/READMETemplate.html b/docs/src/READMETemplate.html
deleted file mode 100644
index 2e09af2..0000000
--- a/docs/src/READMETemplate.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-	<title>Decode Custom CSS Snippets</title>
-	<meta charset="UTF-8">
-	
-	<style>
-		body {
-			background: #E3E5E7;
-			color: #444444;
-			margin: 0;
-			font: normal 300 100% sans-serif; }
-		
-		::selection {
-			background: rgba(0, 155, 205, 0.25); }
-		
-		::-moz-selection {
-			background: rgba(0, 155, 205, 0.25); }
-		
-		a {
-			-webkit-transition: color 0.35s ease-out;
-			-moz-transition: color 0.35s ease-out;
-			transition: color 0.35s ease-out;
-			text-decoration: none;
-			color: #009BCD; }
-		
-		a:hover {
-			color: #007EA6; }
-		
-		a:active {
-			color: #444444; }
-		
-		img {
-			border: none; }
-		
-		ul {
-			margin: 0;
-			padding: 0; }
-		
-		header p {
-			text-align: justify; }
-		
-		main {
-			margin: 0 auto 5%;;
-			width: 70%; }
-		
-		main img {
-			max-width: 100%;
-			box-shadow: 0 0 5px rgba(0,0,0,0.35); }
-						
-		main p {
-			margin-bottom: 5%; }
-			
-		main code {
-			background: #d3d3d3;
-			padding: 0.3em;
-			border-radius: 3px;
-			display: inline-block;; }
-		
-	</style>
-
-</head>
-
-<body>
-
-	<main>
-	
-		<%=content%>
-		
-	<main>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 5a1c7bb..8639525 100644
--- a/functions.php
+++ b/functions.php
@@ -5,13 +5,6 @@
  * @package Decode
  */
  
-/*
- * Set the content width based on the theme's design and stylesheet.
- */
-if ( ! isset( $content_width ) ) {
-	$content_width = 640; /* pixels */
-}
-
 if ( ! function_exists( 'decode_setup' ) ) :
 /*
  * Sets up theme defaults and registers support for various WordPress features.
@@ -57,7 +50,8 @@ function decode_setup() {
 		'header-text' => array(
 			'site-title',
 			'site-description',
-		)
+		),
+		'size' => 'full'
 	);
 	$args = apply_filters( 'decode_site_logo_args', $args );
 	add_theme_support( 'site-logo', $args );
@@ -100,13 +94,13 @@ function decode_setup() {
 	/**
      * Enable support for Post Thumbnails on posts and pages.
      *
-     * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+     * @link https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
      */
 	add_theme_support( 'post-thumbnails' );
 	
 	/**
 	 * Enable support for Post Formats.
-	 * @link http://codex.wordpress.org/Post_Formats
+	 * @link https://codex.wordpress.org/Post_Formats
 	 */
 	$args = array(
 		'aside',
@@ -121,6 +115,18 @@ function decode_setup() {
 endif; // decode_setup
 add_action( 'after_setup_theme', 'decode_setup' );
 
+/**
+ * Set the content width in pixels, based on the theme's design and stylesheet.
+ *
+ * Priority 0 to make it available to lower priority callbacks.
+ *
+ * @global int $content_width
+ */
+function decode_content_width() {
+	$GLOBALS['content_width'] = apply_filters( 'decode_content_width', 640 );
+}
+add_action( 'after_setup_theme', 'decode_content_width', 0 );
+
 /*
  * Register styles and scripts.
  */
@@ -154,7 +160,7 @@ function decode_scripts() {
 /**
  * Register widgetized area and update sidebar with default widgets.
  *
- * @link http://codex.wordpress.org/Function_Reference/register_sidebar
+ * @link https://codex.wordpress.org/Function_Reference/register_sidebar
  */
 if ( ! function_exists( 'decode_widgets_init' ) ) {
 
diff --git a/gruntfile.js b/gruntfile.js
deleted file mode 100644
index acdfae4..0000000
--- a/gruntfile.js
+++ /dev/null
@@ -1,220 +0,0 @@
-module.exports = function(grunt) {
-	
-	// Configuration
-	grunt.initConfig({
-		pkg: grunt.file.readJSON('package.json'),
-		
-		modernizr: {
-			makefile: {
-				"devFile": "remote", // Skip check for dev file
-				"outputFile": "scripts/src/modernizr.js",
-				"extra": {
-					"shiv": false,
-					"printshiv": true,
-					"load": true,
-					"mq": true,
-					"cssclasses": true
-				},
-				"extensibility": {
-					"addtest": false,
-					"prefixed": false,
-					"teststyles": true,
-					"testprops": true,
-					"testallprops": true,
-					"hasevents": false,
-					"prefixes": true,
-					"domprefixes": true
-				},
-				"uglify": false,
-				"tests": ['csstransforms', 'inlinesvg', 'touch', 'flexbox'],
-				"parseFiles": false,
-				"matchCommunityTests": false
-			}
-		},
-		
-		jshint: {
-			all: ['Gruntfile.js', 'scripts/src/decode.js', 'scripts/src/sidebar.js', 'scripts/src/dropdown.js']
-		},
-		
-		uglify: {
-			options: {
-				sourceMap: true
-			},
-			decode: {
-				options: {
-					sourceMapName: 'scripts/srcmaps/decode.js.map'
-				},
-				files: {
-					'scripts/decode.js': ['scripts/src/modernizr.js', 'node_modules/fastclick/lib/fastclick.js', 'scripts/src/sidebar.js', 'scripts/src/dropdown.js', 'scripts/src/decode.js' ],
-				}
-			},
-			customizer: {
-				options: {
-					sourceMapName: 'scripts/srcmaps/customizer.js.map'
-				},
-				files: {
-					'scripts/customizer.js': ['scripts/src/customizer.js'],
-				}
-			}
-		},
-						
-		markdown: {
-			readme: {
-				options: {
-					template: 'docs/src/READMETemplate.html'
-				},
-				files: {
-					'docs/README.html': 'docs/src/README.md'
-				}
-			},
-			customcss: {
-				options: {
-					template: 'docs/src/CustomCSSTemplate.html'
-				},
-				files: {
-					'docs/CustomCSS.html': 'docs/src/CustomCSS.md'
-				}
-			}
-		},
-		
-		copy: {
-			/* Move and rename Normalize so grunt-sass can import and concatenate it. */
-			normalize: {
-				files: {
-					'styles/src/reset/_normalize.scss': 'node_modules/normalize.css/normalize.css'
-				}
-			},
-			/* Copy Readme.md to project root. */
-			readme: {
-				files: {
-					'README.md': 'docs/src/README.md'
-				}
-			}
-		},
-		
-		sass: {
-			options: {
-				sourceMap: true
-			},
-			files: {
-				expand: true,
-				flatten: true,
-				cwd: 'styles/src/',
-				src: '*.scss',
-				dest: 'styles/',
-				ext: '.css'
-			}
-		},
-		
-		csscomb: {
-			options: {
-				config: 'csscomb.json'
-			},
-			comb: {
-				expand: true,
-				src: 'styles/src/*.scss'
-			}
-		},
-		
-		csslint: {
-			options: {
-				'adjoining-classes': false,
-				'box-model': false,
-				'box-sizing': false,
-				'unique-headings': false,
-				'qualified-headings': false
-			},
-			lint: {
-				expand: true,
-				src: 'styles/*.css'
-			}
-		},
-
-		autoprefixer: {
-			options: {
-				browsers: ['> 1%', 'last 2 versions', 'ie 9', 'ie 8', 'firefox 24', 'opera 12.1'],
-				map: true
-			},
-			prefix: {
-				expand: true,
-				src: 'styles/*.css'
-			}
-		},
-
-		cssmin: {
-			minify: {
-				expand: true,
-				flatten: true,
-				cwd: 'styles/',
-				src: '*.css',
-				ext: '.css'
-			}
-		},
-
-		watch: {
-			scripts: {
-				files: ['scripts/src/*.js'],
-				tasks: ['uglify']
-			},
-			css: {
-				files: ['styles/src/**/*.scss'],
-				tasks: ['sass', 'autoprefixer', 'cssmin']
-			},
-			docs: {
-				files: ['docs/src/*.md'],
-				tasks: ['markdown', 'copy']
-			},
-			livereload: {
-				options: { livereload: true },
-				files: ['*.php', '**/*.php', 'style.css', 'css/**', 'js/build/*.js']
-			}
-		}
-	});
-	
-	// Plugin List
-	grunt.loadNpmTasks("grunt-modernizr");
-	grunt.loadNpmTasks('grunt-contrib-jshint');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-markdown');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-sass');
-	grunt.loadNpmTasks('grunt-csscomb');
-	grunt.loadNpmTasks('grunt-autoprefixer');
-	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-contrib-watch');
-
-	
-	// Workflows
-	// $ grunt: Concencates, prefixes, minifies JS and CSS files, shrinks images, and generates docs. The works.
-	grunt.registerTask('default', [
-		'modernizr',
-		'jshint',
-		'uglify',
-		'markdown',
-		'copy',
-		'sass',
-		'csscomb',
-		'autoprefixer',
-		'cssmin',
-		'watch'
-	]);
-	
-	// $ grunt build: Concencates, prefixes, minifies JS and CSS files, and generates docs. For deployments and Travis.
-	grunt.registerTask('build', [
-		'modernizr',
-		'jshint',
-		'uglify',
-		'markdown',
-		'copy',
-		'sass',
-		'csscomb',
-		'autoprefixer',
-		'cssmin'
-	]);
-		
-	// $ grunt dev: Watches for changes while developing.
-	grunt.registerTask('dev', [
-		'watch'
-	]);
-
-};
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..66e8440
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,80 @@
+var gulp       = require('gulp'),
+	merge      = require('merge-stream'),
+	csscomb    = require('gulp-csscomb'),
+	sass       = require('gulp-sass'),
+	postcss    = require('gulp-postcss'),
+	concat     = require('gulp-concat'),
+	uglify     = require('gulp-uglify'),
+	modernizr  = require('gulp-modernizr');
+	sourcemaps = require('gulp-sourcemaps');
+
+var paths = {
+	styles:           ['styles/src/*.scss', '!styles/src/_*.scss'],
+	decodeScript:     ['scripts/src/modernizr.js', 'node_modules/fastclick/lib/fastclick.js', 'scripts/src/sidebar.js', 'scripts/src/dropdown.js', 'scripts/src/decode.js' ],
+	customizerScript: 'scripts/src/customizer.js'
+};
+
+gulp.task('styles', function() {
+	var processors = [
+		require('autoprefixer-core')('last 2 versions', '> 1%', 'ie 9', 'ie 8', 'Firefox ESR'),
+		require('css-mqpacker'),
+		require('postcss-import')({path: ['node_modules']}),
+		require('csswring')
+    ];
+    
+	return gulp.src(paths.styles)
+		.pipe(sourcemaps.init())
+			.pipe(csscomb())
+			.pipe(sass())
+			.pipe(postcss(processors))
+		.pipe(sourcemaps.write('srcmaps/'))
+		.pipe(gulp.dest('styles/'));
+});
+
+gulp.task('copy', ['styles'], function() {
+	gulp.src('styles/style.css')
+		.pipe(sourcemaps.init({loadMaps: true}))
+		.pipe(sourcemaps.write('styles/srcmaps/'))
+		.pipe(gulp.dest('./'));
+});
+
+gulp.task('scripts', ['modernizr'], function() {
+	var decodeScript = gulp.src(paths.decodeScript)
+		.pipe(sourcemaps.init())
+			.pipe(concat('decode.js'))
+			.pipe(uglify())
+		.pipe(sourcemaps.write('srcmaps/'))
+		.pipe(gulp.dest('scripts/'));
+
+	var customizerScript = gulp.src(paths.customizerScript)
+		.pipe(sourcemaps.init())
+			.pipe(concat('customizer.js'))
+			.pipe(uglify())
+		.pipe(sourcemaps.write('srcmaps/'))
+		.pipe(gulp.dest('scripts/'));
+
+	return merge(decodeScript, customizerScript);
+});
+
+gulp.task('modernizr', function() {
+	gulp.src('scripts/src/*.js').pipe(modernizr({
+		cache:   true,
+		dest:    'scripts/src/modernizr.js',
+		options: ['mq', 'html5printshiv'],
+		tests:   ['csstransforms', 'flexbox', 'inlinesvg', 'touchevents'],
+		crawl:   false
+	}))
+	.pipe(gulp.dest('scripts/src/'));
+});
+
+gulp.task('watch', function() {
+	gulp.watch(paths.styles, ['styles']);
+	gulp.watch([paths.decodeScript, paths.customizerScript], ['scripts']);
+});
+
+// Workflows
+// $ gulp: Builds, prefixes, and minifies CSS files; concencates and minifies JS files; watches for changes. The works.
+gulp.task('default', ['styles', 'copy', 'scripts', 'watch']);
+
+// $ gulp build: Builds, prefixes, and minifies CSS files; concencates and minifies JS files. For deployments.
+gulp.task('build', ['styles', 'copy', 'scripts']);
\ No newline at end of file
diff --git a/header.php b/header.php
index e0ffae0..d15579e 100644
--- a/header.php
+++ b/header.php
@@ -30,11 +30,11 @@
 
 <div id="page" class="hfeed site">
 	
-	<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'decode' ); ?></a>
+	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'decode' ); ?></a>
 	
 		<?php function decode_create_sidebar_link() {
 			if ( get_theme_mod( 'show_sidebar', true ) == true ) : ?>
-			<button id="sidebar-link" class="sidebar-link SidebarLink <?php echo get_theme_mod( 'sidebar_button_position', 'left' );?>" title="<?php _e( 'Show sidebar', 'decode' )?>">
+			<button id="sidebar-link" class="sidebar-link SidebarLink <?php echo get_theme_mod( 'sidebar_button_position', 'left' );?>" title="<?php esc_attr_e( 'Show sidebar', 'decode' )?>">
 				<svg width="100%" height="100%" viewBox="0 0 240 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 					<g class="menu-icon" fill-rule="evenodd">
 						<path d="M0,160 L0,200 L240,200 L240,160 L0,160 Z M0,160"></path>
diff --git a/inc/decode-theme-hooks.php b/inc/decode-theme-hooks.php
index e163787..8f8beeb 100644
--- a/inc/decode-theme-hooks.php
+++ b/inc/decode-theme-hooks.php
@@ -7,4 +7,12 @@
 
 function decode_header_image() {
 	do_action( 'decode_header_image' );
+}
+
+function decode_social_icons_first() {
+	do_action( 'decode_social_icons_first' );
+}
+
+function decode_social_icons_last() {
+	do_action( 'decode_social_icons_last' );
 }
\ No newline at end of file
diff --git a/inc/extras.php b/inc/extras.php
index efd19cd..bb2dd59 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -45,7 +45,7 @@ function decode_enhanced_image_navigation( $url, $id ) {
  * Highlight search terms in search results.
  */
 function decode_highlight_search_results( $text ) {
-    if ( is_search() ) {
+    if ( is_search() && ! is_admin() ) {
     	$sr = get_search_query();
 		$keys = implode( '|', explode( ' ', get_search_query() ) );
 		if ($keys != '') { // Check for empty search, and don't modify text if empty
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 5bb0f33..b42adbd 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -152,7 +152,7 @@ function the_posts_navigation() {
 	}
 	?>
 	<nav class="navigation posts-navigation" role="navigation">
-		<h2 class="screen-reader-text"><?php _e( 'Posts navigation', 'decode' ); ?></h2>
+		<h2 class="screen-reader-text"><?php esc_html_e( 'Posts navigation', 'decode' ); ?></h2>
 		<div class="nav-links">
 
 			<?php if ( get_next_posts_link() ) : ?>
@@ -183,7 +183,7 @@ function the_post_navigation() {
 	}
 	?>
 	<nav class="navigation post-navigation" role="navigation">
-		<h2 class="screen-reader-text"><?php _e( 'Post navigation', 'decode' ); ?></h2>
+		<h2 class="screen-reader-text"><?php esc_html_e( 'Post navigation', 'decode' ); ?></h2>
 		<div class="nav-links">
 			<?php
 				previous_post_link( '<div class="nav-previous">%link</div>', '%title' );
diff --git a/index.php b/index.php
index fcddea0..0d93ce3 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
  * and one of the two required files for a theme (the other being style.css).
  * It is used to display a page when nothing more specific matches a query.
  * E.g., it puts together the home page when no home.php file exists.
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Decode
  */
diff --git a/languages/decode.pot b/languages/decode.pot
index 7eb058b..992dcb9 100644
--- a/languages/decode.pot
+++ b/languages/decode.pot
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Decode\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/support/theme/decode\n"
-"POT-Creation-Date: 2015-04-04 19:59-0800\n"
+"POT-Creation-Date: 2015-06-01 23:38-0800\n"
 "PO-Revision-Date: 2015-04-04 19:59-0800\n"
 "Last-Translator: Scott Smith <mail@ScottHSmith.com>\n"
 "Language-Team: Scott Smith <mail@ScottHSmith.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.1\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
@@ -184,23 +184,23 @@ msgstr ""
 msgid "%1$s by %2$s"
 msgstr ""
 
-#: functions.php:33
+#: functions.php:26
 msgid "Header Menu"
 msgstr ""
 
-#: functions.php:34
+#: functions.php:27
 msgid "Sidebar Menu"
 msgstr ""
 
-#: functions.php:35
+#: functions.php:28
 msgid "Footer Menu"
 msgstr ""
 
-#: functions.php:163
+#: functions.php:169
 msgid "Sidebar"
 msgstr ""
 
-#: functions.php:165
+#: functions.php:171
 msgctxt "sidebar description"
 msgid "Only displayed if sidebar remains enabled in the Customize menu."
 msgstr ""
diff --git a/package.json b/package.json
index 28d31a4..3efe574 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Decode",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "author": "Scott Smith <mail@ScottHSmith.com> (http://ScottHSmith.com)",
   "license": "GPLv3",
   "repository": {
@@ -8,20 +8,20 @@
     "url": "https://github.com/ScottSmith95/Decode.git"
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-autoprefixer": "^3.0.0",
-    "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-cssmin": "^0.12.2",
-    "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-uglify": "^0.8.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-csscomb": "^3.0.0",
-    "grunt-markdown": "^0.7.0",
-    "grunt-modernizr": "^0.6.0",
-    "grunt-sass": "^0.18.1"
-  },
-  "dependencies": {
+    "autoprefixer-core": "^5.2.0",
+    "css-mqpacker": "^3.1.0",
+    "csswring": "^3.0.5",
     "fastclick": "^1.0.6",
-    "normalize.css": "^3.0.2"
+    "gulp": "^3.9.0",
+    "gulp-concat": "^2.5.2",
+    "gulp-csscomb": "^3.0.3",
+    "gulp-modernizr": "^1.0.0-alpha",
+    "gulp-postcss": "^5.1.8",
+    "gulp-sass": "^2.0.1",
+    "gulp-sourcemaps": "^1.5.2",
+    "gulp-uglify": "^1.2.0",
+    "merge-stream": "^0.1.7",
+    "normalize.css": "^3.0.3",
+    "postcss-import": "^5.2.2"
   }
 }
diff --git a/page-explore.php b/page-explore.php
index ee30388..5c357bc 100644
--- a/page-explore.php
+++ b/page-explore.php
@@ -23,7 +23,7 @@
 		<div class="post-lists">
 			
 			<div id="recent_posts" class="widget recent-posts">
-				<h1 class="widget-title"><?php _e( 'Recent Posts', 'decode' ); ?></h1>
+				<h1 class="widget-title"><?php esc_html_e( 'Recent Posts', 'decode' ); ?></h1>
 				<ul>
 					<?php $recent_posts = wp_get_archives( array(
 						'type' => 'postbypost',
@@ -34,14 +34,14 @@
 			</div>
 		
 			<div id="archives" class="widget archives">
-				<h1 class="widget-title"><?php _e( 'Archives', 'decode' ); ?></h1>
+				<h1 class="widget-title"><?php esc_html_e( 'Archives', 'decode' ); ?></h1>
 				<ul>
 					<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
 				</ul>
 			</div>
 			
 			<div id="categories" class="widget categories">
-				<h1 class="widget-title"><?php _e( 'Categories', 'decode' ); ?></h1>
+				<h1 class="widget-title"><?php esc_html_e( 'Categories', 'decode' ); ?></h1>
 				<ul>
 					<?php wp_list_categories( array(
 						'title_li' => '',
diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..9021a79
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1,56 @@
+=== Decode ===
+
+Contributors: scottsmith
+Tags: responsive-layout, one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-header, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, black, blue, brown, gray, green, orange, pink, purple, red, silver, tan, white, yellow, dark, light
+
+Requires at least: 4.0
+Tested up to: 4.2.2
+Stable tag: 3.0.7
+License: GPLv3
+License URI: http://www.gnu.org/licenses/gpl-3.0.html
+
+A starter theme called _s, or underscores.
+
+== Description ==
+
+A minimal, modern theme, designed to be mobile first and fully responsive, Decode features the ability to change all the colors in the theme and an elegant sidebar conveniently accessed by tapping on the menu icon. The sidebar can fit all of your widgets and its position can be customized. You can also choose to keep the sidebar always visible on larger screens for a smooth two-column experience. You can even disable the sidebar and comment links if you choose. Decode supports link posts, where the title can be hyperlinked. Decode includes custom social icons in the header that you can easily link to your choice of 55 different social profiles from Twitter and Instagram, to Pinterest and LinkedIn, you will be sure to find support for the network you want alongside a bevy of customizations to make your site unique. Decode has been translated into Chinese, Dutch, French, German, Polish, Russian, and Spanish. <a href="http://scotthsmith.com/projects/decode/">More info here</a>
+
+== Installation ==
+	
+1. In your admin panel, go to Appearance > Themes and click the Add New button.
+2. Click Upload and Choose File, then select the theme's .zip file. Click Install Now.
+3. Click Activate to use your new theme right away.
+
+== Frequently Asked Questions ==
+
+= Does this theme support any plugins? =
+
+Decode includes support for: 
+* Infinite Scroll in Jetpack
+* Site Logo in Jetpack
+* Breadcrumb NavXT, and Breadcrumb trail for breadcrumb navigation
+
+== Changelog ==
+
+= 3.0.7 - April 18 2015 =
+= Added: =
+* Jetpack Site Logo support
+* Czech translation
+* HTML 5 widget output in WordPress 4.2
+
+= Improved: =
+* Support YouTube URLs (Existing YouTube URLs will need to be re-added)
+* Better post pagination design
+* New default text colors
+
+= Removed: =
+* Enable Comments option
+* Google Authorship
+
+= Fixed: =
+* Fix large type in <pre> and <code> tags
+
+== Credits ==
+
+* Based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc., [GPL2](https://www.gnu.org/licenses/gpl-2.0.html)
+* normalize.css http://necolas.github.io/normalize.css/, (C) 2012-2015 Nicolas Gallagher and Jonathan Neal, [MIT](http://opensource.org/licenses/MIT)
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
index 246faa8..e6bbd47 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -8,7 +8,7 @@
 
 <div id="sidebar" class="sidebar <?php echo get_theme_mod( 'sidebar_position', 'left' );?>">
 	<div id="sidebar-top" class="sidebar-top SidebarTop">
-		<button id="sidebar-close" class="sidebar-close SidebarClose" title="<?php _e( 'Hide sidebar', 'decode' )?>">
+		<button id="sidebar-close" class="sidebar-close SidebarClose" title="<?php esc_attr_e( 'Hide sidebar', 'decode' )?>">
 			<svg width="100%" height="100%" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 			<path class="close-icon" d="M0,172.881356 L72.8813559,100 L1.0658141e-14,27.1186441 L27.1186441,-2.84217094e-14 L100,72.8813559 L172.881356,0 L200,27.1186441 L127.118644,100 L200,172.881356 L172.881356,200 L100,127.118644 L27.1186441,200 Z M0,172.881356" fill="#444444"></path>
 			</svg>
@@ -38,7 +38,7 @@
 			</aside>
 
 			<aside id="archives" class="widget">
-				<h1 class="widget-title"><?php _e( 'Archives', 'decode' ); ?></h1>
+				<h1 class="widget-title"><?php esc_html_e( 'Archives', 'decode' ); ?></h1>
 				<ul>
 					<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
 				</ul>
diff --git a/social-links.php b/social-links.php
index 081aee9..280f363 100644
--- a/social-links.php
+++ b/social-links.php
@@ -8,6 +8,9 @@
 
 <div class="social-links">
 <div class="social-links-container">
+	
+	<?php decode_social_icons_first(); ?>
+	
 	<?php if ( get_theme_mod( 'twitter_username', '' ) !== '' ) : ?>
 	<a class="social-link TwitterLink" href="<?php echo esc_url( 'https://twitter.com/' . get_theme_mod( 'twitter_username' ) );?>" <?php if ( get_theme_mod( 'open_links_in_new_tab', false ) == true ) echo 'target="_blank"'; ?> rel="me">
 	<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
@@ -592,5 +595,8 @@
 	</svg>
 	</a>
 	<?php endif; ?>
+	
+	<?php decode_social_icons_last(); ?>
+	
 </div>
 </div><!-- .social-links -->
\ No newline at end of file
diff --git a/styles/src/reset/_reset.scss b/styles/src/reset/_reset.scss
index 33df9c9..f5c3366 100644
--- a/styles/src/reset/_reset.scss
+++ b/styles/src/reset/_reset.scss
@@ -1,7 +1,7 @@
 /*--------------------------------------------------------------
 1.1 - Normalize
 --------------------------------------------------------------*/
-@import 'normalize';
+@import 'normalize.css';
 
 /*--------------------------------------------------------------
 1.2 - Elements
diff --git a/styles/src/style.scss b/styles/src/style.scss
index 0a538fb..dd7d6c0 100644
--- a/styles/src/style.scss
+++ b/styles/src/style.scss
@@ -1,10 +1,10 @@
 /*!
 Theme Name: Decode
 Theme URI: http://ScottHSmith.com/projects/decode/
-Version: 3.0.7
+Version: 3.0.8
 Author: Scott Smith
 Author URI: http://ScottHSmith.com/
-Description: A minimal, modern theme, designed to be mobile first and fully responsive, Decode features the ability to change all the colors in the theme and an elegant sidebar conveniently accessed by tapping on the menu icon. The sidebar can fit all of your widgets and its position can be customized. You can also choose to keep the sidebar always visible on larger screens for an elegent two-column experience. You can even disable the sidebar and comment links if you choose. Decode supports link posts, where the title can be hyperlinked. Decode includes custom social icons in the header that you can easily link to your choice of 55 different social profiles from Twitter and Instagram, to Pinterest and LinkedIn, you will be sure to find support for the network you want alongside a bevy of customizations to make your site unique. Decode has been translated into Chinese, Dutch, French, German, Polish, Russian, and Spanish. <a href="http://scotthsmith.com/projects/decode/">More info here</a>
+Description: A minimal, modern theme, designed to be mobile first and fully responsive, Decode features the ability to change all the colors in the theme and an elegant sidebar conveniently accessed by tapping on the menu icon. The sidebar can fit all of your widgets and its position can be customized. You can also choose to keep the sidebar always visible on larger screens for a smooth two-column experience. You can even disable the sidebar and comment links if you choose. Decode supports link posts, where the title can be hyperlinked. Decode includes custom social icons in the header that you can easily link to your choice of 55 different social profiles from Twitter and Instagram, to Pinterest and LinkedIn, you will be sure to find support for the network you want alongside a bevy of customizations to make your site unique. Decode has been translated into Chinese, Dutch, French, German, Polish, Russian, and Spanish. <a href="http://scotthsmith.com/projects/decode/">More info here</a>
 Tags: responsive-layout, one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-header, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, black, blue, brown, gray, green, orange, pink, purple, red, silver, tan, white, yellow, dark, light
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0-standalone.html
@@ -678,6 +678,7 @@ Decode is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic,
 }
 
 .sticky {
+	/*! This ruleset intentionally left blank. */
 }
 
 .hentry {
@@ -1082,6 +1083,7 @@ li.comment {
 }
 
 .bypostauthor {
+	/*! This ruleset intentionally left blank. */
 }
 
 .comment-respond {