diff --git a/includes/admin/settings/class-sp-settings-modules.php b/includes/admin/settings/class-sp-settings-modules.php
index 821d083c..06c86a3b 100644
--- a/includes/admin/settings/class-sp-settings-modules.php
+++ b/includes/admin/settings/class-sp-settings-modules.php
@@ -28,7 +28,6 @@ class SP_Settings_Modules extends SP_Settings_Page {
 	public function __construct() {
 		$this->id    = 'modules';
 		$this->label = __( 'Modules', 'sportspress' );
-		$this->theme = wp_get_theme();
 
 		$this->sections = apply_filters( 'sportspress_module_sections', array(
 			'general' => __( 'General', 'sportspress' ),
@@ -169,7 +168,7 @@ class SP_Settings_Modules extends SP_Settings_Page {
 							<tbody>
 								<tr><td>
 									<img src="<?php echo $theme->get_screenshot(); ?>" class="sp-theme-screenshot">
-									<p><?php _e( 'Rookie is a free starter theme for SportsPress.', 'sportspress' ); ?></p>
+									<p><?php _e( 'Rookie is a free starter theme for SportsPress designed by ThemeBoy.', 'sportspress' ); ?></p>
 									<p class="sp-module-actions">
 										<a class="button" href="http://tboy.co/themes" target="_blank"><?php _e( 'Need a Better Theme?', 'sportspress' ); ?></a>
 									</p>
@@ -186,7 +185,7 @@ class SP_Settings_Modules extends SP_Settings_Page {
 							<tbody>
 								<tr><td>
 									<img src="<?php echo plugin_dir_url( SP_PLUGIN_FILE ); ?>/assets/images/modules/rookie.png" class="sp-theme-screenshot">
-									<p><?php _e( 'Rookie is a free starter theme for SportsPress.', 'sportspress' ); ?></p>
+									<p><?php _e( 'Rookie is a free starter theme for SportsPress designed by ThemeBoy.', 'sportspress' ); ?></p>
 									<p class="sp-module-actions">
 										<span><?php _e( 'Free', 'sportspress' ); ?></span>
 										<a class="button" href="<?php echo add_query_arg( array( 'theme' => 'rookie' ), network_admin_url( 'theme-install.php' ) ); ?>"><?php _e( 'Install Now', 'sportspress' ); ?></a>
diff --git a/includes/admin/views/html-notice-template-check.php b/includes/admin/views/html-notice-template-check.php
index feeca787..72d7e193 100644
--- a/includes/admin/views/html-notice-template-check.php
+++ b/includes/admin/views/html-notice-template-check.php
@@ -3,5 +3,5 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 ?>
 <div id="message" class="updated sportspress-message wc-connect">
 	<p><?php _e( '<strong>Your theme has bundled outdated copies of SportsPress template files</strong> &#8211; if you encounter functionality issues on the frontend this could the reason. Ensure you update or remove them (in general we recommend only bundling the template files you actually need to customize). See the system report for full details.', 'sportspress' ); ?></p>
-	<p class="submit"><a class="button-primary" href="<?php echo esc_url( add_query_arg( array( 'page' => 'sportspress', 'tab' => 'status' ), admin_url( 'admin.php' ) ) ); ?>"><?php _e( 'System Status', 'sportspress' ); ?></a> <a class="skip button-primary" href="<?php echo esc_url( add_query_arg( 'hide_template_files_notice', 'true' ) ); ?>"><?php _e( 'Hide this notice', 'sportspress' ); ?></a></p>
+	<p class="submit"><a class="button-primary" href="<?php echo esc_url( add_query_arg( array( 'page' => 'sportspress', 'tab' => 'status' ), admin_url( 'admin.php' ) ) ); ?>"><?php _e( 'System Status', 'sportspress' ); ?></a> <a class="skip button" href="<?php echo esc_url( add_query_arg( 'hide_template_files_notice', 'true' ) ); ?>"><?php _e( 'Hide this notice', 'sportspress' ); ?></a></p>
 </div>
\ No newline at end of file
diff --git a/includes/admin/views/html-notice-theme-support.php b/includes/admin/views/html-notice-theme-support.php
index e4f39ad0..2b7cf597 100644
--- a/includes/admin/views/html-notice-theme-support.php
+++ b/includes/admin/views/html-notice-theme-support.php
@@ -3,8 +3,10 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 ?>
 <div id="message" class="error sportspress-message">
 	<p><?php _e( '<strong>Your theme does not declare SportsPress support</strong> &#8211; if you encounter layout issues please read our integration guide or choose a SportsPress theme :)', 'sportspress' ); ?></p>
+	<p><?php _e( 'Have you tried the free Rookie theme yet?', 'sportspress' ); ?></p>
 	<p class="submit">
-		<a class="button-primary" href="http://tboy.co/integration"><?php _e( 'Theme Integration Guide', 'sportspress' ); ?></a>
-		<a class="button-secondary" href="<?php echo add_query_arg( 'hide_theme_support_notice', 'true' ); ?>"><?php _e( 'Hide this notice', 'sportspress' ); ?></a>
+		<a class="button-primary" href="<?php echo add_query_arg( array( 'theme' => 'rookie' ), network_admin_url( 'theme-install.php' ) ); ?>"><?php _e( 'Install Now', 'sportspress' ); ?></a>
+		<a class="button-secondary" href="http://tboy.co/integration"><?php _e( 'Theme Integration Guide', 'sportspress' ); ?></a>
+		<a class="button" href="<?php echo add_query_arg( 'hide_theme_support_notice', 'true' ); ?>"><?php _e( 'Hide this notice', 'sportspress' ); ?></a>
 	</p>
 </div>
\ No newline at end of file