From 77cff78bf2be397f765f1481078ddce9aedd3ac4 Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Sun, 27 Mar 2016 00:32:19 -0600
Subject: [PATCH] Theme adjustments and fixes. Flesh out Theme Default Settings
 descriptions.

---
 themes/default/app_defaults.php | 98 ++++++++++++---------------------
 themes/default/template.php     | 64 +++++++++++----------
 2 files changed, 71 insertions(+), 91 deletions(-)

diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php
index 32f886c071..4d78b2c3ff 100644
--- a/themes/default/app_defaults.php
+++ b/themes/default/app_defaults.php
@@ -54,7 +54,7 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_value'] = '#6c89b5';
 		$array[$x]['default_setting_enabled'] = 'true';
 		$array[$x]['default_setting_order'] = '0';
-		$array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.';
+		$array[$x]['default_setting_description'] = 'Set a background color.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'background_color';
@@ -62,7 +62,7 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_value'] = '#144794';
 		$array[$x]['default_setting_order'] = '1';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set a secondary background (HTML compatible) color, for a gradient effect.';
+		$array[$x]['default_setting_description'] = 'Set a secondary background color, for a gradient effect.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'login_opacity';
@@ -76,14 +76,14 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#888888';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the shadow color (HTML compatible) of the login box.';
+		$array[$x]['default_setting_description'] = 'Set the shadow color of the login box.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'login_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ffffff';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the background color (hexadecimal) for the login box.';
+		$array[$x]['default_setting_description'] = 'Set the background color for the login box.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'domain_visible';
@@ -104,91 +104,63 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#000000';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the text color for domain name.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'domain_shadow_color';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '#ffffff';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the text shadow color for domain name (Enhanced theme only).';
-		$x++;
-		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'domain_background_color';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '#000000';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the background color (hexadecimal) for the domain name.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'domain_background_opacity';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '0.1';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the background opacity of the domain name.';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) for domain name.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'footer_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#000000';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the footer bar.';
+		$array[$x]['default_setting_description'] = 'Set the background color (and opacity) for the footer bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'footer_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ffffff';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the footer bar.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'footer_opacity';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '0.2';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the opacity of the footer bar (decimal).';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) for the footer bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_default_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ccffcc';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the positive (default) message bar.';
+		$array[$x]['default_setting_description'] = 'Set the background color for the positive (default) message bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_default_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#004200';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the positive (default) message bar text.';
+		$array[$x]['default_setting_description'] = 'Set the text color for the positive (default) message bar text.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_negative_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ffcdcd';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the negative message bar.';
+		$array[$x]['default_setting_description'] = 'Set the background color for the negative message bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_negative_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#670000';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the negative message bar text.';
+		$array[$x]['default_setting_description'] = 'Set the text color for the negative message bar text.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_alert_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ffe585';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the background color (HTML compatible) for the alert message bar.';
+		$array[$x]['default_setting_description'] = 'Set the background color for the alert message bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_alert_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#d66721';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Set the foreground color (HTML compatible) for the alert message bar text.';
+		$array[$x]['default_setting_description'] = 'Set the text color for the alert message bar text.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'message_opacity';
@@ -217,14 +189,14 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#fffff';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Set the background color of the content';
+		$array[$x]['default_setting_description'] = 'Set then body background color (and opacity) of the content.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'body_shadow_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#000000';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the color (and opacity) of the body.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'cache';
@@ -238,105 +210,105 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#888888';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the shadow color (and opacity) of the domain selector pane.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'logo_align';
 		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = 'left';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'true';
+		$array[$x]['default_setting_value'] = 'center';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the alignment of the header logo (Inline menu only)';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_main_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ff0000';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set a background color (and opacity) of the main menu bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
-		$array[$x]['default_setting_subcategory'] = 'menu_main_background_color';
+		$array[$x]['default_setting_subcategory'] = 'menu_main_background_image';
 		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '';
+		$array[$x]['default_setting_value'] = '/themes/default/images/background_black.png';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set a background image for the main menu bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_main_shadow_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#000000';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the shadow color (and opacity) of the main menu bar.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_main_text_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ffffff';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the text color of the main menu items.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_main_text_color_hover';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#69e5ff';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the text hover color of the main menu items.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_position';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = 'top';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the position of the main menu (Fixed menu only).';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_style';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = 'fixed';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the style of the main menu.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_sub_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the background color (and opacity) of the sub menus.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_sub_background_color_hover';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the hover background color (and opacity) of the sub menu items.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_sub_icons';
 		$array[$x]['default_setting_name'] = 'boolean';
 		$array[$x]['default_setting_value'] = 'false';
 		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Show indicator icons next to selected sub menu items.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_sub_shadow_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#000000';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Set the shadow color (and opacity) of sub menus.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_sub_text_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#ffffff';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of sub menu items.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'menu_sub_text_color_hover';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#69e5ff';
 		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = '';
