diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js
index c04afce6..dd71d6bb 100644
--- a/assets/js/admin/sportspress-admin.js
+++ b/assets/js/admin/sportspress-admin.js
@@ -50,7 +50,7 @@ jQuery(document).ready(function($){
 
 	// Tab switcher
 	$(".sp-tab-panel").siblings(".sp-tab-bar").find("a").click(function() {
-		$(this).closest("li").removeClass("wp-tab").addClass("wp-tab-active").siblings().removeClass("wp-tab-active").addClass("wp-tab").closest(".wp-tab-bar").siblings($(this).attr("href")).show().trigger('checkCheck').siblings(".wp-tab-panel").hide();
+		$(this).closest("li").addClass("tabs").siblings().removeClass("tabs").closest(".sp-tab-bar").siblings($(this).attr("href")).show().trigger('checkCheck').siblings(".sp-tab-panel").hide();
 		return false;
 	});
 
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
index 57e4d39d..81fb9637 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
@@ -95,12 +95,12 @@ class SP_Meta_Box_Event_Teams {
 					);
 					?>
 					<?php if ( $tabs ) { ?>
-					<ul id="sp_team-tabs" class="wp-tab-bar sp-tab-bar">
+					<ul id="sp_team-tabs" class="sp-tab-bar category-tabs">
 						<?php
 							$j = 0;
 							foreach ( $tabs as $slug => $tab ) {
 								?>
-								<li class="wp-tab<?php if ( 0 == $j ) { ?>-active<?php } ?>"><a href="#<?php echo $slug; ?>-all"><?php echo $tab['label']; ?></a></li>
+								<li class="<?php if ( 0 == $j ) { ?>tabs<?php } ?>"><a href="#<?php echo $slug; ?>-all"><?php echo $tab['label']; ?></a></li>
 								<?php
 								$j++;
 							}
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-columns.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-columns.php
index 8d5e904a..33df4ef4 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-columns.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-columns.php
@@ -51,10 +51,10 @@ class SP_Meta_Box_List_Columns {
 		</ul>
 		<p><strong><?php _e( 'Data', 'sportspress' ); ?></strong></p>
 		<div class="sp-instance">
-			<ul id="sp_column-tabs" class="wp-tab-bar sp-tab-bar">
-				<li class="wp-tab-active"><a href="#sp_performance-all"><?php _e( 'Performance', 'sportspress' ); ?></a></li>
-				<li class="wp-tab"><a href="#sp_metric-all"><?php _e( 'Metrics', 'sportspress' ); ?></a></li>
-				<li class="wp-tab"><a href="#sp_statistic-all"><?php _e( 'Statistics', 'sportspress' ); ?></a></li>
+			<ul id="sp_column-tabs" class="sp-tab-bar category-tabs">
+				<li class="tabs"><a href="#sp_performance-all"><?php _e( 'Performance', 'sportspress' ); ?></a></li>
+				<li><a href="#sp_metric-all"><?php _e( 'Metrics', 'sportspress' ); ?></a></li>
+				<li><a href="#sp_statistic-all"><?php _e( 'Statistics', 'sportspress' ); ?></a></li>
 			</ul>
 			<?php
 			sp_column_checklist( $post->ID, 'sp_performance', 'block', $selected );
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-columns.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-columns.php
index 64e024b7..c3dc1f85 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-columns.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-columns.php
@@ -24,9 +24,9 @@ class SP_Meta_Box_Player_Columns {
 		?>
 		<div class="sp-instance">
 			<?php if ( $tabs ) { ?>
-			<ul id="sp_column-tabs" class="wp-tab-bar sp-tab-bar">
+			<ul id="sp_column-tabs" class="sp-tab-bar category-tabs">
 				<?php foreach ( $tabs as $index => $post_type ) { $object = get_post_type_object( $post_type ); ?>
-				<li class="wp-tab<?php if ( 0 == $index ) { ?>-active<?php } ?>"><a href="#<?php echo $post_type; ?>-all"><?php echo $object->labels->menu_name; ?></a></li>
+				<li class="<?php if ( 0 == $index ) { ?>tabs<?php } ?>"><a href="#<?php echo $post_type; ?>-all"><?php echo $object->labels->menu_name; ?></a></li>
 				<?php } ?>
 			</ul>
 			<?php
diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php
index 08cbe72c..73f7e9d2 100644
--- a/includes/sp-core-functions.php
+++ b/includes/sp-core-functions.php
@@ -845,7 +845,7 @@ if ( !function_exists( 'sp_post_checklist' ) ) {
 		if ( ! isset( $slug ) )
 			$slug = $meta;
 		?>
-		<div id="<?php echo $slug; ?>-all" class="posttypediv wp-tab-panel sp-tab-panel sp-tab-filter-panel sp-select-all-range" style="display: <?php echo $display; ?>;">
+		<div id="<?php echo $slug; ?>-all" class="posttypediv tabs-panel sp-tab-panel sp-tab-filter-panel sp-select-all-range" style="display: <?php echo $display; ?>;">
 			<input type="hidden" value="0" name="<?php echo $slug; ?><?php if ( isset( $index ) ) echo '[' . $index . ']'; ?>[]" />
 			<ul class="categorychecklist form-no-clear">
 				<li class="sp-select-all-container"><label class="selectit"><input type="checkbox" class="sp-select-all"> <strong><?php _e( 'Select All', 'sportspress' ); ?></strong></label></li>
@@ -929,7 +929,7 @@ if ( !function_exists( 'sp_column_checklist' ) ) {
 		if ( ! isset( $post_id ) )
 			global $post_id;
 		?>
-		<div id="<?php echo $meta; ?>-all" class="posttypediv wp-tab-panel sp-tab-panel sp-select-all-range" style="display: <?php echo $display; ?>;">
+		<div id="<?php echo $meta; ?>-all" class="posttypediv tabs-panel sp-tab-panel sp-select-all-range" style="display: <?php echo $display; ?>;">
 			<input type="hidden" value="0" name="sp_columns[]" />
 			<ul class="categorychecklist form-no-clear">
 				<li class="sp-select-all-container"><label class="selectit"><input type="checkbox" class="sp-select-all"> <strong><?php _e( 'Select All', 'sportspress' ); ?></strong></label></li>
diff --git a/modules/sportspress-lazy-loading.php b/modules/sportspress-lazy-loading.php
index 13046d75..c76b5f1f 100644
--- a/modules/sportspress-lazy-loading.php
+++ b/modules/sportspress-lazy-loading.php
@@ -175,7 +175,7 @@ class SportsPress_Lazy_Loading {
 		$diff = array_diff( $post_ids, $selected );
 		$selected = array_flip( $selected );
 		?>
-		<div id="<?php echo $slug; ?>-all" class="posttypediv wp-tab-panel sp-tab-panel sp-ajax-checklist sp-select-all-range" style="display: <?php echo $display; ?>;">
+		<div id="<?php echo $slug; ?>-all" class="posttypediv tabs-panel sp-tab-panel sp-ajax-checklist sp-select-all-range" style="display: <?php echo $display; ?>;">
 			<input type="hidden" value="0" name="<?php echo $slug; ?><?php if ( isset( $index ) ) echo '[' . $index . ']'; ?>[]" />
 			<ul class="categorychecklist form-no-clear">
 				<?php if ( is_array( $posts ) && sizeof( $posts ) ) { ?>