diff --git a/.standard.json b/.standard.json
new file mode 100644
index 0000000..5d326d2
--- /dev/null
+++ b/.standard.json
@@ -0,0 +1 @@
+{"404.php":[],"archive-jetpack-portfolio.php":[],"archive.php":[],"attachment.php":[],"comments.php":[],"footer.php":[],"functions.php":[],"header.php":[],"inc/admin/welcome-screen/class-shapely-notify-system.php":[],"inc/admin/welcome-screen/class-shapely-welcome.php":[],"inc/admin/welcome-screen/sections/actions-required.php":[],"inc/admin/welcome-screen/sections/getting-started.php":[],"inc/admin/welcome-screen/sections/recommended-plugins.php":[],"inc/admin/welcome-screen/sections/support.php":[],"inc/class-shapely-related-posts.php":[],"inc/class-wp-bootstrap-navwalker.php":[],"inc/custom-controls/class-shapely-logo-dimensions.php":[],"inc/customizer.php":[],"inc/extras.php":[],"inc/jetpack.php":[],"inc/libraries/epsilon-framework/class-epsilon-autoloader.php":[],"inc/libraries/epsilon-framework/class-epsilon-framework.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-color-coded-categories.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-color-scheme.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-content-backup.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-customizer.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-notifications.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-notify-system.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-repeater-templates.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-sanitizers.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-typography.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-color-picker.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-color-scheme.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-customizer-navigation.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-icon-picker.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-image.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-layouts.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-repeater.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-section-repeater.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-slider.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-text-editor.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-toggle.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-typography.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-upsell.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-pro.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-recommended-actions.php":[],"inc/libraries/epsilon-framework/customizer/settings/class-epsilon-setting-repeater.php":[],"inc/socialnav.php":[],"inc/template-tags.php":[],"index.php":[],"page-templates/full-width.php":[],"page-templates/no-sidebar.php":[],"page-templates/sidebar-left.php":[],"page-templates/sidebar-right.php":[],"page-templates/template-home.php":[],"page.php":[],"search.php":[],"sidebar-footer.php":[],"sidebar.php":[],"single-jetpack-portfolio.php":[],"single.php":[],"template-parts/content-attachment.php":[],"template-parts/content-grid-small.php":[],"template-parts/content-grid-wide.php":[],"template-parts/content-none.php":[],"template-parts/content-page.php":[],"template-parts/content-portfolio.php":[],"template-parts/content-search.php":[],"template-parts/content.php":[],"template-parts/layouts/blog-grid.php":[],"template-parts/layouts/blog-large-image-grid.php":[],"template-parts/layouts/blog-large-image.php":[],"woocommerce.php":[],"woocommerce/product-searchform.php":[]}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a0c1c50..94ce7a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 sudo: false
 language: php
+dist: precise
 matrix:
   fast_finish: true
   include:
@@ -9,8 +10,9 @@ matrix:
   - php: '5.6'
   - php: '7.0'
   - php: '7.1'
-    env: SNIFF=1
-    env: DEPLOY=1
+    env:
+    - DEPLOY=1
+    - SNIFF=1
 before_script:
 - export PHPCS_DIR=/tmp/phpcs
 - export SNIFFS_DIR=/tmp/sniffs
@@ -18,7 +20,7 @@ before_script:
   $PHPCS_DIR; fi
 - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git
   $SNIFFS_DIR; fi
-- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git
+- if [[ "$SNIFF" == "1" ]]; then git clone -b 7.1.4 --depth 1 https://github.com/wimg/PHPCompatibility.git
   $SNIFFS_DIR/PHPCompatibility; fi
 - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs --config-set installed_paths
   $SNIFFS_DIR; fi
@@ -51,10 +53,10 @@ script:
   --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/*.php;
   fi
 - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n ./**/**/**/**/*.php
-  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/*.php;
+  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/*.php,./**/**/epsilon-framework/**/*.php;
   fi
 - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n ./**/**/**/**/**/*.php
-  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/**/*.php;
+  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/**/*.php,./**/**/epsilon-framework/**/**/*.php;
   fi
 notifications:
   email: false
diff --git a/archive-jetpack-portfolio.php b/archive-jetpack-portfolio.php
index 228b626..b331ff7 100644
--- a/archive-jetpack-portfolio.php
+++ b/archive-jetpack-portfolio.php
@@ -1,49 +1,78 @@
 <?php
-get_header(); ?>
+get_header();
 
-	<div id="primary" class="content-area col-md-12 mb-xs-24">
+$layout = get_theme_mod( 'projects_layout_view', 'mansonry' );
+$layout_class = shapely_get_layout_class();
+
+$item_classes = 'post-snippet col-md-3 col-sm-6 project';
+if ( 'mansonry' == $layout ) {
+	$item_classes .= ' masonry-item';
+}
+
+?>
+	<?php
+	if ( 'sidebar-left' == $layout_class ) :
+		get_sidebar();
+	endif;
+	?>
+	<div id="primary" class="content-area col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 		<main id="main" class="site-main" role="main">
 
 			<?php
-			if ( have_posts() ) : ?>
-
-			<header>
-				<?php
-				echo ( get_theme_mod( 'portfolio_name' ) != '' ) ? '<h1 class="post-title">' . esc_html( get_theme_mod( 'portfolio_name' ) ) . '</h1>' : '';
-				echo ( get_theme_mod( 'portfolio_description' ) != '' ) ? '<p>' . esc_html( get_theme_mod( 'portfolio_description' ) ) . '</p>' : '';
-				?>
-			</header><!-- .page-header -->
+			if ( have_posts() ) :
+			?>
 
-			<div class="masonry-loader fixed-center">
-				<div class="col-sm-12 text-center">
-					<div class="spinner"></div>
+			<?php if ( 'mansonry' == $layout ) : ?>
+				<div class="masonry-loader fixed-center">
+					<div class="col-sm-12 text-center">
+						<div class="spinner"></div>
+					</div>
 				</div>
-			</div>
-			<div class="masonry masonryFlyIn">
+			<?php endif ?>
+			
+			<div class="<?php echo 'mansonry' == $layout ? 'masonry masonryFlyIn' : ''; ?>">
 				<?php
 				/* Start the Loop */
-				while ( have_posts() ) : the_post();
+				while ( have_posts() ) :
+					the_post();
 					$projects_args = array(
 						'fields' => 'names',
 					);
 					$project_types = wp_get_post_terms( $post->ID, 'jetpack-portfolio-type', $projects_args );
+
+					$thumbnail_url = get_the_post_thumbnail_url( get_the_ID(), 'full' );
+					$item_style = '';
+					if ( 'mansonry' != $layout ) {
+						$item_style = 'background-image: url(' . $thumbnail_url . ')';
+					}
 				?>
 
-					<article id="post-<?php the_ID(); ?>" <?php post_class( 'post-snippet col-md-3 col-sm-6 masonry-item project' ); ?>>
-						<div class="image-tile inner-title hover-reveal text-center"><?php
-						if ( has_post_thumbnail() ) { ?>
-							<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
-								<?php the_post_thumbnail( 'medium' ); ?>
-								<div class="title"><?php
+					<article id="post-<?php the_ID(); ?>" <?php post_class( $item_classes ); ?>>
+						<div class="image-tile inner-title hover-reveal text-center"  style="<?php echo $item_style; ?>">
+																										<?php
+																										if ( has_post_thumbnail() ) {
+																										?>
+																											<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
+								<?php
+								if ( 'mansonry' == $layout ) {
+									the_post_thumbnail( 'medium' );
+								}
+								?>
+								<div class="title">
+								<?php
 								the_title( '<h5 class="mb0">', '</h5>' );
 								if ( ! empty( $project_types ) ) {
 									echo '<span>' . implode( ' / ', $project_types ) . '</span>';
-								} ?>
+								}
+								?>
 								</div>
-								</a><?php
-						} ?>
+								</a>
+								<?php
+																										}
+						?>
 						</div>
-					</article><!-- #post-## --><?php
+					</article><!-- #post-## -->
+					<?php
 
 				endwhile;
 
@@ -53,10 +82,15 @@
 
 					get_template_part( 'template-parts/content', 'none' );
 
-				endif; ?>
+				endif;
+				?>
 
 		</main><!-- #main -->
 	</div><!-- #primary -->
-
+	<?php
+	if ( 'sidebar-right' == $layout_class ) :
+		get_sidebar();
+	endif;
+	?>
 <?php
 get_footer();
diff --git a/archive.php b/archive.php
index 94f2a73..8fa2c59 100644
--- a/archive.php
+++ b/archive.php
@@ -7,39 +7,43 @@
  * @package Shapely
  */
 get_header(); ?>
-<?php $layout_class = shapely_get_layout_class();?>
+<?php $layout_class = shapely_get_layout_class(); ?>
 	<div class="row">
 		<?php
 		if ( 'sidebar-left' == $layout_class ) :
 			get_sidebar();
 		endif;
 		?>
-		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
-		if ( have_posts() ) :
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
+																<?php
+																if ( have_posts() ) :
 
-			if ( is_home() && ! is_front_page() ) : ?>
-					<header>
-						<h1 class="page-title screen-reader-text"><?php esc_html( single_post_title() ); ?></h1>
+																	if ( is_home() && ! is_front_page() ) :
+																	?>
+																			<header>
+																				<h1 class="page-title screen-reader-text"><?php esc_html( single_post_title() ); ?></h1>
 					</header>
 
 					<?php
-				endif;
+																		endif;
 
-			$layout_type = get_theme_mod( 'blog_layout_view', 'grid' );
-			$layout_type = str_replace( '_', '-', $layout_type );
+																	$layout_type = get_theme_mod( 'blog_layout_view', 'grid' );
+																	$layout_type = str_replace( '_', '-', $layout_type );
 
-			get_template_part( 'template-parts/layouts/blog', $layout_type );
+																	get_template_part( 'template-parts/layouts/blog', $layout_type );
 
-			shapely_pagination();
+																	shapely_pagination();
 			else :
 				get_template_part( 'template-parts/content', 'none' );
 
-			endif; ?>
+			endif;
+			?>
 		</div><!-- #primary -->
 		<?php
 		if ( 'sidebar-right' == $layout_class ) :
 			get_sidebar();
-		endif; ?>
+		endif;
+		?>
 	</div>
 <?php
 get_footer();
diff --git a/assets/js/customizer-preview.js b/assets/js/customizer-preview.js
new file mode 100644
index 0000000..f34faa5
--- /dev/null
+++ b/assets/js/customizer-preview.js
@@ -0,0 +1,34 @@
+(function( $ ) {// jscs:ignore validateLineBreaks
+
+	if ( 'undefined' !== typeof( wp ) ) {
+		if ( 'undefined' !== typeof( wp.customize ) ) {
+			wp.customize.bind( 'preview-ready', function() {
+				wp.customize.preview.bind( 'update-inline-css', function( object ) {
+					var data = {
+						'action': object.action,
+						'args': object.data,
+						'id': object.id
+					};
+
+					jQuery.ajax({
+						dataType: 'json',
+						type: 'POST',
+						url: WPUrls.ajaxurl,
+						data: data,
+						complete: function( json ) {
+							var sufix = object.action + object.id;
+							var style = $( '#shapely-style-' + sufix );
+
+							if ( ! style.length ) {
+								style = $( 'head' ).append( '<style type="text/css" id="shapely-style-' + sufix + '" />' ).find( '#shapely-style-' + sufix );
+							}
+
+							style.html( json.responseText );
+						}
+					});
+				});
+			});
+		}
+	}
+
+})( jQuery );
diff --git a/assets/js/customizer.js b/assets/js/customizer.js
index f34faa5..b92c866 100644
--- a/assets/js/customizer.js
+++ b/assets/js/customizer.js
@@ -1,34 +1,143 @@
 (function( $ ) {// jscs:ignore validateLineBreaks
 
-	if ( 'undefined' !== typeof( wp ) ) {
-		if ( 'undefined' !== typeof( wp.customize ) ) {
-			wp.customize.bind( 'preview-ready', function() {
-				wp.customize.preview.bind( 'update-inline-css', function( object ) {
-					var data = {
-						'action': object.action,
-						'args': object.data,
-						'id': object.id
-					};
-
-					jQuery.ajax({
-						dataType: 'json',
-						type: 'POST',
-						url: WPUrls.ajaxurl,
-						data: data,
-						complete: function( json ) {
-							var sufix = object.action + object.id;
-							var style = $( '#shapely-style-' + sufix );
-
-							if ( ! style.length ) {
-								style = $( 'head' ).append( '<style type="text/css" id="shapely-style-' + sufix + '" />' ).find( '#shapely-style-' + sufix );
-							}
-
-							style.html( json.responseText );
-						}
-					});
-				});
-			});
-		}
-	}
+  'use strict';
+
+  var api = wp.customize;
+
+  api.shapelyLogoDimension = api.Control.extend( {
+
+    ready: function() {
+      var control = this,
+          dimensions;
+      control.logo = api.control( 'custom_logo' );
+      control.values = control.setting();
+      dimensions = control.container.find( '.shapely-dimension' );
+      control.widthElement = $( dimensions[ 0 ] );
+      control.heightElement = $( dimensions[ 1 ] );
+
+      if ( ! control.values ) {
+        control.respectRatio = 1;
+      } else {
+        control.respectRatio = control.values.ratio;
+      }
+
+      if ( undefined !== control.logo.params.attachment ) {
+        control.hasLogo = true;
+        control.logoWidth = control.logo.params.attachment.width;
+        control.logoHeight = control.logo.params.attachment.height;
+      } else {
+        control.hasLogo = false;
+        control.toggle( false );
+      }
+
+      control.logo.setting.bind( 'change', function() {
+        control.updateLogo();
+      } );
+
+      control.widthElement.keyup( function() {
+        if ( control.respectRatio && control.hasLogo ) {
+          control.calculateRatio( 'width' );
+          control.shapelyInterval = setInterval( control.updateControl, 1000, control );
+        }
+      } );
+
+      control.heightElement.keyup( function() {
+        if ( control.respectRatio && control.hasLogo ) {
+          control.calculateRatio( 'height' );
+          control.shapelyInterval = setInterval( control.updateControl, 1000, control );
+        }
+      } );
+
+      control.container.find( '.ratio input' ).change( function() {
+        var values = control.setting();
+
+        if ( ! values ) {
+          values = {};
+        }
+
+        if ( $( this ).is( ':checked' ) ) {
+          control.respectRatio = 1;
+          values.ratio = 1;
+        } else {
+          control.respectRatio = 0;
+          values.ratio = 0;
+        }
+
+        control.setting( {} );
+        control.setting( values );
+      } );
+
+    },
+
+    updateLogo: function() {
+      var control = this,
+          values = control.setting();
+      if ( undefined !== control.logo.params.attachment ) {
+
+        control.logoWidth = control.logo.params.attachment.width;
+        control.logoHeight = control.logo.params.attachment.height;
+
+        if ( ! values ) {
+          values = {
+            'width': control.logoWidth,
+            'height': control.logoHeight,
+            'ratio': 1
+          };
+        } else {
+          values.width = control.logoWidth;
+          values.height = control.logoHeight;
+        }
+
+        control.widthElement.val( control.logoWidth );
+        control.heightElement.val( control.logoHeight );
+
+        control.setting( {} );
+        control.setting( values );
+
+        control.toggle( true );
+      } else {
+        control.toggle( false );
+      }
+    },
+
+    calculateRatio: function( keep ) {
+      var control = this,
+          aux;
+
+      if ( 'width' === keep ) {
+        aux = control.logoHeight * control.widthElement.val() / control.logoWidth;
+        control.heightElement.val( parseFloat( aux ).toFixed( 2 ) );
+      } else if ( 'height' === keep ) {
+        aux = control.logoWidth * control.heightElement.val() / control.logoHeight;
+        control.widthElement.val( parseFloat( aux ).toFixed( 2 ) );
+      }
+
+      clearInterval( control.shapelyInterval );
+    },
+
+    updateControl: function( control ) {
+      var values = control.setting();
+
+      if ( ! values ) {
+        values = {
+          'width': control.widthElement.val(),
+          'height': control.heightElement.val(),
+          'ratio': 1
+        };
+      } else {
+        values.width = control.widthElement.val();
+        values.height = control.heightElement.val();
+      }
+      control.setting( {} );
+      control.setting( values );
+      clearInterval( control.shapelyInterval );
+    }
+
+  } );
+
+  // Extend epsilon button constructor
+  $.extend( api.controlConstructor, {
+    'shapely-logo-dimension': api.shapelyLogoDimension
+  } );
 
 })( jQuery );
