diff --git a/lib/settings-update.php b/lib/settings-update.php
index 90e2425..0054e2c 100644
--- a/lib/settings-update.php
+++ b/lib/settings-update.php
@@ -1,13 +1,13 @@
 <?php
-include_once("settings-common.php");
+include_once "settings-common.php";
 $text = $_SESSION['text'];
 $t = $text['settings-update'];
 
 // Update this config file?
-if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
-    (isset($_POST["theme"]) && $_POST["theme"] || isset($_GET['action']) && "turnOffTutorialOnLogin" === $_GET['action'])
+if (!$demoMode && true === isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
+    (true === isset($_POST["theme"]) && $_POST["theme"] || true === isset($_GET['action']) && "turnOffTutorialOnLogin" === $_GET['action'])
 ) {
-	$settingsContents = getData("../data/".$settingsFile);
+	$settingsContents = getData("../data/" . $settingsFile);
 
 	// Just updating tutorialOnLogin setting
 	if (true === isset($_GET['action']) && "turnOffTutorialOnLogin" === $_GET['action']) {
@@ -16,14 +16,14 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
             fwrite($fh, str_replace('"tutorialOnLogin"	=> true', '"tutorialOnLogin"	=> false', $settingsContents));
             fclose($fh);
         } else {
-            echo "<script>parent.parent.ICEcoder.message('" . $t['Cannot update config'] . " data/" . $settingsFile . " " . $t['and try again'] . "');</script>";
+            echo "<script>parent.ICEcoder.message('" . $t['Cannot update config'] . " data/" . $settingsFile . " " . $t['and try again'] . "');</script>";
         }
         exit;
     }
 
 	// Replace our settings vars
-	$repPosStart = strpos($settingsContents,'"root"');
-	$repPosEnd = strpos($settingsContents,'"plugins"');
+	$repPosStart = strpos($settingsContents, '"root"');
+	$repPosEnd = strpos($settingsContents, '"plugins"');
 
 	// Has there been a language change?
 	$languageUserChanged = $ICEcoder['languageUser'] != $_POST['languageUser'];