+		$array[$x]['default_setting_description'] = 'Set the hover text color (and opacity) of sub menu items.';
 
 		if($set_session_theme){
 			foreach ($array as $index => $default_settings) {
diff --git a/themes/default/template.php b/themes/default/template.php
index 53d44fb7f3..aeb97a3405 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -139,17 +139,17 @@
 		}
 		else if ($_SESSION['theme']['background_color'][0] != '' && $_SESSION['theme']['background_color'][1] != '') { // vertical gradient
 			$background_color = "background: ".$_SESSION['theme']['background_color'][0].";\n";
-			$background_color .= "background-image: -ms-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
-			$background_color .= "background-image: -moz-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
-			$background_color .= "background-image: -o-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
-			$background_color .= "background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, ".$_SESSION['theme']['background_color'][0]."), color-stop(1, ".$_SESSION['theme']['background_color'][1]."));\n";
-			$background_color .= "background-image: -webkit-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
-			$background_color .= "background-image: linear-gradient(to bottom, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
-		}
-		else { // default: white
-			$background_color = "background: #fff;";
+			$background_color .= "background: -ms-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
+			$background_color .= "background: -moz-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
+			$background_color .= "background: -o-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
+			$background_color .= "background: -webkit-gradient(linear, left top, left bottom, color-stop(0, ".$_SESSION['theme']['background_color'][0]."), color-stop(1, ".$_SESSION['theme']['background_color'][1]."));\n";
+			$background_color .= "background: -webkit-linear-gradient(top, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
+			$background_color .= "background: linear-gradient(to bottom, ".$_SESSION['theme']['background_color'][0]." 0%, ".$_SESSION['theme']['background_color'][1]." 100%);\n";
 		}
 	}
+	else { // default: white
+		$background_color = "background: #fff;\n";
+	}
 ?>
 
 <style type='text/css'>
@@ -169,29 +169,18 @@
 		if ($_SESSION['background_image'] != '') {
 			echo "background-image: url('".$_SESSION['background_image']."');\n";
 			echo "background-size: 100% 100%;\n";
-			echo "background-repeat: no-repeat;\n";
 			echo "background-position: top;\n";
-			echo "background-attachment: fixed;\n";
 		}
 		else {
 			echo $background_color;
 		}
 		?>
+		background-repeat: no-repeat;
+		background-attachment: fixed;
 	}
 
 	div#footer {
 		background: <?php echo $_SESSION['theme']['footer_background_color']['text']; ?>;
-		<?php
-		if ($_SESSION['theme']['footer_opacity']['text'] != '') {
-			?>
-			-khtml-opacity: <?php echo $_SESSION['theme']['footer_opacity']['text']; ?>;
-			-moz-opacity: <?php echo $_SESSION['theme']['footer_opacity']['text']; ?>;
-			filter: alpha(opacity=<?php echo (100 * (float) $_SESSION['theme']['footer_opacity']['text']); ?>);
-			filter: progid:DXImageTransform.Microsoft.Alpha(opacity=<?php echo $_SESSION['theme']['footer_opacity']['text']; ?>);
-			opacity: <?php echo $_SESSION['theme']['footer_opacity']['text']; ?>;
-			<?php
-		}
-		?>
 		text-align: center;
 		vertical-align: middle;
 		padding: 8px;
@@ -261,8 +250,27 @@
 		margin: 1px 7px 0 0;
 		}
 
-	.dropdown:hover .dropdown-menu {
-		display: block;
+	@media(min-width: 768px) {
+		.dropdown:hover .dropdown-menu {
+			display: block;
+			}
+	}
+
+	/* xs menu toggle button */
+	.navbar-inverse .navbar-toggle {
+		border: none;
+		}
+
+	.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus, .navbar-inverse .navbar-toggle:active {
+		background: <?php echo ($_SESSION['theme']['menu_main_background_color']['text'] != '') ? $_SESSION['theme']['menu_main_background_color']['text'] : 'rgba(0,0,0,0.90)'; ?>;
+		}
+
+	.navbar-inverse .navbar-toggle .icon-bar {
+		background: <?php echo ($_SESSION['theme']['menu_main_text_color']['text'] != '') ? $_SESSION['theme']['menu_main_text_color']['text'] : '#fff'; ?>;
+		}
+
+	.navbar-inverse .navbar-toggle:hover > .icon-bar {
+		background: <?php echo ($_SESSION['theme']['menu_main_text_color_hover']['text'] != '') ? $_SESSION['theme']['menu_main_text_color_hover']['text'] : '#fd9c03'; ?>;
 		}
 
 	/* sub menu container */
@@ -303,7 +311,7 @@
 		}
 
 	#logout_icon {
-		color: #ffffff;
+		color: <?php echo ($_SESSION['theme']['domain_color']['text'] != '') ? $_SESSION['theme']['domain_color']['text'] : '#fff'; ?>;
 		font-size: 11pt;
 		margin: 16px 19px 0 5px;
 		filter: alpha(opacity=80);
@@ -1565,7 +1573,7 @@
 					<div class="navbar-header">
 						<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
 							<span class="sr-only">Toggle navigation</span>
-							<span class="icon-bar"></span>
+							<span class="icon-bar" style='margin-top: 1px;'></span>
 							<span class="icon-bar"></span>
 							<span class="icon-bar"></span>
 						</button>
@@ -1624,7 +1632,7 @@
 									foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
 										$mod_a_2 = ($menu_sub['menu_item_link'] != '') ? $menu_sub['menu_item_link'] : '#';
 										$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
-										if ($_SESSION['theme']['menu_sub_icons']) {
+										if ($_SESSION['theme']['menu_sub_icons']['boolean'] == 'true') {
 											$mod_nw = ($menu_sub['menu_item_category'] == 'external') ? "<span class='glyphicon glyphicon-new-window'></span>" : null;
 											switch ($menu_sub['menu_item_title']) {
 												case 'Logout': $mod_icon = "<span class='glyphicon glyphicon-log-out'></span>"; break;
@@ -1677,7 +1685,7 @@
 					$logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left';
 					echo str_replace("center", $logo_align, $open_container);
 					if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/resources/install.php") {
-						$logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/enhanced/images/logo.png";
+						$logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png";
 						echo "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px;'></a>";
 					}