diff --git a/bl-kernel/admin/views/plugins.php b/bl-kernel/admin/views/plugins.php
index 7a3b8c8d..e1f6e296 100644
--- a/bl-kernel/admin/views/plugins.php
+++ b/bl-kernel/admin/views/plugins.php
@@ -97,6 +97,10 @@ echo Bootstrap::formTitle(array('icon' => 'check-square', 'title' => $L->g('Enab
 echo '<table class="table table-striped"><tbody>';
 
 foreach ($pluginsInstalled as $plugin) {
+    if ($plugin->type() == 'theme') {
+        // Do not display theme's plugins
+        continue;
+    }
     echo '<tr id="' . $plugin->className() . '" class="searchItem">';
 
     echo '<td class="align-middle pt-3 pb-3 w-25">';
@@ -105,10 +109,7 @@ foreach ($pluginsInstalled as $plugin) {
     if (method_exists($plugin, 'form')) {
         echo '<a class="me-3" href="' . HTML_PATH_ADMIN_ROOT . 'plugins-settings/' . $plugin->className() . '">' . $L->g('Settings') . '</a>';
     }
-    // You can not disable a plugin for theme which is active
-    if ($plugin->type() != 'theme') {
-        echo '<span class="link deactivatePlugin" data-class-name="' . $plugin->className() . '">' . $L->g('Deactivate') . '</a>';
-    }
+    echo '<span class="link deactivatePlugin" data-class-name="' . $plugin->className() . '">' . $L->g('Deactivate') . '</a>';
     echo '</div>';
     echo '</td>';
 
@@ -137,6 +138,10 @@ echo '<table class="table table-striped"><tbody>';
 
 $pluginsNotInstalled = array_diff_key($plugins['all'], $pluginsInstalled);
 foreach ($pluginsNotInstalled as $plugin) {
+    if ($plugin->type() == 'theme') {
+        // Do not display theme's plugins
+        continue;
+    }
     echo '<tr id="' . $plugin->className() . '" class="searchItem">';
 
     echo '<td class="align-middle pt-3 pb-3 w-25">';
diff --git a/bl-kernel/admin/views/themes.php b/bl-kernel/admin/views/themes.php
index 725a183d..198b968c 100644
--- a/bl-kernel/admin/views/themes.php
+++ b/bl-kernel/admin/views/themes.php
@@ -45,7 +45,7 @@ foreach ($themes as $theme) {
 	echo '
 	<tr>
 		<td class="align-middle pt-4 pb-4">
-			<div>'.$theme['name'].($theme['dirname']==$site->theme()?'<span class="badge bg-primary ms-2">'.$L->g('Enabled').'</span>':'').'</div>
+			<div>'.$theme['name'].($theme['dirname']==$site->theme()?'<span class="badge bg-primary ms-2">'.$L->g('Active').'</span>':'').'</div>
 			<div class="mt-1">
 	';
 
diff --git a/bl-kernel/boot/rules/99.themes.php b/bl-kernel/boot/rules/99.themes.php
index 3cefb31e..7dd74ed8 100644
--- a/bl-kernel/boot/rules/99.themes.php
+++ b/bl-kernel/boot/rules/99.themes.php
@@ -9,26 +9,23 @@ $theme = getPlugin($site->theme()); // Returns plugin object or False
 // Functions
 // ============================================================================
 
-function buildThemes()
-{
+function buildThemes() {
 	global $site;
 
 	$themes = array();
 	$themesPaths = Filesystem::listDirectories(PATH_THEMES);
 
-	foreach($themesPaths as $themePath)
-	{
+	foreach ($themesPaths as $themePath) {
 		// Check if the theme is translated.
 		$languageFilename = $themePath.DS.'languages'.DS.$site->language().'.json';
 		if( !Sanitize::pathFile($languageFilename) ) {
 			$languageFilename = $themePath.DS.'languages'.DS.DEFAULT_LANGUAGE_FILE;
 		}
 
-		if( Sanitize::pathFile($languageFilename) )
-		{
+		if( Sanitize::pathFile($languageFilename) ) {
 			$database = file_get_contents($languageFilename);
 			$database = json_decode($database, true);
-			if(empty($database)) {
+			if (empty($database)) {
 				Log::set('99.themes.php'.LOG_SEP.'Language file error on theme '.$themePath);
 				break;
 			}
diff --git a/bl-themes/blogx/css/style.css b/bl-themes/blogx/css/style.css
index b953ac11..c50a953d 100755
--- a/bl-themes/blogx/css/style.css
+++ b/bl-themes/blogx/css/style.css
@@ -112,4 +112,13 @@ footer {
 /* Icons */
 .bi {
     margin-right: .5rem!important;
-  }
\ No newline at end of file
+  }
+
+/* Remove Focus glow */
+.btn:focus,
+.form-control:focus,
+.form-select:focus,
+input:focus {
+  outline: none !important;
+  box-shadow: none !important;
+}
\ No newline at end of file
diff --git a/bl-themes/popeye/index.php b/bl-themes/popeye/index.php
index a6acccd9..65d8af81 100755
--- a/bl-themes/popeye/index.php
+++ b/bl-themes/popeye/index.php
@@ -35,12 +35,12 @@
 		}
 	?>
 
-	<?php if ($theme->googleFonts()): ?>
-		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:sans,bold">
-		<style>
-			body { font-family: "Open Sans", sans-serif; }
-		</style>
-	<?php endif; ?>
+    <?php if ($theme->googleFonts()): ?>
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:sans,bold">
+        <style>
+            body { font-family: "Open Sans", sans-serif; }
+        </style>
+    <?php endif; ?>
 
 	<!-- Execute Bludit plugins for the hook "Site head" -->
 	<?php execPluginsByHook('siteHead'); ?>