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");
