diff --git a/functions.php b/functions.php
index 801e2d9..5187a77 100644
--- a/functions.php
+++ b/functions.php
@@ -124,9 +124,7 @@ function decode_setup() {
  */
 
 function decode_content_width() {
-	$width = get_theme_mod( 'content_width', 792 );
-
-	$GLOBALS['content_width'] = apply_filters( 'decode_content_width', $width );
+	$GLOBALS['content_width'] = apply_filters( 'decode_content_width', 792 );
 }
 add_action( 'after_setup_theme', 'decode_content_width', 0 );
 
diff --git a/header.php b/header.php
index 6a7c87f..e119c34 100644
--- a/header.php
+++ b/header.php
@@ -17,10 +17,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="profile" href="http://gmpg.org/xfn/11">
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
-<?php if ( ! ( function_exists( 'wp_site_icon' ) && has_site_icon() ) ) {
-	echo '<link rel="icon" href="' . esc_url( get_theme_mod( 'favicon_image', '' ) ) . '">' . "\n" . 
-	'<link rel="apple-touch-icon-precomposed" href="' . esc_url( get_theme_mod( 'favicon_image', '' ) ) . '">' . "\n";
-} ?>
 <?php if ( get_background_image() ) { echo '<link rel="prefetch" href="' . get_background_image() . '">'; } ?>
 
 <?php tha_head_bottom(); ?>
@@ -78,9 +74,9 @@
 			
 			<?php if ( get_theme_mod( 'show_site_description', true ) == true ) : ?>
 				<?php if ( get_theme_mod( 'html_description', '' ) !== '' ) : ?>
-				<h2 class="site-description"><?php echo get_theme_mod( 'html_description' ); ?></h2>
+				<h2 class="site-description"><?php echo decode_sanitize_html( get_theme_mod( 'html_description' ) ); ?></h2>
 				<?php elseif ( get_theme_mod( 'html_description', '' ) == '' ) : ?>
-				<h2 class="site-description"><?php echo get_bloginfo( 'description' );?></h2>
+				<h2 class="site-description"><?php echo esc_html( get_bloginfo( 'description' ) );?></h2>
 				<?php endif; ?>
 			<?php endif; ?>
 			
diff --git a/inc/customizer.php b/inc/customizer.php
index bd00c4d..928cec2 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -21,13 +21,6 @@ public function render_content() {
 	        <?php
 	    }
 	}
-	
-	/**
-	 *	Adds a favicon image uploader control that only allows .ico and .png files to be uploaded.
-	 */
-	class Decode_Customize_Favicon_Image_Control extends WP_Customize_Image_Control {
-		public $extensions = array( 'png', 'ico', 'image/x-icon' );
-	}
 
 	/**
 	 *	Slider Control
@@ -187,8 +180,8 @@ class Decode_Customize {
  * @param WP_Customize_Manager $wp_customize Theme Customizer object.
  */
 public static function decode_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )        ->transport = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' ) ->transport = 'postMessage';
+	$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
+	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
 	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 	$wp_customize->get_setting( 'background_color' )->transport = 'postMessage';
 	$wp_customize->get_setting( 'header_image'  )->transport = 'postMessage';
