From 58d48f19efe41db8fe558b38f25efc926aea95f8 Mon Sep 17 00:00:00 2001
From: danielyxie <dxie@g.hmc.edu>
Date: Tue, 28 Aug 2018 22:24:38 -0500
Subject: [PATCH 1/3] Added .fconf setting for enabline line wrap in terminal
 input. Began implementing wget

---
 css/terminal.scss        |  6 ++++++
 doc/source/changelog.rst |  6 +++---
 netscript.js             |  2 +-
 package-lock.json        |  5 +++++
 package.json             |  1 +
 src/Constants.js         | 28 ++------------------------
 src/Fconf.js             | 11 ++++++++--
 src/Terminal.js          | 43 ++++++++++++++++++++++++++++++----------
 src/engine.js            |  4 ++--
 src/ui/postToTerminal.ts |  2 +-
 10 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/css/terminal.scss b/css/terminal.scss
index ac26b9b3d..7e7ea52bc 100644
--- a/css/terminal.scss
+++ b/css/terminal.scss
@@ -50,6 +50,12 @@
     display: flex;
 }
 
+#terminal-input-td textarea {
+    overflow: hidden;
+    resize:none;
+    height:auto;
+}
+
 #terminal-input-header {
     white-space: pre;
 }
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index 1d3ec509a..5cf080c28 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -17,9 +17,9 @@ v0.40.2 - 8/27/2018
     * There are now, on average, more Synthoid communities in a city
     * If automation is enabled (the feature in Bladeburner console), then switching to another action such as working for a company will now disable the automation
 * Stock Market Changes:
-    *Added a watchlist filter feature to the UI that allows you to specify which stocks to show
-    *Added the Four Sigma (4S) Market Data feed, which provides volatility and price forecast information about stocks
-    *Added the 4S Market Data TIX API, which lets you access the aforementioned data through Netscript
+    * Added a watchlist filter feature to the UI that allows you to specify which stocks to show
+    * Added the Four Sigma (4S) Market Data feed, which provides volatility and price forecast information about stocks
+    * Added the 4S Market Data TIX API, which lets you access the aforementioned data through Netscript
 * There is now a setting for enabling/disabling the popup that appears when you are hospitalized
 * Bug Fix: Stock market should now be correctly initialized in BitNode-8 (by Kline-)
 * Bug Fix: bladeburner.getCurrentAction() should now properly an 'Idle' object rather than null (by Kline-)
diff --git a/netscript.js b/netscript.js
index b632dfdaa..8d7e2ec16 100644
--- a/netscript.js
+++ b/netscript.js
@@ -101,7 +101,7 @@ let NetscriptFunctions =
     "getActionMaxLevel|getActionCurrentLevel|getActionAutolevel|"              +
     "setActionAutolevel|setActionLevel|"                                       +
     "getRank|getSkillPoints|getSkillLevel|getSkillUpgradeCost|"                +
-    "upgradeSkill|getTeamSize|"                                                +
+    "upgradeSkill|getTeamSize|getCity|"                                        +
     "setTeamSize|getCityEstimatedPopulation|getCityEstimatedCommunities|"      +
     "getCityChaos|switchCity|getStamina|joinBladeburnerFaction|getBonusTime";
 
diff --git a/package-lock.json b/package-lock.json
index 3d8a37dd1..7831b8bea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -608,6 +608,11 @@
         "postcss-value-parser": "3.3.0"
       }
     },
+    "autosize": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.2.tgz",
+      "integrity": "sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA=="
+    },
     "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
diff --git a/package.json b/package.json
index 84d48e9fe..beba2a4e3 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "ajv": "^5.1.5",
     "ajv-keywords": "^2.0.0",
     "async": "^2.6.1",
+    "autosize": "^4.0.2",
     "bluebird": "^3.5.1",
     "brace": "^0.11.1",
     "decimal.js": "7.2.3",