diff --git a/assets/js/shapely-scripts.js b/assets/js/shapely-scripts.js
index 8b30e80..380e054 100644
--- a/assets/js/shapely-scripts.js
+++ b/assets/js/shapely-scripts.js
@@ -1,410 +1,503 @@
 (function( $ ) {// jscs:ignore validateLineBreaks
 
-	var clNav, clNavOuterHeight, windowW, menu, farRight, isOnScreen, difference, videos, recentEntries, searchInterval, shapelyCf;
-
-	jQuery( document ).ready(function( $ ) {
-
-		//"use strict";
-
-		jQuery( '.shapely-dropdown' ).click( function( evt ) {
-			evt.preventDefault();
-			jQuery( this ).parent().find( '> ul' ).toggleClass( 'active' );
-		});
-
-		// Smooth scroll to inner links
-
-		jQuery( '.inner-link' ).each(function() {
-			var href = jQuery( this ).attr( 'href' );
-			if ( '#' !== href.charAt( 0 ) ) {
-				jQuery( this ).removeClass( 'inner-link' );
-			}
-		});
-
-		jQuery( '.inner-link' ).click(function() {
-			jQuery( 'html, body' ).animate({
-				scrollTop: 0
-			}, 1000 );
-			return false;
-		});
-
-		// Append .background-image-holder <img>'s as CSS backgrounds
-
-		jQuery( '.background-image-holder' ).each(function() {
-			var imgSrc = jQuery( this ).children( 'img' ).attr( 'src' );
-			jQuery( this ).css( 'background', 'url("' + imgSrc + '")' );
-			jQuery( this ).children( 'img' ).hide();
-			jQuery( this ).css( 'background-position', 'initial' );
-		});
-
-		// Fade in background images
-
-		setTimeout(function() {
-			jQuery( '.background-image-holder' ).each(function() {
-				jQuery( this ).addClass( 'fadeIn' );
-			});
-		}, 200 );
-
-		// Fix nav to top while scrolling
-
-		clNav = $( 'body .nav-container nav:first' );
-		clNavOuterHeight = $( 'body .nav-container nav:first' ).outerHeight();
-		windowW = jQuery( window ).width();
-		if ( windowW > 991 ) {
-			window.addEventListener( 'scroll', updateNav, false );
-			updateNav();
-		}
-
-		$( window ).resize(function() {
-			windowW = $( window ).width();
-			if ( windowW < 992 ) {
-				clNav.removeClass( 'fixed scrolled outOfSight' );
-			} else {
-				window.addEventListener( 'scroll', updateNav, false );
-				updateNav();
-			}
-		});
-
-		// Menu dropdown positioning
-
-		$( '.menu > li > ul' ).each(function() {
-			menu = $( this ).offset();
-			farRight = menu.left + $( this ).outerWidth( true );
-			if ( farRight > $( window ).width() && ! $( this ).hasClass( 'mega-menu' ) ) {
-				$( this ).addClass( 'make-right' );
-			} else if ( farRight > $( window ).width() && $( this ).hasClass( 'mega-menu' ) ) {
-				isOnScreen = $( window ).width() - menu.left;
-				difference = $( this ).outerWidth( true ) - isOnScreen;
-				$( this ).css( 'margin-left', -( difference ) );
-			}
-		});
-
-		// Mobile Menu
-
-		$( '.mobile-toggle' ).click(function() {
-			$( '.nav-bar' ).toggleClass( 'nav-open' );
-			$( this ).toggleClass( 'active' );
-			$( '.search-widget-handle' ).toggleClass( 'hidden-xs hidden-sm' );
-		});
-
-		$( '.module.widget-handle' ).click(function() {
-			$( this ).toggleClass( 'toggle-search' );
-		});
-
-		$( '.search-widget-handle .search-form input' ).click(function( e ) {
-			if ( ! e ) {
-			    e = window.event;
+  var clNav, clNavOuterHeight, windowW, menu, farRight, isOnScreen, difference, videos, recentEntries, searchInterval, shapelyCf, element, newURL, scrollToID;
+
+  jQuery( document ).ready( function( $ ) {
+
+    //"use strict";
+
+    jQuery( '.shapely-dropdown' ).click( function( evt ) {
+      evt.preventDefault();
+      jQuery( this ).parent().find( '> ul' ).toggleClass( 'active' );
+      jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+    } );
+
+    // Smooth scroll to inner links
+    jQuery( '.inner-link' ).each( function() {
+      var href = jQuery( this ).attr( 'href' );
+      if ( '#' !== href.charAt( 0 ) ) {
+        jQuery( this ).removeClass( 'inner-link' );
+      }
+    } );
+
+    // Smooth scroll
+    if ( '' !== window.location.hash ) {
+      element = $( '#site-navigation #menu a[href=' + window.location.hash + ']' );
+      if ( element ) {
+        scrollToID = '#' + element.data( 'scroll' );
+        $( 'html,body' ).animate( {
+          scrollTop: $( scrollToID ).offset().top
+        }, 2000 );
+
+        newURL = window.location.href.replace( window.location.hash, '' );
+        window.history.replaceState( {}, document.title, newURL );
+
+      }
+    }
+
+    $( '#site-navigation #menu a[href^=#]:not([href=#])' ).click( function( evt ) {
+      var scrollToID = '#' + $( this ).data( 'scroll' );
+      evt.preventDefault();
+      $( 'html,body' ).animate( {
+        scrollTop: $( scrollToID ).offset().top
+      }, 2000 );
+    } );
+
+    jQuery( '.inner-link' ).click( function() {
+      jQuery( 'html, body' ).animate( {
+        scrollTop: 0
+      }, 1000 );
+      return false;
+    } );
+
+    // Append .background-image-holder <img>'s as CSS backgrounds
+
+    jQuery( '.background-image-holder' ).each( function() {
+      var imgSrc = jQuery( this ).children( 'img' ).attr( 'src' );
+      jQuery( this ).css( 'background', 'url("' + imgSrc + '")' );
+      jQuery( this ).children( 'img' ).hide();
+      jQuery( this ).css( 'background-position', 'initial' );
+    } );
+
+    // Fade in background images
+
+    setTimeout( function() {
+      jQuery( '.background-image-holder' ).each( function() {
+        jQuery( this ).addClass( 'fadeIn' );
+      } );
+    }, 200 );
+
+    // Fix nav to top while scrolling
+
+    clNav = $( 'body .nav-container nav:first' );
+    clNavOuterHeight = $( 'body .nav-container nav:first' ).outerHeight();
+    windowW = jQuery( window ).width();
+    if ( windowW > 991 ) {
+      window.addEventListener( 'scroll', updateNav, false );
+      updateNav();
+    }
+
+    $( window ).resize( function() {
+      windowW = $( window ).width();
+      if ( windowW < 992 ) {
+        clNav.removeClass( 'fixed scrolled outOfSight' );
+      } else {
+        window.addEventListener( 'scroll', updateNav, false );
+        updateNav();
+      }
+    } );
+
+    // Menu dropdown positioning
+
+    $( '.menu > li > ul' ).each( function() {
+      menu = $( this ).offset();
+      farRight = menu.left + $( this ).outerWidth( true );
+      if ( farRight > $( window ).width() && ! $( this ).hasClass( 'mega-menu' ) ) {
+        $( this ).addClass( 'make-right' );
+      } else if ( farRight > $( window ).width() && $( this ).hasClass( 'mega-menu' ) ) {
+        isOnScreen = $( window ).width() - menu.left;
+        difference = $( this ).outerWidth( true ) - isOnScreen;
+        $( this ).css( 'margin-left', -( difference ) );
+      }
+    } );
+
+    // Mobile Menu
+
+    $( '.mobile-toggle' ).click( function() {
+      $( '.nav-bar' ).toggleClass( 'nav-open' );
+      $( this ).toggleClass( 'active' );
+      $( '.search-widget-handle' ).toggleClass( 'hidden-xs hidden-sm' );
+      jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+    } );
+
+    $( '.module.widget-handle' ).click( function() {
+      $( this ).toggleClass( 'toggle-search' );
+      jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+    } );
+
+    $( '.search-widget-handle .search-form input' ).click( function( e ) {
+      if ( ! e ) {
+        e = window.event;
+      }
+      e.stopPropagation();
+    } );
+
+    // Image Sliders
+    $( '.slider-all-controls' ).flexslider( {
+      start: function( slider ) {
+        if ( slider.find( '.slides li:first-child' ).find( '.fs-vid-background video' ).length ) {
+          slider.find( '.slides li:first-child' ).find( '.fs-vid-background video' ).get( 0 ).play();
+        }
+      },
+      after: function( slider ) {
+        if ( slider.find( '.fs-vid-background video' ).length ) {
+          if ( slider.find( 'li:not(.flex-active-slide)' ).find( '.fs-vid-background video' ).length ) {
+            slider.find( 'li:not(.flex-active-slide)' ).find( '.fs-vid-background video' ).get( 0 ).pause();
+          }
+          if ( slider.find( '.flex-active-slide' ).find( '.fs-vid-background video' ).length ) {
+            slider.find( '.flex-active-slide' ).find( '.fs-vid-background video' ).get( 0 ).play();
+          }
+        }
+      }
+    } );
+    $( '.slider-paging-controls' ).flexslider( {
+      animation: 'slide',
+      directionNav: false,
+      after: function( slider ) {
+        if ( ! slider.playing ) {
+          slider.pause();
+          slider.play();
+          slider.off( 'mouseenter mouseleave' );
+          slider.off( 'mouseover mouseout' );
+          slider.mouseover( function() {
+            if ( ! slider.manualPlay && ! slider.manualPause ) {
+              slider.pause();
             }
-			e.stopPropagation();
-		});
-
-		// Image Sliders
-		$( '.slider-all-controls' ).flexslider({
-			start: function( slider ) {
-				if ( slider.find( '.slides li:first-child' ).find( '.fs-vid-background video' ).length ) {
-					slider.find( '.slides li:first-child' ).find( '.fs-vid-background video' ).get( 0 ).play();
-				}
-			},
-			after: function( slider ) {
-				if ( slider.find( '.fs-vid-background video' ).length ) {
-					if ( slider.find( 'li:not(.flex-active-slide)' ).find( '.fs-vid-background video' ).length ) {
-						slider.find( 'li:not(.flex-active-slide)' ).find( '.fs-vid-background video' ).get( 0 ).pause();
-					}
-					if ( slider.find( '.flex-active-slide' ).find( '.fs-vid-background video' ).length ) {
-						slider.find( '.flex-active-slide' ).find( '.fs-vid-background video' ).get( 0 ).play();
-					}
-				}
-			}
-		});
-		$( '.slider-paging-controls' ).flexslider({
-			animation: 'slide',
-			directionNav: false
-		});
-		$( '.slider-arrow-controls' ).flexslider({
-			controlNav: false
-		});
-		$( '.slider-thumb-controls .slides li' ).each(function() {
-			var imgSrc = $( this ).find( 'img' ).attr( 'src' );
-			$( this ).attr( 'data-thumb', imgSrc );
-		});
-		$( '.slider-thumb-controls' ).flexslider({
-			animation: 'slide',
-			controlNav: 'thumbnails',
-			directionNav: true
-		});
-		$( '.logo-carousel' ).flexslider({
-			minItems: 1,
-			maxItems: 4,
-			move: 1,
-			itemWidth: 200,
-			itemMargin: 0,
-			animation: 'slide',
-			slideshow: true,
-			slideshowSpeed: 3000,
-			directionNav: false,
-			controlNav: false
-		});
-
-		// Lightbox gallery titles
-		$( '.lightbox-grid li a' ).each(function() {
-			var galleryTitle = $( this ).closest( '.lightbox-grid' ).attr( 'data-gallery-title' );
-			$( this ).attr( 'data-lightbox', galleryTitle );
-		});
-
-		videos = $( '.video-widget' );
-		if ( videos.length ) {
-			$.each( videos, function() {
-				var play = $( this ).find( '.play-button' ),
-						pause = $( this ).find( '.pause-button' ),
-						isYoutube = $( this ).hasClass( 'youtube' ),
-						isVimeo = $( this ).hasClass( 'vimeo' ),
-                        videoId, mute, instance, self, autoplay, data, options, containerId, player;
-
-				if ( isYoutube ) {
-					videoId = $( this ).attr( 'data-video-id' );
-                    autoplay = parseInt( $( this ).attr( 'data-autoplay' ), 10 );
-                    mute = parseInt( $( this ).attr( 'data-mute' ), 10 );
-                    instance = $( this ).YTPlayer({
-                        fitToBackground: true,
-                        videoId: videoId,
-                        mute: mute,
-                        playerVars: {
-                            modestbranding: 0,
-                            autoplay: autoplay,
-                            controls: 0,
-                            showinfo: 0,
-                            branding: 0,
-                            rel: 0,
-                            autohide: 0
-                        }
-                    });
-                    self = $( this );
-
-					$( document ).on( 'YTBGREADY', function() {
-						var iframe = self.find( 'iframe' ),
-								height = iframe.height();
-					});
-
-					$( play ).on( 'click', function( e ) {
-						var parent = $( this ).parents( '.video-widget' ),
-								instance = $( parent ).data( 'ytPlayer' ).player;
-                        e.preventDefault();
-						instance.playVideo();
-					});
-
-					$( pause ).on( 'click', function( e ) {
-						var parent = $( this ).parents( '.video-widget' ),
-								instance = $( parent ).data( 'ytPlayer' ).player;
-                        e.preventDefault();
-						instance.pauseVideo();
-					});
-
-				} else if ( isVimeo ) {
-
-					data = jQuery( this ).data();
-					options = {
-						id: data.videoId,
-						autoplay: data.autoplay,
-						loop: 1,
-						title: false,
-						portrait: false,
-						byline:false,
-						height: jQuery( this ).height(),
-						width: jQuery( this ).width()
-					};
-                    containerId = jQuery( this ).find( '.vimeo-holder' ).attr( 'id' );
-					player = new Vimeo.Player( containerId, options );
-
-					if ( data.mute ) {
-                        player.setVolume( 0 );
-                    }
-
-					jQuery( play ).click(function() {
-						player.play();
-					});
-					jQuery( pause ).click(function() {
-						player.pause();
-					});
-
-				} else {
-					$( play ).on( 'click', function( e ) {
-						var parent = $( this ).parents( '.video-widget' ),
-								instance = $( parent ).data( 'vide' ),
-								video = instance.getVideoObject();
-                        e.preventDefault();
-						video.play();
-					});
-
-					$( pause ).on( 'click', function( e ) {
-						var parent = $( this ).parents( '.video-widget' ),
-								instance = $( parent ).data( 'vide' ),
-								video = instance.getVideoObject();
-                        e.preventDefault();
-						video.pause();
-					});
-				}
-			});
-		}
-
-		recentEntries = $( '.widget_recent_entries' ).find( 'li' );
-		$.each( recentEntries, function() {
-			$( this ).find( 'a' ).insertAfter( $( this ).find( '.post-date' ) );
-		});
-
-		$( '.comment-form' ).find( 'textarea' ).insertAfter( $( '.comment-form > #url' ) );
-
-		if ( 'undefined' !== typeof $.fn.owlCarousel ) {
-
-			$( '.owlCarousel' ).each(function( index ) {
-
-				var sliderSelector = '#owlCarousel-' + $( this ).data( 'slider-id' ); // This is the slider selector
-				var sliderItems = $( this ).data( 'slider-items' );
-				var sliderSpeed = $( this ).data( 'slider-speed' );
-				var sliderAutoPlay = $( this ).data( 'slider-auto-play' );
-				var sliderSingleItem = $( this ).data( 'slider-single-item' );
-
-				//Conversion of 1 to true & 0 to false
-				// auto play
-				sliderAutoPlay = ! ( 0 === sliderAutoPlay || 'false' === sliderAutoPlay );
-
-				// Custom Navigation events outside of the owlCarousel mark-up
-				$( '.shapely-owl-next' ).on( 'click', function( event ) {
-					event.preventDefault();
-					$( sliderSelector ).trigger( 'next.owl.carousel' );
-				});
-				$( '.shapely-owl-prev' ).on( 'click', function( event ) {
-					event.preventDefault();
-					$( sliderSelector ).trigger( 'prev.owl.carousel' );
-				});
-
-				// Instantiate the slider with all the options
-				$( sliderSelector ).owlCarousel({
-					items: sliderItems,
-					loop: false,
-					margin: 2,
-					autoplay: sliderAutoPlay,
-					dots: false,
-					autoplayTimeout: sliderSpeed * 10,
-					responsive: {
-						0: {
-							items: 1
-						},
-						768: {
-							items: sliderItems
-						}
-					}
-				});
-			});
-		} // End
-
-		jQuery( '#masthead .function #s' ).focus( function() {
-			jQuery( this ).parents( '.function' ).addClass( 'active' );
-		});
-
-		jQuery( '#masthead .function #s' ).focusout( function() {
-			searchInterval = setInterval(function() {
- jQuery( '#masthead .function' ).removeClass( 'active' );
- }, 500 );
-		});
-
-		jQuery( '#masthead .function #searchsubmit' ).focus( function() {
-			clearInterval( searchInterval );
-			jQuery( this ).parents( '.function' ).addClass( 'active' );
-		});
-
-		jQuery( '#masthead .function #searchsubmit' ).focusout( function() {
-			jQuery( this ).parents( '.function' ).removeClass( 'active' );
-		});
-
-		// Check if is a contact form 7 with parallax background
-		shapelyCf = jQuery( '.contact-section.image-bg .wpcf7' );
-		if ( shapelyCf.length > 0 ) {
-			shapelyCf.on( 'wpcf7submit', function() {
-				setTimeout(function() {
- jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
- }, 800 );
-			});
-		}
-
-	});
-
-	jQuery( window ).load(function( $ ) {
-
-		// "use strict";
-		// Resetting testimonial parallax height
-        var msnry, container, clFirstSectionHeight;
-		if ( 0 !== jQuery( '.testimonial-section' ).length ) {
-			testimonialHeight();
-			setTimeout(function() {
-				testimonialHeight();
-			}, 3000 );
-		}
-
-		// Initialize Masonry
-
-		if ( jQuery( '.masonry' ).length && 'undefined' !== typeof Masonry ) {
-			container = document.querySelector( '.masonry' );
-			msnry = new Masonry( container, {
-				itemSelector: '.masonry-item'
-			});
-
-			msnry.on( 'layoutComplete', function( $ ) {
-
-				clFirstSectionHeight = jQuery( '.main-container section:nth-of-type(1)' ).outerHeight( true );
-				jQuery( '.masonry' ).addClass( 'fadeIn' );
-				jQuery( '.masonry-loader' ).addClass( 'fadeOut' );
-				if ( jQuery( '.masonryFlyIn' ).length ) {
-					masonryFlyIn();
-				}
-			});
-
-			msnry.layout();
-		}
-
-        // Navigation height
-        clFirstSectionHeight = jQuery( '.main-container section:nth-of-type(1)' ).outerHeight( true );
+          } ).mouseout( function() {
+            if ( ! slider.manualPause && ! slider.manualPlay && ! slider.stopped ) {
+              slider.play();
+            }
+          } );
+        }
+      }
+    } );
+    $( '.slider-arrow-controls' ).flexslider( {
+      controlNav: false,
+      after: function( slider ) {
+        if ( ! slider.playing ) {
+          slider.pause();
+          slider.play();
+          slider.off( 'mouseenter mouseleave' );
+          slider.off( 'mouseover mouseout' );
+          slider.mouseover( function() {
+            if ( ! slider.manualPlay && ! slider.manualPause ) {
+              slider.pause();
+            }
+          } ).mouseout( function() {
+            if ( ! slider.manualPause && ! slider.manualPlay && ! slider.stopped ) {
+              slider.play();
+            }
+          } );
+        }
+      }
+    } );
+    $( '.slider-thumb-controls .slides li' ).each( function() {
+      var imgSrc = $( this ).find( 'img' ).attr( 'src' );
+      $( this ).attr( 'data-thumb', imgSrc );
+    } );
+    $( '.slider-thumb-controls' ).flexslider( {
+      animation: 'slide',
+      controlNav: 'thumbnails',
+      directionNav: true,
+      after: function( slider ) {
+        if ( ! slider.playing ) {
+          slider.pause();
+          slider.play();
+          slider.off( 'mouseenter mouseleave' );
+          slider.off( 'mouseover mouseout' );
+          slider.mouseover( function() {
+            if ( ! slider.manualPlay && ! slider.manualPause ) {
+              slider.pause();
+            }
+          } ).mouseout( function() {
+            if ( ! slider.manualPause && ! slider.manualPlay && ! slider.stopped ) {
+              slider.play();
+            }
+          } );
+        }
+      }
+    } );
+    $( '.logo-carousel' ).flexslider( {
+      minItems: 1,
+      maxItems: 4,
+      move: 1,
+      itemWidth: 200,
+      itemMargin: 0,
+      animation: 'slide',
+      slideshow: true,
+      slideshowSpeed: 3000,
+      directionNav: false,
+      controlNav: false,
+      after: function( slider ) {
+        if ( ! slider.playing ) {
+          slider.pause();
+          slider.play();
+          slider.off( 'mouseenter mouseleave' );
+          slider.off( 'mouseover mouseout' );
+          slider.mouseover( function() {
+            if ( ! slider.manualPlay && ! slider.manualPause ) {
+              slider.pause();
+            }
+          } ).mouseout( function() {
+            if ( ! slider.manualPause && ! slider.manualPlay && ! slider.stopped ) {
+              slider.play();
+            }
+          } );
+        }
+      }
+    } );
+
+    // Lightbox gallery titles
+    $( '.lightbox-grid li a' ).each( function() {
+      var galleryTitle = $( this ).closest( '.lightbox-grid' ).attr( 'data-gallery-title' );
+      $( this ).attr( 'data-lightbox', galleryTitle );
+    } );
+
+    videos = $( '.video-widget' );
+    if ( videos.length ) {
+      $.each( videos, function() {
+        var play = $( this ).find( '.play-button' ),
+            pause = $( this ).find( '.pause-button' ),
+            isYoutube = $( this ).hasClass( 'youtube' ),
+            isVimeo = $( this ).hasClass( 'vimeo' ),
+            videoId, mute, instance, self, autoplay, data, options, containerId, player;
+
+        if ( isYoutube ) {
+          videoId = $( this ).attr( 'data-video-id' );
+          autoplay = parseInt( $( this ).attr( 'data-autoplay' ), 10 );
+          mute = parseInt( $( this ).attr( 'data-mute' ), 10 );
+          instance = $( this ).YTPlayer( {
+            fitToBackground: true,
+            videoId: videoId,
+            mute: mute,
+            playerVars: {
+              modestbranding: 0,
+              autoplay: autoplay,
+              controls: 0,
+              showinfo: 0,
+              branding: 0,
+              rel: 0,
+              autohide: 0
+            }
+          } );
+          self = $( this );
+
+          $( document ).on( 'YTBGREADY', function() {
+            var iframe = self.find( 'iframe' ),
+                height = iframe.height();
+          } );
+
+          $( play ).on( 'click', function( e ) {
+            var parent = $( this ).parents( '.video-widget' ),
+                instance = $( parent ).data( 'ytPlayer' ).player;
+            e.preventDefault();
+            instance.playVideo();
+          } );
+
+          $( pause ).on( 'click', function( e ) {
+            var parent = $( this ).parents( '.video-widget' ),
+                instance = $( parent ).data( 'ytPlayer' ).player;
+            e.preventDefault();
+            instance.pauseVideo();
+          } );
+
+        } else if ( isVimeo ) {
+
+          data = jQuery( this ).data();
+          options = {
+            id: data.videoId,
+            autoplay: data.autoplay,
+            loop: 1,
+            title: false,
+            portrait: false,
+            byline: false,
+            height: jQuery( this ).height(),
+            width: jQuery( this ).width()
+          };
+          containerId = jQuery( this ).find( '.vimeo-holder' ).attr( 'id' );
+          player = new Vimeo.Player( containerId, options );
+
+          if ( data.mute ) {
+            player.setVolume( 0 );
+          }
+
+          jQuery( play ).click( function() {
+            player.play();
+          } );
+          jQuery( pause ).click( function() {
+            player.pause();
+          } );
+
+        } else {
+          $( play ).on( 'click', function( e ) {
+            var parent = $( this ).parents( '.video-widget' ),
+                instance = $( parent ).data( 'vide' ),
+                video = instance.getVideoObject();
+            e.preventDefault();
+            video.play();
+          } );
+
+          $( pause ).on( 'click', function( e ) {
+            var parent = $( this ).parents( '.video-widget' ),
+                instance = $( parent ).data( 'vide' ),
+                video = instance.getVideoObject();
+            e.preventDefault();
+            video.pause();
+          } );
+        }
+      } );
+    }
+
+    recentEntries = $( '.widget_recent_entries' ).find( 'li' );
+    $.each( recentEntries, function() {
+      $( this ).find( 'a' ).insertAfter( $( this ).find( '.post-date' ) );
+    } );
+
+    $( '.comment-form' ).find( 'textarea' ).insertAfter( $( '.comment-form > #url' ) );
+
+    if ( 'undefined' !== typeof $.fn.owlCarousel ) {
+
+      $( '.owlCarousel' ).each( function( index ) {
+
+        var sliderSelector = '#owlCarousel-' + $( this ).data( 'slider-id' ); // This is the slider selector
+        var sliderItems = $( this ).data( 'slider-items' );
+        var sliderSpeed = $( this ).data( 'slider-speed' );
+        var sliderAutoPlay = $( this ).data( 'slider-auto-play' );
+        var sliderSingleItem = $( this ).data( 'slider-single-item' );
+
+        //Conversion of 1 to true & 0 to false
+        // auto play
+        sliderAutoPlay = ! ( 0 === sliderAutoPlay || 'false' === sliderAutoPlay );
+
+        // Custom Navigation events outside of the owlCarousel mark-up
+        $( '.shapely-owl-next' ).on( 'click', function( event ) {
+          event.preventDefault();
+          $( sliderSelector ).trigger( 'next.owl.carousel' );
+        } );
+        $( '.shapely-owl-prev' ).on( 'click', function( event ) {
+          event.preventDefault();
+          $( sliderSelector ).trigger( 'prev.owl.carousel' );
+        } );
+
+        // Instantiate the slider with all the options
+        $( sliderSelector ).owlCarousel( {
+          items: sliderItems,
+          loop: false,
+          margin: 2,
+          autoplay: sliderAutoPlay,
+          dots: false,
+          autoplayTimeout: sliderSpeed * 10,
+          responsive: {
+            0: {
+              items: 1
+            },
+            768: {
+              items: sliderItems
+            }
+          }
+        } );
+      } );
+    } // End
+
+    jQuery( '#masthead .function #s' ).focus( function() {
+      jQuery( this ).parents( '.function' ).addClass( 'active' );
+    } );
+
+    jQuery( '#masthead .function #s' ).focusout( function() {
+      searchInterval = setInterval( function() {
+        jQuery( '#masthead .function' ).removeClass( 'active' );
+      }, 500 );
+    } );
+
+    jQuery( '#masthead .function #searchsubmit' ).focus( function() {
+      clearInterval( searchInterval );
+      jQuery( this ).parents( '.function' ).addClass( 'active' );
+    } );
+
+    jQuery( '#masthead .function #searchsubmit' ).focusout( function() {
+      jQuery( this ).parents( '.function' ).removeClass( 'active' );
+    } );
+
+    // Check if is a contact form 7 with parallax background
+    shapelyCf = jQuery( '.contact-section.image-bg .wpcf7' );
+    if ( shapelyCf.length > 0 ) {
+      shapelyCf.on( 'wpcf7submit', function() {
+        setTimeout( function() {
+          jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+        }, 800 );
+      } );
+    }
+
+  } );
+
+  jQuery( window ).load( function( $ ) {
+
+    // "use strict";
+    // Resetting testimonial parallax height
+    var msnry, container, clFirstSectionHeight;
+    if ( 0 !== jQuery( '.testimonial-section' ).length ) {
+      testimonialHeight();
+      setTimeout( function() {
+        testimonialHeight();
+      }, 3000 );
+    }
+
+    // Initialize Masonry
+
+    if ( jQuery( '.masonry' ).length && 'undefined' !== typeof Masonry ) {
+      container = document.querySelector( '.masonry' );
+      msnry = new Masonry( container, {
+        itemSelector: '.masonry-item'
+      } );
+
+      msnry.on( 'layoutComplete', function( $ ) {
 
-	});
-
-	/* Function To
-	 * keep menu fixed
-	 **/
-	function updateNav() {
-		var scroll = $( window ).scrollTop();
-		var windowW = jQuery( window ).width();
-
-		if ( windowW < 992 ) {
-			return;
-		}
-
-		if ( scroll > clNavOuterHeight ) {
-			clNav.addClass( 'outOfSight' );
-		}
-
-		if ( $( window ).scrollTop() > ( clNavOuterHeight + 65 ) ) {//If href = #element id
-			clNav.addClass( 'fixed scrolled' );
-		}
-
-		if ( 0 === $( window ).scrollTop() ) {
-			clNav.removeClass( 'fixed scrolled outOfSight' );
-		}
-	}
-
-	function masonryFlyIn() {
-		var $items = jQuery( '.masonryFlyIn .masonry-item' );
-		var time = 0;
-
-		$items.each(function() {
-			var item = jQuery( this );
-			setTimeout(function() {
-				item.addClass( 'fadeIn' );
-			}, time );
-			time += 170;
-		});
-	}
-
-	jQuery( 'body' ).imagesLoaded( function() {
-		jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
-	});
+        clFirstSectionHeight = jQuery( '.main-container section:nth-of-type(1)' ).outerHeight( true );
+        jQuery( '.masonry' ).addClass( 'fadeIn' );
+        jQuery( '.masonry-loader' ).addClass( 'fadeOut' );
+        if ( jQuery( '.masonryFlyIn' ).length ) {
+          masonryFlyIn();
+        }
+      } );
+
+      msnry.layout();
+    }
+
+    // Navigation height
+    clFirstSectionHeight = jQuery( '.main-container section:nth-of-type(1)' ).outerHeight( true );
+
+  } );
+
+  /* Function To
+   * keep menu fixed
+   **/
+  function updateNav() {
+    var scroll = $( window ).scrollTop();
+    var windowW = jQuery( window ).width();
+
+    if ( windowW < 992 ) {
+      return;
+    }
+
+    if ( scroll > clNavOuterHeight ) {
+      clNav.addClass( 'outOfSight' );
+    }
+
+    if ( $( window ).scrollTop() > ( clNavOuterHeight + 65 ) ) {//If href = #element id
+      clNav.addClass( 'fixed scrolled' );
+    }
+
+    if ( 0 === $( window ).scrollTop() ) {
+      clNav.removeClass( 'fixed scrolled outOfSight' );
+    }
+  }
+
+  function masonryFlyIn() {
+    var $items = jQuery( '.masonryFlyIn .masonry-item' );
+    var time = 0;
+
+    $items.each( function() {
+      var item = jQuery( this );
+      setTimeout( function() {
+        item.addClass( 'fadeIn' );
+      }, time );
+      time += 170;
+    } );
+  }
+
+  jQuery( 'body' ).imagesLoaded( function() {
+    jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+  } );
 
 })( jQuery );
 
@@ -412,7 +505,7 @@
  * Resetting testimonial parallax height
  */
 function testimonialHeight() {
-	jQuery( '.testimonial-section .parallax-window' ).css( 'height', jQuery( '.testimonial-section .parallax-window .container' ).outerHeight() + 150 );
-	jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
+  jQuery( '.testimonial-section .parallax-window' ).css( 'height', jQuery( '.testimonial-section .parallax-window .container' ).outerHeight() + 150 );
+  jQuery( window ).trigger( 'resize' ).trigger( 'scroll' );
 }
 
diff --git a/attachment.php b/attachment.php
index 152232f..5dd28f0 100644
--- a/attachment.php
+++ b/attachment.php
@@ -15,16 +15,19 @@
 			get_sidebar();
 		endif;
 		?>
-		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
-		while ( have_posts() ) : the_post();
-			get_template_part( 'template-parts/content', 'attachment' );
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
+																<?php
+																while ( have_posts() ) :
+																	the_post();
+																	get_template_part( 'template-parts/content', 'attachment' );
 
-			// If comments are open or we have at least one comment, load up the comment template.
-			if ( comments_open() || get_comments_number() ) :
-				comments_template();
-				endif;
+																	// If comments are open or we have at least one comment, load up the comment template.
+																	if ( comments_open() || get_comments_number() ) :
+																		comments_template();
+																		endif;
 
-			endwhile; // End of the loop. ?>
+			endwhile; // End of the loop.
+			?>
 		</div><!-- #primary -->
 		<?php
 		if ( 'sidebar-right' == $layout_class ) :
diff --git a/comments.php b/comments.php
index c571bc0..2a70c97 100644
--- a/comments.php
+++ b/comments.php
@@ -5,7 +5,7 @@
  * This is the template that displays the area of the page that contains both the current comments
  * and the comment form.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link    https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Shapely
  */
@@ -21,78 +21,79 @@
 ?>
 
 <div id="comments" class="comments-area comments  nolist">
-	<?php
-	// You can start editing here -- including this comment!
-	if ( have_comments() ) : ?>
+	<?php if ( have_comments() ) : ?>
 		<h5 class="comments-title">
-		<?php
-		$comments_number = get_comments_number();
-		if ( '1' === $comments_number ) {
-			/* translators: %s: post title */
-			echo _x( '1 COMMENT', 'comments title', 'shapely' );
-		} else {
-			printf(
-				/* translators: number of comments */
-				_nx(
-					'%1$s COMMENT',
-					'%1$s COMMENTS',
-					$comments_number,
-					'comments title',
-					'shapely'
-				),
-				number_format_i18n( $comments_number )
-			);
-		}
-		?>
+			<?php
+			$comments_number = get_comments_number();
+			if ( '1' === $comments_number ) {
+				/* translators: %s: post title */
+				echo _x( '1 COMMENT', 'comments title', 'shapely' );
+			} else {
+				printf(
+					/* translators: number of comments */
+					_nx(
+						'%1$s COMMENT',
+						'%1$s COMMENTS',
+						$comments_number,
+						'comments title',
+						'shapely'
+					),
+					number_format_i18n( $comments_number )
+				);
+			}
+			?>
 		</h5>
 
-		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-		<nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
-			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'shapely' ); ?></h2>
-			<div class="nav-links">
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+			<nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
+				<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'shapely' ); ?></h2>
+				<div class="nav-links">
 