@@ -207,6 +200,7 @@ public static function decode_customize_register( $wp_customize ) {
 	remove_theme_mod( 'steam_user' );
 	remove_theme_mod( 'steam_group' );
 	remove_theme_mod( 'show_all_post_types' );
+	remove_theme_mod( 'favicon_image' );
 	$wp_customize->remove_setting( 'youtube_username' );
 	$wp_customize->remove_setting( 'show_site_navigation' );
 	$wp_customize->remove_setting( 'show_social_icons' );
@@ -215,6 +209,7 @@ public static function decode_customize_register( $wp_customize ) {
 	$wp_customize->remove_setting( 'steam_user' );
 	$wp_customize->remove_setting( 'steam_group' );
 	$wp_customize->remove_setting( 'show_all_post_types' );
+	$wp_customize->remove_setting( 'favicon_image' );
 
 /**
  * Header Options
@@ -224,12 +219,6 @@ public static function decode_customize_register( $wp_customize ) {
     	'title'    => __( 'Header Options', 'decode' ),
 		'priority' => 32,
 	) );
-
-	
-	$wp_customize->add_setting( 'favicon_image', array(
-		'default'           => '',
-		'sanitize_callback' => 'decode_sanitize_string',
-	) );
 	
 	$wp_customize->add_setting( 'show_site_title', array(
 		'default'           => true,
@@ -254,16 +243,6 @@ public static function decode_customize_register( $wp_customize ) {
 		'transport'         => 'postMessage',
 		'sanitize_callback' => 'decode_sanitize_html',
 	) );
-
-	
-	$wp_customize->add_control(
-		new Decode_Customize_Favicon_Image_Control(
-		$wp_customize, 'favicon_image', array(
-			'label'    => __( 'Favicon Image (must be a PNG)', 'decode' ),
-			'section'  => 'decode_header_options',
-			'settings' => 'favicon_image',
-			'priority' => 1,
-	) ) );
 	
 	$wp_customize->add_control( 'show_site_title', array(
 		'label'    => __( 'Show Site Title', 'decode' ),
@@ -280,7 +259,7 @@ public static function decode_customize_register( $wp_customize ) {
 	) );
 	
 	$wp_customize->add_control( 'show_header_menu', array(
-		'label'    => __( 'Show Header Menu', 'decode' ),
+		'label'    => __( 'Show Navigation Menu', 'decode' ),
 		'section'  => 'decode_header_options',
 		'type'     => 'checkbox',
 		'priority' => 4,
@@ -1269,16 +1248,36 @@ public static function decode_customize_register( $wp_customize ) {
 	) );
 
 
-/**
- * Reading Options
- */
+	/**
+	 *	Content Options
+	 */
+	$wp_customize->add_panel( 'decode_content_options_panel', array(
+		'priority'			=> 37,
+		'capability'		=> 'edit_theme_options',
+		'theme_supports'	=> '',
+		'title'				=> esc_html__( 'Content Options', 'decode' )
+	) );
 
-	$wp_customize->add_section( 'decode_content_options', array(
-    	'title'       => __( 'Content Options', 'decode' ),
-		'priority'    => 37,
-		'description' => sprintf( _x( 'These options change the display of %s\'s content', '(blog name)\'s content.' ,'decode' ), get_bloginfo( 'name', 'display' ) ),
-    ) );
-    
+	// General
+	$wp_customize->add_section( 'decode_content_options_general', array(
+		'title'			=> __( 'General', 'decode' ),
+		'priority'		=> 1,
+		'panel'			=> 'decode_content_options_panel'
+	) );
+
+	// Content
+	$wp_customize->add_section( 'decode_content_options_content', array(
+		'title'			=> __( 'Content', 'decode' ),
+		'priority'		=> 2,
+		'panel'			=> 'decode_content_options_panel'
+	) );
+
+	// Content Single
+	$wp_customize->add_section( 'decode_content_options_content_single', array(
+		'title'			=> __( 'Content Single', 'decode' ),
+		'priority'		=> 3,
+		'panel'			=> 'decode_content_options_panel'
+	) );
     
     $wp_customize->add_setting( 'latin_extended_font', array(
 		'default'           => false,
@@ -1363,8 +1362,9 @@ public static function decode_customize_register( $wp_customize ) {
 	) );
 
 	$wp_customize->add_setting( 'content_width', array(
-		'default'			=> 792,
-		'sanitize_callback'	=> 'absint'
+		'default'			=> 41.619,
+		'sanitize_callback'	=> 'absint',
+		'transport'			=> 'postMessage'
 	) );
 
 	$wp_customize->add_setting( 'site_colophon', array(
@@ -1376,141 +1376,142 @@ public static function decode_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control( 'latin_extended_font', array(
 		'label'    => __( 'Load Latin Extended character set. This will increase page load times.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_general',
 		'type'     => 'checkbox',
 		'priority' => 1,
 	) );
 
 	$wp_customize->add_control( 'use_excerpts', array(
 		'label'    => __( 'Use entry excerpts instead of full text on site home. Excludes sticky posts.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content',
 		'type'     => 'checkbox',
-		'priority' => 2,
+		'priority' => 1,
 	) );
 	
 	$wp_customize->add_control( 'use_excerpts_on_archives', array(
 		'label'    => __( 'Use entry excerpts on archive, category, and author pages.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content',
 		'type'     => 'checkbox',
-		'priority' => 3,
+		'priority' => 2,
 	) );
 	
 	$wp_customize->add_control( 'show_featured_images_on_excerpts', array(
 		'label'    => __( 'Display posts\' featured images when excerpts are shown.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content',
 		'type'     => 'checkbox',
-		'priority' => 4,
+		'priority' => 3,
 	) );
 	
 	$wp_customize->add_control( 'show_featured_images_on_singles', array(
 		'label'    => __( 'Display a post\'s featured image on its individual page.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content_single',
 		'type'     => 'checkbox',
-		'priority' => 5,
+		'priority' => 1,
 	) );
 
 	$wp_customize->add_control( 'show_tags', array(
 		'label'    => __( 'Show tags on front page (tags will be shown on post\'s individual page)', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content',
 		'type'     => 'checkbox',
-		'priority' => 6,
+		'priority' => 4,
 	) );
 
 	$wp_customize->add_control( 'show_categories', array(
 		'label'    => __( 'Show categories on front page (categories will be shown on post\'s individual page)', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content',
 		'type'     => 'checkbox',
-		'priority' => 7,
+		'priority' => 5,
 	) );
 	
 	$wp_customize->add_control( 'show_author_section', array(
 		'label'    => __( 'Show author\'s name, profile image, and bio after posts', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content_single',
 		'type'     => 'checkbox',
-		'priority' => 8,
+		'priority' => 2,
 	) );
 
 	$wp_customize->add_control( 'show_leave_a_comment_link', array(
 		'label'    => __( 'Show "Leave a comment" link after posts.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content_single',
 		'type'     => 'checkbox',
-		'priority' => 9,
+		'priority' => 3,
 	) );
 	
 	$wp_customize->add_control( 'entry_date_position', array(
 		'label'   => __( 'Entry Date Position', 'decode' ),
-		'section' => 'decode_content_options',
+		'section' => 'decode_content_options_general',
 		'type'    => 'radio',
 		'choices' => array(
 			'above' => __( 'Above Header', 'decode' ),
 			'below' => __( 'Below Header', 'decode' ),
         ),
-		'priority' => 10,
+		'priority' => 2,
 	) );
 	
 	$wp_customize->add_control( 'show_entry_date_on_excerpts', array(
 		'label'    => __( 'Show entry date for post excepts on the main page', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content',
 		'type'     => 'checkbox',
-		'priority' => 11,
+		'priority' => 6,
 	) );
 	
 	$wp_customize->add_control( 'show_allowed_tags', array(
 		'label'    => __( 'Show allowed HTML tags on comment form', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_content_single',
 		'type'     => 'checkbox',
-		'priority' => 12,
+		'priority' => 4,
 	) );
 	
 	$wp_customize->add_control( 'show_page_headers', array(
 		'label'    => __( 'Show Page Headers', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_general',
 		'type'     => 'checkbox',
-		'priority' => 13,
+		'priority' => 3,
 	) );
 
 	$wp_customize->add_control( 'link_post_title_arrow', array(
 		'label'    => __( 'Add an arrow before the title of a link post', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_general',
 		'type'     => 'checkbox',
-		'priority' => 14,
+		'priority' => 4,
 	) );
 
 	$wp_customize->add_control( 'show_theme_info', array(
 		'label'    => __( 'Show Theme Info (display a line of text about the theme and its creator at the bottom of pages)', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_general',
 		'type'     => 'checkbox',
-		'priority' => 15,
+		'priority' => 5,
 	) );
 
 	$wp_customize->add_control( 'center_content_mobile', array(
 		'label'    => __( 'Center the content on mobile.', 'decode' ),
-		'section'  => 'decode_content_options',
+		'section'  => 'decode_content_options_general',
 		'type'     => 'checkbox',
-		'priority' => 16,
+		'priority' => 6,
 	) );
 
 	$wp_customize->add_control(
 		new Decode_Customize_Slider_Control(
 		$wp_customize, 'content_width', array(
 			'label'			=> esc_html__( 'Content Width', 'decode' ),
+			'description'	=> esc_html__( 'Select the content width in percentage.', 'decode' ),
 			'choices'		=> array(
-				'min'	=> 640,
-				'max'	=> 792,
-				'step'	=> 1
+				'min'	=> 41.619,
+				'max'	=> 80,
+				'step'	=> 0.001
 			),
-			'section'		=> 'decode_content_options',
-			'priority'		=> 17,
+			'section'		=> 'decode_content_options_general',
+			'priority'		=> 7,
 	) ) );
 	
 	$wp_customize->add_control(
 		new Decode_Customize_Textarea_Control(
 		$wp_customize, 'site_colophon', array(
 			'label'    => __( 'Text (colophon, copyright, credits, etc.) for the footer of the site', 'decode' ),
-			'section'  => 'decode_content_options',
+			'section'  => 'decode_content_options_general',
 			'settings' => 'site_colophon',
 			'type'     => 'textarea',
-			'priority' => 18,
+			'priority' => 8,
 	) ) );
 	
 	
@@ -1521,7 +1522,6 @@ public static function decode_customize_register( $wp_customize ) {
  
  	$wp_customize->add_section( 'decode_other_options', array(
     	'title'       => __( 'Other Options', 'decode' ),
-    	'description' => __( 'Custom CSS is longer recommended. This feature may be removed in a future update. To continue using your tweaks, copy and paste your CSS into a custom CSS plugin such as <a href="http://jetpack.me/install/">Jetpack</a>. Get help <a href="http://jetpack.me/support/custom-css/">here</a>.', 'decode' ),
 		'priority' => 38,
     ) );
     
@@ -1645,7 +1645,8 @@ public static function decode_output_color_css() {
 		?>
 		<!-- Decode Custom Colors CSS -->
 		<style type="text/css">
-			<?php self::generate_css(
+			<?php
+			self::generate_css(
 				'body, .sidebar, .sidebar-top, .menu ul ul, .header-style-ghost .site',
 				'background-color',
 				'background_color',
@@ -1763,8 +1764,23 @@ public static function decode_output_color_css() {
 				'border-color',
 				'accent_color'
 			);
-			
 			?>
+
+			@media (min-width: 68.5em) {
+				.site-main {
+					max-width: none;
+				}
+
+				<?php
+				self::generate_css(
+					'.site-main',
+					'width',
+					'content_width',
+					'',
+					'%'
+				);
+				?>
+			}
 		</style>
 		<?php
 	}
diff --git a/inc/extras.php b/inc/extras.php
index e80f384..452cda9 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -110,4 +110,34 @@ function decode_render_title() {
 		<?php
 	}
 	add_action( 'wp_head', 'decode_render_title' );
-endif;
\ No newline at end of file
+endif;
+
+/**
+ *	Get image ID from image URL
+ */
+function decode_get_image_id_from_image_url( $image_url ) {
+    global $wpdb;
+    $attachment = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid='%s';", $image_url ) );
+    if( $attachment ) {
+        return $attachment[0];
+    }
+}
+
+if( version_compare( $GLOBALS['wp_version'], '4.3', '>' ) ) {
+	/**
+	 *	Site Icon
+	 */
+	add_action( 'admin_init', 'decode_site_icon' );
+	function decode_site_icon() {
+		$get_theme = wp_get_theme();
+
+		if( $get_theme['Version'] > '3.12.0' ) {
+			$favicon_image = get_theme_mod( 'favicon_image', '' );
+
+			if( $favicon_image && !has_site_icon() ) {
+				$image_id = decode_get_image_id_from_image_url( $favicon_image );
+				update_option( 'site_icon', $image_id );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/index.php b/index.php
index 0d93ce3..ff5b3f5 100644
--- a/index.php
+++ b/index.php
@@ -1,18 +1,17 @@
 <?php
 /**
- * The main template file.
+ *	The main template file.
  *
- * This is the most generic template file in a WordPress theme
- * 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: https://codex.wordpress.org/Template_Hierarchy
+ *	This is the most generic template file in a WordPress theme
+ *	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: https://codex.wordpress.org/Template_Hierarchy
  *
- * @package Decode
+ *	@package Decode
  */
 
 get_header(); ?>
-
 <section id="primary" class="content-area">
 	<main id="main" class="site-main" role="main">
 
diff --git a/readme.txt b/readme.txt
index 4480366..63a32f6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: responsive-layout, one-column, two-columns, left-sidebar, right-sidebar, c
 
 Requires at least: 4.0
 Tested up to: 4.2.2
-Stable tag: 3.12.0
+Stable tag: 3.13.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -32,6 +32,22 @@ Decode includes support for:
 
 == Changelog ==
 
+### v3.13.0
+	Added:
+		- Has been added "Content Width".
+
+	Improved:
+		- Has been updated sanitize callback for "HTML Description..." field from customizer.
+		- Has been renamed "Show Navigation Menu" instead "Show Header Menu".
+		- "Content Options" panel has been separated in three sections: General, Content, Content Single.
+
+	Removed:
+		- Has been removed "Favicon Icon" field from customizer.
+		- Has been removed the label from "Other Options" section.
+
+	Fixed:
+		- Has been removed target blank attribute on e-mail social icon.
+
 ### v3.12.0
 	Improved:
 		- Has been changed the permalink on "More Info Here" from style.css file.
diff --git a/scripts/src/customizer.js b/scripts/src/customizer.js
index c8967d7..ba35709 100644
--- a/scripts/src/customizer.js
+++ b/scripts/src/customizer.js
@@ -232,4 +232,11 @@
 			}
 		} );
 	} );
+
+	// Content Width
+	wp.customize( 'content_width', function( value ) {
+		value.bind( function( to ) {
+			$( '.site-main' ).css( 'width', to + '%' );
+		} );
+	} );
 } )( jQuery );
\ No newline at end of file
diff --git a/social-links.php b/social-links.php
index 17a69af..f84b5ea 100644
--- a/social-links.php
+++ b/social-links.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * The template for displaying social icons.
+ *	The template for displaying social icons.
  *
- * @package Decode
+ *	@package Decode
  */
 ?>
 
@@ -652,7 +652,7 @@
 		<?php endif; ?>
 		
 		<?php if ( get_theme_mod( 'email_address', '' ) !== '' ) : ?>
-			<a class="contact-link EmailLink" href="<?php echo esc_url( 'mailto:' . antispambot( get_theme_mod( 'email_address' ), 1 ) );?>" <?php if ( get_theme_mod( 'open_links_in_new_tab', false ) == true ) echo 'target="_blank"'; ?> >
+			<a class="contact-link EmailLink" href="<?php echo esc_url( 'mailto:' . antispambot( get_theme_mod( 'email_address' ), 1 ) );?>">
 				<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 					<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
 					<path class="social-icon-fill SocialIconFill" d="M47.525,58.4312 C44.0017303,58.4312 40.8759923,60.0775002 38.8740909,62.6461034 L99.75,94.8175812 L163.968171,60.8797969 C162.084984,59.347607 159.678721,58.4312 157.05,58.4312 Z M36.8768341,66.781991 C36.6754591,67.614632 36.5688,68.4849911 36.5688,69.3812 L36.5688,129.6188 C36.5688,135.6864 41.4574,140.5688 47.525,140.5688 L157.05,140.5688 C163.1176,140.5688 168,135.6864 168,129.6188 L168,69.3812 C168,67.6380936 167.597054,65.9928022 166.878815,64.5329757 L99.7671275,100 L99.75,99.9564542 L99.7328725,100 Z M100,0 C155.2286,0 200,44.7714 200,100 C200,155.2286 155.2286,200 100,200 C44.7714,200 0,155.2286 0,100 C0,44.7714 44.7714,0 100,0 Z M173,61.2980665 L171.309648,57 Z M173,61.2980665" fill="#444444"></path>
diff --git a/styles/src/style.css b/styles/src/style.css
index e77a4a1..01faf5d 100644
--- a/styles/src/style.css
+++ b/styles/src/style.css
@@ -1,7 +1,7 @@
 /*!
 Theme Name: Decode
 Theme URI: http://www.machothemes.com/themes/decode/
-Version: 3.12.0
+Version: 3.13.0
 Author: Macho Themes
 Author URI: http://www.machothemes.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 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://www.machothemes.com/themes/decode/">More info here</a>
@@ -10,7 +10,6 @@ License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0-standalone.html
 Domain Path: /languages/
 Text Domain: decode
-
 Decode is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc.
 */