diff --git a/assets/js/icecoder.js b/assets/js/icecoder.js
index fb92014..2bb9173 100644
--- a/assets/js/icecoder.js
+++ b/assets/js/icecoder.js
@@ -77,7 +77,7 @@ var ICEcoder = {
 
     // Set our aliases
     initAliases: function() {
-        const aliasArray = ["header", "files", "fileOptions", "optionsFile", "optionsEdit", "optionsSource", "optionsHelp", "filesFrame", "editor", "tabsBar", "findBar", "terminal", "output", "database", "git", "content", "tools", "footer", "versionsDisplay", "splitPaneControls", "splitPaneNamesMain", "splitPaneNamesDiff", "charDisplay", "byteDisplay"];
+        const aliasArray = ["header", "files", "fileOptions", "optionsFile", "optionsEdit", "optionsSettings", "optionsHelp", "filesFrame", "editor", "tabsBar", "findBar", "terminal", "output", "database", "git", "content", "tools", "footer", "versionsDisplay", "splitPaneControls", "splitPaneNamesMain", "splitPaneNamesDiff", "charDisplay", "byteDisplay"];
 
         // Create our ID aliases
         for (let i = 0; i < aliasArray.length; i++) {
@@ -199,7 +199,7 @@ var ICEcoder = {
         headerH = 15, fileNavH = 38, tabsBarH = 27, findBarH = 28, toolsBarH = 30;
         this.header.style.width = this.tabsBar.style.width = this.findBar.style.width = winW + "px";
         this.files.style.width = this.editor.style.left = this.filesW + "px";
-        this.optionsFile.style.width = this.optionsEdit.style.width = this.optionsSource.style.width = this.optionsHelp.style.width = this.filesW + "px";
+        this.optionsFile.style.width = this.optionsEdit.style.width = this.optionsSettings.style.width = this.optionsHelp.style.width = this.filesW + "px";
         this.filesFrame.style.height = (winH - headerH - fileNavH - 7 - toolsBarH) + "px";
         this.versionsDisplay.style.left = (this.filesW + 10) + "px";
         this.splitPaneControls.style.left =
@@ -2167,7 +2167,7 @@ var ICEcoder = {
 
     // Show/hide file manager nav options
     showHideFileNav: function(vis, elem) {
-        let options = ["optionsFile", "optionsEdit", "optionsSource", "optionsHelp"];
+        let options = ["optionsFile", "optionsEdit", "optionsSettings", "optionsHelp"];
         if ("hide" === vis) {
             fileNavInt = setTimeout(function(ic) {
                 for (let i = 0; i < options.length; i++) {
@@ -2443,7 +2443,6 @@ var ICEcoder = {
 
         // Moving files
         if ("move" === action) {
-            // TODO: Drag a file somewhere, then try and try it somewhere else, causes JS error
             // Target is root, or another dir?
             const tgtClass = location === ""
                 ? this.filesFrame.contentWindow.document.getElementById("|").parentNode.parentNode.className
@@ -3408,9 +3407,10 @@ var ICEcoder = {
     },
 
     // Show the settings screen
-    settingsScreen: function(hide) {
+    settingsScreen: function(hide, tab) {
         if (!hide) {
-            get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/settings-screen.php" id="settingsIFrame" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
+            tabExtra = tab ? '?tab=' + tab +'&csrf=' + this.csrf : '';
+            get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/settings-screen.php' + tabExtra + '" id="settingsIFrame" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
         }
         this.showHide(hide?'hide':'show',get('blackMask'));
     },
diff --git a/index.php b/index.php
index a1087f0..1ea49b3 100644
--- a/index.php
+++ b/index.php
@@ -223,7 +223,7 @@ if (true === file_exists(dirname(__FILE__) . "/plugins/prettier/standalone.js"))
 		<ul>
 			<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsFile')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsFile')}" id="optionsFileNav"><?php echo $t['File'];?></a></li>
 			<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsEdit')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsEdit')}" id="optionsEditNav"><?php echo $t['Edit'];?></a></li>
-			<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsSource')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsSource')}" id="optionsSourceNav"><?php echo $t['Source'];?></a></li>
+            <li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsSettings')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsSettings')}" id="optionsSettingsNav"><?php echo $t['Settings'];?></a></li>
 			<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsHelp')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsHelp')}" id="optionsHelpNav"><?php echo $t['Help'];?></a></li>
         </ul>
 	</div>
@@ -259,15 +259,28 @@ if (true === file_exists(dirname(__FILE__) . "/plugins/prettier/standalone.js"))
 				<li><a nohref onclick="ICEcoder.autocomplete()"><?php echo $t['Autocomplete'];?></a></li>
 				<li><a nohref onclick="ICEcoder.lineCommentToggle()"><?php echo $t['Comment/Uncomment'];?></a></li>
 				<li><a nohref onclick="ICEcoder.jumpToDefinition()"><?php echo $t['Jump to Definition'];?></a></li>
-				<li><a nohref onClick="ICEcoder.settingsScreen()"><?php echo $t['Settings'];?></a></li>
 			</ul>
 		</div>
+        <div id="optionsSettings" class="optionsList" onmouseover="ICEcoder.showHideFileNav('show',this.id)" onmouseout="ICEcoder.showHideFileNav('hide', this.id);ICEcoder.canShowFMNav = false">
+            <ul>
+                <li><a nohref onclick="ICEcoder.settingsScreen(false, 'general')">General</a></li>
+                <li><a nohref onclick="ICEcoder.settingsScreen(false, 'style')">Style</a></li>
+                <li><a nohref onclick="ICEcoder.settingsScreen(false, 'accounts')">Accounts</a></li>
+                <li><a nohref onclick="ICEcoder.settingsScreen(false, 'security')">Security</a></li>
+                <li><a nohref onclick="ICEcoder.pluginsManager()">Plugins</a></li>
+            </ul>
+        </div>
+        <!--
+        FTP is a far less used method of data transfer and so this menu hidden for now
+        Uncomment if you really want to use it but please note, in future versions of ICEcoder
+        that FTP is likely to be removed altogether
 		<div id="optionsSource" class="optionsList" onmouseover="ICEcoder.showHideFileNav('show',this.id)" onmouseout="ICEcoder.showHideFileNav('hide', this.id);ICEcoder.canShowFMNav = false">
 			<ul>
 				<li><a nohref onclick="ICEcoder.goLocalhostRoot()">Localhost</a></li>
 				<li><a nohref onclick="ICEcoder.ftpManager()">FTP</a></li>
 			</ul>
 		</div>
+		//-->
 		<div id="optionsHelp" class="optionsList" onmouseover="ICEcoder.showHideFileNav('show',this.id)" onmouseout="ICEcoder.showHideFileNav('hide', this.id);ICEcoder.canShowFMNav = false">
 			<ul>
 				<li><a nohref onclick="ICEcoder.viewTutorial(false, 500)">Tutorial</a></li>
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
index da3d354..54d6d76 100644
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -34,11 +34,17 @@ sort($themeArray);
 for ($i=0;$i<count($themeArray);$i++) {
 	echo '<link rel="stylesheet" href="../assets/css/theme/'.$themeArray[$i].'.css?microtime='.microtime(true).'">'.PHP_EOL;
 }
+
+// Do we have a tab to switch to?
+$tabSwitchExtra = "";
+if (true === isset($_GET['tab'])) {
+    $tabSwitchExtra = "switchTab('" . $_GET['tab'] . "');";
+}
 ?>
 <link rel="stylesheet" href="../assets/css/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
 </head>
 
-<body class="settings" onkeyup="parent.ICEcoder.handleModalKeyUp(event, 'settings')" onload="this.focus();">
+<body class="settings" onkeyup="parent.ICEcoder.handleModalKeyUp(event, 'settings')" onload="<?php echo $tabSwitchExtra;?>this.focus();">
 
 <div class="infoPane">
 	<a href="https://icecoder.net" target="_blank"><img src="../assets/images/icecoder.png" alt="ICEcoder" class="logo"></a>