-				<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', 'shapely' ) ); ?></div>
-				<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', 'shapely' ) ); ?></div>
+					<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', 'shapely' ) ); ?></div>
+					<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', 'shapely' ) ); ?></div>
 
-			</div><!-- .nav-links -->
-		</nav><!-- #comment-nav-above -->
-		<?php endif; // Check for comment navigation. ?>
+				</div><!-- .nav-links -->
+			</nav><!-- #comment-nav-above -->
+		<?php endif; ?>
 
 		<?php add_filter( 'comment_reply_link', 'shapely_reply_link_class' ); ?>
 		<ul class="comments-list">
 			<?php
-				wp_list_comments( array(
-					'style'      => 'ol',
-					'short_ping' => true,
+			wp_list_comments(
+				array(
+					'style'       => 'ol',
+					'short_ping'  => true,
 					'avatar_size' => 75,
-					'callback'   => 'shapely_cb_comment',
-				) );
+					'callback'    => 'shapely_cb_comment',
+				)
+			);
 			?>
 		</ul><!-- .comment-list -->
 		<?php remove_filter( 'comment_reply_link', 'shapely_reply_link_class' ); ?>
 
 
-		<?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 esc_html_e( 'Comment navigation', 'shapely' ); ?></h2>
-			<div class="nav-links">
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+			<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
+				<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'shapely' ); ?></h2>
+				<div class="nav-links">
 
-				<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', 'shapely' ) ); ?></div>
-				<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', 'shapely' ) ); ?></div>
+					<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', 'shapely' ) ); ?></div>
+					<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', 'shapely' ) ); ?></div>
 
-			</div><!-- .nav-links -->
-		</nav><!-- #comment-nav-below -->
-		<?php
+				</div><!-- .nav-links -->
+			</nav><!-- #comment-nav-below -->
+			<?php
 		endif; // Check for comment navigation.
 
 	endif; // Check for have_comments().
 
 
 	// If comments are closed and there are comments, let's leave a little note, shall we?
-	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : ?>
+if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
+?>
 
 		<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'shapely' ); ?></p>
-	<?php
+		<?php
 	endif;
 
 	/* comment form */
