diff --git a/includes/class-cli-wpvulnerability.php b/includes/class-cli-wpvulnerability.php
index c62b5b8..326fb3d 100644
--- a/includes/class-cli-wpvulnerability.php
+++ b/includes/class-cli-wpvulnerability.php
@@ -7,14 +7,13 @@
 
 // Make sure the file is not directly accessible.
 if ( ! defined( 'ABSPATH' ) ) {
-	die( 'We\'re sorry, but you can not directly access this file.' );
+	die( 'We\'re sorry, but you cannot directly access this file.' );
 }
 
 /**
  * Class CLI commands.
  */
 class CLI_WPVulnerability {
-
 	/**
 	 * CLI constructor.
 	 *
@@ -23,13 +22,12 @@ class CLI_WPVulnerability {
 	 */
 	public function __construct( $plugins_wpvulnerability ) {
 		$this->plugins = $plugins_wpvulnerability->get_installed_plugins();
-
 		if ( class_exists( 'WP_CLI' ) ) {
 			WP_CLI::add_command(
 				'wpvulnerability',
 				array( $this, 'cli_command' ),
 				array(
-					'shortdesc' => 'Prints a vulnerability',
+					'shortdesc' => 'Show the list of vulnerabilities detected in your site.',
 					'synopsis'  => array(
 						array(
 							'type'        => 'positional',
@@ -64,18 +62,17 @@ public function cli_command( $args ) {
 				$this->themes_subcommand();
 				break;
 			default:
-				WP_CLI::error( "'$args[0]' is not a registered subcommand of 'wpvulnerebality'.\nAvailable subcommands: core, plugins, themes" );
+				WP_CLI::error( "'$args[0]' is not a registered subcommand of 'wpvulnerability'.\nAvailable subcommands: core, plugins, themes" );
 				break;
 		}
 	}
 
-
 	/**
 	 * Themes section.
 	 */
 	public function core_subcommand() {
 		// TODO.
-		WP_CLI::error( 'Subcommand not implemented yet' );
+		WP_CLI::error( 'Command not implemented yet' );
 	}
 
 	/**
@@ -101,7 +98,6 @@ public function plugins_subcommand() {
 						)
 					);
 				}
-
 				WP_CLI\Utils\format_items(
 					'table',
 					$vulnerabilities,
@@ -117,6 +113,6 @@ public function plugins_subcommand() {
 	 */
 	public function themes_subcommand() {
 		// TODO.
-		WP_CLI::error( 'Subcommand not implemented yet' );
+		WP_CLI::error( 'Command not implemented yet' );
 	}
 }
diff --git a/includes/class-health-wpvulnerability.php b/includes/class-health-wpvulnerability.php
index 2719e10..c779ecc 100644
--- a/includes/class-health-wpvulnerability.php
+++ b/includes/class-health-wpvulnerability.php
@@ -14,7 +14,6 @@
  * Class HealthCheck
  */
 class Health_WPVulnerability {
-
 	/**
 	 * Construct Class for Health Kit
 	 */
@@ -30,17 +29,17 @@ public function __construct() {
 	 */
 	public function add_vulnerability_tests( $tests ) {
 		$tests['direct']['wpvulnerability_core'] = array(
-			'label' => __( 'WP Vulnerability Core', 'wpvulnerability' ),
+			'label' => __( 'WPVulnerability Core', 'wpvulnerability' ),
 			'test'  => array( $this, 'test_vulnerability_core' ),
 		);
 
 		$tests['direct']['wpvulnerability_themes'] = array(
-			'label' => __( 'WP Vulnerability Themes', 'wpvulnerability' ),
+			'label' => __( 'WPVulnerability Themes', 'wpvulnerability' ),
 			'test'  => array( $this, 'test_vulnerability_themes' ),
 		);
 
 		$tests['direct']['wpvulnerability_plugins'] = array(
-			'label' => __( 'WP Vulnerability Plugins', 'wpvulnerability' ),
+			'label' => __( 'WPVulnerability Plugins', 'wpvulnerability' ),
 			'test'  => array( $this, 'test_vulnerability_plugins' ),
 		);
 
@@ -54,15 +53,15 @@ public function add_vulnerability_tests( $tests ) {
 	 */
 	public function test_vulnerability_core() {
 		$result = array(
-			'label'       => __( 'There are no vulnerabilities in WordPress Core.', 'wpvulnerability' ),
+			'label'       => __( 'There aren\'t WordPress vulnerabilities', 'wpvulnerability' ),
 			'status'      => 'good',
 			'badge'       => array(
 				'label' => __( 'Security', 'wpvulnerability' ),
-				'color' => 'red',
+				'color' => 'green',
 			),
 			'description' => sprintf(
 				'<p>%s</p>',
-				__( 'You can see the vulnerabilities found in your WordPress installation.', 'wpvulnerability' )
+				__( 'Shows possible vulnerabilities existing in the WordPress core.', 'wpvulnerability' )
 			),
 			'actions'     => '',
 			'test'        => 'wpvulnerability_core',
@@ -71,16 +70,17 @@ public function test_vulnerability_core() {
 		$core_vulnerabilities = wpvulnerability_get_core();
 		if ( ! empty( $core_vulnerabilities ) ) {
 			$result['status']      = 'critical';
-			$result['label']       = __( 'There are vulnerabilities in WordPress Core.', 'wpvulnerability' );
+			$result['label']       = __( 'There are WordPress Core vulnerabilities', 'wpvulnerability' );
+			$result['badge']['color'] = 'red';
 			$result['description'] = sprintf(
 				'<p>%1$s</p> %2$s',
-				__( 'We have found vulnerabilities in WordPress Core.', 'wpvulnerability' ),
+				__( 'We\'ve detected potential vulnerabilities in this WordPress installation. Please check them and keep your installation updated.', 'wpvulnerability' ),
 				wpvulnerability_get_html_vulnerabilities( $core_vulnerabilities )
 			);
 			$result['actions']    .= sprintf(
 				'<p><a href="%s">%s</a></p>',
 				esc_url( admin_url( 'update-core.php' ) ),
-				__( 'Update WordPress Core' )
+				__( 'Update WordPress' )
 			);
 		}
 
@@ -94,15 +94,15 @@ public function test_vulnerability_core() {
 	 */
 	public function test_vulnerability_themes() {
 		$result = array(
-			'label'       => __( 'There are no vulnerabilities in Themes.', 'wpvulnerability' ),
+			'label'       => __( 'There aren\'t themes vulnerabilities', 'wpvulnerability' ),
 			'status'      => 'good',
 			'badge'       => array(
 				'label' => __( 'Security', 'wpvulnerability' ),
-				'color' => 'red',
+				'color' => 'green',
 			),
 			'description' => sprintf(
 				'<p>%s</p>',
-				__( 'You can see the vulnerabilities found in your WordPress installation.', 'wpvulnerability' )
+				__( 'Shows possible vulnerabilities that exist in installed themes.', 'wpvulnerability' )
 			),
 			'actions'     => '',
 			'test'        => 'wpvulnerability_themes',
@@ -112,16 +112,17 @@ public function test_vulnerability_themes() {
 
 		if ( ! empty( $html_vuln ) ) {
 			$result['status']      = 'critical';
-			$result['label']       = __( 'There are vulnerabilities in Themes.', 'wpvulnerability' );
+			$result['label']       = __( 'There are themes vulnerabilities', 'wpvulnerability' );
+			$result['badge']['color'] = 'red';
 			$result['description'] = sprintf(
 				'<p>%1$s</p> %2$s',
-				__( 'We have found vulnerabilities in Themes.', 'wpvulnerability' ),
+				__( 'We\'ve detected potential vulnerabilities in installed themes. Please check them and keep them updated.', 'wpvulnerability' ),
 				$html_vuln
 			);
 			$result['actions']    .= sprintf(
 				'<p><a href="%s">%s</a></p>',
-				esc_url( admin_url( 'update-core.php' ) ),
-				__( 'Update Themes' )
+				esc_url( admin_url( 'themes.php' ) ),
+				__( 'Update themes' )
 			);
 		}
 
@@ -135,15 +136,15 @@ public function test_vulnerability_themes() {
 	 */
 	public function test_vulnerability_plugins() {
 		$result = array(
-			'label'       => __( 'There are no vulnerabilities in Plugins.', 'wpvulnerability' ),
+			'label'       => __( 'There aren\'t plugins vulnerabilities', 'wpvulnerability' ),
 			'status'      => 'good',
 			'badge'       => array(
 				'label' => __( 'Security', 'wpvulnerability' ),
-				'color' => 'red',
+				'color' => 'green',
 			),
 			'description' => sprintf(
 				'<p>%s</p>',
-				__( 'You can see the vulnerabilities found in your WordPress installation.', 'wpvulnerability' )
+				__( 'Shows possible vulnerabilities that exist in installed plugins.', 'wpvulnerability' )
 			),
 			'actions'     => '',
 			'test'        => 'wpvulnerability_plugins',
@@ -153,16 +154,17 @@ public function test_vulnerability_plugins() {
 
 		if ( ! empty( $html_vuln ) ) {
 			$result['status']      = 'critical';
-			$result['label']       = __( 'There are vulnerabilities in Plugins.', 'wpvulnerability' );
+			$result['label']       = __( 'There are plugins vulnerabilities', 'wpvulnerability' );
+			$result['badge']['color'] = 'red';
 			$result['description'] = sprintf(
 				'<p>%1$s</p> %2$s',
-				__( 'We have found vulnerabilities in Plugins. You cand find below.', 'wpvulnerability' ),
+				__( 'We\'ve detected potential vulnerabilities in installed plugins. Please check them and keep them updated.', 'wpvulnerability' ),
 				$html_vuln
 			);
 			$result['actions']    .= sprintf(
 				'<p><a href="%s">%s</a></p>',
-				esc_url( admin_url( 'update-core.php' ) ),
-				__( 'Update Plugins' )
+				esc_url( admin_url( 'plugins.php' ) ),
+				__( 'Update plugins' )
 			);
 		}
 
diff --git a/includes/class-plugins-wpvulnerability.php b/includes/class-plugins-wpvulnerability.php
index b11e54d..bd4ad4c 100644
--- a/includes/class-plugins-wpvulnerability.php
+++ b/includes/class-plugins-wpvulnerability.php
@@ -259,7 +259,7 @@ public function after_row_text( $plugin_file, $plugin_data, $status ) {
 
 		$message = sprintf(
 			/* translators: 1: plugin name */
-			__( '%1$s has a known vulnerability that may be affecting this version. Please update this plugin.', 'wpvulnerability' ),
+			__( '%1$s has a known vulnerability that may be affecting this version.', 'wpvulnerability' ),
 			$plugin_data['Name']
 		);
 
@@ -271,10 +271,18 @@ public function after_row_text( $plugin_file, $plugin_data, $status ) {
 
 		$vulnerabilities = $this->get_cached_plugin_vulnerabilities( $wpvulnerability_data[ $plugin_file ], $plugin_file );
 		foreach ( $vulnerabilities['vulnerabilities'] as $vulnerability ) {
-			$source  = implode( ', ', array_column( $vulnerability['source'], 'name' ) );
+			$source  = implode( '<br>', array_column( $vulnerability['source'], 'name' ) );
 			$string .= '<tr>';
 			$string .= '<td><strong>' . esc_html( $vulnerability['name'] ) . '</strong></td>';
-			$string .= '<td><strong>' . esc_html( $source ) . '</strong></td>';
+
+			$string .= '<td>';
+			if( $vulnerability['closed'] ) {
+				$string .= '<span class="text-red">' . __( 'This plugin is closed. Please replace it with another.', 'wpvulnerability' ) . '</span><br>';
+			}
+			if( $vulnerability['unfixed'] ) {
+				$string .= '<span class="text-red">' . __( 'This vulnerability appears to be unpatched. Stay tuned for upcoming plugin updates.', 'wpvulnerability' ) . '</span><br>';
+			}
+			$string .= esc_html( $source ) . '</td>';
 			$string .= '</tr>';
 		}
 		$string .= '</table>';
@@ -289,13 +297,11 @@ public function after_row_text( $plugin_file, $plugin_data, $status ) {
 	 * prints out error message if plugin(s) is/are vulnerable
 	 */
 	public function vulnerable_admin_notice() {
-		$class   = 'notice notice-error is-dismissible';
-		$message = '<strong>WPVulnerability:</strong> ' . __( 'One or more plugins currently installed have known vulnerabilities with their current version. I suggest updating each vulnerable plugin if an update is available', 'wpvulnerability' );
-
-		printf(
-			'<div class="%1$s"><p>%2$s</p></div>',
-			esc_html( $class ),
-			$message //phpcs:ignore
+		sprintf(
+			// translators: Dismissible message.
+			'<div class="notice notice-error is-dismissible"><strong>%s</strong>: %s</div>',
+			'WPVulnerability',
+			__('There are possible vulnerabilities in your installation. Please, check your WordPress, plugins, and themes.', 'wpvulnerability' )
 		);
 	}
 }
diff --git a/includes/class-wpvul-admin-settings.php b/includes/class-wpvul-admin-settings.php
index 0ecbff8..9df9cd8 100644
--- a/includes/class-wpvul-admin-settings.php
+++ b/includes/class-wpvul-admin-settings.php
@@ -85,7 +85,7 @@ public function create_admin_page() {
 				<div class="header wpvulnerability-header">
 					<div class="logo">
 						<img src="<?php echo esc_url( WPVUL_PLUGIN_URL ) . 'includes/assets/logo.png'; ?>" width="50" height="47" />
-						<h2><?php esc_html_e( 'WPVulnerability Settings', 'wpvulnerability' ); ?></h2>
+						<h2><?php esc_html_e( 'WPVulnerability settings', 'wpvulnerability' ); ?></h2>
 					</div>
 				</div>
 			</div>
@@ -124,14 +124,14 @@ public function page_init() {
 
 		add_settings_section(
 			'admin_wpvulnerability_settings',
-			__( 'Settings for integration to WPVulnerability', 'wpvulnerability' ),
+			__( 'Receive notifications in your email', 'wpvulnerability' ),
 			array( $this, 'admin_section_api_info' ),
 			'wpvulnerability_settings'
 		);
 
 		add_settings_field(
 			'wpvulnerability_emails',
-			__( 'Emails to notify (separated by commas)', 'wpvulnerability' ),
+			__( 'Email address to notify (separated by commas)', 'wpvulnerability' ),
 			array( $this, 'emails_callback' ),
 			'wpvulnerability_settings',
 			'admin_wpvulnerability_settings'
@@ -139,7 +139,7 @@ public function page_init() {
 
 		add_settings_field(
 			'wpvulnerability_period',
-			__( 'Period to send notification emails', 'wpvulnerability' ),
+			__( 'How often you want to receive notifications', 'wpvulnerability' ),
 			array( $this, 'period_callback' ),
 			'wpvulnerability_settings',
 			'admin_wpvulnerability_settings'
@@ -180,7 +180,7 @@ public function sanitize_fields_api( $input ) {
 	 * @return void
 	 */
 	public function admin_section_api_info() {
-		esc_html_e( 'Add your settings for WPVulnerability.', 'wpvulnerability' );
+		esc_html_e( 'Configure and save these settings to receive email notifications.', 'wpvulnerability' );
 	}
 
 	/**
@@ -189,12 +189,10 @@ public function admin_section_api_info() {
 	 * @return void
 	 */
 	public function emails_callback() {
-		if ( empty( $this->wpvulnerability_settings['emails'] ) ) {
-			$this->wpvulnerability_settings['emails'] = get_bloginfo( 'admin_email' );
-		}
 		printf(
-			'<input class="regular-text" type="text" name="wpvulnerability_settings[emails]" id="wpvulnerability_emails" value="%s">',
-			isset( $this->wpvulnerability_settings['emails'] ) ? esc_attr( $this->wpvulnerability_settings['emails'] ) : ''
+			'<input class="regular-text" type="text" name="wpvulnerability_settings[emails]" id="wpvulnerability_emails" value="%s"><br><small>%s</small>',
+			isset( $this->wpvulnerability_settings['emails'] ) ? esc_attr( $this->wpvulnerability_settings['emails'] ) : '',
+			get_bloginfo( 'admin_email' )
 		);
 	}
 
@@ -217,5 +215,3 @@ public function period_callback() {
 }
 
 new WPVul_Admin_Settings();
-
-
diff --git a/includes/class-wpvul-notification.php b/includes/class-wpvul-notification.php
index 44ac317..315270b 100644
--- a/includes/class-wpvul-notification.php
+++ b/includes/class-wpvul-notification.php
@@ -18,15 +18,14 @@
  * @since 1.2
  */
 class WPVUL_Notification {
-
 	/**
 	 * Construct of Class
 	 */
 	public function __construct() {
 		add_filter( 'cron_schedules', array( $this, 'add_every_week' ) );
+		add_filter( 'cron_schedules', array( $this, 'add_every_day' ) );
 		$this->settings = get_option( 'wpvulnerability_settings' );
 		$period         = isset( $this->settings['period'] ) ? $this->settings['period'] : '';
-
 		if ( $period ) {
 			if ( ! wp_next_scheduled( 'wpvulnerability_notification' ) ) {
 				wp_schedule_event( time(), $period, 'wpvulnerability_notification' );
@@ -44,7 +43,21 @@ public function __construct() {
 	public function add_every_week( $schedules ) {
 		$schedules['weekly'] = array(
 			'interval' => 604800,
-			'display'  => __( 'Once Weekly', 'wpvulnerability' ),
+			'display'  => __( 'Every week', 'wpvulnerability' ),
+		);
+		return $schedules;
+	}
+	
+	/**
+	 * Adds schedule every week
+	 *
+	 * @param array $schedules System schedules.
+	 * @return array
+	 */
+	public function add_every_day( $schedules ) {
+		$schedules['daily'] = array(
+			'interval' => 86400,
+			'display'  => __( 'Every day', 'wpvulnerability' ),
 		);
 		return $schedules;
 	}
@@ -57,44 +70,36 @@ public function add_every_week( $schedules ) {
 	public function execute_notification() {
 		$email  = isset( $this->settings['emails'] ) ? $this->settings['emails'] : get_bloginfo( 'admin_email' );
 		$period = isset( $this->settings['period'] ) ? $this->settings['period'] : '';
-
 		if ( empty( $period ) ) {
 			return;
 		}
-
 		// Calc vulnerabilities.
 		$core_vulnerabilities        = wpvulnerability_get_core();
 		$html_plugin_vulnerabilities = wpvulnerability_get_html_plugin_vulnerabilities( 'no-columns,no-desc' );
 		$html_theme_vulnerabilities  = wpvulnerability_get_html_theme_vulnerabilities( 'no-columns,no-desc' );
-
 		if ( empty( $core_vulnerabilities ) && false === $html_plugin_vulnerabilities && false === $html_plugin_vulnerabilities ) {
 			return; // don't send email.
 		}
-
 		if ( ! empty( $core_vulnerabilities ) ) {
-			$email_content  = '<h2>' . esc_html__( 'Core Vulnerabilities', 'wpvulnerability' ) . '</h2>';
+			$email_content  = '<h2>' . esc_html__( 'Core vulnerabilities', 'wpvulnerability' ) . '</h2>';
 			$email_content .= wpvulnerability_get_html_vulnerabilities( $core_vulnerabilities, 'no-columns,no-desc' );
 		}
-
 		// Plugins vulnerabilities.
 		if ( $html_plugin_vulnerabilities ) {
-			$email_content .= '<h2>' . esc_html__( 'Plugin Vulnerabilities', 'wpvulnerability' ) . '</h2>';
+			$email_content .= '<h2>' . esc_html__( 'Plugins vulnerabilities', 'wpvulnerability' ) . '</h2>';
 			$email_content .= $html_plugin_vulnerabilities;
 		}
-
 		// Themes vulnerabilities.
 		if ( $html_theme_vulnerabilities ) {
-			$email_content .= '<h2>' . esc_html__( 'Themes Vulnerabilities', 'wpvulnerability' ) . '</h2>';
+			$email_content .= '<h2>' . esc_html__( 'Themes vulnerabilities', 'wpvulnerability' ) . '</h2>';
 			$email_content .= $html_theme_vulnerabilities;
 		}
-
-		$email_content_hml = $this->html_email( esc_html__( 'Vulnerabilites founded', 'wpvulnerability' ), $email_content );
-
+		$email_content_hml = $this->html_email( esc_html__( 'Vulnerability found', 'wpvulnerability' ), $email_content );
 		// Prepare email.
 		$email_headers = array();
 		$email_subject = sprintf(
 			// translators: site name.
-			__( 'Vulnerabilites founded in %s', 'wpvulnerability' ),
+			__( 'Vulnerability found: %s', 'wpvulnerability' ),
 			get_bloginfo( 'name' )
 		);
 		$email_headers[] = 'From: WPVulnerability <' . get_bloginfo( 'admin_email' ) . '>';
@@ -111,67 +116,79 @@ public function execute_notification() {
 	 */
 	private function html_email( $title, $content ) {
 		$message  = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: Helvetica Neue, Helvetica, Arial, sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
-  <head>
-  <meta name="viewport" content="width=device-width" />
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>WPVulnerability</title>
-  <style type="text/css">
-  img {
-  max-width: 100%;
-  }
-  body {
-  -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
-  }
+<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: Helvetica Neue, Helvetica, Arial, sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+<head>
+	<meta name="viewport" content="width=device-width" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>WPVulnerability</title>
+	<style type="text/css">
+	img { max-width: 100%; }
+  body { -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; }
   body { background-color: #f6f6f6; }
   @media only screen and (max-width: 640px) {
-  body {
-  padding: 0 !important;
-  }
-  h1 { font-weight: 800 !important; margin: 20px 0 5px !important; }
-  h2 { font-weight: 800 !important; margin: 20px 0 5px !important; }
-  h3 { font-weight: 800 !important; margin: 20px 0 5px !important; }
-  h4 { font-weight: 800 !important; margin: 20px 0 5px !important; }
-  h1 { font-size: 22px !important; } 
-  h2 { font-size: 18px !important; }
-  h3 { font-size: 16px !important; }
-  .container { padding: 0 !important; width: 100% !important; }
-  .content { padding: 0 !important; }
-  .content-wrap {
-  padding: 10px !important;
-  }
-  .invoice {
-  width: 100% !important;
-  }
+		body { padding: 0 !important; }
+		h1 { font-weight: 800 !important; margin: 20px 0 5px !important; }
+		h2 { font-weight: 800 !important; margin: 20px 0 5px !important; }
+		h3 { font-weight: 800 !important; margin: 20px 0 5px !important; }
+		h4 { font-weight: 800 !important; margin: 20px 0 5px !important; }
+		h1 { font-size: 22px !important; } 
+		h2 { font-size: 18px !important; }
+		h3 { font-size: 16px !important; }
+		.container { padding: 0 !important; width: 100% !important; }
+		.content { padding: 0 !important; }
+		.content-wrap { padding: 10px !important; }
+		.invoice { width: 100% !important; }
   }
   </style>
-  </head>
-  
-  <body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
-  
-  <table class="body-wrap" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; width: 100%; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6"><tr style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><td style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; margin: 0;" valign="top"></td>
-		<td class="container" width="600" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
-			 <div class="content" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;">
-				  <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff"><tr style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><td class="content-wrap aligncenter" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; text-align: center; margin: 0; padding: 20px;" align="center" valign="top">
-								  <table width="100%" cellpadding="0" cellspacing="0" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><tr style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><td class="content-block" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; margin: 0; padding: 0 0 20px; text-align: center;" valign="top">
-											 <img class="aligncenter" src="' . WPVUL_PLUGIN_URL . 'includes/assets/logo.png" width="100" />
-												  <h1 class="aligncenter" style="font-family: Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; box-sizing: border-box; font-size: 32px; color: #000; line-height: 1.2em; font-weight: 500; text-align: center; margin: 40px 0 0;" align="center">' . $title . '</h1>
-											 </td>
-										</tr><tr style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><td class="content-block alignlef" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; text-align: left; margin: 0; padding: 0 0 20px;" valign="top">';
+</head>
+<body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
+	<table class="body-wrap" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; width: 100%; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
+		<tr style="font-family: sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+			<td style="font-family: sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; margin: 0;" valign="top"></td>
+			<td class="container" width="600" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
+				<div class="content" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;">
+					<table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff">
+						<tr style="font-family: sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+							<td class="content-wrap aligncenter" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; text-align: center; margin: 0; padding: 20px;" align="center" valign="top">
+								<table width="100%" cellpadding="0" cellspacing="0" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+									<tr style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+										<td class="content-block" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; margin: 0; padding: 0 0 20px; text-align: center;" valign="top">
+											<img class="aligncenter" src="' . WPVUL_PLUGIN_URL . 'includes/assets/logo.png" width="100">
+											<h1 class="aligncenter" style="font-family: sans-serif; box-sizing: border-box; font-size: 32px; color: #000; line-height: 1.2em; font-weight: 500; text-align: center; margin: 40px 0 0;" align="center">' . $title . '</h1>
+										</td>
+									</tr>
+									<tr style="font-family: sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+										<td class="content-block alignlef" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; text-align: left; margin: 0; padding: 0 0 20px;" valign="top">';
 		$message .= $content;
-		$message .= '</tr></table><div class="footer" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
-		<table width="100%" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><tr style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; margin: 0;"><td class="aligncenter content-block" style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">';
+		$message .= '									</td>
+									</tr>
+								</table>
+								<div class="footer" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
+									<table width="100%" style="font-family: sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+										<tr style="font-family: sans-serif; box-sizing: border-box; font-size:18px; margin: 0;">
+											<td class="aligncenter content-block" style="font-family: sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">';
 		$message .= sprintf(
 			// translators: %s the website of Databaase.
-			__( 'More information about database in <a href="%s">WPVulnerability</a>', 'wpvulnerability' ),
-			'https://vulnerability.wpsysadmin.com/?utm_source=EmailNotification&utm_medium=link&utm_campaign=footer'
+			'%s <a href="%s">%s</a>',
+			__( 'Learn more about the WordPress Vulnerability Database API at', 'wpvulnerability' ),
+			'https://vulnerability.wpsysadmin.com/',
+			'WPVulnerability'
 		);
-		$message .= '</td></tr></table></div></div></td>
-  <td style="font-family: Helvetica Neue,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; margin: 0;" valign="top"></td>
-  </tr></table></body>
-  </html>';
+		$message .= '											</td>
+										</tr>
+									</table>
+								</div>
+							</td>
+							<td style="font-family: sans-serif; box-sizing: border-box; font-size:18px; vertical-align: top; margin: 0;" valign="top"></td>
+						</tr>
+					</table>
+				</div>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>';
 		return $message;
 	}
 }
-
 new WPVUL_Notification();
diff --git a/includes/helpers-api.php b/includes/helpers-api.php
index 503a597..ad5f8ee 100644
--- a/includes/helpers-api.php
+++ b/includes/helpers-api.php
@@ -18,7 +18,6 @@
  * @return array
  */
 function wpvulnerability_get( $type, $slug = '' ) {
-
 	$args = array(
 		'timeout'   => 3000,
 		'sslverify' => false,
@@ -36,7 +35,7 @@ function wpvulnerability_get( $type, $slug = '' ) {
 		$response = wp_remote_get( $url, $args );
 		if ( isset( $response['response']['code'] ) && 200 === $response['response']['code'] ) {
 			$body = wp_remote_retrieve_body( $response );
-			set_transient( $key, $body, HOUR_IN_SECONDS * 24 );
+			set_transient( $key, $body, HOUR_IN_SECONDS * 4 );
 		}
 	}
 	return json_decode( $vulnerability, true );
@@ -54,11 +53,9 @@ function wpvulnerability_get_core( $version = null ) {
 	}
 	$response      = wpvulnerability_get( 'core', $version );
 	$vulnerability = array();
-
 	if ( ! isset( $response['data']['vulnerability'] ) ) {
 		return false;
 	}
-
 	foreach ( $response['data']['vulnerability'] as $v ) {
 		$vulnerability[] = array(
 			'name'   => $v['name'],
@@ -66,7 +63,6 @@ function wpvulnerability_get_core( $version = null ) {
 			'source' => $v['source'],
 		);
 	}
-
 	return $vulnerability;
 }
 
@@ -80,11 +76,9 @@ function wpvulnerability_get_core( $version = null ) {
 function wpvulnerability_get_plugin( $slug, $version ) {
 	$response      = wpvulnerability_get( 'plugin', $slug );
 	$vulnerability = array();
-
 	if ( ! isset( $response['data']['vulnerability'] ) ) {
 		return false;
 	}
-
 	foreach ( $response['data']['vulnerability'] as $v ) {
 		if ( isset( $v['operator']['min_operator'] ) && $v['operator']['min_operator'] && isset( $v['operator']['max_operator'] ) && $v['operator']['max_operator'] ) {
 			if ( version_compare( $version, $v['operator']['min_version'], $v['operator']['min_operator'] ) && version_compare( $version, $v['operator']['max_version'], $v['operator']['max_operator'] ) ) {
@@ -137,13 +131,10 @@ function wpvulnerability_get_plugin( $slug, $version ) {
 function wpvulnerability_get_theme( $slug, $version ) {
 	$response      = wpvulnerability_get( 'theme', $slug );
 	$vulnerability = array();
-
 	if ( ! isset( $response['data']['vulnerability'] ) ) {
 		return false;
 	}
-
 	foreach ( $response['data']['vulnerability'] as $v ) {
-
 		if ( isset( $v['operator']['min_operator'] ) && $v['operator']['min_operator'] && isset( $v['operator']['max_operator'] ) && $v['operator']['max_operator'] ) {
 			if ( version_compare( $version, $v['operator']['min_version'], $v['operator']['min_operator'] ) && version_compare( $version, $v['operator']['max_version'], $v['operator']['max_operator'] ) ) {
 				$vulnerability[] = array(
@@ -198,15 +189,13 @@ function wpvulnerability_get_statistics() {
 		$response = wp_remote_get( $url );
 		if ( isset( $response['response']['code'] ) && 200 === $response['response']['code'] ) {
 			$body = wp_remote_retrieve_body( $response );
-			set_transient( $key, $body, HOUR_IN_SECONDS * 24 );
+			set_transient( $key, $body, HOUR_IN_SECONDS * 4 );
 		}
 	}
 	$response = json_decode( $vulnerability, true );
-
 	if ( ! isset( $response['data']['stats'] ) ) {
 		return false;
 	}
-
 	return array(
 		'core'    => $response['data']['stats']['core'],
 		'plugins' => $response['data']['stats']['plugins'],
@@ -218,10 +207,8 @@ function wpvulnerability_get_statistics() {
 			'rfc2822'   => gmdate( 'r', $response['updated'] ),
 		),
 	);
-
 }
 
-
 /**
  * Convert vulnerabilities in html
  *
@@ -229,21 +216,20 @@ function wpvulnerability_get_statistics() {
  * @return html
  */
 function wpvulnerability_get_html_vulnerabilities( $vulnerabilities, $type = 'columns' ) {
-	$html = '<table>';
+	$html = '<ul>';
 	foreach ( $vulnerabilities as $vulnerability ) {
 		foreach ( $vulnerability['source'] as $source ) {
-			$html .= '<tr>';
-			$html .= '<td style="background-color:#FAEDE8;padding: 4px 15px 4px 0;"><strong>' . esc_html( $vulnerability['name'] ) . '<br/>' . esc_html( $source['name'] ) . '<br/>' . esc_html( $source['date'] ) . '</strong></td>';
-			if ( str_contains( $type, 'no-columns' ) ) {
-				$html .= '</tr><tr>';
-			}
+			$html .= '<li><b>' . esc_html( $vulnerability['name'] ) . '</b><br>' . esc_html( $source['name'] );
+			//if ( str_contains( $type, 'no-columns' ) ) {
+			//	$html .= '</tr><tr>';
+			//}
 			if ( ! str_contains( $type, 'no-desc' ) ) {
-				$html .= '<td style="background-color:#FAEDE8;padding: 4px 15px 4px 0;">' . esc_html( $source['description'] ) . '</td>';
+				$html .= '<br><i>' . esc_html( $source['description'] ) . '</i>';
 			}
-			$html .= '</tr>';
+			$html .= '</li>';
 		}
 	}
-	$html .= '</table>';
+	$html .= '</ul>';
 	return $html;
 }
 
@@ -267,7 +253,6 @@ function wpvulnerability_get_html_theme_vulnerabilities( $type = 'columns' ) {
 			$found_vulnerabilities = true;
 		}
 	}
-
 	if ( $found_vulnerabilities ) {
 		return $html_vuln;
 	} else {
@@ -282,7 +267,6 @@ function wpvulnerability_get_html_theme_vulnerabilities( $type = 'columns' ) {
  * @return html
  */
 function wpvulnerability_get_html_plugin_vulnerabilities( $type = 'columns' ) {
-
 	$found_vulnerabilities = false;
 	$plugins   = get_plugins();
 	$html_vuln = '';
@@ -301,7 +285,6 @@ function wpvulnerability_get_html_plugin_vulnerabilities( $type = 'columns' ) {
 			$found_vulnerabilities = true;
 		}
 	}
-
 	if ( $found_vulnerabilities ) {
 		return $html_vuln;
 	} else {
diff --git a/languages/ca.mo b/languages/ca.mo
new file mode 100644
index 0000000..9028ace
Binary files /dev/null and b/languages/ca.mo differ
diff --git a/languages/ca.po b/languages/ca.po
new file mode 100644
index 0000000..d1e2833
--- /dev/null
+++ b/languages/ca.po
@@ -0,0 +1,235 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: WPVulnerability\n"
+"POT-Creation-Date: 2023-01-09 10:15+0100\n"
+"PO-Revision-Date: 2023-01-09 10:24+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.2.2\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
+"X-Poedit-WPHeader: wpvulnerability.php\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
+"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;"
+"_n_noop:1,2;_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.min.js\n"
+
+#: includes/class-health-wpvulnerability.php:32
+msgid "WPVulnerability Core"
+msgstr "WPVulnerability nucli"
+
+#: includes/class-health-wpvulnerability.php:37
+msgid "WPVulnerability Themes"
+msgstr "WPVulnerability temes"
+
+#: includes/class-health-wpvulnerability.php:42
+msgid "WPVulnerability Plugins"
+msgstr "WPVulnerability plugins"
+
+#: includes/class-health-wpvulnerability.php:56
+msgid "There aren't WordPress vulnerabilities"
+msgstr "No hi ha vulnerabilitats de WordPress"
+
+#: includes/class-health-wpvulnerability.php:59
+#: includes/class-health-wpvulnerability.php:100
+#: includes/class-health-wpvulnerability.php:142
+msgid "Security"
+msgstr "Seguretat"
+
+#: includes/class-health-wpvulnerability.php:64
+msgid "Shows possible vulnerabilities existing in the WordPress core."
+msgstr ""
+"Mostra les possibles vulnerabilitats existents al nucli del WordPress."
+
+#: includes/class-health-wpvulnerability.php:73
+msgid "There are WordPress Core vulnerabilities"
+msgstr "Hi ha vulnerabilitats del nucli de WordPress"
+
+#: includes/class-health-wpvulnerability.php:77
+msgid ""
+"We've detected potential vulnerabilities in this WordPress installation. "
+"Please check them and keep your installation updated."
+msgstr ""
+"Hem detectat possibles vulnerabilitats en aquesta instal·lació de "
+"WordPress. Per favor, comprem-los i mantenen la teva instal·lació "
+"actualitzada."
+
+#: includes/class-health-wpvulnerability.php:83
+msgid "Update WordPress"
+msgstr "Actualitza WordPress"
+
+#: includes/class-health-wpvulnerability.php:97
+msgid "There aren't themes vulnerabilities"
+msgstr "No hi ha vulnerabilitats de temes"
+
+#: includes/class-health-wpvulnerability.php:105
+msgid "Shows possible vulnerabilities that exist in installed themes."
+msgstr ""
+"Mostra les possibles vulnerabilitats que hi ha en els temes instal·lats."
+
+#: includes/class-health-wpvulnerability.php:115
+msgid "There are themes vulnerabilities"
+msgstr "Hi ha vulnerabilitats en els temes"
+
+#: includes/class-health-wpvulnerability.php:119
+msgid ""
+"We've detected potential vulnerabilities in installed themes. Please check "
+"them and keep them updated."
+msgstr ""
+"Hem detectat possibles vulnerabilitats en els temes instal·lats. Per favor, "
+"comprem-los i mantindre'ls actualitzats."
+
+#: includes/class-health-wpvulnerability.php:125
+msgid "Update themes"
+msgstr "Actualitzar temes"
+
+#: includes/class-health-wpvulnerability.php:139
+msgid "There aren't plugins vulnerabilities"
+msgstr "No hi ha vulnerabilitats de plugins"
+
+#: includes/class-health-wpvulnerability.php:147
+msgid "Shows possible vulnerabilities that exist in installed plugins."
+msgstr ""
+"Mostra les possibles vulnerabilitats que hi ha als plugins instal·lats."
+
+#: includes/class-health-wpvulnerability.php:157
+msgid "There are plugins vulnerabilities"
+msgstr "Hi ha vulnerabilitats als plugins"
+
+#: includes/class-health-wpvulnerability.php:161
+msgid ""
+"We've detected potential vulnerabilities in installed plugins. Please check "
+"them and keep them updated."
+msgstr ""
+"Hem detectat possibles vulnerabilitats en els plugins instal·lats. Per "
+"favor, comproveu-los i manteniu-los actualitzats."
+
+#: includes/class-health-wpvulnerability.php:167
+msgid "Update plugins"
+msgstr "Actualitzar plugins"
+
+#. translators: 1: plugin name
+#: includes/class-plugins-wpvulnerability.php:262
+#, php-format
+msgid "%1$s has a known vulnerability that may be affecting this version."
+msgstr ""
+"%1$s té una vulnerabilitat coneguda que pot estar afectant aquesta versió."
+
+#: includes/class-plugins-wpvulnerability.php:280
+msgid "This plugin is closed. Please replace it with another."
+msgstr "Aquest plugin està tancat. Per favor, reemplaça-ho per un altre."
+
+#: includes/class-plugins-wpvulnerability.php:283
+msgid ""
+"This vulnerability appears to be unpatched. Stay tuned for upcoming plugin "
+"updates."
+msgstr ""
+"Aquesta vulnerabilitat sembla no estar corregida. Esteu atent a pròximes "
+"actualitzacions del plugin."
+
+#: includes/class-plugins-wpvulnerability.php:304
+msgid ""
+"There are possible vulnerabilities in your installation. Please, check your "
+"WordPress, plugins, and themes."
+msgstr ""
+"Hi ha possibles vulnerabilitats en la teva instal·lació. Per favor, revisa "
+"el teu WordPress, plugins i temes."
+
+#. Plugin Name of the plugin/theme
+#: includes/class-wpvul-admin-settings.php:56
+#: includes/class-wpvul-admin-settings.php:57
+msgid "WPVulnerability"
+msgstr "WPVulnerability"
+
+#: includes/class-wpvul-admin-settings.php:88
+msgid "WPVulnerability settings"
+msgstr "Configuració de WPVulnerability"
+
+#: includes/class-wpvul-admin-settings.php:127
+msgid "Receive notifications in your email"
+msgstr "Rep notificacions al teu correu electrònic"
+
+#: includes/class-wpvul-admin-settings.php:134
+msgid "Email address to notify (separated by commas)"
+msgstr "Adreça de correu electrònic a notificar (separada per comes)"
+
+#: includes/class-wpvul-admin-settings.php:142
+msgid "How often you want to receive notifications"
+msgstr "Amb quina freqüència desitges rebre notificacions"
+
+#: includes/class-wpvul-admin-settings.php:183
+msgid "Configure and save these settings to receive email notifications."
+msgstr ""
+"Configuri i guarda aquestes opcions per rebre notificacions per correu "
+"electrònic."
+
+#: includes/class-wpvul-admin-settings.php:210
+msgid "Weekly"
+msgstr "Setmanal"
+
+#: includes/class-wpvul-admin-settings.php:211
+msgid "Daily"
+msgstr "Diari"
+
+#: includes/class-wpvul-notification.php:46
+msgid "Every week"
+msgstr "Cada setmana"
+
+#: includes/class-wpvul-notification.php:60
+msgid "Every day"
+msgstr "Cada dia"
+
+#: includes/class-wpvul-notification.php:84
+msgid "Core vulnerabilities"
+msgstr "Vulnerabilitats del nucli"
+
+#: includes/class-wpvul-notification.php:89
+msgid "Plugins vulnerabilities"
+msgstr "Vulnerabilitats de plugins"
+
+#: includes/class-wpvul-notification.php:94
+msgid "Themes vulnerabilities"
+msgstr "Vulnerabilidades de temas"
+
+#: includes/class-wpvul-notification.php:97
+msgid "Vulnerability found"
+msgstr "Vulnerabilitat trobada"
+
+#. translators: site name.
+#: includes/class-wpvul-notification.php:102
+#, php-format
+msgid "Vulnerability found: %s"
+msgstr "Vulnerabilitat trobada: %s"
+
+#: includes/class-wpvul-notification.php:173
+msgid "Learn more about the WordPress Vulnerability Database API at"
+msgstr ""
+"Obtindre més informació sobre la WordPress Vulnerability Database API a"
+
+#. Plugin URI of the plugin/theme
+msgid "https://vulnerability.wpsysadmin.com/"
+msgstr "https://vulnerability.wpsysadmin.com/"
+
+#. Description of the plugin/theme
+msgid ""
+"Check the security of a WordPress site with information from the WordPress "
+"Vulnerability Database API. Scans Core, plugins, and theme vulnerabilities."
+msgstr ""
+"Comprova la seguretat d'un lloc WordPress amb la informació de la WordPress "
+"Vulnerability Database API. Analitza vulnerabilitats en el nucli, plugins i "
+"temes."
+
+#. Author of the plugin/theme
+msgid "Javier Casares"
+msgstr "Javier Casares"
+
+#. Author URI of the plugin/theme
+msgid "https://www.javiercasares.com/"
+msgstr "https://www.javiercasares.com/"
diff --git a/languages/es_ES.mo b/languages/es_ES.mo
new file mode 100644
index 0000000..23bbdb1
Binary files /dev/null and b/languages/es_ES.mo differ
diff --git a/languages/es_ES.po b/languages/es_ES.po
new file mode 100644
index 0000000..341a624
--- /dev/null
+++ b/languages/es_ES.po
@@ -0,0 +1,234 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: WPVulnerability\n"
+"POT-Creation-Date: 2023-01-09 10:15+0100\n"
+"PO-Revision-Date: 2023-01-09 10:27+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.2.2\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
+"X-Poedit-WPHeader: wpvulnerability.php\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
+"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
+"_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.min.js\n"
+
+#: includes/class-health-wpvulnerability.php:32
+msgid "WPVulnerability Core"
+msgstr "WPVulnerability núcleo"
+
+#: includes/class-health-wpvulnerability.php:37
+msgid "WPVulnerability Themes"
+msgstr "WPVulnerability temas"
+
+#: includes/class-health-wpvulnerability.php:42
+msgid "WPVulnerability Plugins"
+msgstr "WPVulnerability plugins"
+
+#: includes/class-health-wpvulnerability.php:56
+msgid "There aren't WordPress vulnerabilities"
+msgstr "No hay vulnerabilidades de WordPress"
+
+#: includes/class-health-wpvulnerability.php:59
+#: includes/class-health-wpvulnerability.php:100
+#: includes/class-health-wpvulnerability.php:142
+msgid "Security"
+msgstr "Seguridad"
+
+#: includes/class-health-wpvulnerability.php:64
+msgid "Shows possible vulnerabilities existing in the WordPress core."
+msgstr ""
+"Muestra las posibles vulnerabilidades existentes en el núcleo de WordPress."
+
+#: includes/class-health-wpvulnerability.php:73
+msgid "There are WordPress Core vulnerabilities"
+msgstr "Hay vulnerabilidades del núcleo de WordPress"
+
+#: includes/class-health-wpvulnerability.php:77
+msgid ""
+"We've detected potential vulnerabilities in this WordPress installation. "
+"Please check them and keep your installation updated."
+msgstr ""
+"Hemos detectado posibles vulnerabilidades en esta instalación de WordPress. "
+"Por favor, compruébalos y mantén tu instalación actualizada."
+
+#: includes/class-health-wpvulnerability.php:83
+msgid "Update WordPress"
+msgstr "Actualiza WordPress"
+
+#: includes/class-health-wpvulnerability.php:97
+msgid "There aren't themes vulnerabilities"
+msgstr "No hay vulnerabilidades de temas"
+
+#: includes/class-health-wpvulnerability.php:105
+msgid "Shows possible vulnerabilities that exist in installed themes."
+msgstr ""
+"Muestra las posibles vulnerabilidades que existen en los temas instalados."
+
+#: includes/class-health-wpvulnerability.php:115
+msgid "There are themes vulnerabilities"
+msgstr "Hay vulnerabilidades en los temas"
+
+#: includes/class-health-wpvulnerability.php:119
+msgid ""
+"We've detected potential vulnerabilities in installed themes. Please check "
+"them and keep them updated."
+msgstr ""
+"Hemos detectado posibles vulnerabilidades en los temas instalados. Por "
+"favor, compruébalos y mantenlos actualizados."
+
+#: includes/class-health-wpvulnerability.php:125
+msgid "Update themes"
+msgstr "Actualizar temas"
+
+#: includes/class-health-wpvulnerability.php:139
+msgid "There aren't plugins vulnerabilities"
+msgstr "No hay vulnerabilidades de plugins"
+
+#: includes/class-health-wpvulnerability.php:147
+msgid "Shows possible vulnerabilities that exist in installed plugins."
+msgstr ""
+"Muestra las posibles vulnerabilidades que existen en los plugins instalados."
+
+#: includes/class-health-wpvulnerability.php:157
+msgid "There are plugins vulnerabilities"
+msgstr "Hay vulnerabilidades en los plugins"
+
+#: includes/class-health-wpvulnerability.php:161
+msgid ""
+"We've detected potential vulnerabilities in installed plugins. Please check "
+"them and keep them updated."
+msgstr ""
+"Hemos detectado posibles vulnerabilidades en los plugins instalados. Por "
+"favor, compruébalos y mantenlos actualizados."
+
+#: includes/class-health-wpvulnerability.php:167
+msgid "Update plugins"
+msgstr "Actualizar plugins"
+
+#. translators: 1: plugin name
+#: includes/class-plugins-wpvulnerability.php:262
+#, php-format
+msgid "%1$s has a known vulnerability that may be affecting this version."
+msgstr ""
+"%1$s tiene una vulnerabilidad conocida que puede estar afectando a esta "
+"versión."
+
+#: includes/class-plugins-wpvulnerability.php:280
+msgid "This plugin is closed. Please replace it with another."
+msgstr "Este plugin está cerrado. Por favor, reemplázalo por otro."
+
+#: includes/class-plugins-wpvulnerability.php:283
+msgid ""
+"This vulnerability appears to be unpatched. Stay tuned for upcoming plugin "
+"updates."
+msgstr ""
+"Esta vulnerabilidad parece no estar corregida. Estate atento a próximas "
+"actualizaciones del plugin."
+
+#: includes/class-plugins-wpvulnerability.php:304
+msgid ""
+"There are possible vulnerabilities in your installation. Please, check your "
+"WordPress, plugins, and themes."
+msgstr ""
+"Existen posibles vulnerabilidades en tu instalación. Por favor, revisa tu "
+"WordPress, plugins y temas."
+
+#. Plugin Name of the plugin/theme
+#: includes/class-wpvul-admin-settings.php:56
+#: includes/class-wpvul-admin-settings.php:57
+msgid "WPVulnerability"
+msgstr "WPVulnerability"
+
+#: includes/class-wpvul-admin-settings.php:88
+msgid "WPVulnerability settings"
+msgstr "Configuración de WPVulnerability"
+
+#: includes/class-wpvul-admin-settings.php:127
+msgid "Receive notifications in your email"
+msgstr "Recibe notificaciones en tu correo electrónico"
+
+#: includes/class-wpvul-admin-settings.php:134
+msgid "Email address to notify (separated by commas)"
+msgstr "Dirección de correo electrónico a notificar (separada por comas)"
+
+#: includes/class-wpvul-admin-settings.php:142
+msgid "How often you want to receive notifications"
+msgstr "Con qué frecuencia deseas recibir notificaciones"
+
+#: includes/class-wpvul-admin-settings.php:183
+msgid "Configure and save these settings to receive email notifications."
+msgstr ""
+"Configure y guarda estas opciones para recibir notificaciones por correo "
+"electrónico."
+
+#: includes/class-wpvul-admin-settings.php:210
+msgid "Weekly"
+msgstr "Semanal"
+
+#: includes/class-wpvul-admin-settings.php:211
+msgid "Daily"
+msgstr "Diario"
+
+#: includes/class-wpvul-notification.php:46
+msgid "Every week"
+msgstr "Cada semana"
+
+#: includes/class-wpvul-notification.php:60
+msgid "Every day"
+msgstr "Cada día"
+
+#: includes/class-wpvul-notification.php:84
+msgid "Core vulnerabilities"
+msgstr "Vulnerabilidades del núcleo"
+
+#: includes/class-wpvul-notification.php:89
+msgid "Plugins vulnerabilities"
+msgstr "Vulnerabilidades de plugins"
+
+#: includes/class-wpvul-notification.php:94
+msgid "Themes vulnerabilities"
+msgstr "Vulnerabilidades de temas"
+
+#: includes/class-wpvul-notification.php:97
+msgid "Vulnerability found"
+msgstr "Vulnerabilidad encontrada"
+
+#. translators: site name.
+#: includes/class-wpvul-notification.php:102
+#, php-format
+msgid "Vulnerability found: %s"
+msgstr "Vulnerabilidad encontrada: %s"
+
+#: includes/class-wpvul-notification.php:173
+msgid "Learn more about the WordPress Vulnerability Database API at"
+msgstr "Obtén más información sobre la WordPress Vulnerability Database API en"
+
+#. Plugin URI of the plugin/theme
+msgid "https://vulnerability.wpsysadmin.com/"
+msgstr "https://vulnerability.wpsysadmin.com/"
+
+#. Description of the plugin/theme
+msgid ""
+"Check the security of a WordPress site with information from the WordPress "
+"Vulnerability Database API. Scans Core, plugins, and theme vulnerabilities."
+msgstr ""
+"Comprueba la seguridad de un sitio WordPress con la información de la "
+"WordPress Vulnerability Database API. Analiza vulnerabilidades en el núcleo, "
+"plugins y temas."
+
+#. Author of the plugin/theme
+msgid "Javier Casares"
+msgstr "Javier Casares"
+
+#. Author URI of the plugin/theme
+msgid "https://www.javiercasares.com/"
+msgstr "https://www.javiercasares.com/"
diff --git a/languages/wpvulnerability.pot b/languages/wpvulnerability.pot
new file mode 100644
index 0000000..c2c4a0c
--- /dev/null
+++ b/languages/wpvulnerability.pot
@@ -0,0 +1,214 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: WPVulnerability\n"
+"POT-Creation-Date: 2023-01-09 10:15+0100\n"
+"PO-Revision-Date: 2023-01-09 09:56+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Poedit 3.2.2\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
+"X-Poedit-WPHeader: wpvulnerability.php\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
+"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;"
+"_n_noop:1,2;_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.min.js\n"
+
+#: includes/class-health-wpvulnerability.php:32
+msgid "WPVulnerability Core"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:37
+msgid "WPVulnerability Themes"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:42
+msgid "WPVulnerability Plugins"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:56
+msgid "There aren't WordPress vulnerabilities"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:59
+#: includes/class-health-wpvulnerability.php:100
+#: includes/class-health-wpvulnerability.php:142
+msgid "Security"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:64
+msgid "Shows possible vulnerabilities existing in the WordPress core."
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:73
+msgid "There are WordPress Core vulnerabilities"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:77
+msgid ""
+"We've detected potential vulnerabilities in this WordPress installation. "
+"Please check them and keep your installation updated."
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:83
+msgid "Update WordPress"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:97
+msgid "There aren't themes vulnerabilities"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:105
+msgid "Shows possible vulnerabilities that exist in installed themes."
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:115
+msgid "There are themes vulnerabilities"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:119
+msgid ""
+"We've detected potential vulnerabilities in installed themes. Please check "
+"them and keep them updated."
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:125
+msgid "Update themes"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:139
+msgid "There aren't plugins vulnerabilities"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:147
+msgid "Shows possible vulnerabilities that exist in installed plugins."
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:157
+msgid "There are plugins vulnerabilities"
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:161
+msgid ""
+"We've detected potential vulnerabilities in installed plugins. Please check "
+"them and keep them updated."
+msgstr ""
+
+#: includes/class-health-wpvulnerability.php:167
+msgid "Update plugins"
+msgstr ""
+
+#. translators: 1: plugin name
+#: includes/class-plugins-wpvulnerability.php:262
+#, php-format
+msgid "%1$s has a known vulnerability that may be affecting this version."
+msgstr ""
+
+#: includes/class-plugins-wpvulnerability.php:280
+msgid "This plugin is closed. Please replace it with another."
+msgstr ""
+
+#: includes/class-plugins-wpvulnerability.php:283
+msgid ""
+"This vulnerability appears to be unpatched. Stay tuned for upcoming plugin "
+"updates."
+msgstr ""
+
+#: includes/class-plugins-wpvulnerability.php:304
+msgid ""
+"There are possible vulnerabilities in your installation. Please, check your "
+"WordPress, plugins, and themes."
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+#: includes/class-wpvul-admin-settings.php:56
+#: includes/class-wpvul-admin-settings.php:57
+msgid "WPVulnerability"
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:88
+msgid "WPVulnerability settings"
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:127
+msgid "Receive notifications in your email"
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:134
+msgid "Email address to notify (separated by commas)"
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:142
+msgid "How often you want to receive notifications"
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:183
+msgid "Configure and save these settings to receive email notifications."
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:210
+msgid "Weekly"
+msgstr ""
+
+#: includes/class-wpvul-admin-settings.php:211
+msgid "Daily"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:46
+msgid "Every week"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:60
+msgid "Every day"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:84
+msgid "Core vulnerabilities"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:89
+msgid "Plugins vulnerabilities"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:94
+msgid "Themes vulnerabilities"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:97
+msgid "Vulnerability found"
+msgstr ""
+
+#. translators: site name.
+#: includes/class-wpvul-notification.php:102
+#, php-format
+msgid "Vulnerability found: %s"
+msgstr ""
+
+#: includes/class-wpvul-notification.php:173
+msgid "Learn more about the WordPress Vulnerability Database API at"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "https://vulnerability.wpsysadmin.com/"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Check the security of a WordPress site with information from the WordPress "
+"Vulnerability Database API. Scans Core, plugins, and theme vulnerabilities."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Javier Casares"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "https://www.javiercasares.com/"
+msgstr ""
diff --git a/readme.txt b/readme.txt
index e98bafb..7872c2e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,14 +1,14 @@
 === WPVulnerability ===
 Contributors: javiercasares, davidperez, lbonomo
-Tags: security, vulnerability, cve, jvn, patchstack, wpscan, wordfence
+Tags: security, vulnerability, site-health
 Requires at least: 5.2
 Tested up to: 6.1
-Stable tag: 1.2.0
-Version: 1.2.0
+Stable tag: 1.2.1
+Version: 1.2.1
 License: EUPL v1.2
 License URI: https://www.eupl.eu/1.2/en/
 
-Check the security of the WordPress site with the [WordPress Vulnerability Database](https://vulnerability.wpsysadmin.com/) information. Analyzes vulnerabilities in core, plugins and themes.
+Check the security of a WordPress site with information from the [WordPress Vulnerability Database API](https://vulnerability.wpsysadmin.com/). Scans Core, plugins, and theme vulnerabilities.
 
 == Description ==
 
@@ -37,8 +37,7 @@ This plugin or the WordPress Vulnerability Database does not collect any informa
 The information provided by the information database comes from different sources that have been reviewed by third parties. There is no liability of any kind for the information. Act at your own risk.
 
 **Contributors**
-You can contribute to this plugin to [GitHub repository](https://github.com/closemarketing/wpvulnerability)
-
+You can contribute to this plugin to [GitHub repository](https://github.com/javiercasares/wpvulnerability)
 
 == Installation ==
 
@@ -70,31 +69,31 @@ First of all, peace of mind. Investigate what the vulnerability is and, above al
 
 == Changelog ==
 
-= 1.2 =
+= 1.2.1 =
+* Some fixed to improve the operators.
+
+= 1.2.0 =
 * Sends email periodically. You can choose who is going to receive the emails.
 * First approach to WPCLI Commands (thanks to lbonomo).
 
-= 1.1 =
+= 1.1.0 =
 * Fix: Prevents text domain not given correctly.
 * Fix: strings not translated.
 
 = 1.0.1 =
 * Fix: strings not translated.
 
-= 1.0 =
+= 1.0.0 =
 * Added tabs in Health check.
 
-= 0.2 =
+= 0.2.0 =
 * Improved the information in plugins list.
 
-= 0.1 =
+= 0.1.0 =
 * Notification in the plugins list.
 * First release.
 
 == Links ==
 
 *	[WPVulnerability](https://vulnerability.wpsysadmin.com/)
-*	[Close·technology WordPress Plugins](https://close.technology/en/)
 *	[WPSysAdmin](https://www.wpsysadmin.com/)
-
-
diff --git a/wpvulnerability.php b/wpvulnerability.php
index fc2184e..5210c28 100644
--- a/wpvulnerability.php
+++ b/wpvulnerability.php
@@ -2,11 +2,11 @@
 /**
  * Plugin Name: WPVulnerability
  * Plugin URI:  https://vulnerability.wpsysadmin.com/
- * Description: Check the security of the WordPress site with the WordPress Vulnerability Database information. Analyzes vulnerabilities in core, plugins and themes.
+ * Description: Check the security of a WordPress site with information from the WordPress Vulnerability Database API. Scans Core, plugins, and theme vulnerabilities.
  * Requires at least: 5.2
  * Requires PHP: 7.2
- * Version:     1.2.0
- * Author:      javiercasares
+ * Version:     1.2.1
+ * Author:      Javier Casares
  * Author URI:  https://www.javiercasares.com/
  * Text Domain: wpvulnerability
  * Domain Path: /languages
@@ -26,7 +26,7 @@
 defined( 'ABSPATH' ) || die( 'No script kiddies please!' );
 
 define( 'WPVUL_PLUGIN_URL', plugins_url( '/', __FILE__ ) );
-define( 'WPVUL_PLUGIN_VERSION', '1.2.0' );
+define( 'WPVUL_PLUGIN_VERSION', '1.2.1' );
 define( 'WPVUL_PLUGIN_FILE', __FILE__ );
 define( 'WPVUL_PLUGIN_BASE', plugin_basename( __FILE__ ) );
 define( 'WPVUL_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
@@ -48,7 +48,6 @@ function wpvul_plugin_init() {
 require_once WPVUL_PLUGIN_PATH . '/includes/class-wpvul-admin-settings.php';
 require_once WPVUL_PLUGIN_PATH . '/includes/class-wpvul-notification.php';
 
-
 // Initialize our plugin.
 $plugins_wpvulnnerability = new Plugins_WPVulnerability();
 new CLI_WPVulnerability( $plugins_wpvulnnerability );