@@ -32,7 +32,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
     $ICEcoder = array_merge(
         $ICEcoder,
 	    [
-	        "root"               => xssClean($_POST['root'],"html"),
+	        "root"               => xssClean($_POST['root'], "html"),
             "checkUpdates"       => isset($_POST['checkUpdates']) && $_POST['checkUpdates'] ? "true" : "false",
             "openLastFiles"      => isset($_POST['openLastFiles']) && $_POST['openLastFiles'] ? "true" : "false",
             "updateDiffOnSave"   => isset($_POST['updateDiffOnSave']) && $_POST['updateDiffOnSave'] ? "true" : "false",
@@ -40,15 +40,15 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
             "backupsKept"        => isset($_POST['backupsKept']) && $_POST['backupsKept'] ? "true" : "false",
             "backupsDays"        => intval($_POST['backupsDays']),
             "deleteToTmp"        => isset($_POST['deleteToTmp']) && $_POST['deleteToTmp'] ? "true" : "false",
-            "findFilesExclude"   => 'array("'.str_replace(',','","',str_replace(" ","",$_POST['findFilesExclude'])).'")',
+            "findFilesExclude"   => 'array("'.str_replace(',', '","', str_replace(" ", "", $_POST['findFilesExclude'])) . '")',
             "codeAssist"         => isset($_POST['codeAssist']) && $_POST['codeAssist'] ? "true" : "false",
             "visibleTabs"        => isset($_POST['visibleTabs']) && $_POST['visibleTabs'] ? "true" : "false",
             "lockedNav"          => isset($_POST['lockedNav']) && $_POST['lockedNav'] ? "true" : "false",
             "tagWrapperCommand"  => $_POST['tagWrapperCommand'],
             "autoComplete"       => $_POST['autoComplete'],
-            "bannedFiles"        => 'array("'.str_replace(',','","',str_replace(" ","",$_POST['bannedFiles'])).'")',
-            "bannedPaths"        => 'array("'.str_replace(',','","',str_replace(" ","",$_POST['bannedPaths'])).'")',
-            "allowedIPs"         => 'array("'.str_replace(',','","',str_replace(" ","",$_POST['allowedIPs'])).'")',
+            "bannedFiles"        => 'array("' . str_replace(',', '","', str_replace(" ", "", $_POST['bannedFiles'])) . '")',
+            "bannedPaths"        => 'array("' . str_replace(',', '","', str_replace(" ", "", $_POST['bannedPaths'])) . '")',
+            "allowedIPs"         => 'array("' . str_replace(',', '","', str_replace(" ", "", $_POST['allowedIPs'])) . '")',
             "autoLogoutMins"     => intval($_POST['autoLogoutMins']),
             "theme"              => $_POST['theme'],
             "fontSize"           => $_POST['fontSize'],
@@ -63,7 +63,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
             "indentSize"         => intval($_POST['indentSize']),
             "pluginPanelAligned" => $_POST['pluginPanelAligned'],
             "scrollbarStyle"     => $_POST['scrollbarStyle'],
-            "bugFilePaths"       => 'array("'.str_replace(',','","',str_replace(" ","",$_POST['bugFilePaths'])).'")',
+            "bugFilePaths"       => 'array("'.str_replace(',', '","', str_replace(" ", "", $_POST['bugFilePaths'])) . '")',
             "bugFileCheckTimer"  => intval($_POST['bugFileCheckTimer']) >= 0 ? intval($_POST['bugFileCheckTimer']) : 0,
             "bugFileMaxLines"    => intval($_POST['bugFileMaxLines'])
         ]
@@ -71,22 +71,22 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
 
     if ($_POST['password']!="")		{$ICEcoder["password"] = generateHash($_POST['password']);};
 
-	$settingsArray = array("root","checkUpdates","openLastFiles","updateDiffOnSave","languageUser","backupsKept","backupsDays","deleteToTmp","findFilesExclude","codeAssist","visibleTabs","lockedNav","tagWrapperCommand","autoComplete","password","bannedFiles","bannedPaths","allowedIPs","autoLogoutMins","theme","fontSize","lineWrapping","lineNumbers","showTrailingSpace","matchBrackets","autoCloseTags","autoCloseBrackets","indentWithTabs","indentAuto","indentSize","pluginPanelAligned","scrollbarStyle","bugFilePaths","bugFileCheckTimer","bugFileMaxLines");
+	$settingsArray = ["root", "checkUpdates", "openLastFiles", "updateDiffOnSave", "languageUser", "backupsKept", "backupsDays", "deleteToTmp", "findFilesExclude", "codeAssist", "visibleTabs", "lockedNav", "tagWrapperCommand", "autoComplete", "password", "bannedFiles", "bannedPaths", "allowedIPs", "autoLogoutMins", "theme", "fontSize", "lineWrapping", "lineNumbers", "showTrailingSpace", "matchBrackets", "autoCloseTags", "autoCloseBrackets", "indentWithTabs", "indentAuto", "indentSize", "pluginPanelAligned", "scrollbarStyle", "bugFilePaths", "bugFileCheckTimer", "bugFileMaxLines"];
 	$settingsNew = "";
-	for ($i=0;$i<count($settingsArray);$i++) {
-		$settingsNew .= '"'.$settingsArray[$i].'"	=> ';
+	for ($i = 0;$i < count($settingsArray); $i++) {
+		$settingsNew .= '"' . $settingsArray[$i] . '"	=> ';
 		// Wrap certain values in double quotes
-		$settingWrap = $settingsArray[$i]=="root"||$settingsArray[$i]=="password"||$settingsArray[$i]=="languageUser"||$settingsArray[$i]=="theme"||$settingsArray[$i]=="fontSize"||$settingsArray[$i]=="tagWrapperCommand"||$settingsArray[$i]=="autoComplete"||$settingsArray[$i]=="pluginPanelAligned"||$settingsArray[$i]=="scrollbarStyle" ? '"' : '';
+		$settingWrap = $settingsArray[$i] == "root" || $settingsArray[$i] == "password" || $settingsArray[$i] == "languageUser" || $settingsArray[$i] == "theme" || $settingsArray[$i] == "fontSize" || $settingsArray[$i] == "tagWrapperCommand" || $settingsArray[$i] == "autoComplete" || $settingsArray[$i] == "pluginPanelAligned" || $settingsArray[$i] == "scrollbarStyle" ? '"' : '';
 
-		if ($settingsArray[$i]=="password") {
-			$settingsNew .= str_replace("\$", "\\$", $settingWrap.$ICEcoder[$settingsArray[$i]].$settingWrap.','.PHP_EOL);
+		if ("password" === $settingsArray[$i]) {
+			$settingsNew .= str_replace("\$", "\\$", $settingWrap . $ICEcoder[$settingsArray[$i]] . $settingWrap . ',' . PHP_EOL);
 		} else {
-			$settingsNew .= $settingWrap.$ICEcoder[$settingsArray[$i]].$settingWrap.','.PHP_EOL;
+			$settingsNew .= $settingWrap.$ICEcoder[$settingsArray[$i]] . $settingWrap . ',' . PHP_EOL;
 		}
 	}
 
 	// Compile our new settings
-	$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,($repPosEnd),strlen($settingsContents));
+	$settingsContents = substr($settingsContents, 0, $repPosStart) . $settingsNew . substr($settingsContents, ($repPosEnd), strlen($settingsContents));
 
 	// Now update the config file
 	if (is_writeable("../data/".$settingsFile)) {
@@ -94,38 +94,40 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
 		fwrite($fh, $settingsContents);
 		fclose($fh);
 	} else {
-		echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config']." data/".$settingsFile." ".$t['and try again']."');</script>";
+		echo "<script>parent.ICEcoder.message('" . $t['Cannot update config'] . " data/" . $settingsFile . " " . $t['and try again'] . "');</script>";
 	}
 
 	// OK, now the config file has been updated, update our current session with new arrays
-	$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
-	for ($i=0;$i<count($settingsArray);$i++) {
-		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",",str_replace(" ","",$_POST[$settingsArray[$i]]));
+	$settingsArray = array("findFilesExclude", "bannedFiles", "allowedIPs");
+	for ($i = 0; $i <count($settingsArray); $i++) {
+		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",", str_replace(" ", "", $_POST[$settingsArray[$i]]));
 	}
 
 	// Work out the theme to use now