diff --git a/functions.php b/functions.php
index ee4b3b0..87d80d3 100644
--- a/functions.php
+++ b/functions.php
@@ -30,19 +30,26 @@ function shapely_setup() {
 		/**
 		 * Add support for the custom logo functionality
 		 */
-		add_theme_support( 'custom-logo', array(
-			'height'     => 55,
-			'width'      => 135,
-			'flex-width' => true,
-		) );
-
-		add_theme_support( 'custom-header', apply_filters( 'shapely_custom_header_args', array(
-			'default-image'      => '',
-			'default-text-color' => '000000',
-			'width'              => 1900,
-			'height'             => 225,
-			'flex-width'         => true,
-		) ) );
+		add_theme_support(
+			'custom-logo', array(
+				'height'     => 55,
+				'width'      => 135,
+				'flex-width' => true,
+				'flex-height' => true,
+			)
+		);
+
+		add_theme_support(
+			'custom-header', apply_filters(
+				'shapely_custom_header_args', array(
+					'default-image'      => '',
+					'default-text-color' => '000000',
+					'width'              => 1900,
+					'height'             => 225,
+					'flex-width'         => true,
+				)
+			)
+		);
 
 		/*
 		 * Let WordPress manage the document title.
@@ -60,28 +67,36 @@ function shapely_setup() {
 		add_theme_support( 'post-thumbnails' );
 
 		// This theme uses wp_nav_menu() in one location.
-		register_nav_menus( array(
-			'primary'     => esc_html__( 'Primary', 'shapely' ),
-			'social-menu' => esc_html__( 'Social Menu', 'shapely' ),
-		) );
+		register_nav_menus(
+			array(
+				'primary'     => esc_html__( 'Primary', 'shapely' ),
+				'social-menu' => esc_html__( 'Social Menu', 'shapely' ),
+			)
+		);
 
 		/*
 		 * Switch default core markup for search form, comment form, and comments
 		 * to output valid HTML5.
 		 */
-		add_theme_support( 'html5', array(
-			'search-form',
-			'comment-form',
-			'comment-list',
-			'gallery',
-			'caption',
-		) );
+		add_theme_support(
+			'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			)
+		);
 
 		// Set up the WordPress core custom background feature.
-		add_theme_support( 'custom-background', apply_filters( 'shapely_custom_background_args', array(
-			'default-color' => 'ffffff',
-			'default-image' => '',
-		) ) );
+		add_theme_support(
+			'custom-background', apply_filters(
+				'shapely_custom_background_args', array(
+					'default-color' => 'ffffff',
+					'default-image' => '',
+				)
+			)
+		);
 
 		/**
 		 * Enable support for Post Thumbnails on posts and pages.
@@ -191,45 +206,53 @@ function shapely_content_width() {
  * @link https://developer.wordpress.org/themes/functionality/sidebars/#registering-a-sidebar
  */
 function shapely_widgets_init() {
-	register_sidebar( array(
-		'id'            => 'sidebar-1',
-		'name'          => esc_html__( 'Sidebar', 'shapely' ),
-		'before_widget' => '<div id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</div>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
-
-	register_sidebar( array(
-		'id'            => 'sidebar-home',
-		'name'          => esc_html__( 'Homepage', 'shapely' ),
-		'before_widget' => '<div id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</div>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
-
-	for ( $i = 1; $i < 5; $i ++ ) {
-		register_sidebar( array(
-			'id'            => 'footer-widget-' . $i,
-			'name'          => sprintf( esc_html__( 'Footer Widget %s', 'shapely' ), $i ),
-			'description'   => esc_html__( 'Used for footer widget area', 'shapely' ),
+	register_sidebar(
+		array(
+			'id'            => 'sidebar-1',
+			'name'          => esc_html__( 'Sidebar', 'shapely' ),
 			'before_widget' => '<div id="%1$s" class="widget %2$s">',
 			'after_widget'  => '</div>',
 			'before_title'  => '<h2 class="widget-title">',
 			'after_title'   => '</h2>',
-		) );
-	}
+		)
+	);
 
-	if ( shapely_is_woocommerce_activated() ) {
-		register_sidebar( array(
-			'id'            => 'shop-sidebar',
-			'name'          => esc_html__( 'Shop Sidebar', 'shapely' ),
+	register_sidebar(
+		array(
+			'id'            => 'sidebar-home',
+			'name'          => esc_html__( 'Homepage', 'shapely' ),
 			'before_widget' => '<div id="%1$s" class="widget %2$s">',
 			'after_widget'  => '</div>',
 			'before_title'  => '<h2 class="widget-title">',
 			'after_title'   => '</h2>',
-		) );
+		)
+	);
+
+	for ( $i = 1; $i < 5; $i ++ ) {
+		register_sidebar(
+			array(
+				'id'            => 'footer-widget-' . $i,
+				'name'          => sprintf( esc_html__( 'Footer Widget %s', 'shapely' ), $i ),
+				'description'   => esc_html__( 'Used for footer widget area', 'shapely' ),
+				'before_widget' => '<div id="%1$s" class="widget %2$s">',
+				'after_widget'  => '</div>',
+				'before_title'  => '<h2 class="widget-title">',
+				'after_title'   => '</h2>',
+			)
+		);
+	}
+
+	if ( shapely_is_woocommerce_activated() ) {
+		register_sidebar(
+			array(
+				'id'            => 'shop-sidebar',
+				'name'          => esc_html__( 'Shop Sidebar', 'shapely' ),
+				'before_widget' => '<div id="%1$s" class="widget %2$s">',
+				'after_widget'  => '</div>',
+				'before_title'  => '<h2 class="widget-title">',
+				'after_title'   => '</h2>',
+			)
+		);
 	}
 
 }
diff --git a/header.php b/header.php
index 6dc33d3..8963e00 100644
--- a/header.php
+++ b/header.php
@@ -24,11 +24,11 @@
 <div id="page" class="site">
 	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'shapely' ); ?></a>
 
-	<header id="masthead" class="site-header" role="banner">
+	<header id="masthead" class="site-header<?php echo get_theme_mod( 'mobile_menu_on_desktop', false ) ? ' mobile-menu' : ''; ?>" role="banner">
 		<div class="nav-container">
 			<nav id="site-navigation" class="main-navigation" role="navigation">
 				<div class="container nav-bar">
-					<div class="row">
+					<div class="flex-row">
 						<div class="module left site-title-container">
 							<?php shapely_get_header_logo(); ?>
 						</div>
@@ -37,7 +37,7 @@
 						</div>
 						<div class="module-group right">
 							<div class="module left">
-								<?php shapely_header_menu(); // main navigation ?>
+								<?php shapely_header_menu(); ?>
 							</div>
 							<!--end of menu module-->
 							<div class="module widget-handle search-widget-handle left hidden-xs hidden-sm">
@@ -45,8 +45,10 @@
 									<i class="fa fa-search"></i>
 									<span class="title"><?php esc_html_e( 'Site Search', 'shapely' ); ?></span>
 								</div>
-								<div class="function"><?php
-									get_search_form(); ?>
+								<div class="function">
+								<?php
+									get_search_form();
+									?>
 								</div>
 							</div>
 						</div>
@@ -63,6 +65,6 @@
 			</div>
 		<?php endif; ?>
 
-		<section class="content-area <?php echo ( get_theme_mod( 'top_callout', true ) ) ? '' : ' pt0 ' ?>">
+		<section class="content-area <?php echo ( get_theme_mod( 'top_callout', true ) ) ? '' : ' pt0 '; ?>">
 			<div id="main" class="<?php echo ( ! is_page_template( 'page-templates/template-home.php' ) ) ? 'container' : ''; ?>"
 				 role="main">
diff --git a/inc/admin/welcome-screen/class-shapely-welcome.php b/inc/admin/welcome-screen/class-shapely-welcome.php
index c60704e..4c6f05d 100644
--- a/inc/admin/welcome-screen/class-shapely-welcome.php
+++ b/inc/admin/welcome-screen/class-shapely-welcome.php
@@ -19,14 +19,18 @@ public function __construct() {
 		add_action( 'customize_controls_enqueue_scripts', array( $this, 'shapely_welcome_scripts_for_customizer' ) );
 
 		/* ajax callback for dismissable required actions */
-		add_action( 'wp_ajax_shapely_dismiss_required_action', array(
-			$this,
-			'shapely_dismiss_required_action_callback',
-		) );
-		add_action( 'wp_ajax_nopriv_shapely_dismiss_required_action', array(
-			$this,
-			'shapely_dismiss_required_action_callback',
-		) );
+		add_action(
+			'wp_ajax_shapely_dismiss_required_action', array(
+				$this,
+				'shapely_dismiss_required_action_callback',
+			)
+		);
+		add_action(
+			'wp_ajax_nopriv_shapely_dismiss_required_action', array(
+				$this,
+				'shapely_dismiss_required_action_callback',
+			)
+		);
 
 		$theme = wp_get_theme();
 		$this->theme_name = $theme->get( 'Name' );
@@ -49,10 +53,12 @@ public function shapely_welcome_register_menu() {
 		$action_count = $this->count_actions();
 		$title        = $action_count > 0 ? esc_html__( 'About Shapely', 'shapely' ) . '<span class="badge-action-count">' . esc_html( $action_count ) . '</span>' : esc_html__( 'About Shapely', 'shapely' );
 
-		add_theme_page( 'About shapely', $title, 'edit_theme_options', 'shapely-welcome', array(
-			$this,
-			'shapely_welcome_screen',
-		) );
+		add_theme_page(
+			'About shapely', $title, 'edit_theme_options', 'shapely-welcome', array(
+				$this,
+				'shapely_welcome_screen',
+			)
+		);
 	}
 
 	/**
@@ -120,12 +126,14 @@ public function shapely_welcome_style_and_scripts( $hook_suffix ) {
 		wp_enqueue_style( 'shapely-welcome-screen-css', get_template_directory_uri() . '/inc/admin/welcome-screen/css/welcome.css' );
 		wp_enqueue_script( 'shapely-welcome-screen-js', get_template_directory_uri() . '/inc/admin/welcome-screen/js/welcome.js', array( 'jquery' ) );
 
-		wp_localize_script( 'shapely-welcome-screen-js', 'shapelyWelcomeScreenObject', array(
-			'nr_actions_required'      => absint( $this->count_actions() ),
-			'ajaxurl'                  => esc_url( admin_url( 'admin-ajax.php' ) ),
-			'template_directory'       => esc_url( get_template_directory_uri() ),
-			'no_required_actions_text' => esc_html__( 'Hooray! There are no required actions for you right now.', 'shapely' ),
-		) );
+		wp_localize_script(
+			'shapely-welcome-screen-js', 'shapelyWelcomeScreenObject', array(
+				'nr_actions_required'      => absint( $this->count_actions() ),
+				'ajaxurl'                  => esc_url( admin_url( 'admin-ajax.php' ) ),
+				'template_directory'       => esc_url( get_template_directory_uri() ),
+				'no_required_actions_text' => esc_html__( 'Hooray! There are no required actions for you right now.', 'shapely' ),
+			)
+		);
 
 	}
 
@@ -161,10 +169,10 @@ public function shapely_dismiss_required_action_callback() {
 				$shapely_show_required_actions = get_option( 'shapely_show_required_actions' );
 
 				switch ( esc_html( $_GET['todo'] ) ) {
-					case 'add';
+					case 'add':
 						$shapely_show_required_actions[ $action_id ] = true;
 						break;
-					case 'dismiss';
+					case 'dismiss':
 						$shapely_show_required_actions[ $action_id ] = false;
 						break;
 					default:
@@ -238,26 +246,28 @@ public function call_plugin_api( $slug ) {
 		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 		$call_api = get_transient( 'shapely_plugin_information_transient_' . $slug );
 		if ( false === $call_api ) {
-			$call_api = plugins_api( 'plugin_information', array(
-				'slug'   => $slug,
-				'fields' => array(
-					'downloaded'        => false,
-					'rating'            => false,
-					'description'       => false,
-					'short_description' => true,
-					'donate_link'       => false,
-					'tags'              => false,
-					'sections'          => true,
-					'homepage'          => true,
-					'added'             => false,
-					'last_updated'      => false,
-					'compatibility'     => false,
-					'tested'            => false,
-					'requires'          => false,
-					'downloadlink'      => false,
-					'icons'             => true,
-				),
-			) );
+			$call_api = plugins_api(
+				'plugin_information', array(
+					'slug'   => $slug,
+					'fields' => array(
+						'downloaded'        => false,
+						'rating'            => false,
+						'description'       => false,
+						'short_description' => true,
+						'donate_link'       => false,
+						'tags'              => false,
+						'sections'          => true,
+						'homepage'          => true,
+						'added'             => false,
+						'last_updated'      => false,
+						'compatibility'     => false,
+						'tested'            => false,
+						'requires'          => false,
+						'downloadlink'      => false,
+						'icons'             => true,
+					),
+				)
+			);
 			set_transient( 'shapely_plugin_information_transient_' . $slug, $call_api, 30 * MINUTE_IN_SECONDS );
 		}
 
@@ -305,7 +315,7 @@ public function check_for_icon( $arr ) {
 
 	public function create_action_link( $state, $slug ) {
 		$slug2 = Shapely_Notify_System::_get_plugin_basename_from_slug( $slug );
-		
+
 		switch ( $state ) {
 			case 'install':
 				return wp_nonce_url(
@@ -320,22 +330,26 @@ public function create_action_link( $state, $slug ) {
 				);
 				break;
 			case 'deactivate':
-				return add_query_arg( array(
-					'action'        => 'deactivate',
-					'plugin'        => rawurlencode( $slug2 ),
-					'plugin_status' => 'all',
-					'paged'         => '1',
-					'_wpnonce'      => wp_create_nonce( 'deactivate-plugin_' . $slug2 ),
-				), network_admin_url( 'plugins.php' ) );
+				return add_query_arg(
+					array(
+						'action'        => 'deactivate',
+						'plugin'        => rawurlencode( $slug2 ),
+						'plugin_status' => 'all',
+						'paged'         => '1',
+						'_wpnonce'      => wp_create_nonce( 'deactivate-plugin_' . $slug2 ),
+					), network_admin_url( 'plugins.php' )
+				);
 				break;
 			case 'activate':
-				return add_query_arg( array(
-					'action'        => 'activate',
-					'plugin'        => rawurlencode( $slug2 ),
-					'plugin_status' => 'all',
-					'paged'         => '1',
-					'_wpnonce'      => wp_create_nonce( 'activate-plugin_' . $slug2 ),
-				), network_admin_url( 'plugins.php' ) );
+				return add_query_arg(
+					array(
+						'action'        => 'activate',
+						'plugin'        => rawurlencode( $slug2 ),
+						'plugin_status' => 'all',
+						'paged'         => '1',
+						'_wpnonce'      => wp_create_nonce( 'activate-plugin_' . $slug2 ),
+					), network_admin_url( 'plugins.php' )
+				);
 				break;
 		}
 	}
@@ -371,7 +385,7 @@ class="about-text"><?php echo esc_html__( 'Shapely is now installed and ready to
 				   class="nav-tab <?php echo 'getting_started' == $active_tab ? 'nav-tab-active' : ''; ?>"><?php echo esc_html__( 'Getting Started', 'shapely' ); ?></a>
 				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_actions' ) ); ?>"
 				   class="nav-tab <?php echo 'recommended_actions' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Actions', 'shapely' ); ?>
-					<?php echo $action_count > 0 ? '<span class="badge-action-count">' . esc_html( $action_count ) . '</span>' : '' ?></a>
+					<?php echo $action_count > 0 ? '<span class="badge-action-count">' . esc_html( $action_count ) . '</span>' : ''; ?></a>
 				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_plugins' ) ); ?>"
 				   class="nav-tab <?php echo 'recommended_plugins' == $active_tab ? 'nav-tab-active' : ''; ?> "><?php echo esc_html__( 'Recommended Plugins', 'shapely' ); ?></a>
 				<a href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=support' ) ); ?>"
diff --git a/inc/admin/welcome-screen/sections/actions-required.php b/inc/admin/welcome-screen/sections/actions-required.php
index 697d082..ce693f6 100644
--- a/inc/admin/welcome-screen/sections/actions-required.php
+++ b/inc/admin/welcome-screen/sections/actions-required.php
@@ -19,10 +19,10 @@
 
 		foreach ( $shapely_required_actions as $shapely_required_action_key => $shapely_required_action_value ) :
 			$hidden = false;
-			if ( false === @$shapely_show_required_actions[ $shapely_required_action_value['id'] ] ) {
+			if ( isset( $shapely_show_required_actions[ $shapely_required_action_value['id'] ] ) && false === $shapely_show_required_actions[ $shapely_required_action_value['id'] ] ) {
 				$hidden = true;
 			}
-			if ( @$shapely_required_action_value['check'] ) {
+			if ( isset( $shapely_required_action_value['check'] ) && $shapely_required_action_value['check'] ) {
 				continue;
 			}
 			?>
@@ -32,13 +32,24 @@
 				<?php else : ?>
 					<span data-action="add" class="dashicons dashicons-hidden shapely-required-action-button" id="<?php echo esc_attr( $shapely_required_action_value['id'] ); ?>"></span>
 				<?php endif; ?>
-				<h3><?php if ( ! empty( $shapely_required_action_value['title'] ) ) : echo esc_html( $shapely_required_action_value['title'] );
-endif; ?></h3>
+				<h3>
+				<?php
+				if ( ! empty( $shapely_required_action_value['title'] ) ) :
+					echo esc_html( $shapely_required_action_value['title'] );
+endif;
+?>
+</h3>
 				<p>
-					<?php if ( ! empty( $shapely_required_action_value['description'] ) ) : echo esc_html( $shapely_required_action_value['description'] );
-endif; ?>
-					<?php if ( ! empty( $shapely_required_action_value['help'] ) ) : echo '<br/>' . wp_kses_post( $shapely_required_action_value['help'] );
-endif; ?>
+					<?php
+					if ( ! empty( $shapely_required_action_value['description'] ) ) :
+						echo esc_html( $shapely_required_action_value['description'] );
+endif;
+?>
+					<?php
+					if ( ! empty( $shapely_required_action_value['help'] ) ) :
+						echo '<br/>' . wp_kses_post( $shapely_required_action_value['help'] );
+endif;
+?>
 				</p>
 				<?php
 				if ( ! empty( $shapely_required_action_value['external'] ) && file_exists( $shapely_required_action_value['external'] ) ) {
@@ -67,8 +78,8 @@
 					}
 
 					?>
-					<p class="plugin-card-<?php echo esc_attr( $shapely_required_action_value['plugin_slug'] ) ?> action_button <?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'active' : '' ?>">
-						<a data-slug="<?php echo esc_attr( $shapely_required_action_value['plugin_slug'] ) ?>" class="<?php echo esc_attr( $class ); ?>" href="<?php echo esc_url( $url ) ?>"> <?php echo esc_html( $label ) ?> </a>
+					<p class="plugin-card-<?php echo esc_attr( $shapely_required_action_value['plugin_slug'] ); ?> action_button <?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'active' : ''; ?>">
+						<a data-slug="<?php echo esc_attr( $shapely_required_action_value['plugin_slug'] ); ?>" class="<?php echo esc_attr( $class ); ?>" href="<?php echo esc_url( $url ); ?>"> <?php echo esc_html( $label ); ?> </a>
 					</p>
 					<?php
 				};
diff --git a/inc/admin/welcome-screen/sections/getting-started.php b/inc/admin/welcome-screen/sections/getting-started.php
index 9580261..5ce4167 100644
--- a/inc/admin/welcome-screen/sections/getting-started.php
+++ b/inc/admin/welcome-screen/sections/getting-started.php
@@ -17,13 +17,15 @@
 		<?php } else { ?>
 			<p><span class="dashicons dashicons-no-alt"></span> <a
 					href="<?php echo esc_url( admin_url( 'themes.php?page=shapely-welcome&tab=recommended_actions' ) ); ?>"><?php esc_html_e( 'Check recommended actions', 'shapely' ); ?></a>
-			</p> <?php
-}; ?>
+			</p> 
+			<?php
+};
+?>
 	</div><!--/.col-->
 
 	<div class="col">
 		<h3><?php esc_html_e( 'Step 2 - Check our documentation', 'shapely' ); ?></h3>
-		<p><?php esc_html_e( 'Even if you\'re a long-time WordPress user, we still believe you should give our documentation a very quick Read.', 'shapely' ) ?></p>
+		<p><?php esc_html_e( 'Even if you\'re a long-time WordPress user, we still believe you should give our documentation a very quick Read.', 'shapely' ); ?></p>
 		<p>
 			<a target="_blank" href="<?php echo esc_url( 'https://colorlib.com/wp/support/shapely/' ); ?>"><?php esc_html_e( 'Full documentation', 'shapely' ); ?></a>
 		</p>
diff --git a/inc/admin/welcome-screen/sections/recommended-plugins.php b/inc/admin/welcome-screen/sections/recommended-plugins.php
index e33b3c6..c3035fb 100644
--- a/inc/admin/welcome-screen/sections/recommended-plugins.php
+++ b/inc/admin/welcome-screen/sections/recommended-plugins.php
@@ -35,18 +35,19 @@
 
 		?>
 		<div class="col plugin_box">
-			<img src="<?php echo esc_attr( $icon ) ?>" alt="plugin box image">
+			<img src="<?php echo esc_attr( $icon ); ?>" alt="plugin box image">
 			<span
-				class="version"><?php echo esc_html__( 'Version:', 'shapely' ); ?><?php echo esc_html( $info->version ) ?></span>
+				class="version"><?php echo esc_html__( 'Version:', 'shapely' ); ?><?php echo esc_html( $info->version ); ?></span>
 			<span
-				class="separator">|</span> <?php echo wp_kses_post( $info->author ) ?>
-			<div class="action_bar <?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'active' : '' ?>">
-				<span class="plugin_name"><?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'Active: ' : '' ?><?php echo esc_html( $info->name ); ?></span>
+				class="separator">|</span> <?php echo wp_kses_post( $info->author ); ?>
+			<div class="action_bar <?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'active' : ''; ?>">
+				<span class="plugin_name"><?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'Active: ' : ''; ?><?php echo esc_html( $info->name ); ?></span>
 			</div>
-			<span class="plugin-card-<?php echo esc_attr( $plugin ) ?> action_button <?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'active' : '' ?>">
-				<a data-slug="<?php echo esc_attr( $plugin ) ?>" class="<?php echo esc_attr( $class ); ?>" href="<?php echo esc_url( $url ) ?>"> <?php echo esc_html( $label ) ?> </a>
+			<span class="plugin-card-<?php echo esc_attr( $plugin ); ?> action_button <?php echo ( 'install' !== $active['needs'] && $active['status'] ) ? 'active' : ''; ?>">
+				<a data-slug="<?php echo esc_attr( $plugin ); ?>" class="<?php echo esc_attr( $class ); ?>" href="<?php echo esc_url( $url ); ?>"> <?php echo esc_html( $label ); ?> </a>
 			</span>
 		</div>
-	<?php }// End foreach().
+	<?php
+}// End foreach().
 	?>
 </div>
diff --git a/inc/admin/welcome-screen/sections/support.php b/inc/admin/welcome-screen/sections/support.php
index 0b4386f..78f3585 100644
--- a/inc/admin/welcome-screen/sections/support.php
+++ b/inc/admin/welcome-screen/sections/support.php
@@ -2,7 +2,7 @@
 	<div class="col">
 		<h3><i class="dashicons dashicons-sos"></i><?php esc_html_e( 'Contact Support', 'shapely' ); ?></h3>
 		<p>
-			<i><?php esc_html_e( 'We offer excellent support through our advanced ticketing system. Make sure to register your purchase before contacting support!', 'shapely' ) ?></i>
+			<i><?php esc_html_e( 'We offer excellent support through our advanced ticketing system. Make sure to register your purchase before contacting support!', 'shapely' ); ?></i>
 		</p>
 		<p><a target="_blank"  class="button button-primary"
 			  href="<?php echo esc_url( 'https://colorlib.com/wp/forums/' ); ?>"><?php esc_html_e( 'Contact Support', 'shapely' ); ?></a>
@@ -12,7 +12,7 @@
 	<div class="col">
 		<h3><i class="dashicons dashicons-book-alt"></i><?php esc_html_e( 'Documentation', 'shapely' ); ?></h3>
 		<p>
-			<i><?php esc_html_e( 'This is the place to go to reference different aspects of the theme. Our online documentation is an incredible resource for learning the ins and outs of using shapely.', 'shapely' ) ?></i>
+			<i><?php esc_html_e( 'This is the place to go to reference different aspects of the theme. Our online documentation is an incredible resource for learning the ins and outs of using shapely.', 'shapely' ); ?></i>
 		</p>
 		<p>
 			<a target="_blank" href="<?php echo esc_url( 'https://colorlib.com/wp/support/shapely/' ); ?>"><?php esc_html_e( 'See our full documentation', 'shapely' ); ?></a>
diff --git a/inc/class-shapely-related-posts.php b/inc/class-shapely-related-posts.php
index e8d5ac2..c1614cf 100644
--- a/inc/class-shapely-related-posts.php
+++ b/inc/class-shapely-related-posts.php
@@ -107,13 +107,51 @@ public function get_related_posts( $post_id, $number_posts = - 1 ) {
 				return $related_postquery;
 			}
 
-			$args = wp_parse_args( $args, array(
-				'category__in'        => wp_get_post_categories( $post_id ),
-				'ignore_sticky_posts' => 0,
-				'posts_per_page'      => $number_posts,
-				'post__not_in'        => array( $post_id ),
-				//              'meta_key'            => '_thumbnail_id',
-			) );
+			$args = wp_parse_args(
+				$args, array(
+					'category__in'        => wp_get_post_categories( $post_id ),
+					'ignore_sticky_posts' => 0,
+					'posts_per_page'      => $number_posts,
+					'post__not_in'        => array( $post_id ),
+				)
+			);
+
+			if ( is_singular( 'jetpack-portfolio' ) ) {
+				unset( $args['category__in'] );
+				$args['post_type'] = 'jetpack-portfolio';
+
+				$terms_args = array(
+					'fields' => 'ids',
+				);
+				$types = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-type', $terms_args );
+				$tags = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-tag', $terms_args );
+
+				$tax_query = array();
+
+				if ( ! empty( $types ) ) {
+					array_push(
+						$tax_query, array(
+							'taxonomy' => 'jetpack-portfolio-type',
+							'field'    => 'term_id',
+							'terms'    => $types,
+						)
+					);
+				}
+
+				if ( ! empty( $tags ) ) {
+					array_push(
+						$tax_query, array(
+							'taxonomy' => 'jetpack-portfolio-tag',
+							'field'    => 'term_id',
+							'terms'    => $tags,
+						)
+					);
+				}
+
+				if ( ! empty( $tax_query ) ) {
+					$args['tax_query'] = $tax_query;
+				}
+			}
 
 			$related_postquery = new WP_Query( $args );
 
@@ -129,6 +167,13 @@ public function get_related_posts( $post_id, $number_posts = - 1 ) {
 		 * @return string                    HTML markup to display related posts
 		 **/
 		function output_related_posts() {
+
+			if ( is_singular( 'jetpack-portfolio' ) ) {
+				if ( ! get_theme_mod( 'related_projects_area', true ) ) {
+					return;
+				}
+			}
+
 			// Check if related posts should be shown
 			$related_posts = $this->get_related_posts( get_the_ID(), get_option( 'posts_per_page' ) );
 
@@ -150,7 +195,11 @@ function output_related_posts() {
 			 * Heading
 			 */
 			echo '<div class="col-lg-11 col-sm-10 col-xs-12 shapely-related-posts-title">';
-			echo '<h3><span>' . esc_html__( 'Related articles ', 'shapely' ) . '</span></h3>';
+			if ( is_singular( 'jetpack-portfolio' ) ) {
+				echo '<h3><span>' . esc_html__( 'Related projects', 'shapely' ) . '</span></h3>';
+			} else {
+				echo '<h3><span>' . esc_html__( 'Related articles ', 'shapely' ) . '</span></h3>';
+			}
 			echo '</div>';
 
 			echo '</div><!--/.row-->';
@@ -165,9 +214,11 @@ function output_related_posts() {
 			echo '</ul>';
 			echo '</div>';
 
-			echo sprintf( '<div class="owlCarousel owl-carousel owl-theme" data-slider-id="%s" id="owlCarousel-%s" 
+			echo sprintf(
+				'<div class="owlCarousel owl-carousel owl-theme" data-slider-id="%s" id="owlCarousel-%s" 
 			data-slider-items="%s" 
-			data-slider-speed="400" data-slider-auto-play="%s" data-slider-navigation="false">', get_the_ID(), get_the_ID(), absint( $limit ), esc_html( $auto_play ) );
+			data-slider-speed="400" data-slider-auto-play="%s" data-slider-navigation="false">', get_the_ID(), get_the_ID(), absint( $limit ), esc_html( $auto_play )
+			);
 
 			// Loop through related posts
 			while ( $related_posts->have_posts() ) {
diff --git a/inc/class-wp-bootstrap-navwalker.php b/inc/class-wp-bootstrap-navwalker.php
index e00dfa0..1afa3af 100644
--- a/inc/class-wp-bootstrap-navwalker.php
+++ b/inc/class-wp-bootstrap-navwalker.php
@@ -26,6 +26,8 @@ public function start_lvl( &$output, $depth = 0, $args = array() ) {
 	 */
 	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
 		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+		$extra = get_post_meta( $item->ID, '_menu_item_extra', true );
+		$widget = get_post_meta( $item->ID, '_menu_item_widget', true );
 
 		/**
 		 * Dividers, Headers or Disabled
@@ -82,6 +84,16 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 				$atts['href'] = ! empty( $item->url ) ? $item->url : '';
 			}
 
+			if ( 'shapely-section' == $extra ) {
+				if ( ! is_front_page() ) {
+					$atts['href'] = site_url() . esc_attr( $item->url );
+				}
+
+				if ( '' != $widget ) {
+					$atts['data-scroll'] = $widget;
+				}
+			}
+
 			$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
 
 			$attributes = '';
diff --git a/inc/custom-controls/class-shapely-logo-dimensions.php b/inc/custom-controls/class-shapely-logo-dimensions.php
new file mode 100644
index 0000000..7a1fa1a
--- /dev/null
+++ b/inc/custom-controls/class-shapely-logo-dimensions.php
@@ -0,0 +1,75 @@
+<?php
+
+class Shapely_Logo_Dimensions extends WP_Customize_Control {
+
+	public $type = 'shapely-logo-dimension';
+
+	public function __construct( WP_Customize_Manager $manager, $id, array $args ) {
+		parent::__construct( $manager, $id, $args );
+		$manager->register_control_type( 'Shapely_Logo_Dimensions' );
+	}
+
+	public function get_dimensions() {
+
+		$current_value = $this->value();
+
+		if ( ! $current_value ) {
+			$current_value = array(
+				'width' => '',
+				'height' => '',
+				'ratio' => 1,
+			);
+
+			$custom_logo = get_theme_mod( 'custom_logo' );
+			if ( $custom_logo ) {
+				$logo = wp_get_attachment_image_src( $custom_logo , 'full' );
+				if ( is_array( $logo ) ) {
+
+					$current_value['width'] = $logo[1];
+					$current_value['height'] = $logo[2];
+
+				}
+			}
+		}
+
+		return $current_value;
+
+	}
+
+	public function json() {
+		$json = parent::json();
+		$json['id']      = $this->id;
+		$json['link']    = $this->get_link();
+		$json['value']   = $this->get_dimensions();
+		$json['widthLabel'] = esc_attr__( 'Logo Width:', 'shapely' );
+		$json['heightLabel'] = esc_attr__( 'Logo Height:', 'shapely' );
+		$json['checkboxtLabel'] = esc_attr__( 'Keep logo ratio.', 'shapely' );
+
+		return $json;
+
+	}
+
+	public function content_template() {
+	?>
+
+		<div class="shapely-logo-dimension">
+			<div class="half">
+				<label for="{{{ data.id }}}-width">{{ data.widthLabel }}</label>
+				<input type="text" id="{{{ data.id }}}-width" value="{{ data.value.width }}" class="shapely-dimension">
+			</div>
+			<div class="half">
+				<label for="{{{ data.id }}}-height">{{ data.heightLabel }}</label>
+				<input type="text" id="{{{ data.id }}}-height" value="{{ data.value.height }}" class="shapely-dimension">
+			</div>
+			<div class="ratio">
+				<label>
+					<input class="shapely-ratio" type="checkbox" id="{{{ data.id }}}-ration" <# if( data.value.ratio ) { #> checked="checked" <# } #> value="1">
+					{{ data.checkboxtLabel }}
+				</label>
+			</div>
+		</div>
+
+	<?php
+	}
+
+}
diff --git a/inc/customizer.php b/inc/customizer.php
index eb6efd0..2f4e4fa 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -16,43 +16,55 @@ function shapely_customize_register( $wp_customize ) {
 		return;
 	}
 
-	$wp_customize->selective_refresh->add_partial( 'blogname', array(
-		'selector'        => '.site-title',
-		'render_callback' => function () {
-			bloginfo( 'name' );
-		},
-	) );
-
-	$wp_customize->selective_refresh->add_partial( 'footer_callout_text', array(
-		'selector'        => '.footer-callout',
-		'render_callback' => function () {
-			shapely_footer_callout();
-		},
-	) );
-	$wp_customize->selective_refresh->add_partial( 'footer_callout_btntext', array(
-		'selector'        => '.footer-callout',
-		'render_callback' => function () {
-			shapely_footer_callout();
-		},
-	) );
-	$wp_customize->selective_refresh->add_partial( 'footer_callout_link', array(
-		'selector'        => '.footer-callout',
-		'render_callback' => function () {
-			shapely_footer_callout();
-		},
-	) );
-	$wp_customize->selective_refresh->add_partial( 'blog_name', array(
-		'selector'        => '.header-callout',
-		'render_callback' => function () {
-			shapely_top_callout();
-		},
-	) );
-	$wp_customize->selective_refresh->add_partial( 'header_textcolor', array(
-		'selector'        => '.header-callout',
-		'render_callback' => function () {
-			shapely_top_callout();
-		},
-	) );
+	$wp_customize->selective_refresh->add_partial(
+		'blogname', array(
+			'selector'        => '.site-title',
+			'render_callback' => function () {
+				bloginfo( 'name' );
+			},
+		)
+	);
+
+	$wp_customize->selective_refresh->add_partial(
+		'footer_callout_text', array(
+			'selector'        => '.footer-callout',
+			'render_callback' => function () {
+				shapely_footer_callout();
+			},
+		)
+	);
+	$wp_customize->selective_refresh->add_partial(
+		'footer_callout_btntext', array(
+			'selector'        => '.footer-callout',
+			'render_callback' => function () {
+				shapely_footer_callout();
+			},
+		)
+	);
+	$wp_customize->selective_refresh->add_partial(
+		'footer_callout_link', array(
+			'selector'        => '.footer-callout',
+			'render_callback' => function () {
+				shapely_footer_callout();
+			},
+		)
+	);
+	$wp_customize->selective_refresh->add_partial(
+		'blog_name', array(
+			'selector'        => '.header-callout',
+			'render_callback' => function () {
+				shapely_top_callout();
+			},
+		)
+	);
+	$wp_customize->selective_refresh->add_partial(
+		'header_textcolor', array(
+			'selector'        => '.header-callout',
+			'render_callback' => function () {
+				shapely_top_callout();
+			},
+		)
+	);
 
 }
 
@@ -66,6 +78,8 @@ function shapely_customizer( $wp_customize ) {
 	// Recomended actions
 	global $shapely_required_actions, $shapely_recommended_plugins;
 
+	require_once get_template_directory() . '/inc/custom-controls/class-shapely-logo-dimensions.php';
+
 	$customizer_recommended_plugins = array();
 	if ( is_array( $shapely_recommended_plugins ) ) {
 		foreach ( $shapely_recommended_plugins as $k => $s ) {
@@ -90,43 +104,70 @@ function shapely_customizer( $wp_customize ) {
 
 	$theme_slug = 'shapely';
 
-	$wp_customize->add_section( new Epsilon_Section_Recommended_Actions( $wp_customize, 'epsilon_recomended_section', array(
-		'title'                        => esc_html__( 'Recomended Actions', 'shapely' ),
-		'social_text'                  => esc_html__( 'We are social', 'shapely' ),
-		'plugin_text'                  => esc_html__( 'Recomended Plugins', 'shapely' ),
-		'actions'                      => $customizer_shapely_required_actions,
-		'plugins'                      => $customizer_recommended_plugins,
-		'theme_specific_option'        => $theme_slug . '_show_required_actions',
-		'theme_specific_plugin_option' => $theme_slug . '_show_recommended_plugins',
-		'facebook'                     => 'https://www.facebook.com/colorlib',
-		'twitter'                      => 'https://twitter.com/colorlib',
-		'wp_review'                    => true,
-		'priority'                     => 0,
-	) ) );
-
-	$wp_customize->add_section( new Epsilon_Section_Pro( $wp_customize, 'epsilon-section-pro', array(
-		'title'       => esc_html__( 'Theme documentation', 'shapely' ),
-		'button_text' => esc_html__( 'Learn more', 'shapely' ),
-		'button_url'  => 'https://colorlib.com/wp/support/shapely/',
-		'priority'    => 0,
-	) ) );
+	$wp_customize->add_section(
+		new Epsilon_Section_Recommended_Actions(
+			$wp_customize, 'epsilon_recomended_section', array(
+				'title'                        => esc_html__( 'Recomended Actions', 'shapely' ),
+				'social_text'                  => esc_html__( 'We are social', 'shapely' ),
+				'plugin_text'                  => esc_html__( 'Recomended Plugins', 'shapely' ),
+				'actions'                      => $customizer_shapely_required_actions,
+				'plugins'                      => $customizer_recommended_plugins,
+				'theme_specific_option'        => $theme_slug . '_show_required_actions',
+				'theme_specific_plugin_option' => $theme_slug . '_show_recommended_plugins',
+				'facebook'                     => 'https://www.facebook.com/colorlib',
+				'twitter'                      => 'https://twitter.com/colorlib',
+				'wp_review'                    => true,
+				'priority'                     => 0,
+			)
+		)
+	);
+
+	$wp_customize->add_section(
+		new Epsilon_Section_Pro(
+			$wp_customize, 'epsilon-section-pro', array(
+				'title'       => esc_html__( 'Theme documentation', 'shapely' ),
+				'button_text' => esc_html__( 'Learn more', 'shapely' ),
+				'button_url'  => 'https://colorlib.com/wp/support/shapely/',
+				'priority'    => 0,
+			)
+		)
+	);
 
 	/* Main option Settings Panel */
-	$wp_customize->add_panel( 'shapely_main_options', array(
-		'capability'     => 'edit_theme_options',
-		'theme_supports' => '',
-		'title'          => esc_html__( 'Theme Options', 'shapely' ),
-		'description'    => esc_html__( 'Panel to update shapely theme options', 'shapely' ), // Include html tags such as <p>.
+	$wp_customize->add_panel(
+		'shapely_main_options', array(
+			'capability'     => 'edit_theme_options',
+			'theme_supports' => '',
+			'title'          => esc_html__( 'Theme Options', 'shapely' ),
+			'description'    => esc_html__( 'Panel to update shapely theme options', 'shapely' ), // Include html tags such as <p>.
 		'priority'       => 10, // Mixed with top-level-section hierarchy.
-	) );
+		)
+	);
 
-	$wp_customize->add_panel( 'shapely_blog_options', array(
-		'capability'     => 'edit_theme_options',
-		'theme_supports' => '',
-		'title'          => esc_html__( 'Blog Settings', 'shapely' ),
-		'description'    => esc_html__( 'Panel to update Blog related options', 'shapely' ), // Include html tags such as <p>.
+	$wp_customize->add_panel(
+		'shapely_blog_options', array(
+			'capability'     => 'edit_theme_options',
+			'theme_supports' => '',
+			'title'          => esc_html__( 'Blog Settings', 'shapely' ),
+			'description'    => esc_html__( 'Panel to update Blog related options', 'shapely' ), // Include html tags such as <p>.
 		'priority'       => 10, // Mixed with top-level-section hierarchy.
-	) );
+		)
+	);
+
+	// Logo dimensions
+	$wp_customize->add_setting(
+		'shapely_logo_dimension', array(
+			'sanitize_callback' => 'shapely_sanitize_logo_dimension',
+		)
+	);
+	$wp_customize->add_control(
+		new Shapely_Logo_Dimensions(
+			$wp_customize, 'shapely_logo_dimension', array(
+				'section'     => 'title_tagline',
+				'priority'    => 9,
+			)
+		)
+	);
 
 	$title_tagline = $wp_customize->get_section( 'title_tagline' );
 	if ( $title_tagline ) {
@@ -148,420 +189,992 @@ function shapely_customizer( $wp_customize ) {
 		$header_image->priority = 31;
 	}
 
-	$wp_customize->add_section( 'shapely_blog_section', array(
-		'title'    => esc_html__( 'Blog Index Settings', 'shapely' ),
-		'panel'    => 'shapely_blog_options',
-		'priority' => 33,
-	) );
-
-	$wp_customize->add_section( 'shapely_single_post_section', array(
-		'title'    => esc_html__( 'Blog Single Settings', 'shapely' ),
-		'panel'    => 'shapely_blog_options',
-		'priority' => 35,
-	) );
-	$wp_customize->add_setting( 'link_color', array(
-		'default'           => '#745cf9',
-		'sanitize_callback' => 'sanitize_hex_color',
-	) );
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_color', array(
-		'label'       => esc_html__( 'Link Color', 'shapely' ),
-		'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
-		'section'     => 'colors',
-	) ) );
-	$wp_customize->add_setting( 'link_hover_color', array(
-		'default'           => '#5234f9',
-		'sanitize_callback' => 'sanitize_hex_color',
-	) );
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_hover_color', array(
-		'label'       => esc_html__( 'Link Hover Color', 'shapely' ),
-		'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
-		'section'     => 'colors',
-	) ) );
-	$wp_customize->add_setting( 'button_color', array(
-		'default'           => '#745cf9',
-		'sanitize_callback' => 'sanitize_hex_color',
-	) );
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'button_color', array(
-		'label'       => esc_html__( 'Button Color', 'shapely' ),
-		'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
-		'section'     => 'colors',
-	) ) );
-	$wp_customize->add_setting( 'button_hover_color', array(
-		'default'           => '#5234f9',
-		'sanitize_callback' => 'sanitize_hex_color',
-	) );
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'button_hover_color', array(
-		'label'       => esc_html__( 'Button Hover Color', 'shapely' ),
-		'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
-		'section'     => 'colors',
-	) ) );
-
-	$wp_customize->add_setting( 'social_color', array(
-		'default'           => '#fff',
-		'sanitize_callback' => 'sanitize_hex_color',
-	) );
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'social_color', array(
-		'label'       => esc_html__( 'Social Icon Color', 'shapely' ),
-		'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
-		'section'     => 'colors',
-	) ) );
+	$wp_customize->add_section(
+		'shapely_blog_section', array(
+			'title'    => esc_html__( 'Blog Index Settings', 'shapely' ),
+			'panel'    => 'shapely_blog_options',
+			'priority' => 33,
+		)
+	);
+
+	$wp_customize->add_section(
+		'shapely_single_post_section', array(
+			'title'    => esc_html__( 'Blog Single Settings', 'shapely' ),
+			'panel'    => 'shapely_blog_options',
+			'priority' => 35,
+		)
+	);
+	$wp_customize->add_setting(
+		'link_color', array(
+			'default'           => '#745cf9',
+			'sanitize_callback' => 'sanitize_hex_color',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'link_color', array(
+				'label'       => esc_html__( 'Link Color', 'shapely' ),
+				'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
+				'section'     => 'colors',
+			)
+		)
+	);
+	$wp_customize->add_setting(
+		'link_hover_color', array(
+			'default'           => '#5234f9',
+			'sanitize_callback' => 'sanitize_hex_color',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'link_hover_color', array(
+				'label'       => esc_html__( 'Link Hover Color', 'shapely' ),
+				'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
+				'section'     => 'colors',
+			)
+		)
+	);
+	$wp_customize->add_setting(
+		'button_color', array(
+			'default'           => '#745cf9',
+			'sanitize_callback' => 'sanitize_hex_color',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'button_color', array(
+				'label'       => esc_html__( 'Button Color', 'shapely' ),
+				'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
+				'section'     => 'colors',
+			)
+		)
+	);
+	$wp_customize->add_setting(
+		'button_hover_color', array(
+			'default'           => '#5234f9',
+			'sanitize_callback' => 'sanitize_hex_color',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'button_hover_color', array(
+				'label'       => esc_html__( 'Button Hover Color', 'shapely' ),
+				'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
+				'section'     => 'colors',
+			)
+		)
+	);
+
+	$wp_customize->add_setting(
+		'social_color', array(
+			'default'           => '#fff',
+			'sanitize_callback' => 'sanitize_hex_color',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'social_color', array(
+				'label'       => esc_html__( 'Social Icon Color', 'shapely' ),
+				'description' => esc_html__( 'Default used if no color is selected', 'shapely' ),
+				'section'     => 'colors',
+			)
+		)
+	);
 
 	// add "Sidebar" section
-	$wp_customize->add_section( 'shapely_main_section', array(
-		'title'    => esc_html__( 'Main Options', 'shapely' ),
-		'priority' => 11,
-		'panel'    => 'shapely_main_options',
-	) );
+	$wp_customize->add_section(
+		'shapely_main_section', array(
+			'title'    => esc_html__( 'Main Options', 'shapely' ),
+			'priority' => 11,
+			'panel'    => 'shapely_main_options',
+		)
+	);
 
-	$wp_customize->add_setting( 'top_callout', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
+	$wp_customize->add_setting(
+		'top_callout', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
 
 	if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'top_callout', array(
-			'label'    => esc_html__( 'Show Blog Title', 'shapely' ),
-			'description' => esc_html__( 'Show/hide the title from the Blog Page', 'shapely' ),
-			'section'  => 'shapely_blog_section',
-			'priority' => 20,
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'top_callout', array(
+					'label'    => esc_html__( 'Show Blog Title', 'shapely' ),
+					'description' => esc_html__( 'Show/hide the title from the Blog Page', 'shapely' ),
+					'section'  => 'shapely_blog_section',
+					'priority' => 20,
+				)
+			)
+		);
 	} else {
-		$wp_customize->add_control( 'top_callout', array(
-			'label'    => esc_html__( 'Show Blog Title', 'shapely' ),
-			'description' => esc_html__( 'Show/hide the title from the Blog Page', 'shapely' ),
-			'section'  => 'shapely_blog_section',
-			'priority' => 20,
-			'type'     => 'checkbox',
-		) );
+		$wp_customize->add_control(
+			'top_callout', array(
+				'label'    => esc_html__( 'Show Blog Title', 'shapely' ),
+				'description' => esc_html__( 'Show/hide the title from the Blog Page', 'shapely' ),
+				'section'  => 'shapely_blog_section',
+				'priority' => 20,
+				'type'     => 'checkbox',
+			)
+		);
 	}
 
-	$wp_customize->add_setting( 'hide_post_title', array(
-		'default'           => 0,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
+	$wp_customize->add_setting(
+		'hide_post_title', array(
+			'default'           => 0,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
 
 	if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'hide_post_title', array(
-			'label'   => esc_html__( 'Title in Blog Post', 'shapely' ),
-			'section' => 'wpseo_breadcrumbs_customizer_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'hide_post_title', array(
+					'label'   => esc_html__( 'Title in Blog Post', 'shapely' ),
+					'section' => 'wpseo_breadcrumbs_customizer_section',
+				)
+			)
+		);
 	} else {
-		$wp_customize->add_control( 'hide_post_title', array(
-			'label'   => esc_html__( 'Title in Blog Post', 'shapely' ),
-			'section' => 'wpseo_breadcrumbs_customizer_section',
-			'type'    => 'checkbox',
-		) );
+		$wp_customize->add_control(
+			'hide_post_title', array(
+				'label'   => esc_html__( 'Title in Blog Post', 'shapely' ),
+				'section' => 'wpseo_breadcrumbs_customizer_section',
+				'type'    => 'checkbox',
+			)
+		);
 	}
 
-	$wp_customize->add_setting( 'blog_name', array(
-		'default'           => '',
-		'sanitize_callback' => 'wp_kses_stripslashes',
-		'transport'         => 'postMessage',
-	) );
-	$wp_customize->add_control( 'blog_name', array(
-		'label'       => esc_html__( 'Blog Name in Top Callout', 'shapely' ),
-		'description' => esc_html__( 'Heading for the Blog page', 'shapely' ),
-		'section'     => 'shapely_blog_section',
-	) );
+	$wp_customize->add_setting(
+		'blog_name', array(
+			'default'           => '',
+			'sanitize_callback' => 'wp_kses_stripslashes',
+			'transport'         => 'postMessage',
+		)
+	);
+	$wp_customize->add_control(
+		'blog_name', array(
+			'label'       => esc_html__( 'Blog Name in Top Callout', 'shapely' ),
+			'description' => esc_html__( 'Heading for the Blog page', 'shapely' ),
+			'section'     => 'shapely_blog_section',
+		)
+	);
 
-	if ( post_type_exists( 'jetpack-portfolio' ) ) {
-		$wp_customize->add_setting( 'portfolio_name', array(
+	$wp_customize->add_setting(
+		'mobile_menu_on_desktop', array(
+			'default'           => 0,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'mobile_menu_on_desktop', array(
+					'label'   => esc_html__( 'Mobile Menu on Desktop', 'shapely' ),
+					'description' => esc_html__( 'Always the menu will be like the mobile menu', 'shapely' ),
+					'section' => 'shapely_main_section',
+				)
+			)
+		);
+	} else {
+		$wp_customize->add_control(
+			'mobile_menu_on_desktop', array(
+				'label'   => esc_html__( 'Mobile Menu on Desktop', 'shapely' ),
+				'description' => esc_html__( 'Always the menu will be like the mobile menu', 'shapely' ),
+				'section' => 'shapely_main_section',
+				'type'    => 'checkbox',
+			)
+		);
+	}
+	$wp_customize->add_setting(
+		'footer_callout_text', array(
+			'default'           => '',
+			'sanitize_callback' => 'wp_kses_stripslashes',
+			'transport'         => 'postMessage',
+		)
+	);
+	$wp_customize->add_control(
+		'footer_callout_text', array(
+			'label'       => esc_html__( 'Text for Footer Callout', 'shapely' ),
+			'description' => esc_html__( 'The title of the call to action section from footer', 'shapely' ),
+			'section'     => 'shapely_main_section',
+		)
+	);
+
+	$wp_customize->add_setting(
+		'footer_callout_btntext', array(
 			'default'           => '',
 			'sanitize_callback' => 'wp_kses_stripslashes',
-		) );
-		$wp_customize->add_control( 'portfolio_name', array(
-			'label'   => esc_html__( 'Portfolio Archive Title', 'shapely' ),
-			'description' => esc_html__( 'Add a title on the Portfolio Archive Page.', 'shapely' ),
+			'transport'         => 'postMessage',
+		)
+	);
+	$wp_customize->add_control(
+		'footer_callout_btntext', array(
+			'label'   => esc_html__( 'Text for Footer Callout Button', 'shapely' ),
+			'description' => esc_html__( 'The label of the call to action section\'s button from the footer', 'shapely' ),
 			'section' => 'shapely_main_section',
-		) );
+		)
+	);
+	$wp_customize->add_setting(
+		'footer_callout_link', array(
+			'default'           => '',
+			'sanitize_callback' => 'esc_url_raw',
+			'transport'         => 'postMessage',
+		)
+	);
+	$wp_customize->add_control(
+		'footer_callout_link', array(
+			'label'       => esc_html__( 'CFA Button Link', 'shapely' ),
+			'section'     => 'shapely_main_section',
+			'description' => esc_html__( 'The URL of the call to action section\'s button from footer', 'shapely' ),
+			'type'        => 'text',
+		)
+	);
 
-		$wp_customize->add_setting( 'portfolio_description', array(
+	// add "Footer" section
+	$wp_customize->add_section(
+		'shapely_footer_section', array(
+			'title'    => esc_html__( 'Footer', 'shapely' ),
+			'priority' => 90,
+		)
+	);
+
+	$wp_customize->add_setting(
+		'shapely_footer_copyright', array(
 			'default'           => '',
+			'transport'         => 'refresh',
 			'sanitize_callback' => 'wp_kses_stripslashes',
-		) );
-		$wp_customize->add_control( 'portfolio_description', array(
+		)
+	);
+
+	$wp_customize->add_control(
+		'shapely_footer_copyright', array(
 			'type'    => 'textarea',
-			'label'   => esc_html__( 'Portfolio Archive Description', 'shapely' ),
-			'description' => esc_html__( 'Add a description on the Portfolio Archive Page.', 'shapely' ),
-			'section' => 'shapely_main_section',
-		) );
-	}
+			'label'   => esc_html__( 'Copyright Text', 'shapely' ),
+			'section' => 'shapely_footer_section',
+		)
+	);
 
-	$wp_customize->add_setting( 'footer_callout_text', array(
-		'default'           => '',
-		'sanitize_callback' => 'wp_kses_stripslashes',
-		'transport'         => 'postMessage',
-	) );
-	$wp_customize->add_control( 'footer_callout_text', array(
-		'label'       => esc_html__( 'Text for Footer Callout', 'shapely' ),
-		'description' => esc_html__( 'The title of the call to action section from footer', 'shapely' ),
-		'section'     => 'shapely_main_section',
-	) );
-
-	$wp_customize->add_setting( 'footer_callout_btntext', array(
-		'default'           => '',
-		'sanitize_callback' => 'wp_kses_stripslashes',
-		'transport'         => 'postMessage',
-	) );
-	$wp_customize->add_control( 'footer_callout_btntext', array(
-		'label'   => esc_html__( 'Text for Footer Callout Button', 'shapely' ),
-		'description' => esc_html__( 'The label of the call to action section\'s button from the footer', 'shapely' ),
-		'section' => 'shapely_main_section',
-	) );
-	$wp_customize->add_setting( 'footer_callout_link', array(
-		'default'           => '',
-		'sanitize_callback' => 'esc_url_raw',
-		'transport'         => 'postMessage',
-	) );
-	$wp_customize->add_control( 'footer_callout_link', array(
-		'label'       => esc_html__( 'CFA Button Link', 'shapely' ),
-		'section'     => 'shapely_main_section',
-		'description' => esc_html__( 'The URL of the call to action section\'s button from footer', 'shapely' ),
-		'type'        => 'text',
-	) );
+	$wp_customize->add_setting(
+		'title_in_header', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'title_above_post', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'post_date', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'post_category', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'post_author', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
 
-	// add "Footer" section
-	$wp_customize->add_section( 'shapely_footer_section', array(
-		'title'    => esc_html__( 'Footer', 'shapely' ),
-		'priority' => 90,
-	) );
-
-	$wp_customize->add_setting( 'shapely_footer_copyright', array(
-		'default'           => '',
-		'transport'         => 'refresh',
-		'sanitize_callback' => 'wp_kses_stripslashes',
-	) );
-
-	$wp_customize->add_control( 'shapely_footer_copyright', array(
-		'type'    => 'textarea',
-		'label'   => esc_html__( 'Copyright Text', 'shapely' ),
-		'section' => 'shapely_footer_section',
-	) );
-
-	$wp_customize->add_setting( 'title_in_header', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'title_above_post', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'post_date', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'post_category', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'post_author', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	
-	$wp_customize->add_setting( 'first_letter_caps', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'tags_post_meta', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'related_posts_area', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'post_author_area', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'post_author_left_side', array(
-		'default'           => 0,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
-	$wp_customize->add_setting( 'post_author_email', array(
-		'default'           => 0,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
+	$wp_customize->add_setting(
+		'first_letter_caps', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'tags_post_meta', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'related_posts_area', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'post_author_area', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'post_author_left_side', array(
+			'default'           => 0,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'post_author_email', array(
+			'default'           => 0,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
 
 	// Single Post Settings
 	if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
 
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'title_in_header', array(
-			'label'   => esc_html__( 'Show title in header', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the post title from callout', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'title_in_header', array(
+					'label'   => esc_html__( 'Show title in header', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the post title from callout', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
 
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'title_above_post', array(
-			'label'   => esc_html__( 'Show title above post', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the post title above post content', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'title_above_post', array(
+					'label'   => esc_html__( 'Show title above post', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the post title above post content', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
 
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'post_date', array(
-			'label'   => esc_html__( 'Show the date', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the date when post was published', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'post_date', array(
+					'label'   => esc_html__( 'Show the date', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the date when post was published', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
 
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'post_author', array(
-			'label'   => esc_html__( 'Show the author', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the author who written the post under the post title', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'post_author', array(
+					'label'   => esc_html__( 'Show the author', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the author who written the post under the post title', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
 
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'post_category', array(
-			'label'   => esc_html__( 'Show the category', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the categories of post', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'post_category', array(
+					'label'   => esc_html__( 'Show the category', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the categories of post', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
 
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'first_letter_caps', array(
-			'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
-			'description' => esc_html__( 'This will transform your first letter from a post into uppercase', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'tags_post_meta', array(
-			'label'   => esc_html__( 'Tags Post Meta', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide tags from the end of post', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'related_posts_area', array(
-			'label'   => esc_html__( 'Related Posts Area', 'shapely' ),
-			'description' => esc_html__( 'This will enable/disable the related posts', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'post_author_area', array(
-			'label'   => esc_html__( 'Post Author Area', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'post_author_left_side', array(
-			'label'   => esc_html__( 'Post Author Left Side', 'shapely' ),
-			'description' => esc_html__( 'This will move the author box from the bottom of the post on top on the left side', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'post_author_email', array(
-			'label'   => esc_html__( 'Show Author Email', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'first_letter_caps', array(
+					'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+					'description' => esc_html__( 'This will transform your first letter from a post into uppercase', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'tags_post_meta', array(
+					'label'   => esc_html__( 'Tags Post Meta', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide tags from the end of post', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'related_posts_area', array(
+					'label'   => esc_html__( 'Related Posts Area', 'shapely' ),
+					'description' => esc_html__( 'This will enable/disable the related posts', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'post_author_area', array(
+					'label'   => esc_html__( 'Post Author Area', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'post_author_left_side', array(
+					'label'   => esc_html__( 'Post Author Left Side', 'shapely' ),
+					'description' => esc_html__( 'This will move the author box from the bottom of the post on top on the left side', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'post_author_email', array(
+					'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
+					'section' => 'shapely_single_post_section',
+				)
+			)
+		);
 	} else {
-		$wp_customize->add_control( 'first_letter_caps', array(
-			'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
-			'description' => esc_html__( 'This will transform your first letter from a post into uppercase', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'checkbox',
-		) );
-		$wp_customize->add_control( 'tags_post_meta', array(
-			'label'   => esc_html__( 'Tags Post Meta', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide tags from the end of post', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'checkbox',
-		) );
-		$wp_customize->add_control( 'related_posts_area', array(
-			'label'   => esc_html__( 'Related Posts Area', 'shapely' ),
-			'description' => esc_html__( 'This will enable/disable the related posts', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'checkbox',
-		) );
-		$wp_customize->add_control( 'post_author_area', array(
-			'label'   => esc_html__( 'Post Author Area', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'checkbox',
-		) );
-		$wp_customize->add_control( 'post_author_left_side', array(
-			'label'   => esc_html__( 'Post Author Left Side', 'shapely' ),
-			'description' => esc_html__( 'This will move the author box from the bottom of the post on top on the left side', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'checkbox',
-		) );
-		$wp_customize->add_control( 'post_author_email', array(
-			'label'   => esc_html__( 'Show Author Email', 'shapely' ),
-			'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
-			'section' => 'shapely_single_post_section',
-			'type'    => 'checkbox',
-		) );
+		$wp_customize->add_control(
+			'first_letter_caps', array(
+				'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+				'description' => esc_html__( 'This will transform your first letter from a post into uppercase', 'shapely' ),
+				'section' => 'shapely_single_post_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'tags_post_meta', array(
+				'label'   => esc_html__( 'Tags Post Meta', 'shapely' ),
+				'description' => esc_html__( 'This will show/hide tags from the end of post', 'shapely' ),
+				'section' => 'shapely_single_post_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'related_posts_area', array(
+				'label'   => esc_html__( 'Related Posts Area', 'shapely' ),
+				'description' => esc_html__( 'This will enable/disable the related posts', 'shapely' ),
+				'section' => 'shapely_single_post_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'post_author_area', array(
+				'label'   => esc_html__( 'Post Author Area', 'shapely' ),
+				'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
+				'section' => 'shapely_single_post_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'post_author_left_side', array(
+				'label'   => esc_html__( 'Post Author Left Side', 'shapely' ),
+				'description' => esc_html__( 'This will move the author box from the bottom of the post on top on the left side', 'shapely' ),
+				'section' => 'shapely_single_post_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'post_author_email', array(
+				'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+				'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
+				'section' => 'shapely_single_post_section',
+				'type'    => 'checkbox',
+			)
+		);
 	} // End if().
-	$wp_customize->add_setting( 'single_post_layout_template', array(
-		'default'           => 'sidebar-right',
-		'sanitize_callback' => 'shapely_sanitize_blog_layout',
-	) );
-
-	$wp_customize->add_control( 'single_post_layout_template', array(
-		'label'   => esc_html__( 'Single Post Template', 'shapely' ),
-		'description' => esc_html__( 'Set the default template for single posts', 'shapely' ),
-		'section' => 'shapely_single_post_section',
-		'type'    => 'select',
-		'choices' => array(
-			'full-width'    => esc_html__( 'Full Width', 'shapely' ),
-			'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
-			'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
-			'sidebar-right' => esc_html__( 'Sidebar Right', 'shapely' ),
-		),
-	) );
-
-	$wp_customize->add_setting( 'blog_layout_view', array(
-		'default'           => 'grid',
-		'sanitize_callback' => 'wp_kses_stripslashes',
-	) );
-
-	$wp_customize->add_control( 'blog_layout_view', array(
-		'label'   => esc_html__( 'Blog Layout', 'shapely' ),
-		'description' => esc_html__( 'Choose how you want to display posts in grid', 'shapely' ),
-		'section' => 'shapely_blog_section',
-		'type'    => 'select',
-		'choices' => array(
-			'grid'             => esc_html__( 'Grid only', 'shapely' ),
-			'large_image_grid' => esc_html__( 'Large Image and Grid', 'shapely' ),
-			'large_image'      => esc_html__( 'Large Images', 'shapely' ),
-		),
-	) );
-
-	$wp_customize->add_setting( 'blog_layout_template', array(
-		'default'           => 'sidebar-right',
-		'sanitize_callback' => 'shapely_sanitize_blog_layout',
-	) );
-
-	$wp_customize->add_control( 'blog_layout_template', array(
-		'label'   => esc_html__( 'Blog Template', 'shapely' ),
-		'description' => esc_html__( 'Choose the template for your posts page', 'shapely' ),
-		'section' => 'shapely_blog_section',
-		'type'    => 'select',
-		'choices' => array(
-			'full-width'    => esc_html__( 'Full Width', 'shapely' ),
-			'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
-			'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
-			'sidebar-right' => esc_html__( 'Sidebar Right', 'shapely' ),
-		),
-	) );
+	$wp_customize->add_setting(
+		'single_post_layout_template', array(
+			'default'           => 'sidebar-right',
+			'sanitize_callback' => 'shapely_sanitize_blog_layout',
+		)
+	);
+
+	$wp_customize->add_control(
+		'single_post_layout_template', array(
+			'label'   => esc_html__( 'Single Post Template', 'shapely' ),
+			'description' => esc_html__( 'Set the default template for single posts', 'shapely' ),
+			'section' => 'shapely_single_post_section',
+			'type'    => 'select',
+			'choices' => array(
+				'full-width'    => esc_html__( 'Full Width', 'shapely' ),
+				'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
+				'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
+				'sidebar-right' => esc_html__( 'Sidebar Right', 'shapely' ),
+			),
+		)
+	);
+
+	$wp_customize->add_setting(
+		'blog_layout_view', array(
+			'default'           => 'grid',
+			'sanitize_callback' => 'wp_kses_stripslashes',
+		)
+	);
+
+	$wp_customize->add_control(
+		'blog_layout_view', array(
+			'label'   => esc_html__( 'Blog Layout', 'shapely' ),
+			'description' => esc_html__( 'Choose how you want to display posts in grid', 'shapely' ),
+			'section' => 'shapely_blog_section',
+			'type'    => 'select',
+			'choices' => array(
+				'grid'             => esc_html__( 'Grid only', 'shapely' ),
+				'large_image_grid' => esc_html__( 'Large Image and Grid', 'shapely' ),
+				'large_image'      => esc_html__( 'Large Images', 'shapely' ),
+			),
+		)
+	);
+
+	$wp_customize->add_setting(
+		'blog_layout_template', array(
+			'default'           => 'sidebar-right',
+			'sanitize_callback' => 'shapely_sanitize_blog_layout',
+		)
+	);
+
+	$wp_customize->add_control(
+		'blog_layout_template', array(
+			'label'   => esc_html__( 'Blog Template', 'shapely' ),
+			'description' => esc_html__( 'Choose the template for your posts page', 'shapely' ),
+			'section' => 'shapely_blog_section',
+			'type'    => 'select',
+			'choices' => array(
+				'full-width'    => esc_html__( 'Full Width', 'shapely' ),
+				'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
+				'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
+				'sidebar-right' => esc_html__( 'Sidebar Right', 'shapely' ),
+			),
+		)
+	);
 
 	// shapely_category_page_section
-	$wp_customize->add_setting( 'show_category_on_category_page', array(
-		'default'           => 1,
-		'sanitize_callback' => 'shapely_sanitize_checkbox',
-	) );
+	$wp_customize->add_setting(
+		'show_category_on_category_page', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
 	if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
-		$wp_customize->add_control( new Epsilon_Control_Toggle( $wp_customize, 'show_category_on_category_page', array(
-			'label'   => esc_html__( 'Show Category on Posts', 'shapely' ),
-			'description' => esc_html__( 'Show/hide posts\' categories from the Category Page', 'shapely' ),
-			'section' => 'shapely_blog_section',
-		) ) );
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'show_category_on_category_page', array(
+					'label'   => esc_html__( 'Show Category on Posts', 'shapely' ),
+					'description' => esc_html__( 'Show/hide posts\' categories from the Category Page', 'shapely' ),
+					'section' => 'shapely_blog_section',
+				)
+			)
+		);
 	} else {
-		$wp_customize->add_control( 'show_category_on_category_page', array(
-			'label'   => esc_html__( 'Show Category on Posts', 'shapely' ),
-			'description' => esc_html__( 'Show/hide posts\' categories from the Category Page', 'shapely' ),
-			'section' => 'shapely_blog_section',
-			'type'    => 'checkbox',
-		) );
+		$wp_customize->add_control(
+			'show_category_on_category_page', array(
+				'label'   => esc_html__( 'Show Category on Posts', 'shapely' ),
+				'description' => esc_html__( 'Show/hide posts\' categories from the Category Page', 'shapely' ),
+				'section' => 'shapely_blog_section',
+				'type'    => 'checkbox',
+			)
+		);
+	}
+
+	if ( post_type_exists( 'jetpack-portfolio' ) ) {
+
+		// Add Projects Settings
+		$wp_customize->add_panel(
+			'shapely_projects_options', array(
+				'capability'     => 'edit_theme_options',
+				'theme_supports' => '',
+				'title'          => esc_html__( 'Projects Settings', 'shapely' ),
+				'description'    => esc_html__( 'Panel to update projects related options', 'shapely' ),
+				'priority'       => 10,
+			)
+		);
+		$wp_customize->add_section(
+			'shapely_projects_section', array(
+				'title'    => esc_html__( 'Projects Page Settings', 'shapely' ),
+				'panel'    => 'shapely_projects_options',
+				'priority' => 33,
+			)
+		);
+
+		$wp_customize->add_section(
+			'shapely_single_project_section', array(
+				'title'    => esc_html__( 'Project Single Settings', 'shapely' ),
+				'panel'    => 'shapely_projects_options',
+				'priority' => 35,
+			)
+		);
+
+		// Projects Archive Page
+		$wp_customize->add_setting(
+			'portfolio_archive_title', array(
+				'default'           => 1,
+				'sanitize_callback' => 'shapely_sanitize_checkbox',
+			)
+		);
+		if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
+			$wp_customize->add_control(
+				new Epsilon_Control_Toggle(
+					$wp_customize, 'portfolio_archive_title', array(
+						'label'    => esc_html__( 'Show Portfolio Archive Title', 'shapely' ),
+						'description' => esc_html__( 'Show/hide the title from the Portfolio Archive Page', 'shapely' ),
+						'section'  => 'shapely_projects_section',
+					)
+				)
+			);
+		} else {
+			$wp_customize->add_control(
+				'portfolio_archive_title', array(
+					'label'    => esc_html__( 'Show Portfolio Archive Title', 'shapely' ),
+					'description' => esc_html__( 'Show/hide the title from the Portfolio Archive Page', 'shapely' ),
+					'section'  => 'shapely_projects_section',
+					'type'     => 'checkbox',
+				)
+			);
+		}
+		$wp_customize->add_setting(
+			'portfolio_name', array(
+				'default'           => '',
+				'sanitize_callback' => 'wp_kses_stripslashes',
+			)
+		);
+		$wp_customize->add_control(
+			'portfolio_name', array(
+				'label'   => esc_html__( 'Portfolio Archive Title', 'shapely' ),
+				'description' => esc_html__( 'Add a title on the Portfolio Archive Page.', 'shapely' ),
+				'section' => 'shapely_projects_section',
+			)
+		);
+
+		$wp_customize->add_setting(
+			'portfolio_description', array(
+				'default'           => '',
+				'sanitize_callback' => 'wp_kses_post',
+			)
+		);
+		$wp_customize->add_control(
+			'portfolio_description', array(
+				'type'    => 'textarea',
+				'label'   => esc_html__( 'Portfolio Archive Description', 'shapely' ),
+				'description' => esc_html__( 'Add a description on the Portfolio Archive Page.', 'shapely' ),
+				'section' => 'shapely_projects_section',
+			)
+		);
+
+		$wp_customize->add_setting(
+			'projects_layout_view', array(
+				'default'           => 'mansonry',
+				'sanitize_callback' => 'wp_kses_stripslashes',
+			)
+		);
+
+		$wp_customize->add_control(
+			'projects_layout_view', array(
+				'label'   => esc_html__( 'Projects Layout', 'shapely' ),
+				'description' => esc_html__( 'Choose how you want to display projects', 'shapely' ),
+				'section' => 'shapely_projects_section',
+				'type'    => 'select',
+				'choices' => array(
+					'mansonry' => esc_html__( 'Masonry', 'shapely' ),
+					'grid' => esc_html__( 'Grid', 'shapely' ),
+				),
+			)
+		);
+
+		$wp_customize->add_setting(
+			'projects_layout_template', array(
+				'default'           => 'full-width',
+				'sanitize_callback' => 'shapely_sanitize_blog_layout',
+			)
+		);
+
+		$wp_customize->add_control(
+			'projects_layout_template', array(
+				'label'   => esc_html__( 'Projects Template', 'shapely' ),
+				'description' => esc_html__( 'Choose the template for your projects archive page', 'shapely' ),
+				'section' => 'shapely_projects_section',
+				'type'    => 'select',
+				'choices' => array(
+					'full-width'    => esc_html__( 'Full Width', 'shapely' ),
+					'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
+					'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
+					'sidebar-right' => esc_html__( 'Sidebar Right', 'shapely' ),
+				),
+			)
+		);
 	}
 
+	// Single Project
+	$wp_customize->add_setting(
+		'project_title_in_header', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'title_above_project', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_date', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_category', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_author', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+
+	$wp_customize->add_setting(
+		'project_first_letter_caps', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_tags_project_meta', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'related_projects_area', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_author_area', array(
+			'default'           => 1,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_author_left_side', array(
+			'default'           => 0,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+	$wp_customize->add_setting(
+		'project_author_email', array(
+			'default'           => 0,
+			'sanitize_callback' => 'shapely_sanitize_checkbox',
+		)
+	);
+
+	// Single Project Settings
+	if ( class_exists( 'Epsilon_Control_Toggle' ) ) {
+
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_title_in_header', array(
+					'label'   => esc_html__( 'Show title in header', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the project title from callout', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'title_above_project', array(
+					'label'   => esc_html__( 'Show title above project', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the project title above project content', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_date', array(
+					'label'   => esc_html__( 'Show the date', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the date when project was published', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_author', array(
+					'label'   => esc_html__( 'Show the author', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the author who written the project under the project title', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_category', array(
+					'label'   => esc_html__( 'Show the project type', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the type of project', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_first_letter_caps', array(
+					'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+					'description' => esc_html__( 'This will transform your first letter from a project into uppercase', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'tags_project_meta', array(
+					'label'   => esc_html__( 'Tags Project Meta', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide tags from the end of project', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'related_projects_area', array(
+					'label'   => esc_html__( 'Related Projects Area', 'shapely' ),
+					'description' => esc_html__( 'This will enable/disable the related projects', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_author_area', array(
+					'label'   => esc_html__( 'Project Author Area', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_author_left_side', array(
+					'label'   => esc_html__( 'Project Author Left Side', 'shapely' ),
+					'description' => esc_html__( 'This will move the author box from the bottom of the project on top on the left side', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new Epsilon_Control_Toggle(
+				$wp_customize, 'project_author_email', array(
+					'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+					'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
+					'section' => 'shapely_single_project_section',
+				)
+			)
+		);
+	} else {
+		$wp_customize->add_control(
+			'project_first_letter_caps', array(
+				'label'   => esc_html__( 'First Letter Caps', 'shapely' ),
+				'description' => esc_html__( 'This will transform your first letter from a project into uppercase', 'shapely' ),
+				'section' => 'shapely_single_project_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'tags_project_meta', array(
+				'label'   => esc_html__( 'Tags Project Meta', 'shapely' ),
+				'description' => esc_html__( 'This will show/hide tags from the end of project', 'shapely' ),
+				'section' => 'shapely_single_project_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'related_projects_area', array(
+				'label'   => esc_html__( 'Related Projects Area', 'shapely' ),
+				'description' => esc_html__( 'This will enable/disable the related projects', 'shapely' ),
+				'section' => 'shapely_single_project_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'project_author_area', array(
+				'label'   => esc_html__( 'Project Author Area', 'shapely' ),
+				'description' => esc_html__( 'This will show/hide the author box', 'shapely' ),
+				'section' => 'shapely_single_project_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'project_author_left_side', array(
+				'label'   => esc_html__( 'Project Author Left Side', 'shapely' ),
+				'description' => esc_html__( 'This will move the author box from the bottom of the project on top on the left side', 'shapely' ),
+				'section' => 'shapely_single_project_section',
+				'type'    => 'checkbox',
+			)
+		);
+		$wp_customize->add_control(
+			'project_author_email', array(
+				'label'   => esc_html__( 'Show Author Email', 'shapely' ),
+				'description' => esc_html__( 'This will show/hide the author\'s email from the author box', 'shapely' ),
+				'section' => 'shapely_single_project_section',
+				'type'    => 'checkbox',
+			)
+		);
+	} // End if().
+	$wp_customize->add_setting(
+		'single_project_layout_template', array(
+			'default'           => 'sidebar-right',
+			'sanitize_callback' => 'shapely_sanitize_blog_layout',
+		)
+	);
+
+	$wp_customize->add_control(
+		'single_project_layout_template', array(
+			'label'   => esc_html__( 'Single Project Template', 'shapely' ),
+			'description' => esc_html__( 'Set the default template for single project', 'shapely' ),
+			'section' => 'shapely_single_project_section',
+			'type'    => 'select',
+			'choices' => array(
+				'full-width'    => esc_html__( 'Full Width', 'shapely' ),
+				'no-sidebar'    => esc_html__( 'No Sidebar', 'shapely' ),
+				'sidebar-left'  => esc_html__( 'Sidebar Left', 'shapely' ),
+				'sidebar-right' => esc_html__( 'Sidebar Right', 'shapely' ),
+			),
+		)
+	);
+
 }
 
 add_action( 'customize_register', 'shapely_customizer' );
 
+/**
+ * Sanitize logo dimension setting.
+ */
+function shapely_sanitize_logo_dimension( $dimensions ) {
+	$new_dimensions = array();
+
+	if ( isset( $dimensions['width'] ) ) {
+		$new_dimensions['width'] = abs( floatval( $dimensions['width'] ) );
+	}
+
+	if ( isset( $dimensions['height'] ) ) {
+		$new_dimensions['height'] = abs( floatval( $dimensions['height'] ) );
+	}
+
+	if ( isset( $dimensions['ratio'] ) ) {
+		$new_dimensions['ratio'] = absint( $dimensions['ratio'] );
+	}
+
+	return $new_dimensions;
+
+}
+
 /**
  * Sanitize checkbox for WordPress customizer.
  */
@@ -611,6 +1224,16 @@ function shapely_customizer_custom_control_css() {
 		#customize-control-shapely-main_body_typography-size select, #customize-control-shapely-main_body_typography-face select, #customize-control-shapely-main_body_typography-style select {
 			width: 60%;
 		}
+		.shapely-logo-dimension .half {
+			width: 49%;
+			float: left;
+		}
+		.shapely-logo-dimension .half:nth-child(2) {
+			margin-left: 2%;
+		}
+		.shapely-logo-dimension .ratio {
+			clear: both;
+		}
 	</style>
 	<?php
 }
@@ -621,6 +1244,11 @@ function shapely_customizer_custom_control_css() {
  * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
  */
 function shapely_customize_preview_js() {
-	wp_enqueue_script( 'shapely_customizer', get_template_directory_uri() . '/assets/js/customizer.js', array( 'customize-preview' ), '20140317', true );
+	wp_enqueue_script( 'shapely_customizer', get_template_directory_uri() . '/assets/js/customizer-preview.js', array( 'customize-preview' ), '20140317', true );
 }
 add_action( 'customize_preview_init', 'shapely_customize_preview_js' );
+
+function shapely_customize_preview() {
+	wp_enqueue_script( 'shapely_customizer', get_template_directory_uri() . '/assets/js/customizer.js', array( 'customize-preview' ), '20140317', true );
+}
+add_action( 'customize_controls_enqueue_scripts', 'shapely_customize_preview' );
diff --git a/inc/extras.php b/inc/extras.php
index 6fe344f..3d14449 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -96,16 +96,18 @@ function shapely_add_custom_table_class( $content ) {
 	 */
 	function shapely_header_menu() {
 		// display the WordPress Custom Menu if available
-		wp_nav_menu( array(
-			'menu_id'         => 'menu',
-			'theme_location'  => 'primary',
-			'depth'           => 0,
-			'container'       => 'div',
-			'container_class' => 'collapse navbar-collapse navbar-ex1-collapse',
-			'menu_class'      => 'menu',
-			'fallback_cb'     => 'Wp_Bootstrap_Navwalker::fallback',
-			'walker'          => new Wp_Bootstrap_Navwalker(),
-		));
+		wp_nav_menu(
+			array(
+				'menu_id'         => 'menu',
+				'theme_location'  => 'primary',
+				'depth'           => 0,
+				'container'       => 'div',
+				'container_class' => 'collapse navbar-collapse navbar-ex1-collapse',
+				'menu_class'      => 'menu',
+				'fallback_cb'     => 'Wp_Bootstrap_Navwalker::fallback',
+				'walker'          => new Wp_Bootstrap_Navwalker(),
+			)
+		);
 	} /* end header menu */
 endif;
 
@@ -151,7 +153,7 @@ function shapely_get_theme_options() {
           input[type="submit"],
           button[type="submit"],
           .post-content .more-link { background:' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important; border: 2px solid' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important;}';
-          echo '.shapely_home_parallax > section:not(.image-bg) .btn-white { color:' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important; border: 2px solid' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important; }';
+			echo '.shapely_home_parallax > section:not(.image-bg) .btn-white { color:' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important; border: 2px solid' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important; }';
 		}
 		if ( get_theme_mod( 'button_hover_color' ) ) {
 			echo '.btn-filled:hover, .woocommerce #respond input#submit.alt:hover,
@@ -240,7 +242,8 @@ function shapely_make_top_level_menu_clickable() {
 				}
 			});
 		</script>
-	<?php }
+	<?php
+	}
 }
 
 add_action( 'wp_footer', 'shapely_make_top_level_menu_clickable', 1 );
@@ -249,9 +252,11 @@ function shapely_make_top_level_menu_clickable() {
  * Add Read More button to post archive
  */
 function shapely_excerpt_more( $more ) {
-	return '<div><a class="btn-filled btn" href="' . esc_url( get_the_permalink() ) . '" title="' . the_title_attribute( array(
-		'echo' => false,
-	) ) . '">' . esc_html_x( 'Read More', 'Read More', 'shapely' ) . '</a></div>';
+	return '<div><a class="btn-filled btn" href="' . esc_url( get_the_permalink() ) . '" title="' . the_title_attribute(
+		array(
+			'echo' => false,
+		)
+	) . '">' . esc_html_x( 'Read More', 'Read More', 'shapely' ) . '</a></div>';
 }
 
 add_filter( 'excerpt_more', 'shapely_excerpt_more' );
@@ -266,11 +271,14 @@ function shapely_pagination() {
 		<div class="text-center">
 			<nav class="pagination">
 				<?php
-				the_posts_pagination( array(
-					'mid_size'  => 2,
-					'prev_text' => '<icon class="fa fa-angle-left"></icon>',
-					'next_text' => '<icon class="fa fa-angle-right"></icon>',
-				) ); ?>
+				the_posts_pagination(
+					array(
+						'mid_size'  => 2,
+						'prev_text' => '<icon class="fa fa-angle-left"></icon>',
+						'next_text' => '<icon class="fa fa-angle-right"></icon>',
+					)
+				);
+					?>
 			</nav>
 		</div>
 		<?php
@@ -311,6 +319,7 @@ function shapely_author_bio() {
 		$author_description = get_the_author_meta( 'description' );
 		$author_name = ( '' != trim( $author_nickname ) ) ? $author_nickname : ( trim( $author_displayname ) != '' ) ? $author_displayname : $author_fullname;
 		$show_athor_email = get_theme_mod( 'post_author_email', false );
+		$show_project_athor_email = get_theme_mod( 'project_author_email', false );
 		?>
 
 		<div class="author-bio">
@@ -322,36 +331,43 @@ function shapely_author_bio() {
 				</div>
 				<div class="col-sm-10">
 					<b class="fn"><?php echo esc_html( $author_name ); ?></b>
-					<p><?php
+					<p>
+					<?php
 					if ( '' != trim( $author_description ) ) {
 						echo esc_html( $author_description );
-					} ?>
+					}
+					?>
 					</p>
-					<?php if ( $show_athor_email ) : ?>
+					<?php if ( ( $show_athor_email && ! is_singular( 'jetpack-portfolio' ) ) || ( is_singular( 'jetpack-portfolio' ) && $show_project_athor_email ) ) : ?>
 						<a class="author-email" href="mailto:<?php echo esc_attr( antispambot( $author_email ) ); ?>"><?php echo esc_html( antispambot( $author_email ) ); ?></a>
 					<?php endif ?>
 					<ul class="list-inline social-list author-social">
 						<?php
 						$twitter_profile = get_the_author_meta( 'twitter' );
-						if ( $twitter_profile && '' != $twitter_profile ) { ?>
+						if ( $twitter_profile && '' != $twitter_profile ) {
+						?>
 							<li>
 							<a href="<?php echo esc_url( $twitter_profile ); ?>">
 								<i class="fa fa-twitter"></i>
 							</a>
-							</li><?php
+							</li>
+							<?php
 						}
 
 						$fb_profile = get_the_author_meta( 'facebook' );
-						if ( $fb_profile && '' != $fb_profile ) { ?>
+						if ( $fb_profile && '' != $fb_profile ) {
+						?>
 							<li>
 							<a href="<?php echo esc_url( $fb_profile ); ?>">
 								<i class="fa fa-facebook"></i>
 							</a>
-							</li><?php
+							</li>
+							<?php
 						}
 
 						$dribble_profile = get_the_author_meta( 'dribble' );
-						if ( $dribble_profile && '' != $dribble_profile ) { ?>
+						if ( $dribble_profile && '' != $dribble_profile ) {
+						?>
 							<li>
 								<a href="<?php echo esc_url( $dribble_profile ); ?>">
 									<i class="fa fa-dribbble"></i>
@@ -361,22 +377,27 @@ function shapely_author_bio() {
 						}
 
 						$github_profile = get_the_author_meta( 'github' );
-						if ( $github_profile && '' != $github_profile ) { ?>
+						if ( $github_profile && '' != $github_profile ) {
+						?>
 							<li>
 							<a href="<?php echo esc_url( $github_profile ); ?>">
 								<i class="fa fa-vimeo"></i>
 							</a>
-							</li><?php
+							</li>
+							<?php
 						}
 
 						$vimeo_profile = get_the_author_meta( 'vimeo' );
-						if ( $vimeo_profile && '' != $vimeo_profile ) { ?>
+						if ( $vimeo_profile && '' != $vimeo_profile ) {
+						?>
 							<li>
 							<a href="<?php echo esc_url( $vimeo_profile ); ?>">
 								<i class="fa fa-github"></i>
 							</a>
-							</li><?php
-						} ?>
+							</li>
+							<?php
+						}
+						?>
 					</ul>
 				</div>
 			</div>
@@ -400,9 +421,9 @@ function shapely_cb_comment( $comment, $args, $depth ) {
 		$add_below = 'div-comment';
 	}
 	?>
-	<li <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ) ?> id="comment-<?php comment_ID() ?>">
+	<li <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID(); ?>">
 		<?php if ( 'div' != $args['style'] ) : ?>
-		<div id="div-comment-<?php comment_ID() ?>" class="comment-body">
+		<div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 			<?php endif; ?>
 			<div class="avatar">
 				<?php
@@ -417,7 +438,11 @@ function shapely_cb_comment( $comment, $args, $depth ) {
 					<time datetime="2016-01-28T12:43:17+00:00">
 						<?php
 						/* translators: 1: date, 2: time */
-						printf( __( '%1$s at %2$s', 'shapely' ), get_comment_date(), get_comment_time() ); ?></time><?php edit_comment_link( esc_html__( 'Edit', 'shapely' ), '  ', '' );
+						printf( __( '%1$s at %2$s', 'shapely' ), get_comment_date(), get_comment_time() );
+						?>
+						</time>
+						<?php
+						edit_comment_link( esc_html__( 'Edit', 'shapely' ), '  ', '' );
 					?>
 				</div>
 				<?php
@@ -427,7 +452,8 @@ function shapely_cb_comment( $comment, $args, $depth ) {
 					'max_depth' => $args['max_depth'],
 				);
 
-				comment_reply_link( array_merge( $args, $comment_reply_args ) ); ?>
+				comment_reply_link( array_merge( $args, $comment_reply_args ) );
+				?>
 
 				<?php if ( '0' == $comment->comment_approved ) : ?>
 					<p>
@@ -483,16 +509,55 @@ function shapely_custom_comment_form() {
  * Header Logo
  */
 function shapely_get_header_logo() {
-	$logo_id = get_theme_mod( 'custom_logo', '' );
-	$logo    = wp_get_attachment_image_src( $logo_id, 'full' ); ?>
-
-	<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php
-	if ( '' != $logo[0] ) { ?>
-		<img src="<?php echo esc_url( $logo[0] ); ?>" class="logo" alt="<?php echo esc_html( get_bloginfo( 'name' ) ); ?>"><?php
-	} else { ?>
-		<span class="site-title"><?php echo esc_html( get_bloginfo( 'name' ) ); ?></span><?php
-	} ?>
-	</a><?php
+
+	$logo_dimensions = get_theme_mod( 'shapely_logo_dimension', array() );
+	if ( ! empty( $logo_dimensions ) && isset( $logo_dimensions['width'] ) && isset( $logo_dimensions['height'] ) ) {
+		$dimension = array( $logo_dimensions['width'], $logo_dimensions['height'] );
+	} else {
+		$dimension = 'full';
+	}
+
+	$custom_logo_id = get_theme_mod( 'custom_logo' );
+	// We have a logo. Logo is go.
+	if ( $custom_logo_id ) {
+		$custom_logo_attr = array(
+			'class'    => 'custom-logo logo',
+			'itemprop' => 'logo',
+		);
+		/*
+		 * If the logo alt attribute is empty, get the site title and explicitly
+		 * pass it to the attributes used by wp_get_attachment_image().
+		 */
+		$image_alt = get_post_meta( $custom_logo_id, '_wp_attachment_image_alt', true );
+		if ( empty( $image_alt ) ) {
+			$custom_logo_attr['alt'] = get_bloginfo( 'name', 'display' );
+		}
+		/*
+		 * If the alt attribute is not empty, there's no need to explicitly pass
+		 * it because wp_get_attachment_image() already adds the alt attribute.
+		 */
+		$html = sprintf(
+			'<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
+			esc_url( home_url( '/' ) ),
+			wp_get_attachment_image( $custom_logo_id, $dimension, false, $custom_logo_attr )
+		);
+	} // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
+	elseif ( is_customize_preview() ) {
+		$html = sprintf(
+			'<a href="%1$s" class="custom-logo-link"><img class="custom-logo"/ style="display:none;"><span class="site-title">%2$s</span></a>',
+			esc_url( home_url( '/' ) ),
+			esc_html( get_bloginfo( 'name' ) )
+		);
+	} else {
+		$html = sprintf(
+			'<a href="%1$s" class="custom-logo-link"><span class="site-title">%2$s</span></a>',
+			esc_url( home_url( '/' ) ),
+			esc_html( get_bloginfo( 'name' ) )
+		);
+	}
+
+	echo $html;
+
 }
 
 /*
@@ -500,7 +565,9 @@ function shapely_get_header_logo() {
  * then from themeoptions
  */
 function shapely_get_layout_class() {
-	if ( is_single() ) {
+	if ( is_singular( 'jetpack-portfolio' ) ) {
+		$layout_class = get_theme_mod( 'single_project_layout_template', 'sidebar-right' );
+	} elseif ( is_single() ) {
 		$template     = get_page_template_slug();
 		$layout_class = '';
 		switch ( $template ) {
@@ -540,6 +607,8 @@ function shapely_get_layout_class() {
 				$layout_class = get_theme_mod( 'blog_layout_template', 'sidebar-right' );
 				break;
 		}
+	} elseif ( is_archive() && is_post_type_archive( 'jetpack-portfolio' ) ) {
+		$layout_class = get_theme_mod( 'projects_layout_template', 'full-width' );
 	} else {
 		$layout_class = get_theme_mod( 'blog_layout_template', 'sidebar-right' );
 	} // End if().
@@ -568,11 +637,14 @@ function shapely_show_sidebar() {
  * Top Callout
  */
 function shapely_top_callout() {
-	if ( ( get_theme_mod( 'top_callout', true ) && ! is_single() ) || ( is_single() && get_theme_mod( 'title_in_header', true ) ) ) {
+	if ( ( get_theme_mod( 'portfolio_archive_title', true ) && is_post_type_archive( 'jetpack-portfolio' ) ) ||
+		( get_theme_mod( 'top_callout', true ) && ! is_single() && ! is_post_type_archive( 'jetpack-portfolio' ) ) ||
+		( is_single() && get_theme_mod( 'title_in_header', true ) && ! is_singular( 'jetpack-portfolio' ) ) ||
+		( get_theme_mod( 'project_title_in_header', true ) && is_singular( 'jetpack-portfolio' ) ) ) {
 		$header = get_header_image();
 		?>
 	<section
-		class="page-title-section bg-secondary <?php echo $header ? 'header-image-bg' : '' ?>" <?php echo $header ? 'style="background-image:url(' . $header . ')"' : '' ?>>
+		class="page-title-section bg-secondary <?php echo $header ? 'header-image-bg' : ''; ?>" <?php echo $header ? 'style="background-image:url(' . $header . ')"' : ''; ?>>
 		<div class="container">
 			<div class="row">
 				<?php
@@ -581,30 +653,46 @@ class="page-title-section bg-secondary <?php echo $header ? 'header-image-bg' :
 				if ( function_exists( 'yoast_breadcrumb' ) ) {
 					$options             = get_option( 'wpseo_internallinks' );
 					$breadcrumbs_enabled = ( true === $options['breadcrumbs-enable'] );
-					$title_in_post       = get_theme_mod( 'hide_post_title', false );
+					$title_in_post       = get_theme_mod( 'hide_post_title', true );
 				}
 				$header_color = get_theme_mod( 'header_textcolor', false );
 				?>
 				<?php if ( $title_in_post ) : ?>
-					<div
-						class="<?php echo $breadcrumbs_enabled ? 'col-md-6 col-sm-6 col-xs-12' : 'col-xs-12'; ?>">
-						<h3 class="page-title" <?php echo $header_color ? 'style="color:#' . esc_attr( $header_color ) . '"' : '' ?>>
+					<div class="<?php echo $breadcrumbs_enabled ? 'col-md-6 col-sm-6 col-xs-12' : 'col-xs-12'; ?>">
+						<h3 class="page-title" <?php echo $header_color ? 'style="color:#' . esc_attr( $header_color ) . '"' : ''; ?>>
 							<?php
 							if ( is_home() ) {
 								echo esc_html( get_theme_mod( 'blog_name' ) ? get_theme_mod( 'blog_name' ) : __( 'Blog', 'shapely' ) );
 							} elseif ( is_search() ) {
 								_e( 'Search', 'shapely' );
 							} elseif ( is_archive() ) {
-								echo ( is_post_type_archive( 'jetpack-portfolio' ) ) ? esc_html__( 'Portfolio', 'shapely' ) : get_the_archive_title();
+								if ( is_post_type_archive( 'jetpack-portfolio' ) ) {
+									$portfolio_title = get_theme_mod( 'portfolio_name', esc_html__( 'Portfolio', 'shapely' ) );
+									echo $portfolio_title;
+								} else {
+									echo get_the_archive_title();
+								}
 							} else {
-								echo ( is_singular( 'jetpack-portfolio' ) ) ? esc_html__( 'Portfolio', 'shapely' ) : get_the_title();
-							} ?>
+								echo get_the_title();
+							}
+							?>
 						</h3>
+						<?php
+
+						if ( is_archive() && is_post_type_archive( 'jetpack-portfolio' ) ) {
+							$portfolio_description = get_theme_mod( 'portfolio_description' );
+							if ( $portfolio_description ) {
+								echo '<p>' . wp_kses_post( $portfolio_description ) . '</p>';
+							}
+						}
+
+						?>
 					</div>
 				<?php endif; ?>
 				<?php if ( function_exists( 'yoast_breadcrumb' ) ) { ?>
 					<?php
-					if ( $breadcrumbs_enabled ) { ?>
+					if ( $breadcrumbs_enabled ) {
+					?>
 						<div class="<?php echo $title_in_post ? 'col-md-6 col-sm-6' : ''; ?> col-xs-12 text-right">
 							<?php yoast_breadcrumb( '<p id="breadcrumbs">', '</p>' ); ?>
 						</div>
@@ -615,13 +703,16 @@ class="<?php echo $breadcrumbs_enabled ? 'col-md-6 col-sm-6 col-xs-12' : 'col-xs
 			<!--end of row-->
 		</div>
 		<!--end of container-->
-		</section><?php
-	} else { ?>
+		</section>
+		<?php
+	} else {
+	?>
 		<?php if ( function_exists( 'yoast_breadcrumb' ) ) { ?>
 			<div class="container mt20">
 				<?php yoast_breadcrumb( '<p id="breadcrumbs">', '</p>' ); ?>
 			</div>
-		<?php }
+		<?php
+}
 	} // End if().
 }
 
@@ -629,7 +720,8 @@ class="<?php echo $breadcrumbs_enabled ? 'col-md-6 col-sm-6 col-xs-12' : 'col-xs
  * Footer Callout
  */
 function shapely_footer_callout() {
-	if ( get_theme_mod( 'footer_callout_text' ) != '' ) { ?>
+	if ( get_theme_mod( 'footer_callout_text' ) != '' ) {
+	?>
 		<section class="cfa-section bg-secondary">
 		<div class="container">
 			<div class="row">
@@ -648,7 +740,8 @@ class="mb0 btn btn-lg btn-filled cfa-button">
 				</div>
 			</div>
 		</div>
-		</section><?php
+		</section>
+		<?php
 	}
 }
 
diff --git a/inc/jetpack.php b/inc/jetpack.php
index 06673eb..50c19d8 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -15,11 +15,13 @@
  */
 function shapely_jetpack_setup() {
 	// Add theme support for Infinite Scroll.
-	add_theme_support( 'infinite-scroll', array(
-		'container' => 'main',
-		'render'    => 'shapely_infinite_scroll_render',
-		'footer'    => 'page',
-	) );
+	add_theme_support(
+		'infinite-scroll', array(
+			'container' => 'main',
+			'render'    => 'shapely_infinite_scroll_render',
+			'footer'    => 'page',
+		)
+	);
 
 	// Add theme support for Responsive Videos.
 	add_theme_support( 'jetpack-responsive-videos' );
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 0939ed4..200a133 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -17,7 +17,8 @@ function shapely_posted_on() {
 			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
 		}
 
-		$time_string = sprintf( $time_string,
+		$time_string = sprintf(
+			$time_string,
 			esc_attr( get_the_date( 'c' ) ),
 			esc_html( get_the_date() ),
 			esc_attr( get_the_modified_date( 'c' ) ),
@@ -31,7 +32,8 @@ function shapely_posted_on() {
 		</li>
 		<li><i class="fa fa-calendar"></i><span class="posted-on"><?php echo $time_string; ?></span></li>
 		<?php shapely_post_category(); ?>
-		</ul><?php
+		</ul>
+		<?php
 		echo ( is_archive() ) ? '<hr>' : '';
 	}
 endif;
@@ -42,33 +44,41 @@ function shapely_posted_on() {
 	 */
 	function shapely_posted_on_no_cat() {
 
-		$post_author  = get_theme_mod( 'post_author', true );
-		$post_date  = get_theme_mod( 'post_date', true );
+		if ( is_singular( 'jetpack-portfolio' ) ) {
+			$post_author  = get_theme_mod( 'project_author', true );
+			$post_date  = get_theme_mod( 'project_date', true );
+		} else {
+			$post_author  = get_theme_mod( 'post_author', true );
+			$post_date  = get_theme_mod( 'post_date', true );
+		}
+
 		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
 		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
 			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
 		}
 
-		$time_string = sprintf( $time_string,
+		$time_string = sprintf(
+			$time_string,
 			esc_attr( get_the_date( 'c' ) ),
 			esc_html( get_the_date() ),
 			esc_attr( get_the_modified_date( 'c' ) ),
 			esc_html( get_the_modified_date() )
-		); 
+		);
 
 		if ( $post_date || $post_author ) :
 		?>
 
 		<ul class="post-meta">
-		<?php if ( $post_date ): ?>
+		<?php if ( $post_date ) : ?>
 			<li><span class="posted-on"><?php echo $time_string; ?></span></li>
 		<?php endif ?>
 		
-		<?php if ( $post_author ): ?>
+		<?php if ( $post_author ) : ?>
 			<li><span><?php echo esc_html__( 'by', 'shapely' ); ?> <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" title="<?php echo esc_attr( get_the_author() ); ?>"><?php esc_html( the_author() ); ?></a></span></li>
 		<?php endif ?>
 		
-		</ul><?php
+		</ul>
+		<?php
 		endif;
 	}
 endif;
@@ -121,11 +131,13 @@ function shapely_categorized_blog() {
 	$all_the_cool_cats = get_transient( 'shapely_categories' );
 	if ( false === $all_the_cool_cats ) {
 		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
-			'fields'     => 'ids',
-			'hide_empty' => 1,
-			'number'     => 2,
-		) );
+		$all_the_cool_cats = get_categories(
+			array(
+				'fields'     => 'ids',
+				'hide_empty' => 1,
+				'number'     => 2,
+			)
+		);
 
 		// Count the number of categories that are attached to the posts.
 		$all_the_cool_cats = count( $all_the_cool_cats );
diff --git a/index.php b/index.php
index eb74ad3..f04820e 100644
--- a/index.php
+++ b/index.php
@@ -12,36 +12,39 @@
  * @package Shapely
  */
 get_header(); ?>
-<?php $layout_class = shapely_get_layout_class();?>
+<?php $layout_class = shapely_get_layout_class(); ?>
 	<div class="row">
 		<?php
 		if ( 'sidebar-left' == $layout_class ) :
 			get_sidebar();
 		endif;
 		?>
-		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
-		if ( have_posts() ) :
-
-			if ( is_home() && ! is_front_page() ) : ?>
-					<header>
-						<h1 class="page-title screen-reader-text"><?php esc_html( single_post_title() ); ?></h1>
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
+																<?php
+																if ( have_posts() ) :
+
+																	if ( is_home() && ! is_front_page() ) :
+																	?>
+																			<header>
+																				<h1 class="page-title screen-reader-text"><?php esc_html( single_post_title() ); ?></h1>
 					</header>
 
 					<?php
-				endif;
+																		endif;
 
-			$layout_type = get_theme_mod( 'blog_layout_view', 'grid' );
-			$layout_type = str_replace( '_', '-', $layout_type );
+																	$layout_type = get_theme_mod( 'blog_layout_view', 'grid' );
+																	$layout_type = str_replace( '_', '-', $layout_type );
 
-			get_template_part( 'template-parts/layouts/blog', $layout_type );
+																	get_template_part( 'template-parts/layouts/blog', $layout_type );
 
-			shapely_pagination();
+																	shapely_pagination();
 
 			else :
 
 				get_template_part( 'template-parts/content', 'none' );
 
-			endif; ?>
+			endif;
+			?>
 		</div><!-- #primary -->
 		<?php
 		if ( 'sidebar-right' == $layout_class ) :
diff --git a/package.json b/package.json
index 4c6f532..57d685c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shapely",
   "main": "Gruntfile.js",
-  "version": "1.1.7",
+  "version": "1.2.0",
   "homepage": "https://www.colorlib.com",
   "author": "Colorlib",
   "license": "GPL v3",
diff --git a/page-templates/full-width.php b/page-templates/full-width.php
index 88f6cce..13852bc 100644
--- a/page-templates/full-width.php
+++ b/page-templates/full-width.php
@@ -9,7 +9,8 @@
 	<div class="row">
 		<div id="primary" class="col-md-12 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'template-parts/content' );
 
diff --git a/page-templates/no-sidebar.php b/page-templates/no-sidebar.php
index 7128f1b..23f660c 100644
--- a/page-templates/no-sidebar.php
+++ b/page-templates/no-sidebar.php
@@ -7,7 +7,8 @@
 	<div class="row">
 		<div id="primary" class="col-md-8 mb-xs-24 no-sidebar">
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'template-parts/content' );
 
diff --git a/page-templates/sidebar-left.php b/page-templates/sidebar-left.php
index 6bec982..f0ceb3d 100644
--- a/page-templates/sidebar-left.php
+++ b/page-templates/sidebar-left.php
@@ -10,7 +10,8 @@
 		<?php get_sidebar(); ?>
 		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'template-parts/content' );
 
diff --git a/page-templates/sidebar-right.php b/page-templates/sidebar-right.php
index 9b54914..314c49c 100644
--- a/page-templates/sidebar-right.php
+++ b/page-templates/sidebar-right.php
@@ -9,7 +9,8 @@
 	<div class="row">
 		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'template-parts/content' );
 
diff --git a/page-templates/template-home.php b/page-templates/template-home.php
index 08b1036..10a1c36 100644
--- a/page-templates/template-home.php
+++ b/page-templates/template-home.php
@@ -9,7 +9,8 @@
 
 <?php get_header(); ?>
 <?php
-if ( ! function_exists( 'dynamic_sidebar' ) || ! dynamic_sidebar( 'sidebar-home' ) ) : ?>
+if ( ! function_exists( 'dynamic_sidebar' ) || ! dynamic_sidebar( 'sidebar-home' ) ) :
+?>
 	<div class="container p24 wp-caption-text">
 		<h5><?php echo esc_html__( 'This is the "Home Sidebar Section", add some widgets to it to change it.', 'shapely' ); ?></h5>
 	</<div>
diff --git a/page.php b/page.php
index 227bff9..efdda85 100644
--- a/page.php
+++ b/page.php
@@ -20,17 +20,20 @@
 			get_sidebar();
 		endif;
 		?>
-		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
-		while ( have_posts() ) : the_post();
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
+																<?php
+																while ( have_posts() ) :
+																	the_post();
 
-			get_template_part( 'template-parts/content', 'page' );
+																	get_template_part( 'template-parts/content', 'page' );
 
-			// If comments are open or we have at least one comment, load up the comment template.
-			if ( comments_open() || get_comments_number() ) :
-				comments_template();
-				endif;
+																	// If comments are open or we have at least one comment, load up the comment template.
+																	if ( comments_open() || get_comments_number() ) :
+																		comments_template();
+																		endif;
 
-			endwhile; // End of the loop. ?>
+			endwhile; // End of the loop.
+			?>
 		</div><!-- #primary -->
 		<?php
 		if ( 'sidebar-right' == $layout_class ) :
diff --git a/readme.txt b/readme.txt
index 04f127d..b9864b3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 
 Theme Name: Shapely
 Theme URI: https://colorlib.com/wp/shapely/
-Version: 1.1.6
+Version: 1.2.0
 Tested up to: WP 4.8
 
 Author: Aigars Silkalns
@@ -60,6 +60,10 @@ This page template is used to create the Parallax homepage from our demo : https
 
 
 == Changelog ==
+= 1.2.0 =
+
+* Implemented milestone https://github.com/puikinsh/shapely/milestone/4
+
 = 1.1.6 - June 15 2017 =
 
 * Implemented milestone https://github.com/puikinsh/shapely/milestone/2
diff --git a/search.php b/search.php
index e2325c2..dc41932 100644
--- a/search.php
+++ b/search.php
@@ -18,7 +18,8 @@
 			<main id="main" class="site-main" role="main">
 
 				<?php
-				if ( have_posts() ) : ?>
+				if ( have_posts() ) :
+				?>
 
 					<header class="entry-header nolist">
 						<h1 class="post-title entry-title"><?php printf( esc_html__( 'Search Results for: %s', 'shapely' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
@@ -26,7 +27,8 @@
 
 					<?php
 					/* Start the Loop */
-					while ( have_posts() ) : the_post();
+					while ( have_posts() ) :
+						the_post();
 
 						/**
 						 * Run the loop for the search to output the results.
@@ -42,7 +44,8 @@
 
 					get_template_part( 'template-parts/content', 'none' );
 
-				endif; ?>
+				endif;
+				?>
 
 			</main><!-- #main -->
 		</section><!-- #primary -->
diff --git a/single-jetpack-portfolio.php b/single-jetpack-portfolio.php
new file mode 100644
index 0000000..f318801
--- /dev/null
+++ b/single-jetpack-portfolio.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * The template for displaying all single posts.
+ *
+ * @link    https://developer.wordpress.org/themes/basics/template-hierarchy/#single-post
+ *
+ * @package Shapely
+ */
+
+get_header(); ?>
+<?php $layout_class = shapely_get_layout_class(); ?>
+	<div class="row">
+		<?php
+		if ( 'sidebar-left' == $layout_class ) :
+			get_sidebar();
+		endif;
+		?>
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
+																<?php
+																while ( have_posts() ) :
+																	the_post();
+
+																	get_template_part( 'template-parts/content', 'portfolio' );
+
+																	// If comments are open or we have at least one comment, load up the comment template.
+																	if ( comments_open() || get_comments_number() ) :
+																		comments_template();
+																		endif;
+
+			endwhile; // End of the loop.
+			?>
+		</div><!-- #primary -->
+		<?php
+		if ( 'sidebar-right' == $layout_class ) :
+			get_sidebar();
+		endif;
+		?>
+	</div>
+<?php
+get_footer();
diff --git a/single.php b/single.php
index 8c425cc..8e25445 100644
--- a/single.php
+++ b/single.php
@@ -15,17 +15,20 @@
 			get_sidebar();
 		endif;
 		?>
-		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
-		while ( have_posts() ) : the_post();
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
+																<?php
+																while ( have_posts() ) :
+																	the_post();
 
-			get_template_part( 'template-parts/content' );
+																	get_template_part( 'template-parts/content' );
 
-			// If comments are open or we have at least one comment, load up the comment template.
-			if ( comments_open() || get_comments_number() ) :
-				comments_template();
-				endif;
+																	// If comments are open or we have at least one comment, load up the comment template.
+																	if ( comments_open() || get_comments_number() ) :
+																		comments_template();
+																		endif;
 
-			endwhile; // End of the loop. ?>
+			endwhile; // End of the loop.
+			?>
 		</div><!-- #primary -->
 		<?php
 		if ( 'sidebar-right' == $layout_class ) :
diff --git a/style.css b/style.css
index 732c5ac..485ee5d 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://colorlib.com/wp/themes/shapely
 Author: colorlib
 Author URI: https://colorlib.com/
 Description: Shapely is a powerful and versatile one page WordPress theme with pixel perfect design and outstanding functionality. It is by far the most advanced free WordPress theme available today with loads of unmatched customization options. This theme comes with several homepage widgets that can be used to add portfolio, testimonials, parallax sections, your product or service information, call for action and much more. Shapely supports most free and premium WordPress plugins such as WooCommerce, Jetpack, Gravity Forms, Contact Form 7, Yoast SEO, Google Analytics by Yoast and much more. This theme is the best suited for business, landing page, portfolio, ecommerce, store, local business,  personal websites but can be tweaked to be used as blog, magazine or any other awesome website while highlighting its unique one page setup. This is going to be the last WordPress theme you will ever want to use because it is so much better than anything you have seen. Needless to say that this theme is SEO friendly thanks to its well optimized strucutre. Shapely theme is mobile friendly and fully responsive making it your best multipurpose partnert for any project and website.
-Version: 1.1.7
+Version: 1.2
 License: GNU General Public License v3
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: shapely
@@ -447,8 +447,8 @@ a, a:visited, a:active, a:hover {
 .main-navigation {
     clear: both;
     display: block;
-    float: left;
     width: 100%;
+    padding: 10px 0;
 }
 
 .main-navigation ul {
@@ -560,6 +560,11 @@ a, a:visited, a:active, a:hover {
 #site-navigation .module.left {
     padding-left: 15px;
 }
+#site-navigation .container > .flex-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
 
 /*--------------------------------------------------------------
 # Accessibility
@@ -1366,8 +1371,6 @@ nav .btn, .nav-bar .btn {
 }
 
 .nav-bar {
-    height: 55px;
-    max-height: 55px;
     line-height: 53px;
 }
 
@@ -1375,19 +1378,16 @@ nav {
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 }
 
-.nav-bar .module, .nav-bar .module-group {
+.nav-bar .module:not( .site-title-container ),
+.nav-bar .module-group {
     height: 55px;
 }
 
-.nav-bar a {
+.nav-bar a:not( .custom-logo-link ) {
     display: inline-block;
     height: 55px;
 }
 
-.logo {
-    max-height: 60%;
-}
-
 .menu > li.dropdown {
     padding-right: 18px;
 }
@@ -1830,12 +1830,149 @@ nav.fixed.scrolled {
     }
 }
 
+/* Mobile Menu on Desktop */
+@media all and (min-width: 992px) {
+    .mobile-menu .module.widget-handle {
+        border-left: none;
+        line-height: 40px;
+        min-height: 40px;
+    }
+    .mobile-menu .nav-bar .module-group {
+        width: 100%;
+    }
+    .mobile-menu .visible-xs,
+    .mobile-menu .visible-sm,
+    .mobile-menu .nav-open .navbar-collapse.collapse {
+        display: block!important;
+    }
+
+    .mobile-menu .navbar-collapse.collapse,
+    .mobile-menu .nav-bar .module-group .module.hidden-xs,
+    .mobile-menu .nav-bar .module-group .module.hidden-sm {
+        display: none !important;
+    }
+    .mobile-menu #site-navigation .container > .flex-row {
+        flex-wrap: wrap;
+    }
+    .mobile-menu .nav-bar, .nav-bar .module-group,
+    .mobile-menu .nav-bar .module,
+    .mobile-menu .nav-bar .module:not( .site-title-container ) {
+        height: auto;
+    }
+    .mobile-menu .nav-bar .module {
+        padding: 0 16px;
+    }
+    .mobile-menu .navbar-collapse {
+        margin-top: 20px;
+        width: 100%;
+    }
+    .mobile-menu .main-navigation .menu li {
+        line-height: 24px;
+        display: block;
+        width: 100%;
+        max-width: 100%;
+    }
+    .mobile-menu .main-navigation .menu a {
+        height: auto;
+        line-height: 24px;
+        padding: 4px 0;
+    }
+    .mobile-menu .shapely-dropdown {
+        float: right;
+        border: 1px solid;
+        font-size: 11px;
+        padding: 0 10px;
+        display: inline-block;
+        cursor: pointer;
+    }
+    .mobile-menu .main-navigation .menu > li > ul {
+        position: relative;
+        opacity: 1;
+        visibility: visible;
+        display: none;
+        transform: translate3d(0, 0px, 0);
+        -webkit-transform: translate3d(0, 0px, 0);
+        -moz-transform: translate3d(0, 0px, 0);
+        width: 100%;
+        left: 0;
+        border: 0 !important;
+        box-shadow: none;
+    }
+    .mobile-menu .dropdown:after {
+        display: none;
+    }
+    .mobile-menu ul.dropdown-menu.active {
+        display: block !important;
+    }
+    .mobile-menu .module-group .module.left {
+        float: none;
+        display: block;
+    }
+    .mobile-menu .main-navigation .menu > li ul {
+        position: relative;
+        width: 100%;
+        opacity: 1;
+        visibility: visible;
+        transform: translate3d(0, 0px, 0);
+        -webkit-transform: translate3d(0, 0px, 0);
+        -moz-transform: translate3d(0, 0px, 0);
+        left: 0;
+        border: 0 !important;
+        box-shadow: none;
+    }
+    .mobile-menu .main-navigation .menu > li > ul > li ul {
+        left: 0 !important;
+        display: none;
+        padding: 0;
+    }
+    .mobile-menu #site-navigation.main-navigation .menu > li > ul li a {
+        width: auto;
+        display: inline-block;
+        padding: 10px 16px;
+    }
+    .mobile-menu .main-navigation .menu > li > ul li a {
+        padding: 10px 16px;
+    }
+    .mobile-menu .main-navigation .dropdown .dropdown li {
+        padding-left: 18px;
+    }
+    .mobile-menu .main-navigation .menu > li > ul li a:hover,
+    .mobile-menu .main-navigation  .menu > li > ul li:hover > a {
+        background-color: #fff;
+    }
+    .mobile-menu .search-widget-handle .search {
+        padding: 0 15px;
+    }
+    .mobile-menu .widget-handle .function {
+        width: 100%;
+        max-width: 300px;
+        position: relative;
+        opacity: 1;
+        transform: translate3d(0, 0px, 0);
+        -webkit-transform: translate3d(0, 0px, 0);
+        -moz-transform: translate3d(0, 0px, 0);
+        visibility: visible;
+        margin-top: 0;
+        display: none;
+        box-shadow: none !important;
+    }
+    .mobile-menu .module.widget-handle .title {
+        display: inline-block;
+        position: relative;
+        bottom: 3px;
+        margin-left: 8px;
+    }
+    .mobile-menu .toggle-search .function {
+        display: block;
+    }
+}
+
 @media all and (max-width: 991px) {
     .site-title-container {
         width: 84%;
     }
 
-    .nav-bar, .nav-bar .module-group, .nav-bar .module {
+    .nav-bar, .nav-bar .module-group, .nav-bar .module, .nav-bar .module:not( .site-title-container ) {
         height: auto;
     }
 
@@ -1957,6 +2094,12 @@ nav.fixed.scrolled {
     .mobile-toggle i {
         line-height: 53px !important;
     }
+    #site-navigation .container > .flex-row {
+        flex-wrap: wrap;
+    }
+    .navbar-collapse {
+        margin-top: 20px;
+    }
 }
 
 /*!---------- 8. FORMS ----------*/
@@ -2942,6 +3085,26 @@ iframe {
 .project .image-tile {
     margin: 0;
 }
+.project:not( .masonry-item ) .image-tile {
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+.project:not( .masonry-item ) .image-tile a {
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+.project:not( .masonry-item ) {
+    padding-bottom: 25%;
+    position: relative;
+    margin-bottom: 0;
+}
 
 /*!---------- 21. FOOTER ----------*/
 
@@ -3984,7 +4147,8 @@ footer.bg-dark a {
     .author-bio-left-side .author-bio .author-social li a {
       color: #001c28; }
 
-.single-post .entry-content .dropcaps-content > p:first-child:first-letter {
+.single-post .entry-content .dropcaps-content > p:first-child:first-letter,
+.single-jetpack-portfolio .entry-content .dropcaps-content > p:first-child:first-letter {
   float: left;
   font-size: 57px;
   margin: 10px;
diff --git a/template-parts/content-attachment.php b/template-parts/content-attachment.php
index 5867fbc..57fadd1 100644
--- a/template-parts/content-attachment.php
+++ b/template-parts/content-attachment.php
@@ -12,7 +12,8 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php
-		if ( has_post_thumbnail() ) { ?>
+		if ( has_post_thumbnail() ) {
+		?>
 			<a class="text-center" href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
 			<?php
 				$thumbnail_args = array(
@@ -49,10 +50,10 @@
 		<hr/>
 		<div class="shapely-next-prev row">
 			<div class="col-md-6 text-left">
-				<?php echo wp_kses_post( $prev ) ?>
+				<?php echo wp_kses_post( $prev ); ?>
 			</div>
 			<div class="col-md-6 text-right">
-				<?php echo wp_kses_post( $next ) ?>
+				<?php echo wp_kses_post( $next ); ?>
 			</div>
 		</div>
 	<?php endif; ?>
diff --git a/template-parts/content-grid-small.php b/template-parts/content-grid-small.php
index d32fee7..af15730 100644
--- a/template-parts/content-grid-small.php
+++ b/template-parts/content-grid-small.php
@@ -54,24 +54,32 @@
 
 			<div class="entry-meta">
 				<?php
-				shapely_posted_on_no_cat(); ?><!-- post-meta -->
+				shapely_posted_on_no_cat();
+				?>
+				<!-- post-meta -->
 			</div>
 
 			<?php
-			the_content( sprintf(
-				/* translators: %s: Name of current post. */
-							 wp_kses( __( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
-								 'span' => array(
-									 'class' => array(),
-								 ),
-							 ) ),
-				the_title( '<span class="screen-reader-text">"', '"</span>', false )
-			) );
+			the_content(
+				sprintf(
+					/* translators: %s: Name of current post. */
+							 wp_kses(
+								 __( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
+									 'span' => array(
+										 'class' => array(),
+									 ),
+								 )
+							 ),
+					the_title( '<span class="screen-reader-text">"', '"</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
-				'after'  => '</div>',
-			) );
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
+					'after'  => '</div>',
+				)
+			);
 			?>
 		</div><!-- .entry-content -->
 	</article><!-- #post-## -->
diff --git a/template-parts/content-grid-wide.php b/template-parts/content-grid-wide.php
index fe78914..08125ca 100644
--- a/template-parts/content-grid-wide.php
+++ b/template-parts/content-grid-wide.php
@@ -61,24 +61,32 @@
 
 				<div class="entry-meta">
 					<?php
-					shapely_posted_on_no_cat(); ?><!-- post-meta -->
+					shapely_posted_on_no_cat();
+					?>
+					<!-- post-meta -->
 				</div>
 
 				<?php
-				the_content( sprintf(
-					/* translators: %s: Name of current post. */
-								 wp_kses( __( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
-									 'span' => array(
-										 'class' => array(),
-									 ),
-								 ) ),
-					the_title( '<span class="screen-reader-text">"', '"</span>', false )
-				) );
+				the_content(
+					sprintf(
+						/* translators: %s: Name of current post. */
+								 wp_kses(
+									 __( 'Read more %s <span class="meta-nav">&rarr;</span>', 'shapely' ), array(
+										 'span' => array(
+											 'class' => array(),
+										 ),
+									 )
+								 ),
+						the_title( '<span class="screen-reader-text">"', '"</span>', false )
+					)
+				);
 
-				wp_link_pages( array(
-					'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
-					'after'  => '</div>',
-				) );
+				wp_link_pages(
+					array(
+						'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
+						'after'  => '</div>',
+					)
+				);
 				?>
 			</div><!-- .entry-content -->
 		</article><!-- #post-## -->
diff --git a/template-parts/content-none.php b/template-parts/content-none.php
index c3cc161..7964c92 100644
--- a/template-parts/content-none.php
+++ b/template-parts/content-none.php
@@ -16,7 +16,8 @@
 
 	<div class="page-content">
 		<?php
-		if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
+		if ( is_home() && current_user_can( 'publish_posts' ) ) :
+		?>
 
 			<p>
 			<?php
@@ -36,12 +37,14 @@
 			<?php
 				get_search_form();
 
-		else : ?>
+		else :
+		?>
 
 			<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'shapely' ); ?></p>
 			<?php
 				get_search_form();
 
-		endif; ?>
+		endif;
+		?>
 	</div><!-- .page-content -->
 </section><!-- .no-results -->
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index fbe6163..787ce03 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -2,7 +2,8 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php
-		if ( has_post_thumbnail() ) { ?>
+		if ( has_post_thumbnail() ) {
+		?>
 			<a class="text-center" href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
 			<?php
 				$thumbnail_args = array(
@@ -37,10 +38,10 @@
 		<hr/>
 		<div class="shapely-next-prev row">
 			<div class="col-md-6 text-left">
-				<?php echo wp_kses_post( $prev ) ?>
+				<?php echo wp_kses_post( $prev ); ?>
 			</div>
 			<div class="col-md-6 text-right">
-				<?php echo wp_kses_post( $next ) ?>
+				<?php echo wp_kses_post( $next ); ?>
 			</div>
 		</div>
 	<?php endif; ?>
diff --git a/template-parts/content-portfolio.php b/template-parts/content-portfolio.php
new file mode 100644
index 0000000..ce69d27
--- /dev/null
+++ b/template-parts/content-portfolio.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Template part for displaying posts.
+ *
+ * @link    https://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package Shapely
+ */
+
+$dropcaps    = get_theme_mod( 'project_first_letter_caps', true );
+$enable_tags = get_theme_mod( 'project_tags_post_meta', true );
+$post_author = get_theme_mod( 'project_author_area', true );
+$left_side   = get_theme_mod( 'project_author_left_side', false );
+$post_title  = get_theme_mod( 'title_above_project', true );
+$post_category  = get_theme_mod( 'project_category', true );
+
+?>
+<article id="post-<?php the_ID(); ?>" <?php post_class( 'post-content post-grid-wide' ); ?>>
+	<header class="entry-header nolist">
+		<?php
+		$category = get_the_terms( get_the_ID(), 'jetpack-portfolio-type' );
+		if ( has_post_thumbnail() ) {
+			$layout = shapely_get_layout_class();
+			$size   = 'shapely-featured';
+
+			if ( 'full-width' == $layout ) {
+				$size = 'shapely-full';
+			}
+			$image = get_the_post_thumbnail( get_the_ID(), $size );
+
+			$allowed_tags = array(
+				'img'      => array(
+					'data-srcset' => true,
+					'data-src'    => true,
+					'srcset'      => true,
+					'sizes'       => true,
+					'src'         => true,
+					'class'       => true,
+					'alt'         => true,
+					'width'       => true,
+					'height'      => true,
+				),
+				'noscript' => array(),
+			);
+		?>
+		<a href="<?php echo esc_url( get_the_permalink() ); ?>">
+			<?php echo wp_kses( $image, $allowed_tags ); ?>
+		</a>
+
+		<?php if ( isset( $category[0] ) && $post_category ) : ?>
+			<span class="shapely-category">
+				<a href="<?php echo esc_url( get_category_link( $category[0]->term_id ) ); ?>">
+					<?php echo esc_html( $category[0]->name ); ?>
+				</a>
+			</span>
+		<?php endif; ?>
+		<?php
+		}// End if().
+	?>
+	</header><!-- .entry-header -->
+	<div class="entry-content">
+		<?php if ( $post_title ) : ?>
+			<h2 class="post-title">
+				<a href="<?php echo esc_url( get_the_permalink() ); ?>"><?php echo wp_trim_words( get_the_title(), 9 ); ?></a>
+			</h2>
+		<?php endif ?>
+		
+
+		<div class="entry-meta">
+			<?php
+			shapely_posted_on_no_cat();
+			?>
+			<!-- post-meta -->
+		</div>
+
+		<?php if ( $post_author && $left_side ) : ?>
+			<div class="row">
+				<div class="col-md-3 col-xs-12 author-bio-left-side">
+					<?php
+					shapely_author_bio();
+					?>
+				</div>
+				<div class="col-md-9 col-xs-12 shapely-content <?php echo $dropcaps ? 'dropcaps-content' : ''; ?>">
+					<?php
+					the_content();
+
+					wp_link_pages(
+						array(
+							'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
+							'after'  => '</div>',
+						)
+					);
+					?>
+				</div>
+			</div>
+		<?php else : ?>
+			<div class="shapely-content <?php echo $dropcaps ? 'dropcaps-content' : ''; ?>">
+				<?php
+				the_content();
+
+				wp_link_pages(
+					array(
+						'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
+						'after'  => '</div>',
+					)
+				);
+				?>
+			</div>
+		<?php endif; ?>
+	</div><!-- .entry-content -->
+
+	<?php
+	$prev = get_previous_post_link();
+	$prev = str_replace( '&laquo;', '<div class="wrapper"><span class="fa fa-angle-left"></span>', $prev );
+	$prev = str_replace( '</a>', '</a></div>', $prev );
+	$next = get_next_post_link();
+	$next = str_replace( '&raquo;', '<span class="fa fa-angle-right"></span></div>', $next );
+	$next = str_replace( '<a', '<div class="wrapper"><a', $next );
+	?>
+	<div class="shapely-next-prev row">
+		<div class="col-md-6 text-left">
+			<?php echo wp_kses_post( $prev ); ?>
+		</div>
+		<div class="col-md-6 text-right">
+			<?php echo wp_kses_post( $next ); ?>
+		</div>
+	</div>
+
+	<?php
+	if ( $post_author && ! $left_side ) :
+		shapely_author_bio();
+	endif;
+
+	if ( $enable_tags ) :
+		$tags_list = get_the_term_list( get_the_ID(), 'jetpack-portfolio-tag', '', ' ' );
+		echo ! empty( $tags_list ) ? '<div class="shapely-tags"><span class="fa fa-tags"></span>' . $tags_list . '</div>' : '';
+	endif;
+	?>
+
+	<?php do_action( 'shapely_single_after_article' ); ?>
+</article>
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index e8faa0a..9456413 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -50,7 +50,9 @@
 
 			<div class="entry-meta">
 				<?php
-				shapely_posted_on_no_cat(); ?><!-- post-meta -->
+				shapely_posted_on_no_cat();
+				?>
+				<!-- post-meta -->
 			</div>
 
 			<?php the_excerpt(); ?>
diff --git a/template-parts/content.php b/template-parts/content.php
index 2f85440..0cd8640 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -54,11 +54,12 @@
 				</a>
 			</span>
 		<?php endif; ?>
-		<?php }// End if().
+		<?php
+		}// End if().
 	?>
 	</header><!-- .entry-header -->
 	<div class="entry-content">
-		<?php if ( $post_title ): ?>
+		<?php if ( $post_title ) : ?>
 			<h2 class="post-title">
 				<a href="<?php echo esc_url( get_the_permalink() ); ?>"><?php echo wp_trim_words( get_the_title(), 9 ); ?></a>
 			</h2>
@@ -67,7 +68,9 @@
 
 		<div class="entry-meta">
 			<?php
-			shapely_posted_on_no_cat(); ?><!-- post-meta -->
+			shapely_posted_on_no_cat();
+			?>
+			<!-- post-meta -->
 		</div>
 
 		<?php if ( $post_author && $left_side ) : ?>
@@ -81,10 +84,12 @@
 					<?php
 					the_content();
 
-					wp_link_pages( array(
-						'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
-						'after'  => '</div>',
-					) );
+					wp_link_pages(
+						array(
+							'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
+							'after'  => '</div>',
+						)
+					);
 					?>
 				</div>
 			</div>
@@ -93,10 +98,12 @@
 				<?php
 				the_content();
 
-				wp_link_pages( array(
-					'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
-					'after'  => '</div>',
-				) );
+				wp_link_pages(
+					array(
+						'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'shapely' ),
+						'after'  => '</div>',
+					)
+				);
 				?>
 			</div>
 		<?php endif; ?>
@@ -113,10 +120,10 @@
 		?>
 		<div class="shapely-next-prev row">
 			<div class="col-md-6 text-left">
-				<?php echo wp_kses_post( $prev ) ?>
+				<?php echo wp_kses_post( $prev ); ?>
 			</div>
 			<div class="col-md-6 text-right">
-				<?php echo wp_kses_post( $next ) ?>
+				<?php echo wp_kses_post( $next ); ?>
 			</div>
 		</div>
 
diff --git a/template-parts/layouts/blog-grid.php b/template-parts/layouts/blog-grid.php
index 07e6c88..7bb249b 100644
--- a/template-parts/layouts/blog-grid.php
+++ b/template-parts/layouts/blog-grid.php
@@ -4,7 +4,8 @@
 	<div class="row">
 		<?php
 		global $wp_query;
-		while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 			$i = $wp_query->current_post + 1;
 			/*
 			 * Include the Post-Format-specific template for the content.
diff --git a/template-parts/layouts/blog-large-image-grid.php b/template-parts/layouts/blog-large-image-grid.php
index 8c23b06..cb7be28 100644
--- a/template-parts/layouts/blog-large-image-grid.php
+++ b/template-parts/layouts/blog-large-image-grid.php
@@ -2,7 +2,8 @@
 /* Start the Loop */
 
 global $wp_query;
-while ( have_posts() ) : the_post();
+while ( have_posts() ) :
+	the_post();
 	/*
 	 * Include the Post-Format-specific template for the content.
 	 * If you want to override this in a child theme, then include a file
diff --git a/template-parts/layouts/blog-large-image.php b/template-parts/layouts/blog-large-image.php
index ec478b5..e26ccba 100644
--- a/template-parts/layouts/blog-large-image.php
+++ b/template-parts/layouts/blog-large-image.php
@@ -2,7 +2,8 @@
 /* Start the Loop */
 
 global $wp_query;
-while ( have_posts() ) : the_post();
+while ( have_posts() ) :
+	the_post();
 	/*
 	 * Include the Post-Format-specific template for the content.
 	 * If you want to override this in a child theme, then include a file
diff --git a/woocommerce/product-searchform.php b/woocommerce/product-searchform.php
index 85e16b4..5ba8034 100644
--- a/woocommerce/product-searchform.php
+++ b/woocommerce/product-searchform.php
@@ -24,6 +24,6 @@
 <form role="search" method="get" class="woocommerce-product-search" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label class="screen-reader-text" for="woocommerce-product-search-field-<?php echo isset( $index ) ? absint( $index ) : 0; ?>"><?php _e( 'Search for:', 'shapely' ); ?></label>
 	<input type="text" id="woocommerce-product-search-field-<?php echo isset( $index ) ? absint( $index ) : 0; ?>" class="search-field" placeholder="<?php echo esc_attr__( 'Search products&hellip;', 'shapely' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
-	<button type="submit" class="searchsubmit"><i class="fa fa-search" aria-hidden="true"></i><span class="screen-reader-text"><?php echo esc_attr__( 'Search', 'shapely' ) ?></span></button>
+	<button type="submit" class="searchsubmit"><i class="fa fa-search" aria-hidden="true"></i><span class="screen-reader-text"><?php echo esc_attr__( 'Search', 'shapely' ); ?></span></button>
 	<input type="hidden" name="post_type" value="product" />
 </form>