diff --git a/404.php b/404.php
index 6e821466..fd28b7ca 100755
--- a/404.php
+++ b/404.php
@@ -6,7 +6,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#404-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 get_header(); ?>
diff --git a/archive.php b/archive.php
index 2296c481..8547302f 100755
--- a/archive.php
+++ b/archive.php
@@ -12,7 +12,7 @@
  * @link https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 get_header(); ?>
 
diff --git a/comments.php b/comments.php
index 820f4c75..4acdbb40 100755
--- a/comments.php
+++ b/comments.php
@@ -8,7 +8,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#comments-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 /*
diff --git a/content-none.php b/content-none.php
index 7a8d624c..4320a7e3 100755
--- a/content-none.php
+++ b/content-none.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#content-slug-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 ?>
 
diff --git a/content-page.php b/content-page.php
index d517840c..8795ca56 100755
--- a/content-page.php
+++ b/content-page.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#content-slug-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 ?>
 
diff --git a/content-search.php b/content-search.php
index 131bd05a..84783bc1 100755
--- a/content-search.php
+++ b/content-search.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#content-slug-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 ?>
 
diff --git a/content.php b/content.php
index f80ae4ba..7c9840cd 100755
--- a/content.php
+++ b/content.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#content-slug-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 ?>
 
diff --git a/footer.php b/footer.php
index a660ea32..342de5b1 100755
--- a/footer.php
+++ b/footer.php
@@ -7,7 +7,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#footer-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 ?>
 
diff --git a/functions.php b/functions.php
index 7ecd7e3f..a272bb6d 100755
--- a/functions.php
+++ b/functions.php
@@ -45,7 +45,7 @@
  */
 if ( version_compare( get_bloginfo( 'version' ), PRIMER_MIN_WP_VERSION, '<' ) ) {
 
-	require_once get_template_directory() . '/inc/back-compat.php';
+	require_once get_template_directory() . '/inc/compat/wordpress.php';
 
 }
 
@@ -78,25 +78,44 @@
 require_once get_template_directory() . '/inc/hooks.php';
 
 /**
- * Load Customizer class.
+ * Load Beaver Builder compatibility file.
  *
  * @since 1.0.0
  */
-require_once get_template_directory() . '/inc/customizer.php';
+if ( class_exists( 'FLBuilder' ) ) {
+
+	require_once get_template_directory() . '/inc/compat/beaver-builder.php';
+
+}
+
+/**
+ * Load Jetpack compatibility file.
+ *
+ * @since 1.0.0
+ */
+if ( class_exists( 'Jetpack' ) ) {
+
+	require_once get_template_directory() . '/inc/compat/jetpack.php';
+
+}
 
 /**
  * Load WooCommerce compatibility file.
  *
  * @since 1.0.0
  */
-require_once get_template_directory() . '/inc/woocommerce.php';
+if ( class_exists( 'WooCommerce' ) ) {
+
+	require_once get_template_directory() . '/inc/compat/woocommerce.php';
+
+}
 
 /**
- * Load Jetpack compatibility file.
+ * Load Customizer class (must be required last).
  *
  * @since 1.0.0
  */