-	$ICEcoder["theme"]=="default" ? $themeURL = 'assets/css/editor.css' : $themeURL = 'assets/css/theme/'.$ICEcoder["theme"].'.css';
-	$themeURL .= "?microtime=".microtime(true);
+    $themeURL = "default" === $ICEcoder["theme"]
+        ? 'assets/css/editor.css'
+        : 'assets/css/theme/' . $ICEcoder["theme"] . '.css';
+	$themeURL .= "?microtime=" . microtime(true);
 
 	// Do we need a file manager refresh?
-	$refreshFM = $_POST['changedFileSettings']=="true" ? "true" : "false";
+	$refreshFM = $_POST['changedFileSettings'] == "true" ? "true" : "false";
 
 	// Change multiUser and enableRegistration in config___settings.php
-	$generalSettingsContents = getData(dirname(__FILE__)."/../data/".$configSettings);
+	$generalSettingsContents = getData(dirname(__FILE__) . "/../data/" . $configSettings);
 	$isMultiUser = isset($_POST['multiUser']) && $_POST['multiUser'] ? "true" : "false";
-	$generalSettingsContents = str_replace('"multiUser"		=> true,','"multiUser"		=> '.$isMultiUser.',',$generalSettingsContents);
-	$generalSettingsContents = str_replace('"multiUser"		=> false,','"multiUser"		=> '.$isMultiUser.',',$generalSettingsContents);
+	$generalSettingsContents = str_replace('"multiUser"		=> true,', '"multiUser"		=> ' . $isMultiUser . ',', $generalSettingsContents);
+	$generalSettingsContents = str_replace('"multiUser"		=> false,', '"multiUser"		=> ' . $isMultiUser . ',', $generalSettingsContents);
 
 	$isEnableRegistration = isset($_POST['enableRegistration']) && $_POST['enableRegistration'] ? "true" : "false";
-	$generalSettingsContents = str_replace('"enableRegistration"	=> true','"enableRegistration"	=> '.$isEnableRegistration,$generalSettingsContents);
-	$generalSettingsContents = str_replace('"enableRegistration"	=> false','"enableRegistration"	=> '.$isEnableRegistration,$generalSettingsContents);
+	$generalSettingsContents = str_replace('"enableRegistration"	=> true', '"enableRegistration"	=> ' . $isEnableRegistration, $generalSettingsContents);
+	$generalSettingsContents = str_replace('"enableRegistration"	=> false', '"enableRegistration"	=> ' . $isEnableRegistration, $generalSettingsContents);
 
