Remove - Base color option.

404.php

@@ -23,8 +23,6 @@
 	do_action( 'colormag_before_body_content' );
 	?>
 
-		<?php colormag_two_sidebar_select(); ?>
-
 		<div id="cm-primary" class="cm-primary">
 			<div class="cm-posts">
 				<section class="cm-error-404 cm-not-found">
@@ -62,7 +60,7 @@
 	 * Hook: colormag_after_body_content.
 	 */
 	do_action( 'colormag_after_body_content' );
-	
+
 	?>
 </div>
 

Gruntfile.js

@@ -84,7 +84,7 @@ module.exports = function ( grunt ) {
 				options : {
 					type        : 'wp-theme',
 					domainPath  : 'languages',
-					potFilename : 'colormag-pro.pot',
+					potFilename : 'colormag.pot',
 					potHeaders  : {
 						'report-msgid-bugs-to' : '[email protected]',
 						'language-team'        : 'LANGUAGE <EMAIL@ADDRESS>'
@@ -150,7 +150,7 @@ module.exports = function ( grunt ) {
 			theme   : {
 				options : {
 					textdomain  : 'colormag',
-					slug        : 'themes/colormag-pro',
+					slug        : 'themes/colormag',
 					file_format : '%domainPath%/%wp_locale%.%format%'
 				}
 			}
@@ -159,7 +159,7 @@ module.exports = function ( grunt ) {
 		// Compress files and folders.
 		compress : {
 			options : {
-				archive : 'dist/colormag-pro.zip'
+				archive : 'dist/colormag.zip'
 			},
 			files   : {
 				src    : [
@@ -176,7 +176,7 @@ module.exports = function ( grunt ) {
 					'!node_modules/**',
 					'!package-lock.json'
 				],
-				dest   : 'colormag-pro',
+				dest   : 'colormag',
 				expand : true
 			}
 		},

archive.php

@@ -23,33 +23,15 @@
 	do_action( 'colormag_before_body_content' );
 	?>
 
-	<?php colormag_two_sidebar_select(); ?>
-
 		<div id="cm-primary" class="cm-primary">
 
 			<?php
 
-			$grid_layout = get_theme_mod( 'colormag_blog_layout', 'layout-1' );
-
-			$layout1_style = get_theme_mod( 'colormag_blog_layout_1_style', 'style-1' );
-
-			$layout2_style = get_theme_mod( 'colormag_blog_layout_2_style', 'style-1' );
-
-			$grid_col = get_theme_mod( 'colormag_grid_layout_column', '2' );
+			$grid_layout = 'layout-2';
 
-			$style = '';
+			$style = 'cm-layout-2-style-1';
 
-			if ( 'layout-1' === $grid_layout ) {
-				$style = 'cm-' . $grid_layout . '-' . $layout1_style;
-			} elseif ( 'layout-2' === $grid_layout ) {
-				$style = 'cm-' . $grid_layout . '-' . $layout2_style;
-			}
-
-			$col = '';
-
-			if ( 'layout-2' === $grid_layout ) {
-				$col = 'col-' . $grid_col;
-			}
+			$col = 'col-2';
 
 			/**
 			 * Functions hooked into colormag_action_archive_header action.
@@ -58,15 +40,8 @@
 			 */
 			do_action( 'colormag_action_archive_header' );
 			?>
-			<?php
-			$pagination_type  = get_theme_mod( 'colormag_pagination_type', 'default' );
-			$pagination_class = '';
 
-			if ( 'infinite_scroll' === $pagination_type ) {
-				$pagination_class .= 'tg-infinite-scroll-container';
-			}
-			?>
-			<div class="cm-posts <?php echo esc_attr( 'cm-' . $grid_layout . ' ' . $style  . ' ' . $col . ' ' . $pagination_class ); ?>" >
+			<div class="cm-posts <?php echo esc_attr( 'cm-' . $grid_layout . ' ' . $style . ' ' . $col ); ?>" >
 				<?php
 				if ( have_posts() ) :
 
@@ -75,16 +50,6 @@
 					 */
 					do_action( 'colormag_before_archive_page_loop' );
 					?>
-
-					<?php
-					$pagination_type  = get_theme_mod( 'colormag_pagination_type', 'default' );
-					$pagination_class = '';
-
-					if ( 'infinite_scroll' === $pagination_type ) {
-						$pagination_class .= 'tg-infinite-scroll-container';
-					}
-					?>
-					<?php echo esc_attr( $pagination_class ); ?>
 						<?php
 						while ( have_posts() ) :
 							the_post();
@@ -113,8 +78,6 @@
 				endif; // if ( have_posts() ) :
 				?>
 			</div><!-- .cm-posts -->
-
-			<?php colormag_infinite_scroll(); ?>
 		</div><!-- #cm-primary -->
 
 	<?php