diff --git a/src/Constants.js b/src/Constants.js
index e85f3e47e..c3f0d8386 100644
--- a/src/Constants.js
+++ b/src/Constants.js
@@ -493,32 +493,8 @@ let CONSTANTS = {
                                "World Stock Exchange account and TIX API Access<br>",
 
     LatestUpdate:
-    "v0.40.2<br>" +
-    "------------------------------<br>"  +
-    "* Bladeburner Changes:<br>" +
-    "*** Added getBonusTime(), getSkillUpgradeCost(), and getCity() Netscript functions to the API<br>" +
-    "*** Buffed the effects of many Bladeburner Augmentations<br>" +
-    "*** The Blade's Simulacrum Augmentation requires significantly less reputation but slightly more money<br>" +
-    "*** Slightly increased the amount of successes needed for a Contract/Operation in order to increase its max level<br>" +
-    "*** Increased the amount of money gained from Contracts by ~25%<br>" +
-    "*** Increased the base amount of rank gained from Operations by 10%<br>" +
-    "*** Significantly increased the 'randomness' in determining a Contract/Operation's initial count and rate of count increase<br>" +
-    "*** The number (count) of Operations should now increase significantly faster<br>" +
-    "*** There are now, on average, more Synthoid communities in a city<br>" +
-    "*** If automation is enabled (the feature in Bladeburner console), then switching to another action such as working for a company will now disable the automation<br>" +
-    "------------------------------<br>"  +
-    "* Stock Market Changes:<br>" +
-    "***Added a watchlist filter feature to the UI that allows you to specify which stocks to show<br>" +
-    "***Added the Four Sigma (4S) Market Data feed, which provides volatility and price forecast information about stocks<br>"  +
-    "***Added the 4S Market Data TIX API, which lets you access the aforementioned data through Netscript<br>"  +
-    "------------------------------<br>"  +
-    "* There is now a setting for enabling/disabling the popup that appears when you are hospitalized<br>" +
-    "* Bug Fix: Stock market should now be correctly initialized in BitNode-8 (by Kline-)<br>" +
-    "* Bug Fix: bladeburner.getCurrentAction() should now properly an 'Idle' object rather than null (by Kline-)<br>" +
-    "* Bug Fix: Bladeburner skill cost multiplier should now properly increase in BitNode-12 (by hydroflame)<br>" +
-    "* Bug Fix: 'document', 'hacknet', and 'window' keywords should no longer be counted multiple times in RAM calculations<br>" +
-    "* Bug Fix: Joining factions through Singularity functions should now prevent you from joining opposing factions<br>" + 
-    "* Bug Fix: Four Sigma should no longer have two 'Speech Enhancement' Augmentations (by Kline-)<br>"
+    "v0.40.3<br>" +
+    ""
 
 }
 