-	if (is_writeable(dirname(__FILE__)."/../data/".$configSettings)) {
-		$fConfigSettings = fopen(dirname(__FILE__)."/../data/".$configSettings, 'w');
+	if (is_writeable(dirname(__FILE__) . "/../data/" . $configSettings)) {
+		$fConfigSettings = fopen(dirname(__FILE__)."/../data/" . $configSettings, 'w');
 		fwrite($fConfigSettings, $generalSettingsContents);
 		fclose($fConfigSettings);
 	} else {
-		echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config']." data/".$configSettings." ".$t['and try again']."');</script>";
+		echo "<script>parent.ICEcoder.message('" . $t['Cannot update config'] . " data/" . $configSettings . " " . $t['and try again'] . "');</script>";
 	}
 
 	// If we've changed langugage, reload ICEcoder now
@@ -135,6 +137,32 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] &&
 	}
 
 	// With all that worked out, we can now hide the settings screen and apply the new settings
-	$jsBugFilePaths = "['".str_replace(",","','",str_replace(" ","",$_POST['bugFilePaths']))."']";
-	echo "<script>parent.parent.ICEcoder.settingsScreen('hide');parent.parent.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",'".$ICEcoder["tagWrapperCommand"]."','".$ICEcoder["autoComplete"]."',".$ICEcoder["visibleTabs"].",'".$ICEcoder["fontSize"]."',".$ICEcoder["lineWrapping"].",".$ICEcoder["lineNumbers"].",".$ICEcoder["showTrailingSpace"].",".$ICEcoder["matchBrackets"].",".$ICEcoder["autoCloseTags"].",".$ICEcoder["autoCloseBrackets"].",".$ICEcoder["indentWithTabs"].",".$ICEcoder["indentAuto"].",".$ICEcoder["indentSize"].",'".$ICEcoder["pluginPanelAligned"]."','".$ICEcoder["scrollbarStyle"]."',".$jsBugFilePaths.",".$ICEcoder["bugFileCheckTimer"].",".$ICEcoder["bugFileMaxLines"].",".$ICEcoder["updateDiffOnSave"].",".$ICEcoder["autoLogoutMins"].",".$refreshFM.");iceRoot = '".$ICEcoder["root"]."';</script>";
+	$jsBugFilePaths = "['" . str_replace(",", "','", str_replace(" ", "", $_POST['bugFilePaths'])) . "']";
+	echo "<script>parent.ICEcoder.settingsScreen('hide'); parent.ICEcoder.useNewSettings('" .
+        $themeURL . "'," .
+        $ICEcoder["codeAssist"] . "," .
+        $ICEcoder["lockedNav"] . ",'" .
+        $ICEcoder["tagWrapperCommand"] . "','" .
+        $ICEcoder["autoComplete"] . "'," .
+        $ICEcoder["visibleTabs"] . ",'" .
+        $ICEcoder["fontSize"] . "'," .
+        $ICEcoder["lineWrapping"] . "," .
+        $ICEcoder["lineNumbers"] . "," .
+        $ICEcoder["showTrailingSpace"] . "," .
+        $ICEcoder["matchBrackets"] . "," .
+        $ICEcoder["autoCloseTags"] . "," .
+        $ICEcoder["autoCloseBrackets"] . "," .
+        $ICEcoder["indentWithTabs"] . "," .
+        $ICEcoder["indentAuto"] . "," .
+        $ICEcoder["indentSize"] . ",'" .
+        $ICEcoder["pluginPanelAligned"] . "','" .
+        $ICEcoder["scrollbarStyle"] . "'," .
+        $jsBugFilePaths . "," .
+        $ICEcoder["bugFileCheckTimer"] . "," .
+        $ICEcoder["bugFileMaxLines"] . "," .
+        $ICEcoder["updateDiffOnSave"] . "," .
+        $ICEcoder["autoLogoutMins"] . "," .
+        $refreshFM .
+        ");iceRoot = '" . $ICEcoder["root"] .
+        "';</script>";
 }