diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 9fee5bd9..d5becdad 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -503,7 +503,6 @@ foreach ($postArray as $value) {
     hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."quick_help_sections` SET `show` = '1' WHERE `id` = '".intval($value)."'");
 }
 
-//TODO change this to DB calls
 // Save the modsForHesk_settings.inc.php file
 $set['rtl'] = empty($_POST['rtl']) ? 0 : 1;
 $set['show-icons'] = empty($_POST['show-icons']) ? 0 : 1;
@@ -516,6 +515,7 @@ $set['mfh_attachments'] = empty($_POST['email_attachments']) ? 0 : 1;
 $set['show_number_merged'] = empty($_POST['show_number_merged']) ? 0 : 1;
 $set['request_location'] = empty($_POST['request_location']) ? 0 : 1;
 $set['category_order_column'] = empty($_POST['category_order_column']) ? 'cat_order' : 'name';
+
 $rich_text_setting = hesk_POST('rich_text_for_tickets', 0);
 if ($rich_text_setting == 0) {
 	$set['rich_text_for_tickets'] = 0;
@@ -527,6 +527,7 @@ if ($rich_text_setting == 0) {
 	$set['rich_text_for_tickets'] = 1;
 	$set['rich_text_for_tickets_for_customers'] = 1;
 }
+
 $set['statuses_order_column'] = empty($_POST['statuses_order_column']) ? 'sort' : 'name';
 $set['kb_attach_dir'] = hesk_POST('kb_attach_dir', 'attachments');
 
@@ -546,77 +547,32 @@ $set['dropdownItemTextColor'] = hesk_input(hesk_POST('dropdownItemTextColor'));
 $set['dropdownItemTextHoverColor'] = hesk_input(hesk_POST('dropdownItemTextHoverColor'));
 $set['questionMarkColor'] = hesk_input(hesk_POST('questionMarkColor'));
 $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownItemTextHoverBackgroundColor'));
-$modsForHesk_file_content='<?php
-
-//-- Mods For Hesk Theme Color Settings
-$modsForHesk_settings[\'navbarBackgroundColor\'] = \''.$set['navbarBackgroundColor'].'\';
-$modsForHesk_settings[\'navbarBrandColor\'] = \''.$set['navbarBrandColor'].'\';
-$modsForHesk_settings[\'navbarBrandHoverColor\'] = \''.$set['navbarBrandHoverColor'].'\';
-$modsForHesk_settings[\'navbarItemTextColor\'] = \''.$set['navbarItemTextColor'].'\';
-$modsForHesk_settings[\'navbarItemTextHoverColor\'] = \''.$set['navbarItemTextHoverColor'].'\';
-$modsForHesk_settings[\'navbarItemTextSelectedColor\'] = \''.$set['navbarItemTextSelectedColor'].'\';
-$modsForHesk_settings[\'navbarItemSelectedBackgroundColor\'] = \''.$set['navbarItemSelectedBackgroundColor'].'\';
-$modsForHesk_settings[\'dropdownItemTextColor\'] = \''.$set['dropdownItemTextColor'].'\';
-$modsForHesk_settings[\'dropdownItemTextHoverColor\'] = \''.$set['dropdownItemTextHoverColor'].'\';
-$modsForHesk_settings[\'dropdownItemTextHoverBackgroundColor\'] = \''.$set['dropdownItemTextHoverBackgroundColor'].'\';
-$modsForHesk_settings[\'questionMarkColor\'] = \''.$set['questionMarkColor'].'\';
-
-//-- Set this to 1 for right-to-left text.
-$modsForHesk_settings[\'rtl\'] = '.$set['rtl'].';
-
-//-- Set this to 1 to show icons next to navigation menu items
-$modsForHesk_settings[\'show_icons\'] = '.$set['show-icons'].';
-
-//-- Set this to 1 to enable custom field names as keys
-$modsForHesk_settings[\'custom_field_setting\'] = '.$set['custom-field-setting'].';
-
-//-- Set this to 1 to enable email verification for new customers
-$modsForHesk_settings[\'customer_email_verification_required\'] = '.$set['customer-email-verification-required'].';
-
-//-- Set this to 1 to enable HTML-formatted emails.
-$modsForHesk_settings[\'html_emails\'] = '.$set['html_emails'].';
-
-//-- Mailgun Settings
-$modsForHesk_settings[\'use_mailgun\'] = '.$set['use_mailgun'].';
-$modsForHesk_settings[\'mailgun_api_key\'] = \''.$set['mailgun_api_key'].'\';
-$modsForHesk_settings[\'mailgun_domain\'] = \''.$set['mailgun_domain'].'\';
-
-//-- Set this to 1 to enable bootstrap-theme.css
-$modsForHesk_settings[\'use_bootstrap_theme\'] = '.$set['use_bootstrap_theme'].';
-
-//-- Default value for new Knowledgebase article: 0 = Published, 1 = Private, 2 = Draft
-$modsForHesk_settings[\'new_kb_article_visibility\'] = '.$set['new_kb_article_visibility'].';
-
-//-- Setting for adding attachments to email messages. Either 0 for default-HESK behavior, or 1 to send as attachments
-$modsForHesk_settings[\'attachments\'] = '.$set['mfh_attachments'].';
-
-//-- Setting for showing number of merged tickets in the ticket search screen. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'show_number_merged\'] = '.$set['show_number_merged'].';
-
-//-- Setting for requesting user\'s location. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'request_location\'] = '.$set['request_location'].';
-
-//-- Column to sort categories by. Can be either \'name\' or \'cat_order\'
-$modsForHesk_settings[\'category_order_column\'] = \''.$set['category_order_column'].'\';
-
-//-- Setting for using rich-text editor for tickets. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'rich_text_for_tickets\'] = '.$set['rich_text_for_tickets'].';
-
-//-- Column to sort statuses by. Can be either \'sort\' or \'name\'
-$modsForHesk_settings[\'statuses_order_column\'] = \''.$set['statuses_order_column'].'\';
-
-//-- Directory to store knowledgebase articles in.
-$modsForHesk_settings[\'kb_attach_dir\'] = \''.$set['kb_attach_dir'].'\';
-
-//-- Setting for using rich-text editor for customers. 0 = Disable, 1 = Enable
-$modsForHesk_settings[\'rich_text_for_tickets_for_customers\'] = '.$set['rich_text_for_tickets_for_customers'].';';
-
-// Write the file
-if ( ! file_put_contents(HESK_PATH . 'modsForHesk_settings.inc.php', $modsForHesk_file_content) )
-{
-    hesk_error($hesklang['err_modsForHesk_settings']);
-}
-
+mfh_updateSetting('rtl', $set['rtl']);
+mfh_updateSetting('show_icons', $set['show-icons']);
+mfh_updateSetting('custom_field_setting', $set['custom-field-setting']);
+mfh_updateSetting('customer_email_verification_required', $set['customer-email-verification-required']);
+mfh_updateSetting('html_emails', $set['html_emails']);
+mfh_updateSetting('use_bootstrap_theme', $set['use_bootstrap_theme']);
+mfh_updateSetting('new_kb_article_visibility', $set['new_kb_article_visibility']);
+mfh_updateSetting('attachments', $set['mfh_attachments']);
+mfh_updateSetting('show_number_merged', $set['show_number_merged']);
+mfh_updateSetting('request_location', $set['request_location']);
+mfh_updateSetting('category_order_column', $set['category_order_column'], true);
+mfh_updateSetting('rich_text_for_tickets', $set['rich_text_for_tickets']);
+mfh_updateSetting('rich_text_for_tickets_for_customers', $set['rich_text_for_tickets_for_customers']);
+mfh_updateSetting('statuses_order_column', $set['statuses_order_column'], true);
+mfh_updateSetting('kb_attach_dir', $set['kb_attach_dir'], true);
+mfh_updateSetting('navbarBackgroundColor', $set['navbarBackgroundColor'], true);
+mfh_updateSetting('navbarBrandColor', $set['navbarBrandColor'], true);
+mfh_updateSetting('navbarBrandHoverColor', $set['navbarBrandHoverColor'], true);
+mfh_updateSetting('navbarItemTextColor', $set['navbarItemTextColor'], true);
+mfh_updateSetting('navbarItemTextHoverColor', $set['navbarItemTextHoverColor'], true);
+mfh_updateSetting('navbarItemTextSelectedColor', $set['navbarItemTextSelectedColor'], true);
+mfh_updateSetting('navbarItemSelectedBackgroundColor', $set['navbarItemSelectedBackgroundColor'], true);
+mfh_updateSetting('dropdownItemTextColor', $set['dropdownItemTextColor'], true);
+mfh_updateSetting('dropdownItemTextHoverColor', $set['dropdownItemTextHoverColor'], true);
+mfh_updateSetting('questionMarkColor', $set['questionMarkColor'], true);
+mfh_updateSetting('dropdownItemTextHoverBackgroundColor', $set['dropdownItemTextHoverBackgroundColor'], true);
 
 // Prepare settings file and save it
 $settings_file_content='<?php
@@ -857,6 +813,13 @@ exit();
 
 
 /** FUNCTIONS **/
+function mfh_updateSetting($key, $value, $isString = false) {
+	global $hesk_settings;
+
+	$formattedValue = $isString ? "'".hesk_dbEscape($value)."'" : intval($value);
+
+	hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = ".$formattedValue." WHERE `Key` = '".$key."'");
+}
 
 function hesk_checkMinMax($myint,$min,$max,$defval)
 {
diff --git a/inc/header.inc.php b/inc/header.inc.php
index abf72259..fde164a1 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -60,49 +60,6 @@ $modsForHesk_settings = mfh_getSettings();
 	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
     <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-        <style>
-            .navbar-default {
-                background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
-                background-image: none;
-                filter: none;
-            }
-            .navbar-default .navbar-brand {
-                color: <?php echo $modsForHesk_settings['navbarBrandColor']; ?>;
-            }
-            .navbar-default .navbar-brand:focus, .navbar-default .navbar-brand:hover {
-                color: <?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>;
-                background-color: transparent;
-            }
-            .navbar-default .navbar-nav>li>a {
-                color: <?php echo $modsForHesk_settings['navbarItemTextColor']; ?>;
-            }
-            .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover {
-                color: <?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>;
-                background-color: transparent;
-            }
-            .dropdown-menu>li>a {
-                color: <?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>;
-            }
-            .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
-                color: <?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>;
-                text-decoration: none;
-                background-color: <?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>;
-            }
-            .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
-                color: <?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>;
-                background-color: <?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>;
-                background-image: none;
-            }
-            .settingsquestionmark {
-                color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
-                font-size: 14px;
-                cursor: pointer;
-            }
-            .h3questionmark {
-                color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
-                font-size: 14px;
-            }
-        </style>
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
@@ -117,6 +74,47 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-octicon-2.1.2.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
+    <style>
+        .navbar-default {
+            background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
+            background-image: none;
+            filter: none;
+        }
+        .navbar-default .navbar-brand {
+            color: <?php echo $modsForHesk_settings['navbarBrandColor']; ?>;
+        }
+        .navbar-default .navbar-brand:focus, .navbar-default .navbar-brand:hover {
+            color: <?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>;
+            background-color: transparent;
+        }
+        .navbar-default .navbar-nav>li>a {
+            color: <?php echo $modsForHesk_settings['navbarItemTextColor']; ?>;
+        }
+        .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover {
+            color: <?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>;
+            background-color: transparent;
+        }
+        .dropdown-menu>li>a {
+            color: <?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>;
+        }
+        .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
+            color: <?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>;
+            text-decoration: none;
+            background-color: <?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>;
+        }
+        .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
+            color: <?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>;
+            background-color: <?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>;
+            background-image: none;
+        }
+        .settingsquestionmark {
+            color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+            cursor: pointer;
+        }
+        .h3questionmark {
+            color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+        }
+    </style>
 
     <?php
 
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index fd497f8e..c5708c66 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -56,7 +56,7 @@ $modsForHesk_settings = mfh_getSettings();
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
 	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
@@ -71,6 +71,47 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-octicon-2.1.2.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
+	<style>
+		.navbar-default {
+			background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
+			background-image: none;
+			filter: none;
+		}
+		.navbar-default .navbar-brand {
+			color: <?php echo $modsForHesk_settings['navbarBrandColor']; ?>;
+		}
+		.navbar-default .navbar-brand:focus, .navbar-default .navbar-brand:hover {
+			color: <?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>;
+			background-color: transparent;
+		}
+		.navbar-default .navbar-nav>li>a {
+			color: <?php echo $modsForHesk_settings['navbarItemTextColor']; ?>;
+		}
+		.navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover {
+			color: <?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>;
+			background-color: transparent;
+		}
+		.dropdown-menu>li>a {
+			color: <?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>;
+		}
+		.dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
+			color: <?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>;
+			text-decoration: none;
+			background-color: <?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>;
+		}
+		.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover {
+			color: <?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>;
+			background-color: <?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>;
+			background-image: none;
+		}
+		.settingsquestionmark {
+			color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+			cursor: pointer;
+		}
+		.h3questionmark {
+			color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
+		}
+	</style>
 
     <?php
 	/* Prepare Javascript that browser should load on page load */