-require_once get_template_directory() . '/inc/jetpack.php';
+require_once get_template_directory() . '/inc/customizer.php';
 
 /**
  * Sets up theme defaults and registers support for various WordPress features.
diff --git a/header.php b/header.php
index 9910fd44..a04d1875 100755
--- a/header.php
+++ b/header.php
@@ -5,7 +5,7 @@
  * Displays all of the head element and everything up until the "site-content" div.
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 ?><!DOCTYPE html>
diff --git a/inc/compat/beaver-builder.php b/inc/compat/beaver-builder.php
new file mode 100644
index 00000000..c661e41d
--- /dev/null
+++ b/inc/compat/beaver-builder.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Beaver Builder compatibility.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
+
+/**
+ * Use full-width layout by default on Page Builder posts.
+ *
+ * @action add_post_meta
+ * @global Primer_Customizer_Layouts $primer_customizer_layouts
+ * @since  1.0.0
+ *
+ * @param int    $post_id
+ * @param string $meta_key
+ * @param mixed  $meta_value
+ */
+function primer_bb_layout( $post_id, $meta_key, $meta_value ) {
+
+	if ( '_fl_builder_draft' === $meta_key ) {
+
+		global $primer_customizer_layouts;
+
+		if ( isset( $primer_customizer_layouts->layouts['one-column-wide'] ) ) {
+
+			update_post_meta( $post_id, 'primer_layout', 'one-column-wide' );
+
+		}
+
+	}
+
+}
+add_action( 'add_post_meta', 'primer_bb_layout', 10, 3 );
+
+/**
+ * Add color scheme targets for Beaver Builder elements.
+ *
+ * @filter primer_colors
+ * @since  1.0.0
+ *
+ * @param  array $colors
+ *
+ * @return array
+ */
+function primer_bb_colors( $colors ) {
+
+	$bb_colors = array(
+		'primary_text_color' => array(
+			'css' => array(
+				'.fl-callout-text,
+				.fl-rich-text' => array(
+					'color' => '%1$s',
+				),
+			),
+		),
+		'button_color' => array(
+			'css' => array(
+				'a.fl-button,
+				a.fl-button:visited,
+				.content-area .fl-builder-content a.fl-button,
+				.content-area .fl-builder-content a.fl-button:visited' => array(
+					'background-color' => '%1$s',
+					'border-color'     => '%1$s',
+				),
+			),
+			'rgba_css' => array(
+				'a.fl-button:hover,
+				a.fl-button:active,
+				a.fl-button:focus,
+				a.fl-button:visited:hover,
+				a.fl-button:visited:active,
+				a.fl-button:visited:focus,
+				.content-area .fl-builder-content a.fl-button:hover,
+				.content-area .fl-builder-content a.fl-button:active,
+				.content-area .fl-builder-content a.fl-button:focus,
+				.content-area .fl-builder-content a.fl-button:visited:hover,
+				.content-area .fl-builder-content a.fl-button:visited:active,
+				.content-area .fl-builder-content a.fl-button:visited:focus' => array(
+					'background-color' => 'rgba(%1$s, 0.8)',
+					'border-color'     => 'rgba(%1$s, 0.8)',
+				),
+			),
+		),
+		'button_text_color' => array(
+			'css' => array(
+				'a.fl-button
+				a.fl-button:hover,
+				a.fl-button:active,
+				a.fl-button:focus,
+				a.fl-button:visited,
+				a.fl-button:visited:hover,
+				a.fl-button:visited:active,
+				a.fl-button:visited:focus,
+				.content-area .fl-builder-content a.fl-button,
+				.content-area .fl-builder-content a.fl-button *,
+				.content-area .fl-builder-content a.fl-button:visited,
+				.content-area .fl-builder-content a.fl-button:visited *' => array(
+					'color' => '%1$s',
+				),
+			),
+		),
+	);
+
+	return primer_array_replace_recursive( $colors, $bb_colors );
+
+}
+add_filter( 'primer_colors', 'primer_bb_colors' );
diff --git a/inc/jetpack.php b/inc/compat/jetpack.php
similarity index 96%
rename from inc/jetpack.php
rename to inc/compat/jetpack.php
index 33d21114..c5e22243 100755
--- a/inc/jetpack.php
+++ b/inc/compat/jetpack.php
@@ -3,6 +3,7 @@
  * Jetpack compatibility.
  *
  * @package Primer