diff --git a/src/Fconf.js b/src/Fconf.js
index 77cddf622..be3729360 100644
--- a/src/Fconf.js
+++ b/src/Fconf.js
@@ -1,8 +1,9 @@
 import {parse, Node}                            from "../utils/acorn";
 
 var FconfSettings = {
-    ENABLE_BASH_HOTKEYS:     false,
-    ENABLE_TIMESTAMPS:       false,
+    ENABLE_BASH_HOTKEYS:        false,
+    ENABLE_TIMESTAMPS:          false,
+    WRAP_INPUT:                 false,
 }
 
 var FconfComments = {
@@ -15,6 +16,11 @@ var FconfComments = {
                          "http://bitburner.readthedocs.io/en/latest/shortcuts.html",
     ENABLE_TIMESTAMPS: "Terminal commands and log entries will be timestamped. The timestamp\n" +
                        "will have the format: M/D h:m",
+    WRAP_INPUT: "Wrap Terminal Input. If this is enabled, then when a Terminal command is\n" +
+                "too long and overflows, then it will wrap to the next line instead of\n" +
+                "side-scrolling\n\n" +
+                "Note that after you enable/disable this, you'll have to run a command\n" +
+                "before its effect takes place.",
 }
 
 //Parse Fconf settings from the config text
@@ -74,6 +80,7 @@ function parseFconfSetting(setting, value) {
     switch(setting) {
         case "ENABLE_BASH_HOTKEYS":
         case "ENABLE_TIMESTAMPS":
+        case "WRAP_INPUT":
             var value = value.toLowerCase();
             if (value === "1" || value === "true" || value === "y") {
                 value = true;
diff --git a/src/Terminal.js b/src/Terminal.js
index 821416ac2..aac09ecef 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -48,6 +48,7 @@ import {yesNoBoxCreate,
 import {post, hackProgressBarPost,
         hackProgressPost}                   from "./ui/postToTerminal";
 
+import autosize from 'autosize';
 import * as JSZip from 'jszip';
 import * as FileSaver from 'file-saver';
 
@@ -64,8 +65,8 @@ $(document).keydown(function(event) {
 
 		if (event.keyCode === KEY.ENTER) {
             event.preventDefault(); //Prevent newline from being entered in Script Editor
-			var command = $('input[class=terminal-input]').val();
-			      post(
+			var command = terminalInput.value;
+			post(
                 "[" +
                 (FconfSettings.ENABLE_TIMESTAMPS ? getTimestamp() + " " : "") +
                 Player.getCurrentServer().hostname +
@@ -520,9 +521,18 @@ let Terminal = {
     commandHistoryIndex: 0,
 
     resetTerminalInput: function() {
-        document.getElementById("terminal-input-td").innerHTML =
-            "<div id='terminal-input-header'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
-            '<input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        if (FconfSettings.WRAP_INPUT) {
+            document.getElementById("terminal-input-td").innerHTML =
+                "<div id='terminal-input-header'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
+                '<textarea type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+
+            //Auto re-size the line element as it wraps
+            autosize(document.getElementById("terminal-input-text-box"));
+        } else {
+            document.getElementById("terminal-input-td").innerHTML =
+                "<div id='terminal-input-header'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
+                '<input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        }
         var hdr = document.getElementById("terminal-input-header");
         hdr.style.display = "inline";
     },
@@ -824,7 +834,6 @@ let Terminal = {
                     Player.analyze();
 
                     //Disable terminal
-                    //Terminal.resetTerminalInput();
                     document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
                     $('input[class=terminal-input]').prop('disabled', true);
                     iTutorialNextStep();
@@ -848,7 +857,6 @@ let Terminal = {
 					Player.hack();
 
 					//Disable terminal
-                    //Terminal.resetTerminalInput();
 					document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
 					$('input[class=terminal-input]').prop('disabled', true);
                     iTutorialNextStep();
@@ -929,7 +937,6 @@ let Terminal = {
                 Player.analyze();
 
                 //Disable terminal
-                //Terminal.resetTerminalInput();
                 document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
                 $('input[class=terminal-input]').prop('disabled', true);
 				break;
@@ -1090,7 +1097,6 @@ let Terminal = {
 					Player.hack();
 
 					//Disable terminal
-                    //Terminal.resetTerminalInput();
 					document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
 					$('input[class=terminal-input]').prop('disabled', true);
 				}
@@ -1576,6 +1582,23 @@ let Terminal = {
                         post("No such alias exists");
                     }
                 }
+                break;
+            case "wget":
+                if (commandArray.length !== 2) {
+                    return post("Incorrect usage of wget command. Usage: wget [url] [target file]");
+                }
+                var args = commandArray[1].split(" ");
+                if (args.length !== 2) {
+                    return post("Incorrect usage of wget command. Usage: wget [url] [target file]");
+                }
+
+                let url = args[0];
+                let target = args[1];
+                $.get(url, function(data) {
+                    post(data);
+                }, 'text').fail(function(e) {
+                    post("wget failed: " + JSON.stringify(e));
+                })
                 break;
 			default:
 				post("Command not found");
@@ -1809,7 +1832,7 @@ let Terminal = {
          * @returns {void}
          */
         /**
-         * @type {Object.<string, ProgramHandler} 
+         * @type {Object.<string, ProgramHandler}
          */
         const programHandlers = {};
         programHandlers[Programs.NukeProgram.name] = (server) => {
diff --git a/src/engine.js b/src/engine.js
index 8ea543dcd..22f6c2d6a 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -548,11 +548,11 @@ let Engine = {
 
     displayCharacterOverviewInfo: function() {
         Engine.overview.update();
-        
+
 
         const save = document.getElementById("character-overview-save-button");
         const flashClass = "flashing-button";
-        if(!Settings.AutosaveInterval) {    
+        if(!Settings.AutosaveInterval) {
             save.classList.add(flashClass);
         } else {
             save.classList.remove(flashClass);
diff --git a/src/ui/postToTerminal.ts b/src/ui/postToTerminal.ts
index 8fb3383bc..519af1001 100644
--- a/src/ui/postToTerminal.ts
+++ b/src/ui/postToTerminal.ts
@@ -1,4 +1,4 @@
-import { getElementById } from "../../utils/uiHelpers/getElementById";
+import { getElementById }   from "../../utils/uiHelpers/getElementById";
 
 /**
  * Adds some output to the terminal.

From 98598b103dc28ecc09faf61cd89ae0b80398de0a Mon Sep 17 00:00:00 2001
From: danielyxie <dxie@g.hmc.edu>
Date: Fri, 7 Sep 2018 20:53:11 -0500
Subject: [PATCH 2/3] Implemented wget Terminal command

---
 src/Constants.js  |   2 +-
 src/HelpText.ts   |  11 ++++-
 src/SaveObject.js |   2 +-
 src/Terminal.js   | 121 ++++++++++++++++++++++++++++++++--------------
 4 files changed, 96 insertions(+), 40 deletions(-)

diff --git a/src/Constants.js b/src/Constants.js
index c3f0d8386..719a80040 100644
--- a/src/Constants.js
+++ b/src/Constants.js
@@ -494,7 +494,7 @@ let CONSTANTS = {
 
     LatestUpdate:
     "v0.40.3<br>" +
-    ""
+    "* Added a setting in .fconf for enabling line-wrap in the Terminal input<br>"
 
 }
 
diff --git a/src/HelpText.ts b/src/HelpText.ts
index ff88a21ce..0c5bfaf76 100644
--- a/src/HelpText.ts
+++ b/src/HelpText.ts
@@ -32,7 +32,8 @@ export const TerminalHelpText: string =
     "tail [script] [args...]        Displays dynamic logs for the specified script<br>" +
     "theme [preset] | bg txt hlgt   Change the color scheme of the UI<br>" +
     "top                            Displays all running scripts and their RAM usage<br>" +
-    'unalias "[alias name]"         Deletes the specified alias<br>';
+    'unalias "[alias name]"         Deletes the specified alias<br>' +
+    'wget [url] [target file]       Retrieves code/text from a web server<br>';
 
 interface IMap<T> {
     [key: string]: T;
@@ -214,5 +215,11 @@ export const HelpTexts: IMap<string> = {
                     "Then it could be removed using:<br><br>" +
                     'unalias "r"<br><br>' +
                     "It is not necessary to differentiate between global and non-global aliases when using 'unalias'",
-
+    wget:           "wget [url] [target file]<br>" +
+                    "Retrieves data from a URL and downloads it to a file on the current server. The data can only " +
+                    "be downloaded to a script (.script, .ns, .js) or a text file (.txt). If the file already exists, " +
+                    "it will be overwritten by this command.<br><br>" +
+                    "Note that it will not be possible to download data from many websites because they do not allow " +
+                    "cross-origin resource sharing (CORS). Example:<br><br>" +
+                    "wget https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md game_readme.txt",
 };
diff --git a/src/SaveObject.js b/src/SaveObject.js
index 55db3250e..c83734979 100644
--- a/src/SaveObject.js
+++ b/src/SaveObject.js
@@ -451,7 +451,7 @@ function loadImportedGame(saveObj, saveString) {
 
     var popupId = "import-game-restart-game-notice";
     var txt = createElement("p", {
-        innerText:"Imported game! I would suggest saving the game and then reloading the page " +
+        innerText:"Imported game! You need to SAVE the game and then RELOAD the page " +
                  "to make sure everything runs smoothly"
     });
     var gotitBtn = createElement("a", {
diff --git a/src/Terminal.js b/src/Terminal.js
index aac09ecef..3001c1164 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -741,7 +741,56 @@ let Terminal = {
         $('input[class=terminal-input]').prop('disabled', false);
     },
 
-	executeCommand:  function(command) {
+    writeToScriptFile : function(server, fn, code) {
+        var ret = {success: false, overwritten: false};
+        if (!isScriptFilename(fn) || !(server instanceof Server)) { return ret; }
+
+        //Check if the script already exists, and overwrite it if it does
+        for (let i = 0; i < server.scripts.length; ++i) {
+            if (fn === server.scripts[i].filename) {
+                let script = server.scripts[i];
+                script.code = code;
+                script.updateRamUsage();
+                script.module = "";
+                ret.overwritten = true;
+                ret.success = true;
+                return ret;
+            }
+        }
+
+        //Otherwise, create a new script
+        var newScript = new Script();
+        newScript.filename = fn;
+        newScript.code = code;
+        newScript.updateRamUsage();
+        newScript.server = server.ip;
+        server.scripts.push(newScript);
+        ret.success = true;
+        return ret;
+    },
+
+    writeToTextFile : function(server, fn, txt) {
+        var ret = {success: false, overwritten: false};
+        if (!fn.endsWith("txt") || !(server instanceof Server)) { return ret; }
+
+        //Check if the text file already exists, and overwrite if it does
+        for (let i = 0; i < server.textFiles.length; ++i) {
+            if (server.textFiles[i].fn === fn) {
+                ret.overwritten = true;
+                server.textFiles[i].text = txt;
+                ret.success = true;
+                return ret;
+            }
+        }
+
+        //Otherwise create a new text file
+        var newFile = new TextFile(fn, txt);
+        server.textFiles.push(newFile);
+        ret.success = true;
+        return ret;
+    },
+
+	executeCommand : function(command) {
         command = command.trim();
         //Replace all extra whitespace in command with a single space
         command = command.replace(/\s\s+/g, ' ');
@@ -1395,8 +1444,7 @@ let Terminal = {
                         }
                     }
                     destServer.messages.push(scriptname);
-                    post(scriptname + " copied over to " + destServer.hostname);
-                    return;
+                    return post(scriptname + " copied over to " + destServer.hostname);
                 }
 
                 //Scp for txt files
@@ -1412,18 +1460,15 @@ let Terminal = {
 
                     if (!found) {return post("Error: no such file exists!");}
 
-                    for (var i = 0; i < destServer.textFiles.length; ++i) {
-                        if (destServer.textFiles[i].fn === scriptname) {
-                            //Overwrite
-                            destServer.textFiles[i].text = txtFile.text;
-                            post("WARNING: " + scriptname + " already exists on " + destServer.hostname +
-                                 "and will be overwriten");
-                            return post(scriptname + " copied over to " + destServer.hostname);
-                        }
+                    let tRes = Terminal.writeToTextFile(destServer, txtFile.fn, txtFile.text);
+                    if (!tRes.success) {
+                        return post("Error: scp failed");
                     }
-                    var newFile = new TextFile(txtFile.fn, txtFile.text);
-                    destServer.textFiles.push(newFile);
-                    return post(scriptname + " copied over to " + destServer.hostname);
+                    if (tRes.overwritten) {
+                        post(`WARNING: ${scriptname} already exists on ${destServer.hostname} and will be overwriten`);
+                        return post(`${scriptname} overwritten on ${destServer.hostname}`);
+                    }
+                    return post(`${scriptname} copied over to ${destServer.hostname}`);
                 }
 
                 //Get the current script
@@ -1439,27 +1484,16 @@ let Terminal = {
                     return;
                 }
 
-                //Overwrite script if it exists
-                for (var i = 0; i < destServer.scripts.length; ++i) {
-                    if (scriptname == destServer.scripts[i].filename) {
-                        post("WARNING: " + scriptname + " already exists on " + destServer.hostname + " and will be overwritten");
-                        var oldScript = destServer.scripts[i];
-                        oldScript.code = sourceScript.code;
-                        oldScript.ramUsage = sourceScript.ramUsage;
-                        oldScript.module = "";
-                        post(scriptname + " overwriten on " + destServer.hostname);
-                        return;
-                    }
+                let sRes = Terminal.writeToScriptFile(destServer, scriptname, sourceScript.code);
+                if (!sRes.success) {
+                    return post(`Error: scp failed`);
                 }
-
-                var newScript = new Script();
-                newScript.filename = scriptname;
-                newScript.code = sourceScript.code;
-                newScript.ramUsage = sourceScript.ramUsage;
-                newScript.destServer = ip;
-                destServer.scripts.push(newScript);
-                post(scriptname + " copied over to " + destServer.hostname);
-				break;
+                if (sRes.overwritten) {
+                    post(`WARNING: ${scriptname} already exists on ${destServer.hostname} and will be overwritten`);
+                    return post(`${scriptname} overwritten on ${destServer.hostname}`);
+                }
+                post(`${scriptname} copied over to ${destServer.hostname}`);
+                break;
             case "sudov":
                 if (commandArray.length != 1) {
                     post("Incorrect number of arguments. Usage: sudov"); return;
@@ -1594,10 +1628,25 @@ let Terminal = {
 
                 let url = args[0];
                 let target = args[1];
+                if (!isScriptFilename(target) && !target.endsWith(".txt")) {
+                    return post(`wget failed: Invalid target file. Target file must be script or text file`);
+                }
                 $.get(url, function(data) {
-                    post(data);
+                    let res;
+                    if (isScriptFilename(target)) {
+                        res = Terminal.writeToScriptFile(s, target, data);
+                    } else {
+                        res = Terminal.writeToTextFile(s, target, data);
+                    }
+                    if (!res.success) {
+                        return post("wget failed");
+                    }
+                    if (res.overwritten) {
+                         return post(`wget successfully retrieved content and overwrote ${target}`);
+                    }
+                    return post(`wget successfully retrieved content to new file ${target}`);
                 }, 'text').fail(function(e) {
-                    post("wget failed: " + JSON.stringify(e));
+                    return post("wget failed: " + JSON.stringify(e));
                 })
                 break;
 			default:

From 93c1d603c5f4c6bfc2a427e62d51c5b56e1badc8 Mon Sep 17 00:00:00 2001
From: danielyxie <dxie@g.hmc.edu>
Date: Fri, 7 Sep 2018 21:53:10 -0500
Subject: [PATCH 3/3] Fixed issue with prompt color

---
 index.html      | 54 ++++++++++++++++++++++++-------------------------
 src/Terminal.js |  6 +++---
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/index.html b/index.html
index 300047c63..eab423e27 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>Bitburner - development</title>
+    <title>Bitburner</title>
     <link rel="apple-touch-icon" sizes="180x180" href="dist/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="dist/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="dist/favicon-16x16.png">
@@ -109,7 +109,7 @@
 
         <div id="script-editor-filename-wrapper">
             <p id="script-editor-filename-tag"> <strong style="background-color:#555;">Script name: </strong></p>
-            <input id="script-editor-filename" type="text" maxlength="30" tabindex="1" />
+            <input id="script-editor-filename" type="text" maxlength="30" tabindex="1"/>
         </div>
 
         <div id="javascript-editor"></div>
@@ -159,7 +159,7 @@
 
             <fieldset>
             <label for="script-editor-option-maxerr" class="tooltip">Max Error Count</label>
-            <input type="range" max="1000" min="50" value="200" step="1" name="script-editor-option-maxerr" id="script-editor-option-maxerr" />
+            <input type="range" max="1000" min="50" value="200" step="1" name="script-editor-option-maxerr" id="script-editor-option-maxerr"/>
             <em id="script-editor-option-maxerror-value-label" style="font-style: normal;"></em>
             </fieldset>
         </div> <!-- End script editor options panel -->
@@ -170,7 +170,7 @@
         <table id="terminal">
             <tr id="terminal-input">
                 <td id="terminal-input-td" tabindex="2">$
-                    <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1" onfocus="this.value = this.value;" />
+                    <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1" onfocus="this.value = this.value;"/>
                 </td>
             </tr>
         </table>
@@ -187,7 +187,7 @@
         provides information about each script's production. The scripts are categorized by the hostname of the servers on which
         they are running. </p>
         <p id="active-scripts-total-prod">Total online production of
-            Active scripts: <span class="money-gold"><span id="active-scripts-total-production-active">$0.000</span> / sec</span><br />
+            Active scripts: <span class="money-gold"><span id="active-scripts-total-production-active">$0.000</span> / sec</span><br/>
             Total online production since last Aug installation: <span id="active-scripts-total-prod-aug-total" class="money-gold">$0.000</span>
             (<span class="money-gold"><span id="active-scripts-total-prod-aug-avg" class="money-gold">$0.000</span> / sec</span>)</p>
 		<ul class="active-scripts-list" id="active-scripts-list" style="list-style: none;">
@@ -201,19 +201,19 @@
         The Hacknet is a global, decentralized network of machines. It is used by hackers all around
         the world to anonymously share computing power and perform distributed cyberattacks without the
         fear of being traced.
-        <br /><br />
+        <br/><br/>
         Here, you can purchase a Hacknet Node, a specialized machine that can connect and contribute its
         resources to the Hacknet network. This allows you to take a small percentage of profits
         from hacks performed on the network. Essentially, you are renting out your Node's computing power.
-        <br /><br />
+        <br/><br/>
         Each Hacknet Node you purchase will passively earn you money. Each Hacknet Node can be upgraded
         in order to increase its computing power and thereby increase the profit you earn from it.
         </p>
         <a id="hacknet-nodes-purchase-button" class="a-link-button"> Purchase Hacknet Node </a>
-        <br />
+        <br/>
         <div id="hacknet-nodes-money-multipliers-div">
             <p id="hacknet-nodes-money">
-                <span>Money:</span><span id="hacknet-nodes-player-money" class="money-gold"></span><br />
+                <span>Money:</span><span id="hacknet-nodes-player-money" class="money-gold"></span><br/>
                 <span>Total Hacknet Node Production:</span><span id="hacknet-nodes-total-production" class="money-gold"></span>
             </p>
             <span id="hacknet-nodes-multipliers">
@@ -471,8 +471,7 @@
 
 	<!-- Tutorial content -->
 	<div id="tutorial-container" class="generic-menupage-container">
-        <a id="tutorial-getting-started-link" class="a-link-button"
-           href="http://bitburner.wikia.com/wiki/Chapt3rs_Guide_to_Getting_Started_with_Bitburner" target="_blank"> Getting Started </a>
+        <a id="tutorial-getting-started-link" class="a-link-button" href="http://bitburner.wikia.com/wiki/Chapt3rs_Guide_to_Getting_Started_with_Bitburner" target="_blank"> Getting Started </a>
         <a id="tutorial-networking-link" class="a-link-button"> Servers & Networking </a>
         <a id="tutorial-hacking-link" class="a-link-button"> Hacking </a>
         <a id="tutorial-scripts-link" class="a-link-button"> Scripts </a>
@@ -481,8 +480,7 @@
         <a id="tutorial-jobs-link" class="a-link-button"> Companies and Infiltration </a>
         <a id="tutorial-factions-link" class="a-link-button"> Factions </a>
         <a id="tutorial-augmentations-link" class="a-link-button"> Augmentations </a>
-        <a id="tutorial-shortcuts-link" class="a-link-button"
-            href="https://bitburner.wikia.com/wiki/Shortcuts" target="_blank"> Keyboard Shortcuts </a>
+        <a id="tutorial-shortcuts-link" class="a-link-button" href="https://bitburner.wikia.com/wiki/Shortcuts" target="_blank"> Keyboard Shortcuts </a>
 
         <a id="tutorial-back-button" class="a-link-button"> Back </a>
         <p id="tutorial-text"> </p>
@@ -625,7 +623,7 @@
         <p id="location-slums-description">
             You have entered the Slums, a poverty-ridden district filled with gangs, criminals, and
             other shadowy entities. The city's government and police have neglected this area for years...
-            <br /><br /><br />
+            <br/><br/><br/>
             In the Slums, you can commit crimes to earn money and experience. Crime attempts are not always
             successful. Your chance at successfully committing a crime is determined by your stats.
         </p>
@@ -672,7 +670,7 @@
 
     <div id="stock-market-container" class="generic-menupage-container">
         <p>
-            Welcome to the World Stock Exchange (WSE)! <br /><br />
+            Welcome to the World Stock Exchange (WSE)! <br/><br/>
 
             To begin trading, you must first purchase an account. WSE accounts will persist
             after you 'reset' by installing Augmentations.
@@ -685,7 +683,7 @@
             TIX, short for Trade Information eXchange, is the communications protocol supported by the WSE.
             Purchasing access to the TIX API lets you write code to create your own algorithmic/automated
             trading strategies.
-            <br /><br />
+            <br/><br/>
             If you purchase access to the TIX API, you will retain that access even after
             you 'reset' by installing Augmentations.
         </p>
@@ -695,7 +693,7 @@
         <p>
             Four Sigma's (4S) Market Data Feed provides information about stocks
             that will help your trading strategies.
-            <br /><br />
+            <br/><br/>
             If you purchase access to 4S Market Data and/or the 4S TIX API, you will
             retain that access even after you 'reset' by installing Augmentations.
         </p>
@@ -713,7 +711,7 @@
         <a id="stock-market-mode" class="a-link-button tooltip"></a>
         <a id="stock-market-expand-tickers" class="a-link-button tooltip">Expand tickers</a>
         <a id="stock-market-collapse-tickers" class="a-link-button tooltip">Collapse tickers</a>
-        <br /><br />
+        <br/><br/>
         <input id="stock-market-watchlist-filter" type="text" placeholder="Filter Stocks by symbol (comma-separated list)"/>
         <a id="stock-market-watchlist-filter-update" class="a-link-button"> Update Watchlist </a>
         <ul id="stock-market-list" style="list-style:none;">
@@ -743,7 +741,7 @@
     <div id="yes-no-text-input-box-container" class="popup-box-container">
         <div id="yes-no-text-input-box-content" class="popup-box-content">
             <p id="yes-no-text-input-box-text"> </p>
-            <input type="text" id="yes-no-text-input-box-input" pattern="[a-zA-Z0-9-_]" maxlength="30" />
+            <input type="text" id="yes-no-text-input-box-input" pattern="[a-zA-Z0-9-_]" maxlength="30"/>
             <span id="yes-no-text-input-box-yes" class="popup-box-button"> Yes </span>
             <span id="yes-no-text-input-box-no" class="popup-box-button"> No </span>
         </div>
@@ -755,7 +753,7 @@
             <p id="faction-invitation-box-text"> </p>
             <p id="faction-invitation-box-message"> </p>
             <p id="faction-invitation-box-warning">
-                Would you like to join? <br /> <br />
+                Would you like to join? <br/> <br/>
                 Warning: Joining this faction may prevent you from joining other factions during this run!
             </p>
             <span id="faction-invitation-box-yes" class="popup-box-button"> Yes </span>
@@ -768,8 +766,8 @@
         <div id="infiltration-box-content" class="popup-box-content">
             <p id="infiltration-box-text"> </p>
 
-            <span id="infiltration-box-sell" class="a-link-button"> Sell on Black Market </span> <br /><br />
-            <select id="infiltration-faction-select"> </select> <br />
+            <span id="infiltration-box-sell" class="a-link-button"> Sell on Black Market </span> <br/><br/>
+            <select id="infiltration-faction-select"> </select> <br/>
             <span id="infiltration-box-faction" class="a-link-button"> Give to Faction for Reputation </span>
 
         </div>
@@ -855,7 +853,7 @@
         <div id="game-options-content" class="game-options-box">
             <span id="game-options-close-button">&times;</span>
             <h1> Game Options </h1>
-            <br />
+            <br/>
             <div id="game-options-left-panel">
                 <!-- Netscript execution time -->
                 <fieldset>
@@ -867,7 +865,7 @@
                         </span>
                     </label>
 
-                    <input type ="range" max="100" min="10" step="1" name="settingsNSExecTimeRangeVal" id="settingsNSExecTimeRangeVal" value="25" />
+                    <input type="range" max="100" min="10" step="1" name="settingsNSExecTimeRangeVal" id="settingsNSExecTimeRangeVal" value="25"/>
                     <em id="settingsNSExecTimeRangeValLabel" style="font-style: normal;"></em>
                 </fieldset>
 
@@ -881,7 +879,7 @@
                         </span>
                     </label>
 
-                    <input type="range" max="100" min="20" step="1" name="settingsNSLogRangeVal" id="settingsNSLogRangeVal" value="50" />
+                    <input type="range" max="100" min="20" step="1" name="settingsNSLogRangeVal" id="settingsNSLogRangeVal" value="50"/>
                     <em id="settingsNSLogRangeValLabel" style="font-style: normal;"></em>
                 </fieldset>
 
@@ -895,7 +893,7 @@
                         </span>
                     </label>
 
-                    <input type="range" max="100" min="20" step="1" name="settingsNSPortRangeVal" id="settingsNSPortRangeVal" value="50" />
+                    <input type="range" max="100" min="20" step="1" name="settingsNSPortRangeVal" id="settingsNSPortRangeVal" value="50"/>
                     <em id="settingsNSPortRangeValLabel" style="font-style: normal;"></em>
                 </fieldset>
 
@@ -907,7 +905,7 @@
                         </span>
                     </label>
 
-                    <input type="range" max="600" min="0" step="1" name="settingsAutosaveIntervalVal" id="settingsAutosaveIntervalVal" value="60" />
+                    <input type="range" max="600" min="0" step="1" name="settingsAutosaveIntervalVal" id="settingsAutosaveIntervalVal" value="60"/>
                     <em id="settingsAutosaveIntervalValLabel" style="font-style: normal;"></em>
                 </fieldset>
 
@@ -993,7 +991,7 @@
                 <a id="save-game-link" class="a-link-button" style="display:inline-block;width:46%;"> Save Game </a>
                 <a id="delete-game-link" class="a-link-button" style="display:inline-block;width:46%;"> Delete Game </a>
                 <a id="export-game-link" class="a-link-button" style="display:inline-block;width:46%;"> Export Game </a>
-                <input type="file" id="import-game-file-selector" name="file" />
+                <input type="file" id="import-game-file-selector" name="file"/>
                 <a id="import-game-link" class="a-link-button" style="display:inline-block;width:46%;"> Import Game </a>
                 <a id="debug-delete-scripts-link" class="a-link-button tooltip" style="display:block;width:46%;">
                     (DEBUG) Delete Active Scripts
diff --git a/src/Terminal.js b/src/Terminal.js
index 45429ffc3..def530d1c 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -69,7 +69,7 @@ $(document).keydown(function(event) {
             event.preventDefault(); //Prevent newline from being entered in Script Editor
 			var command = terminalInput.value;
 			post(
-                "[" +
+                "<span class='prompt'>[" +
                 (FconfSettings.ENABLE_TIMESTAMPS ? getTimestamp() + " " : "") +
                 Player.getCurrentServer().hostname +
                 " ~]&gt;</span> " + command
@@ -527,14 +527,14 @@ let Terminal = {
     resetTerminalInput: function() {
         if (FconfSettings.WRAP_INPUT) {
             document.getElementById("terminal-input-td").innerHTML =
-                "<div id='terminal-input-header'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
+                "<div id='terminal-input-header' class='prompt'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
                 '<textarea type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
 
             //Auto re-size the line element as it wraps
             autosize(document.getElementById("terminal-input-text-box"));
         } else {
             document.getElementById("terminal-input-td").innerHTML =
-                "<div id='terminal-input-header'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
+                "<div id='terminal-input-header' class='prompt'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
                 '<input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
         }
         var hdr = document.getElementById("terminal-input-header");