+ * @since   1.0.0
  */
 
 /**
diff --git a/inc/compat/woocommerce.php b/inc/compat/woocommerce.php
new file mode 100644
index 00000000..94c3cfda
--- /dev/null
+++ b/inc/compat/woocommerce.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * WooCommerce compatibility.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
+
+/**
+ * Enable support for WooCommerce.
+ *
+ * @action after_setup_theme
+ * @link   https://docs.woothemes.com/document/third-party-custom-theme-compatibility/
+ * @since  1.0.0
+ */
+function primer_wc_setup() {
+
+	add_theme_support( 'woocommerce' );
+
+}
+add_action( 'after_setup_theme', 'primer_wc_setup' );
+
+/**
+ * Remove the default WooCommerce page wrapper.
+ *
+ * @since 1.0.0
+ */
+remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper' );
+remove_action( 'woocommerce_after_main_content',  'woocommerce_output_content_wrapper_end' );
+
+/**
+ * Markup for page wrapper start.
+ *
+ * @action woocommerce_before_main_content
+ * @since  1.0.0
+ */
+function primer_wc_wrapper_start() {
+
+	?>
+	<div id="primary" class="content-area">
+
+		<main id="main" class="site-main" role="main">
+
+			<article class="primer-woocommerce hentry">
+	<?php
+
+}
+add_action( 'woocommerce_before_main_content', 'primer_wc_wrapper_start' );
+
+/**
+ * Markup for page wrapper end.
+ *
+ * @action woocommerce_after_main_content
+ * @since  1.0.0
+ */
+function primer_wc_wrapper_end() {
+
+	?>
+	</article></main></div>
+	<?php
+
+}
+add_action( 'woocommerce_after_main_content', 'primer_wc_wrapper_end' );
+
+/**
+ * Add tertiary sidebar to WooCommerce templates.
+ *
+ * @action woocommerce_sidebar
+ * @since  1.0.0
+ */
+function primer_wc_sidebar() {
+
+	get_sidebar( 'tertiary' );
+
+}
+add_action( 'woocommerce_sidebar', 'primer_wc_sidebar' );
+
+/**
+ * Display WooCommerce messages above post and page content.
+ *
+ * @action primer_before_post_content
+ * @action primer_before_page_content
+ * @since  1.0.0
+ */
+function primer_wc_shop_messages() {
+
+	if ( function_exists( 'is_checkout' ) && ! is_checkout() ) {
+
+		echo wp_kses_post( do_shortcode( '[woocommerce_messages]' ) );
+
+	}
+
+}
+add_action( 'primer_before_post_content', 'primer_wc_shop_messages' );
+add_action( 'primer_before_page_content', 'primer_wc_shop_messages' );
+
+/**
+ * Filter the layout for the WooCommerce shop page.
+ *
+ * @filter theme_mod_layout
+ * @since  1.0.0
+ *
+ * @param  string $layout
+ *
+ * @return string
+ */
+function primer_wc_shop_layout( $layout ) {
+
+	if ( is_shop() ) {
+
+		remove_filter( 'primer_current_layout', __FUNCTION__ ); // Prevent infinite loop
+
+		$layout = primer_get_layout( wc_get_page_id( 'shop' ) );
+
+	}
+
+	return $layout;
+
+}
+add_filter( 'primer_current_layout', 'primer_wc_shop_layout' );
+
+/**
+ * Filter the WooCommerce shop page title.
+ *
+ * @filter primer_the_page_title
+ * @since  1.0.0
+ *
+ * @param  string $title
+ *
+ * @return string
+ */
+function primer_wc_shop_title( $title ) {
+
+	if ( is_shop() ) {
+
+		add_filter( 'woocommerce_page_title', '__return_null' );
+
+		$title = get_the_title( wc_get_page_id( 'shop' ) );
+
+	}
+
+	return $title;
+
+}
+add_filter( 'primer_the_page_title', 'primer_wc_shop_title' );
+
+/**
+ * Filter the number of WooCommerce shop columns
+ *
+ * @filter loop_shop_columns
+ * @filter woocommerce_related_products_columns
+ * @filter woocommerce_upsells_products_columns
+ * @since 1.0.0
+ *
+ * @param  int $columns
+ *
+ * @return int
+ */
+function primer_wc_shop_columns( $columns ) {
+
+	if ( is_shop() && 0 === strpos( primer_get_layout(), 'three-column-' ) ) {
+
+		add_filter( 'post_class', 'primer_wc_product_classes' );
+
+		$columns = 2;
+
+	}
+
+	return $columns;
+
+}
+add_filter( 'loop_shop_columns',                    'primer_wc_shop_columns' );
+add_filter( 'woocommerce_related_products_columns', 'primer_wc_shop_columns' );
+add_filter( 'woocommerce_upsells_products_columns', 'primer_wc_shop_columns' );
+
+/**
+ * Filter the WooCommerce product class.
+ *
+ * @filter primer_wc_product_classes
+ * @global WP_Post $post
+ * @global array   $woocommerce_loop
+ *
+ * @param  array $classes
+ *
+ * @return array
+ *
+ * @since 1.0.0
+ */
+function primer_wc_product_classes( $classes ) {
+
+	global $post, $woocommerce_loop;
+
+	/**
+	 * Check if on the WooCommerce shop page, and the post type is 'product'
+	 *
+	 * @var bool
+	 */
+	$is_product = ( is_shop() && 'product' === $post->post_type );
+
+	/**
+	 * Check if on single product page, in upsell or related product loop
+	 * and the post type is 'product'
+	 *
+	 * @var bool
+	 */
+	$is_upsell_or_related = (
+		is_single()
+		&&
+		isset( $woocommerce_loop['name'] )
+		&&
+		'product' === $post->post_type
+		&&
+		( 'related' === $woocommerce_loop['name'] || 'up-sells' === $woocommerce_loop['name'] )
+	);
+
+	if ( $is_product ||  $is_upsell_or_related ) {
+
+		$classes[] = 'primer-2-column-product';
+
+	}
+
+	return $classes;
+
+}
+
+/**
+ * Add color scheme targets for WooCommerce elements.
+ *
+ * @filter primer_colors
+ * @since  1.0.0
+ *
+ * @param  array $colors
+ *
+ * @return array
+ */
+function primer_wc_colors( $colors ) {
+
+	$wc_colors = array(
+		'button_color' => array(
+			'css' => array(
+				'.woocommerce button.button.alt,
+				.woocommerce a.button,
+				.woocommerce a.button.alt,
+				.woocommerce #respond input#submit,
+				.woocommerce .product span.onsale' => array(
+					'background-color' => '%1$s',
+					'border-color'     => '%1$s',
+				),
+			),
+			'rgba_css' => array(
+				'.woocommerce button.button.alt:hover, .woocommerce button.button.alt:active, .woocommerce button.button.alt:focus,
+				.woocommerce a.button:hover, .woocommerce a.button:active, .woocommerce a.button:focus,
+				.woocommerce a.button.alt:hover, .woocommerce a.button.alt:active, .woocommerce a.button.alt:focus,
+				.woocommerce #respond input#submit:hover' => array(
+					'background-color' => 'rgba(%1$s, 0.8)',
+					'border-color'     => 'rgba(%1$s, 0.8)',
+				),
+			),
+		),
+		'button_text_color' => array(
+			'css' => array(
+				'.woocommerce button.button.alt, .woocommerce button.button.alt:hover,
+				.woocommerce a.button, .woocommerce a.button:visited, .woocommerce a.button:hover, .woocommerce a.button:visited:hover,
+				.woocommerce a.button.alt, .woocommerce a.button.alt:visited, .woocommerce a.button.alt:hover, .woocommerce a.button.alt:visited:hover,
+				.woocommerce #respond input#submit, .woocommerce #respond input#submit:hover,
+				.woocommerce .product span.onsale' => array(
+					'color' => '%1$s',
+				),
+			),
+		),
+	);
+
+	return primer_array_replace_recursive( $colors, $wc_colors );
+
+}
+add_filter( 'primer_colors', 'primer_wc_colors' );
diff --git a/inc/back-compat.php b/inc/compat/wordpress.php
similarity index 92%
rename from inc/back-compat.php
rename to inc/compat/wordpress.php
index ce8c2ee6..71988671 100644
--- a/inc/back-compat.php
+++ b/inc/compat/wordpress.php
@@ -11,9 +11,7 @@
  */
 
 /**
- * Prevent switching to Primer on old versions of WordPress.
- *
- * Switches to the default theme.
+ * Switch to the default theme immediately.
  *
  * @since 1.0.0
  */
@@ -26,7 +24,7 @@ function primer_switch_theme() {
 	add_action( 'admin_notices', 'primer_upgrade_notice' );
 
 }
-add_action( 'after_switch_theme', 'primer_switch_theme' );
+add_action( 'after_setup_theme', 'primer_switch_theme', 1 );
 
 /**
  * Return the required WordPress version upgrade message.
diff --git a/inc/wpcom.php b/inc/compat/wpcom.php
similarity index 97%
rename from inc/wpcom.php
rename to inc/compat/wpcom.php
index d8d52b3f..70b2cbdd 100755
--- a/inc/wpcom.php
+++ b/inc/compat/wpcom.php
@@ -5,6 +5,7 @@
  * This file is centrally included from `wp-content/mu-plugins/wpcom-theme-compat.php`.
  *
  * @package Primer
+ * @since   1.0.0
  */
 
 /**
diff --git a/inc/customizer.php b/inc/customizer.php
index 5f102643..100aa216 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Customizer bootstrap.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
 
 class Primer_Customizer {
 
diff --git a/inc/customizer/colors.php b/inc/customizer/colors.php
index 463bcba6..75cabde7 100644
--- a/inc/customizer/colors.php
+++ b/inc/customizer/colors.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Customizer Colors functionality.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
 
 class Primer_Customizer_Colors {
 
@@ -164,9 +170,7 @@ public function __construct() {
 						input[type="datetime"]:focus,
 						input[type="datetime-local"]:focus,
 						input[type="color"]:focus,
-						textarea:focus,
-						.fl-callout-text,
-						.fl-rich-text' => array(
+						textarea:focus' => array(
 							'color' => '%1$s',
 						),
 					),
@@ -295,15 +299,9 @@ public function __construct() {
 					'css'     => array(
 						'button,
 						a.button, a.button:visited,
-						.content-area .fl-builder-content a.fl-button, .content-area .fl-builder-content a.fl-button:visited,
 						input[type="button"],
 						input[type="reset"],
-						input[type="submit"],
-						.woocommerce button.button.alt,
-						.woocommerce a.button,
-						.woocommerce a.button.alt,
-						.woocommerce #respond input#submit,
-						.woocommerce .product span.onsale' => array(
+						input[type="submit"]' => array(
 							'background-color' => '%1$s',
 							'border-color'     => '%1$s',
 						),
@@ -311,14 +309,9 @@ public function __construct() {
 					'rgba_css' => array(
 						'button:hover, button:active, button:focus,
 						a.button:hover, a.button:active, a.button:focus, a.button:visited:hover, a.button:visited:active, a.button:visited:focus,
-						.content-area .fl-builder-content a.fl-button:hover, .content-area .fl-builder-content a.fl-button:active, .content-area .fl-builder-content a.fl-button:focus, .content-area .fl-builder-content a.fl-button:visited:hover, .content-area .fl-builder-content a.fl-button:visited:active, .content-area .fl-builder-content a.fl-button:visited:focus,
 						input[type="button"]:hover, input[type="button"]:active, input[type="button"]:focus,
 						input[type="reset"]:hover, input[type="reset"]:active, input[type="reset"]:focus,
-						input[type="submit"]:hover, input[type="submit"]:active, input[type="submit"]:focus,
-						.woocommerce button.button.alt:hover, .woocommerce button.button.alt:active, .woocommerce button.button.alt:focus,
-						.woocommerce a.button:hover, .woocommerce a.button:active, .woocommerce a.button:focus,
-						.woocommerce a.button.alt:hover, .woocommerce a.button.alt:active, .woocommerce a.button.alt:focus,
-						.woocommerce #respond input#submit:hover' => array(
+						input[type="submit"]:hover, input[type="submit"]:active, input[type="submit"]:focus' => array(
 							'background-color' => 'rgba(%1$s, 0.8)',
 							'border-color'     => 'rgba(%1$s, 0.8)',
 						),
@@ -331,15 +324,9 @@ public function __construct() {
 					'css'     => array(
 						'button, button:hover, button:active, button:focus,
 						a.button, a.button:hover, a.button:active, a.button:focus, a.button:visited, a.button:visited:hover, a.button:visited:active, a.button:visited:focus,
-						a.fl-button, .content-area .fl-builder-content a.fl-button, .content-area .fl-builder-content a.fl-button:visited, .content-area .fl-builder-content a.fl-button *, .content-area .fl-builder-content a.fl-button:visited *, a.fl-button:hover, a.fl-button:active, a.fl-button:focus, a.fl-button:visited, a.fl-button:visited:hover, a.fl-button:visited:active, a.fl-button:visited:focus,
 						input[type="button"], input[type="button"]:hover, input[type="button"]:active, input[type="button"]:focus,
 						input[type="reset"], input[type="reset"]:hover, input[type="reset"]:active, input[type="reset"]:focus,
-						input[type="submit"], input[type="submit"]:hover, input[type="submit"]:active, input[type="submit"]:focus,
-						.woocommerce button.button.alt, .woocommerce button.button.alt:hover,
-						.woocommerce a.button, .woocommerce a.button:visited, .woocommerce a.button:hover, .woocommerce a.button:visited:hover,
-						.woocommerce a.button.alt, .woocommerce a.button.alt:visited, .woocommerce a.button.alt:hover, .woocommerce a.button.alt:visited:hover,
-						.woocommerce #respond input#submit, .woocommerce #respond input#submit:hover,
-						.woocommerce .product span.onsale' => array(
+						input[type="submit"], input[type="submit"]:hover, input[type="submit"]:active, input[type="submit"]:focus' => array(
 							'color' => '%1$s',
 						),
 					),
diff --git a/inc/customizer/controls/layouts.php b/inc/customizer/controls/layouts.php
index b20f2aed..a1b70a26 100644
--- a/inc/customizer/controls/layouts.php
+++ b/inc/customizer/controls/layouts.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Customizer Layouts controls.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
 
 class Primer_Customizer_Layouts_Control extends WP_Customize_Control {
 
@@ -68,13 +74,19 @@ protected function render_content() {
 
 		if ( ! empty( $this->label ) ) {
 
-			printf( '<span class="customize-control-title">%s</span>', esc_html( $this->label ) );
+			printf(
+				'<span class="customize-control-title">%s</span>',
+				esc_html( $this->label )
+			);
 
 		}
 
 		if ( ! empty( $this->description ) ) {
 
-			printf( '<span class="description customize-control-description">%s</span>', esc_html( $this->description ) );
+			printf(
+				'<span class="description customize-control-description">%s</span>',
+				esc_html( $this->description )
+			);
 
 		}
 
diff --git a/inc/customizer/fonts.php b/inc/customizer/fonts.php
index 2cdb1d93..f75f7007 100644
--- a/inc/customizer/fonts.php
+++ b/inc/customizer/fonts.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Customizer Fonts functionality.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
 
 class Primer_Customizer_Fonts {
 
diff --git a/inc/customizer/layouts.php b/inc/customizer/layouts.php
index fc1e8df2..4b535bd7 100644
--- a/inc/customizer/layouts.php
+++ b/inc/customizer/layouts.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Customizer Layouts functionality.
+ *
+ * @package Primer
+ * @since   1.0.0
+ */
 
 class Primer_Customizer_Layouts {
 
@@ -98,7 +104,6 @@ public function __construct() {
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 		add_action( 'customize_register',    array( $this, 'customize_register' ) );
-		add_action( 'add_post_meta',         array( $this, 'page_builder_layout' ), 10, 3 );
 
 		if ( $this->meta_box ) {
 
@@ -502,26 +507,6 @@ public function customize_register( WP_Customize_Manager $wp_customize ) {
 
 	}
 
-	/**
-	 * Use full-width layout by default on Page Builder posts.
-	 *
-	 * @action add_post_meta
-	 * @since  1.0.0
-	 *
-	 * @param int    $post_id
-	 * @param string $meta_key
-	 * @param mixed  $meta_value
-	 */
-	public function page_builder_layout( $post_id, $meta_key, $meta_value ) {
-
-		if ( '_fl_builder_draft' === $meta_key && isset( $this->layouts['one-column-wide'] ) ) {
-
-			update_post_meta( $post_id, 'primer_layout', 'one-column-wide' );
-
-		}
-
-	}
-
 	/**
 	 * Add layout class to body element on the front-end.
 	 *
@@ -605,6 +590,17 @@ public function get_current_layout( $post = null ) {
 		$override = $this->get_post_layout( $post );
 		$layout   = ( $override ) ? $override : $this->get_global_layout();
 
+		/**
+		 * Filter the current layout.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param WP_Post|int|null $post
+		 *
+		 * @var string
+		 */
+		$layout = (string) apply_filters( 'primer_current_layout', $layout, $post );
+
 		return $this->layout_exists( $layout ) ? $layout : $this->default;
 
 	}
diff --git a/inc/helpers.php b/inc/helpers.php
index 07d05c77..b5abcb6c 100644
--- a/inc/helpers.php
+++ b/inc/helpers.php
@@ -3,6 +3,7 @@
  * Custom helper functions for this theme.
  *
  * @package Primer
+ * @since   1.0.0
  */
 
 /**
@@ -123,7 +124,7 @@ function primer_is_fixed_width() {
 /**
  * Return the current layout.
  *
- * @global string $primer_customizer_layouts
+ * @global Primer_Customizer_Layouts $primer_customizer_layouts
  * @since  1.0.0
  *
  * @param  int $post_id (optional)
@@ -143,8 +144,8 @@ function primer_get_layout( $post_id = null ) {
 /**
  * Return the global layout.
  *
- * @global string $primer_customizer_layouts
- * @since 1.0.0
+ * @global Primer_Customizer_Layouts $primer_customizer_layouts
+ * @since  1.0.0
  *
  * @return string
  */
diff --git a/inc/hooks.php b/inc/hooks.php
index 78196f79..d6061971 100644
--- a/inc/hooks.php
+++ b/inc/hooks.php
@@ -3,6 +3,7 @@
  * Custom actions for this theme.
  *
  * @package Primer
+ * @since   1.0.0
  */
 
 /**
diff --git a/inc/template-tags.php b/inc/template-tags.php
index eff0f9c0..2d1d7bb9 100755
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -3,6 +3,7 @@
  * Custom template tags for this theme.
  *
  * @package Primer
+ * @since   1.0.0
  */
 
 /**
diff --git a/inc/walker-nav-menu.php b/inc/walker-nav-menu.php
index 9e219e87..c9c27b63 100644
--- a/inc/walker-nav-menu.php
+++ b/inc/walker-nav-menu.php
@@ -3,8 +3,9 @@
 /**
  * Custom class that adds some markup before the nav menu.
  *
- * @since 1.0.0
- * @see   primer_add_primary_menu()
+ * @package Primer
+ * @since   1.0.0
+ * @see     primer_add_primary_menu()
  */
 class Primer_Walker_Nav_Menu extends Walker_Nav_Menu {
 
diff --git a/inc/woocommerce.php b/inc/woocommerce.php
deleted file mode 100644
index 0a7aebf6..00000000
--- a/inc/woocommerce.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-/**
- * Enable support for WooCommerce.
- *
- * @action after_setup_theme
- * @link   https://docs.woothemes.com/document/third-party-custom-theme-compatibility/
- * @since  1.0.0
- */
-function primer_woocommerce_setup() {
-
-	add_theme_support( 'woocommerce' );
-
-}
-add_action( 'after_setup_theme', 'primer_woocommerce_setup' );
-
-/**
- * Remove the default WooCommerce page wrapper.
- *
- * @since 1.0.0
- */
-remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper' );
-remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end' );
-
-/**
- * Markup for page wrapper start.
- *
- * @action woocommerce_before_main_content
- * @since  1.0.0
- */
-function primer_woo_wrapper_start() {
-
-	?>
-	<div id="primary" class="content-area">
-
-		<main id="main" class="site-main" role="main">
-
-			<article class="primer-woocommerce hentry">
-	<?php
-
-}
-add_action( 'woocommerce_before_main_content', 'primer_woo_wrapper_start' );
-
-/**
- * Markup for page wrapper end.
- *
- * @action woocommerce_after_main_content
- * @since  1.0.0
- */
-function primer_woo_wrapper_end() {
-
-	?>
-	</article></main></div>
-	<?php
-
-}
-add_action( 'woocommerce_after_main_content', 'primer_woo_wrapper_end' );
-
-/**
- * Add tertiary sidebar to WooCommerce templates.
- *
- * @action woocommerce_sidebar
- * @since  1.0.0
- */
-function primer_woocommerce_sidebar() {
-
-	get_sidebar( 'tertiary' );
-
-}
-add_action( 'woocommerce_sidebar', 'primer_woocommerce_sidebar' );
-
-/**
- * Display WooCommerce messages above post and page content.
- *
- * @action primer_before_post_content
- * @action primer_before_page_content
- * @since  1.0.0
- */
-function primer_woo_shop_messages() {
-
-	if ( function_exists( 'is_checkout' ) && ! is_checkout() ) {
-
-		echo wp_kses_post( do_shortcode( '[woocommerce_messages]' ) );
-
-	}
-
-}
-add_action( 'primer_before_post_content', 'primer_woo_shop_messages' );
-add_action( 'primer_before_page_content', 'primer_woo_shop_messages' );
-
-/**
- * Safely check if the current page is the WooCommerce shop.
- *
- * @since 1.0.0
- *
- * @return bool
- */
-function primer_is_woo_shop() {
-
-	return ( function_exists( 'is_shop' ) && is_shop() );
-
-}
-
-/**
- * Filter the layout for the WooCommerce shop page.
- *
- * @filter theme_mod_layout
- * @since  1.0.0
- *
- * @param  string $layout
- *
- * @return string
- */
-function primer_woo_shop_layout( $layout ) {
-
-	if ( primer_is_woo_shop() && function_exists( 'wc_get_page_id' ) ) {
-
-		remove_filter( 'theme_mod_layout', __FUNCTION__ ); // Prevent infinite loop
-
-		$layout = primer_get_layout( wc_get_page_id( 'shop' ) );
-
-	}
-
-	return $layout;
-
-}
-add_filter( 'theme_mod_layout', 'primer_woo_shop_layout' );
-
-/**
- * Filter the layout for the WooCommerce shop page.
- *
- * @filter primer_layout_has_sidebar
- * @since  1.0.0
- *
- * @param  bool $has_sidebar
- *
- * @return bool
- */
-function primer_woo_shop_layout_has_sidebar( $has_sidebar ) {
-
-	if ( primer_is_woo_shop() && function_exists( 'wc_get_page_id' ) ) {
-
-		remove_filter( 'primer_layout_has_sidebar', __FUNCTION__ ); // Prevent infinite loop
-
-		$has_sidebar = primer_layout_has_sidebar( primer_get_layout( wc_get_page_id( 'shop' ) ) );
-
-	}
-
-	return $has_sidebar;
-
-}
-add_filter( 'primer_layout_has_sidebar', 'primer_woo_shop_layout_has_sidebar' );
-
-/**
- * Filter the WooCommerce shop page title.
- *
- * @filter primer_the_page_title
- * @since  1.0.0
- *
- * @param  string $title
- *
- * @return string
- */
-function primer_woo_shop_title( $title ) {
-
-	if ( primer_is_woo_shop() && function_exists( 'wc_get_page_id' ) ) {
-
-		$title = get_the_title( wc_get_page_id( 'shop' ) );
-
-		add_filter( 'woocommerce_page_title', '__return_null' );
-
-	}
-
-	return $title;
-
-}
-add_filter( 'primer_the_page_title', 'primer_woo_shop_title' );
-
-/**
- * Filter the number of WooCommerce shop columns
- *
- * @filter loop_shop_columns
- * @filter woocommerce_related_products_columns
- * @filter woocommerce_upsells_products_columns
- * @since 1.0.0
- *
- * @param  int $columns
- *
- * @return int
- */
-function primer_woo_shop_columns( $columns ) {
-
-	// If the layout is not a three-column layout, return number of columns
-	if ( strpos( primer_woo_shop_layout( primer_get_layout() ), 'three-column-' ) === false ) {
-
-		return $columns;
-
-	}
-
-	// Add the 2 column layout class
-	add_filter( 'post_class', 'primer_woo_product_classes' );
-
-	return 2;
-
-}
-add_filter( 'loop_shop_columns',                    'primer_woo_shop_columns' );
-add_filter( 'woocommerce_related_products_columns', 'primer_woo_shop_columns' );
-add_filter( 'woocommerce_upsells_products_columns', 'primer_woo_shop_columns' );
-
-/**
- * Filter the WooCommerce product class.
- *
- * @filter primer_woo_product_classes
- * @global WP_Post $post
- * @global array   $woocommerce_loop
- *
- * @param  array $classes
- *
- * @return array
- *
- * @since 1.0.0
- */
-function primer_woo_product_classes( $classes ) {
-
-	global $post, $woocommerce_loop;
-
-	/**
-	 * Check if on the WooCommerce shop page, and the post type is 'product'
-	 *
-	 * @var boolean
-	 */
-	$is_woo_shop_product = ( primer_is_woo_shop() && 'product' === $post->post_type ) ? true : false;
-
-	/**
-	 * Check if on single product page, in upsell or related product loop
-	 * and the post type is 'product'
-	 *
-	 * @var boolean
-	 */
-
-	$is_upsell_or_related_product = ( is_single() && isset( $woocommerce_loop['name'] ) && ( 'related' === $woocommerce_loop['name'] || 'up-sells' === $woocommerce_loop['name'] ) && 'product' === $post->post_type ) ? true : false;
-
-	// Main WooCommerce shop loop products
-	if ( $is_woo_shop_product ||  $is_upsell_or_related_product ) {
-
-		$classes[] = 'primer-2-column-product';
-
-	}
-
-	return $classes;
-
-}
diff --git a/index.php b/index.php
index e62f523c..bfb41708 100755
--- a/index.php
+++ b/index.php
@@ -10,7 +10,7 @@
  * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 get_header(); ?>
diff --git a/page.php b/page.php
index 8df10999..5a2c3541 100755
--- a/page.php
+++ b/page.php
@@ -10,7 +10,7 @@
  * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 get_header(); ?>
diff --git a/search.php b/search.php
index c68bfb8b..bae44cd5 100755
--- a/search.php
+++ b/search.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/basics/template-hierarchy/#search-result
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 get_header(); ?>
diff --git a/sidebar-tertiary.php b/sidebar-tertiary.php
index e5509559..ce664a28 100755
--- a/sidebar-tertiary.php
+++ b/sidebar-tertiary.php
@@ -5,16 +5,10 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#sidebar-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
-$layouts = array(
-	'three-column-default',
-	'three-column-center',
-	'three-column-reversed',
-);
-
-if ( ! primer_layout_has_sidebar() || ! is_active_sidebar( 'sidebar-2' ) || ! in_array( primer_get_layout(), $layouts ) ) {
+if ( ! primer_layout_has_sidebar() || ! is_active_sidebar( 'sidebar-2' ) || 0 === strpos( primer_get_layout(), 'three-column-' ) ) {
 
 	return;
 
diff --git a/sidebar.php b/sidebar.php
index 2e925df2..61638065 100755
--- a/sidebar.php
+++ b/sidebar.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/template-files-section/partial-and-miscellaneous-template-files/#sidebar-php
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 if ( ! primer_layout_has_sidebar() || ! is_active_sidebar( 'sidebar-1' ) ) {
diff --git a/single.php b/single.php
index 93538755..c9dca5f3 100755
--- a/single.php
+++ b/single.php
@@ -5,7 +5,7 @@
  * @link https://developer.wordpress.org/themes/basics/template-hierarchy/#single-post
  *
  * @package Primer
- * @since 1.0.0
+ * @since   1.0.0
  */
 
 get_header(); ?>
diff --git a/templates/parts/credit.php b/templates/parts/credit.php
index 9646e36d..cdf2da44 100644
--- a/templates/parts/credit.php
+++ b/templates/parts/credit.php
@@ -3,6 +3,7 @@
  * Displays site credit.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/footer-navigation.php b/templates/parts/footer-navigation.php
index a8737298..47dcb593 100644
--- a/templates/parts/footer-navigation.php
+++ b/templates/parts/footer-navigation.php
@@ -3,6 +3,7 @@
  * Displays the footer navigation.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/footer-widgets.php b/templates/parts/footer-widgets.php
index b6ef9602..b06d6f59 100755
--- a/templates/parts/footer-widgets.php
+++ b/templates/parts/footer-widgets.php
@@ -3,6 +3,7 @@
  * Displays the footer widget areas.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/hero.php b/templates/parts/hero.php
index efea589f..a48f1a43 100644
--- a/templates/parts/hero.php
+++ b/templates/parts/hero.php
@@ -3,6 +3,7 @@
  * Displays the site header.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/page-content.php b/templates/parts/loop/page-content.php
index b3654dc7..e61da459 100755
--- a/templates/parts/loop/page-content.php
+++ b/templates/parts/loop/page-content.php
@@ -3,6 +3,7 @@
  * Template part for displaying the page content inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/page-footer.php b/templates/parts/loop/page-footer.php
index 7e2ee6cd..513462d0 100755
--- a/templates/parts/loop/page-footer.php
+++ b/templates/parts/loop/page-footer.php
@@ -3,6 +3,7 @@
  * Template part for displaying the page footer inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 
 edit_post_link( esc_html__( 'Edit', 'primer' ), '<span class="edit-link">', '</span>' );
diff --git a/templates/parts/loop/post-content.php b/templates/parts/loop/post-content.php
index 3dff0f05..540adb9e 100755
--- a/templates/parts/loop/post-content.php
+++ b/templates/parts/loop/post-content.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post content inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/post-excerpt.php b/templates/parts/loop/post-excerpt.php
index a2836acd..884e5e83 100755
--- a/templates/parts/loop/post-excerpt.php
+++ b/templates/parts/loop/post-excerpt.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post excerpt inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/post-footer.php b/templates/parts/loop/post-footer.php
index 704bfc8b..318eecc3 100755
--- a/templates/parts/loop/post-footer.php
+++ b/templates/parts/loop/post-footer.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post footer inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/post-meta.php b/templates/parts/loop/post-meta.php
index 34920e0c..5a30b3f8 100644
--- a/templates/parts/loop/post-meta.php
+++ b/templates/parts/loop/post-meta.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post meta inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/post-search-footer.php b/templates/parts/loop/post-search-footer.php
index 19882d93..d5f44433 100755
--- a/templates/parts/loop/post-search-footer.php
+++ b/templates/parts/loop/post-search-footer.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post footer on search results inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/post-thumbnail.php b/templates/parts/loop/post-thumbnail.php
index dd1b523f..07ce8822 100755
--- a/templates/parts/loop/post-thumbnail.php
+++ b/templates/parts/loop/post-thumbnail.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post thumbnail inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/loop/post-title.php b/templates/parts/loop/post-title.php
index a5cc6557..06d81f77 100755
--- a/templates/parts/loop/post-title.php
+++ b/templates/parts/loop/post-title.php
@@ -3,6 +3,7 @@
  * Template part for displaying the post title inside The Loop.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/mobile-menu.php b/templates/parts/mobile-menu.php
index 53d8be55..681660e2 100644
--- a/templates/parts/mobile-menu.php
+++ b/templates/parts/mobile-menu.php
@@ -2,7 +2,8 @@
 /**
  * Display the mobile menu
  *
- * @since 1.0.0
+ * @package Primer
+ * @since   1.0.0
  */
 ?>
 <div class="menu-toggle" id="menu-toggle">
diff --git a/templates/parts/page-title.php b/templates/parts/page-title.php
index 3503a86b..2a1a9a22 100755
--- a/templates/parts/page-title.php
+++ b/templates/parts/page-title.php
@@ -3,6 +3,7 @@
  * Displays page titles.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/primary-navigation.php b/templates/parts/primary-navigation.php
index 1f67a0c5..a6d93de8 100755
--- a/templates/parts/primary-navigation.php
+++ b/templates/parts/primary-navigation.php
@@ -3,6 +3,7 @@
  * Displays the primary navigation.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/site-info.php b/templates/parts/site-info.php
index 8cfbf848..8681b73f 100755
--- a/templates/parts/site-info.php
+++ b/templates/parts/site-info.php
@@ -3,6 +3,7 @@
  * Displays the footer site info.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/site-title.php b/templates/parts/site-title.php
index 7165a152..2381a419 100755
--- a/templates/parts/site-title.php
+++ b/templates/parts/site-title.php
@@ -3,6 +3,7 @@
  * Displays the site title.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>
 
diff --git a/templates/parts/social-navigation.php b/templates/parts/social-navigation.php
index 0c1b5fc4..e694128e 100644
--- a/templates/parts/social-navigation.php
+++ b/templates/parts/social-navigation.php
@@ -3,6 +3,7 @@
  * Displays the social navigation.
  *
  * @package Primer
+ * @since   1.0.0
  */
 ?>