diff --git a/css/_theme.scss b/css/_theme.scss
index 75134be78..0b727d702 100644
--- a/css/_theme.scss
+++ b/css/_theme.scss
@@ -2,11 +2,16 @@ $fontFamily: 'Lucida Console', 'Lucida Sans Unicode', 'Fira Mono', 'Consolas', '
 $defaultFontSize: 16px;
 
 /* COLORS */
-$hacky-green: #adff2f;
+$hacker-green: #adff2f;
+$success-green: #3adb76;
+$alert-red: #ff2929;
+$money-gold: #ffd700;
+$light-yellow: #faffdf;
 
 /* Attributes */
-$my-stat-hp-color:    #dd3434;
-$my-stat-money-color: #ffd700;
-$my-stat-hack-color:  $hacky-green;
-$my-stat-cha-color:   #a671d1;
-$my-stat-int-color:   #6495ed;
+$my-stat-hp-color: #dd3434;
+$my-stat-money-color: $money-gold;
+$my-stat-hack-color: $hacker-green;
+$my-stat-physical: $light-yellow;
+$my-stat-cha-color: #a671d1;
+$my-stat-int-color: #6495ed;
diff --git a/css/menupages.scss b/css/menupages.scss
index cd35bec4a..e949b0fce 100644
--- a/css/menupages.scss
+++ b/css/menupages.scss
@@ -200,38 +200,37 @@
 .active-scripts-script-header {
     background-color: #555;
     color: var(--my-font-color);
-    padding: 4px;
-    padding-left: 10px;
+    padding: 4px 25px 4px 10px;
     cursor: pointer;
     width: auto;
     text-align: left;
     border: none;
     outline: none;
-}
+    position: relative;
 
-.active-scripts-script-header:hover,
-.active-scripts-script-header.active:hover {
-    background-color: #666;
-}
+    &:after {
+        content: '\02795'; /* "plus" sign (+) */
+        font-size: $defaultFontSize * 0.8125;
+        float: right;
+        margin-left: 5px;
+        color: transparent;
+        text-shadow: 0 0 0 var(--my-font-color);
+        position: absolute;
+        bottom: 4px;
+    }
 
-.active-scripts-script-header.active {
-    background-color: #555;
-}
+    &.active:after {
+        content: "\2796"; /* "minus" sign (-) */
+    }
 
-.active-scripts-script-header:after {
-    content: '\02795'; /* "plus" sign (+) */
-    font-size: $defaultFontSize * 0.8125;
-    float: right;
-    margin-left: 5px;
-    color: transparent;
-    text-shadow: 0 0 0 var(--my-font-color);
-}
+    &:hover,
+    &.active:hover {
+        background-color: #666;
+    }
 
-.active-scripts-script-header.active:after {
-    content: "\2796"; /* "minus" sign (-) */
-    font-size: $defaultFontSize * 0.8125;
-    float: right;
-    margin-left: 5px;
+    &.active {
+        background-color: #555;
+    }
 }
 
 .active-scripts-script-panel {
@@ -405,8 +404,8 @@
 
 #faction-container p,
 #faction-container pre {
-    padding: 6px;
-    margin: 6px;
+    padding: 4px 6px;
+    margin: 4px 6px;
 }
 
 #faction-container pre {
@@ -522,6 +521,11 @@
 #infiltration-container {
     position: fixed;
     padding: 6px;
+
+    span {
+        margin: 0;
+        padding: 0;
+    }
 }
 
 #infiltration-left-panel,
@@ -544,6 +548,10 @@
     margin: 4px;
 }
 
+#infiltration-buttons {
+    margin-top: 20px;
+}
+
 #infiltration-buttons .a-link-button {
     display: inline;
     width: 25%;
diff --git a/css/popupboxes.scss b/css/popupboxes.scss
index 453a06e7a..d6536f2c5 100644
--- a/css/popupboxes.scss
+++ b/css/popupboxes.scss
@@ -87,6 +87,11 @@
     z-index: 2;
     background-color: var(--my-background-color);
     padding: 10px;
+
+    p span {
+        padding: 0;
+        margin: 0;
+    }
 }
 
 .dialog-box-close-button {
@@ -138,6 +143,11 @@
     margin: 8px;
 }
 
+#infiltration-box-content span {
+    padding: 0;
+    margin: 0;
+}
+
 #infiltration-faction-select {
     background-color: #000;
 }
diff --git a/css/styles.scss b/css/styles.scss
index b725b4fff..c0ee086e3 100644
--- a/css/styles.scss
+++ b/css/styles.scss
@@ -163,14 +163,14 @@ a:visited {
     -ms-user-select: none;
     -khtml-user-select: none;
     -webkit-user-select: none;
-}
 
-.a-link-button:hover {
-    background-color: #666;
-}
+    &:hover {
+        background-color: #666;
+    }
 
-.a-link-button:active {
-    @include boxShadow(inset 0 1px 4px rgba(0, 0, 0, 0.6));
+    &:active {
+        @include boxShadow(inset 0 1px 4px rgba(0, 0, 0, 0.6));
+    }
 }
 
 /* Make anchor tags ("a" elements) inactive (not clickable) */
@@ -182,16 +182,18 @@ a:visited {
     margin: 5px;
     border: 1px solid #333;
     cursor: default;
-}
 
-.a-link-button-inactive:hover .tooltiptext,
-.a-link-button-inactive:hover .tooltiptexthigh,
-.a-link-button-inactive:hover .tooltiptextleft {
-    visibility: visible;
-}
+    &:hover {
+        .tooltiptext,
+        .tooltiptexthigh,
+        .tooltiptextleft {
+            visibility: visible;
+        }
+    }
 
-.a-link-button-inactive:active {
-    pointer-events: none;
+    &:active {
+        pointer-events: none;
+    }
 }
 
 /* Make anchor tags ("a" elements) for activated actions */
@@ -203,16 +205,18 @@ a:visited {
     margin: 5px;
     border: 1px solid #0a0;
     cursor: default;
-}
 
-.a-link-button-bought:hover .tooltiptext,
-.a-link-button-bought:hover .tooltiptexthigh,
-.a-link-button-bought:hover .tooltiptextleft {
-    visibility: visible;
-}
+    &:hover {
+        .tooltiptext,
+        .tooltiptexthigh,
+        .tooltiptextleft {
+            visibility: visible;
+        }
+    }
 
-.a-link-button-bought:active {
-    pointer-events: none;
+    &:active {
+        pointer-events: none;
+    }
 }
 
 .dropdown {
@@ -253,22 +257,23 @@ a:visited {
 
 /* Tool tips (when hovering over an element */
 .tooltip {
-    position: relative;
     display: inline-block;
-}
+    position: relative;
 
-.tooltip .tooltiptext {
-    visibility: hidden;
-    width: 300px;
-    background-color: var(--my-background-color);
-    border: 2px solid var(--my-highlight-color);
-    color: #fff;
-    text-align: center;
-    padding: 4px;
-    left: 101%;
+    .tooltiptext {
+        visibility: hidden;
+        width: 300px;
+        background-color: var(--my-background-color);
+        border: 2px solid var(--my-highlight-color);
+        color: #fff;
+        text-align: center;
+        padding: 4px;
+        left: 101%;
 
-    position: absolute;
-    z-index: 99;
+        pointer-events: none;
+        position: absolute;
+        z-index: 99;
+    }
 }
 
 /* Same thing as a normal tooltip except its a bit higher */
@@ -287,7 +292,7 @@ a:visited {
     z-index: 99;
 }
 
-/* Similar to a normal tooltip except its positioned on the left of the elemnt
+/* Similar to a normal tooltip except its positioned on the left of the element
    rather than the right to avoid exceeding the elements normal width */
 .tooltip .tooltiptextleft {
     visibility: hidden;
@@ -460,12 +465,12 @@ a:visited {
     width: auto;
     max-width: 280px;
     overflow: auto; /* Enable scroll if needed */
-    background-color: #393636; /* Fallback color */
+    background-color: rgba(57, 54, 54, 0.9); /* Fallback color */
     z-index: 1;
 }
 
 #character-overview-text {
-    color: #faffdf;
+    color: $my-stat-physical;
 
     table {
         border-collapse: collapse;
@@ -536,10 +541,10 @@ a:visited {
     cursor: pointer;
     color: #fff;
     text-decoration: underline;
-}
 
-.scan-analyze-link:hover {
-    text-decoration: none;
+    &:hover {
+        text-decoration: none;
+    }
 }
 
 /* Accordion menus (Header with collapsible panel) */
@@ -572,7 +577,7 @@ a:visited {
         color: transparent;
         text-shadow: 0 0 0 #fff;
         position: absolute;
-        bottom: 3px;
+        bottom: 5px;
         right: 6px;
     }
 
@@ -603,3 +608,34 @@ a:visited {
     margin: 0;
     padding: 0;
 }
+
+/* Helper Classes */
+.hacker-green {
+    color: $hacker-green;
+}
+
+.money-gold {
+    color: $money-gold;
+}
+
+.light-yellow {
+    color: $light-yellow;
+}
+
+.failure {
+    color: $alert-red;
+    text-shadow: 0 0 0 $alert-red;
+}
+
+.success {
+    color: $success-green;
+    text-shadow: 0 0 0 $success-green;
+}
+
+.physical-yellow {
+    color: $my-stat-physical;
+}
+
+.charisma-purple {
+    color: $my-stat-cha-color;
+}
diff --git a/css/terminal.scss b/css/terminal.scss
index cbc54b782..856df717c 100644
--- a/css/terminal.scss
+++ b/css/terminal.scss
@@ -19,6 +19,12 @@
     overflow-y: scroll;
     background-color: var(--my-background-color);
     table-layout: fixed;
+
+    .prompt {
+        color: var(--my-prompt-color);
+        margin: 0;
+        padding: 0;
+    }
 }
 
 #terminal-input {
@@ -51,7 +57,6 @@
 }
 
 #terminal-input-header {
-    color: var(--my-prompt-color);
     white-space: pre;
 }
 
diff --git a/index.html b/index.html
index 81f7ddf08..7c6a79b0a 100644
--- a/index.html
+++ b/index.html
@@ -187,9 +187,9 @@
         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 id="active-scripts-total-production-active">$0.000</span> / sec<br/>
-            Total online production since last Aug installation: <span id="active-scripts-total-prod-aug-total">$0.000</span>
-            (<span id="active-scripts-total-prod-aug-avg">$0.000</span> / sec)</p>
+            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;">
 		</ul>
 	</div>
@@ -201,20 +201,20 @@
         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"></span><br/>
-                <span>Total Hacknet Node Production:</span><span id="hacknet-nodes-total-production"></span>
+                <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">
                 <a id="hacknet-nodes-1x-multiplier" class="a-link-button-inactive"> x1 </a>
@@ -623,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>
@@ -670,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.
@@ -683,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>
@@ -693,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>
@@ -711,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;">
@@ -753,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>
@@ -766,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>
@@ -853,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>
diff --git a/src/Faction.js b/src/Faction.js
index 688021af9..133675548 100644
--- a/src/Faction.js
+++ b/src/Faction.js
@@ -115,7 +115,7 @@ function factionExists(name) {
 //      This might change in the future for balance
 function initFactions() {
     for(const name in FactionInfos) {
-        resetFaction(new Faction(name));    
+        resetFaction(new Faction(name));
     }
 }
 
diff --git a/src/Infiltration.js b/src/Infiltration.js
index feb8b0609..504c3407f 100644
--- a/src/Infiltration.js
+++ b/src/Infiltration.js
@@ -162,7 +162,7 @@ function nextInfiltrationLevel(inst) {
                 if (!e.isTrusted) {return false;}
                 var res = attemptInfiltrationKill(inst);
                 if (res[0]) {
-                    writeInfiltrationStatusText("You SUCCESSFULLY killed the security bots! Unfortunately you alerted the " +
+                    writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> killed the security bots! Unfortunately you alerted the " +
                                                 "rest of the facility's security. The facility's security " +
                                                 "level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
                     Player.karma -= 1;
@@ -170,7 +170,7 @@ function nextInfiltrationLevel(inst) {
                     return false;
                 } else {
                     var dmgTaken = Math.max(1, Math.round(1.5 * inst.securityLevel / Player.defense));
-                    writeInfiltrationStatusText("You FAILED to kill the security bots. The bots fight back " +
+                    writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to kill the security bots. The bots fight back " +
                                                 "and raise the alarm! You take " + dmgTaken + " damage and " +
                                                 "the facility's security level increases by " +
                                                 formatNumber((res[1]*100)-100, 2).toString() + "%");
@@ -186,12 +186,12 @@ function nextInfiltrationLevel(inst) {
                 if (!e.isTrusted) {return false;}
                 var res = attemptInfiltrationAssassinate(inst);
                 if (res[0]) {
-                    writeInfiltrationStatusText("You SUCCESSFULLY assassinated the security bots without being detected!");
+                    writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> assassinated the security bots without being detected!");
                     Player.karma -= 1;
                     endInfiltrationLevel(inst);
                     return false;
                 } else {
-                    writeInfiltrationStatusText("You FAILED to assassinate the security bots. The bots have not detected " +
+                    writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to assassinate the security bots. The bots have not detected " +
                                                 "you but are now more alert for an intruder. The facility's security level " +
                                                 "has increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
                 }
@@ -209,7 +209,7 @@ function nextInfiltrationLevel(inst) {
                 if (!e.isTrusted) {return false;}
                 var res = attemptInfiltrationKill(inst);
                 if (res[0]) {
-                    writeInfiltrationStatusText("You SUCCESSFULLY killed the security guard! Unfortunately you alerted the " +
+                    writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> killed the security guard! Unfortunately you alerted the " +
                                                 "rest of the facility's security. The facility's security " +
                                                 "level has increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
                     Player.karma -= 3;
@@ -218,7 +218,7 @@ function nextInfiltrationLevel(inst) {
                     return false;
                 } else {
                     var dmgTaken = Math.max(1, Math.round(inst.securityLevel / Player.defense));
-                    writeInfiltrationStatusText("You FAILED to kill the security guard. The guard fights back " +
+                    writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to kill the security guard. The guard fights back " +
                                                 "and raises the alarm! You take " + dmgTaken + " damage and " +
                                                 "the facility's security level has increased by " +
                                                 formatNumber((res[1]*100)-100, 2).toString() + "%");
@@ -236,13 +236,13 @@ function nextInfiltrationLevel(inst) {
                 if (!e.isTrusted) {return false;}
                 var res = attemptInfiltrationAssassinate(inst);
                 if (res[0]) {
-                    writeInfiltrationStatusText("You SUCCESSFULLY assassinated the security guard without being detected!");
+                    writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> assassinated the security guard without being detected!");
                     Player.karma -= 3;
                     ++Player.numPeopleKilled;
                     endInfiltrationLevel(inst);
                     return false;
                 } else {
-                    writeInfiltrationStatusText("You FAILED to assassinate the security guard. The guard has not detected " +
+                    writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to assassinate the security guard. The guard has not detected " +
                                                 "you but is now more alert for an intruder. The facility's security level " +
                                                 "has increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
                 }
@@ -259,14 +259,14 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationKnockout(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY knocked out the security guard! " +
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> knocked out the security guard! " +
                                         "Unfortunately you made a lot of noise and alerted other security.");
             writeInfiltrationStatusText("The facility's security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
             endInfiltrationLevel(inst);
             return false;
         } else {
             var dmgTaken = Math.max(1, Math.round(inst.securityLevel / Player.defense));
-            writeInfiltrationStatusText("You FAILED to knockout the security guard. The guard " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to knockout the security guard. The guard " +
                                         "raises the alarm and fights back! You take " + dmgTaken + " damage and " +
                                         "the facility's security level increases by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
             if (Player.takeDamage(dmgTaken)) {
@@ -282,13 +282,13 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationStealthKnockout(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY knocked out the security guard without making " +
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> knocked out the security guard without making " +
                                         "any noise!");
             endInfiltrationLevel(inst);
             return false;
         } else {
             var dmgTaken = Math.max(1, Math.round(inst.securityLevel / Player.defense));
-            writeInfiltrationStatusText("You FAILED to stealthily knockout the security guard. The guard " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to stealthily knockout the security guard. The guard " +
                                         "raises the alarm and fights back! You take " + dmgTaken + " damage and " +
                                         "the facility's security level increases by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
             if (Player.takeDamage(dmgTaken)) {
@@ -304,12 +304,12 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationHack(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY hacked and disabled the security system!");
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> hacked and disabled the security system!");
             writeInfiltrationStatusText("The facility's security level increased by " + ((res[1]*100) - 100).toString() + "%");
             endInfiltrationLevel(inst);
             return false;
         } else {
-            writeInfiltrationStatusText("You FAILED to hack the security system. The facility's " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to hack the security system. The facility's " +
                                         "security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
         }
         updateInfiltrationButtons(inst, scenario);
@@ -321,12 +321,12 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationDestroySecurity(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY and violently destroy the security system!");
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> and violently destroy the security system!");
             writeInfiltrationStatusText("The facility's security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
             endInfiltrationLevel(inst);
             return false;
         } else {
-            writeInfiltrationStatusText("You FAILED to destroy the security system. The facility's " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to destroy the security system. The facility's " +
                                         "security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
         }
         updateInfiltrationButtons(inst, scenario);
@@ -338,11 +338,11 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationSneak(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY sneak past the security undetected!");
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> sneak past the security undetected!");
             endInfiltrationLevel(inst);
             return false;
         } else {
-            writeInfiltrationStatusText("You FAILED and were detected while trying to sneak past security! The facility's " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> and were detected while trying to sneak past security! The facility's " +
                                         "security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
         }
         updateInfiltrationButtons(inst, scenario);
@@ -354,12 +354,12 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationPickLockedDoor(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY pick the locked door!");
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> pick the locked door!");
             writeInfiltrationStatusText("The facility's security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
             endInfiltrationLevel(inst);
             return false;
         } else {
-            writeInfiltrationStatusText("You FAILED to pick the locked door. The facility's security level " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to pick the locked door. The facility's security level " +
                                         "increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
         }
         updateInfiltrationButtons(inst, scenario);
@@ -377,13 +377,13 @@ function nextInfiltrationLevel(inst) {
         }
         var res = attemptInfiltrationBribe(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY bribed a guard to let you through " +
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> bribed a guard to let you through " +
                                         "to the next clearance level for $" + bribeAmt);
             Player.loseMoney(bribeAmt);
             endInfiltrationLevel(inst);
             return false;
         } else {
-            writeInfiltrationStatusText("You FAILED to bribe a guard! The guard is alerting " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to bribe a guard! The guard is alerting " +
                                         "other security guards about your presence! The facility's " +
                                         "security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
         }
@@ -396,12 +396,12 @@ function nextInfiltrationLevel(inst) {
         if (!e.isTrusted) {return false;}
         var res = attemptInfiltrationEscape(inst);
         if (res[0]) {
-            writeInfiltrationStatusText("You SUCCESSFULLY escape from the facility with the stolen classified " +
+            writeInfiltrationStatusText("You <span class='success'>SUCCESSFULLY</span> escape from the facility with the stolen classified " +
                                         "documents and company secrets!");
             endInfiltration(inst, true);
             return false;
         } else {
-            writeInfiltrationStatusText("You FAILED to escape from the facility. You took 1 damage. The facility's " +
+            writeInfiltrationStatusText("You <span class='failure'>FAILED</span> to escape from the facility. You took 1 damage. The facility's " +
                                         "security level increased by " + formatNumber((res[1]*100)-100, 2).toString() + "%");
             if (Player.takeDamage(1)) {
                 endInfiltration(inst, false);
@@ -429,9 +429,9 @@ function endInfiltrationLevel(inst) {
                                BitNodeMultipliers.InfiltrationMoney;
         inst.secretsStolen.push(baseSecretValue);
         dialogBoxCreate("You found and stole a set of classified documents from the company. " +
-                        "These classified secrets could probably be sold for money ($" +
-                        formatNumber(secretMoneyValue, 2) + "), or they " +
-                        "could be given to factions for reputation (" + formatNumber(secretValue, 3) + " rep)");
+                        "These classified secrets could probably be sold for money (<span class='money-gold'>$" +
+                        formatNumber(secretMoneyValue, 2) + "</span>), or they " +
+                        "could be given to factions for reputation (<span class='light-yellow'>" + formatNumber(secretValue, 3) + " rep</span>)");
     }
 
     //Increase security level based on difficulty
@@ -469,17 +469,18 @@ function updateInfiltrationLevelText(inst) {
 
     var expMultiplier = 2 * inst.clearanceLevel / inst.maxClearanceLevel;
     document.getElementById("infiltration-level-text").innerHTML =
-        "Facility name: " + inst.companyName + "<br>" +
-        "Clearance Level: " + inst.clearanceLevel + "<br>" +
-        "Security Level: " + formatNumber(inst.securityLevel, 3) + "<br><br>" +
-        "Total reputation value of secrets stolen: " + formatNumber(totalValue, 3) + "<br>" +
-        "Total monetary value of secrets stolen: $" + formatNumber(totalMoneyValue, 2) + "<br><br>" +
-        "Hack exp gained: " + formatNumber(inst.hackingExpGained * expMultiplier, 3) + "<br>" +
-        "Str exp gained: " + formatNumber(inst.strExpGained * expMultiplier, 3) + "<br>" +
-        "Def exp gained: " + formatNumber(inst.defExpGained * expMultiplier, 3) + "<br>" +
-        "Dex exp gained: " + formatNumber(inst.dexExpGained * expMultiplier, 3) + "<br>" +
-        "Agi exp gained: " + formatNumber(inst.agiExpGained * expMultiplier, 3) + "<br>" +
-        "Cha exp gained: " + formatNumber(inst.chaExpGained * expMultiplier, 3);
+        "Facility name:    " + inst.companyName + "<br>" +
+        "Clearance Level:  " + inst.clearanceLevel + "<br>" +
+        "Security Level:   " + formatNumber(inst.securityLevel, 3) + "<br><br>" +
+        "Total value of stolen secrets<br>" +
+        "Reputation:       <span class='light-yellow'>" + formatNumber(totalValue, 3) + "</span><br>" +
+        "Money:           <span class='money-gold'>$" + formatNumber(totalMoneyValue, 2) + "</span><br><br>" +
+        "Hack exp gained:  " + formatNumber(inst.hackingExpGained * expMultiplier, 3) + "<br>" +
+        "Str exp gained:   " + formatNumber(inst.strExpGained * expMultiplier, 3) + "<br>" +
+        "Def exp gained:   " + formatNumber(inst.defExpGained * expMultiplier, 3) + "<br>" +
+        "Dex exp gained:   " + formatNumber(inst.dexExpGained * expMultiplier, 3) + "<br>" +
+        "Agi exp gained:   " + formatNumber(inst.agiExpGained * expMultiplier, 3) + "<br>" +
+        "Cha exp gained:   " + formatNumber(inst.chaExpGained * expMultiplier, 3);
 }
 
 function updateInfiltrationButtons(inst, scenario) {
diff --git a/src/Location.js b/src/Location.js
index f7cb96f31..4abaee68f 100644
--- a/src/Location.js
+++ b/src/Location.js
@@ -1001,7 +1001,7 @@ function displayLocationContent() {
             slumsDealDrugs.innerHTML = "Deal Drugs (" + (drugsChance*100).toFixed(3) + "% chance of success)";
             slumsDealDrugs.innerHTML += '<span class="tooltiptext"> Attempt to deal drugs </span>';
             slumsBondForgery.style.display = "block";
-            slumsBondForgery.innerHTML = "Bond Forgery(" + (bondChance*100).toFixed(3) + "% chance of success)";
+            slumsBondForgery.innerHTML = "Bond Forgery (" + (bondChance*100).toFixed(3) + "% chance of success)";
             slumsBondForgery.innerHTML += "<span class='tooltiptext'> Attempt to forge corporate bonds</span>";
             slumsTrafficArms.style.display = "block";
             slumsTrafficArms.innerHTML = "Traffick Illegal Arms (" + (armsChance*100).toFixed(3) + "% chance of success)";
diff --git a/src/Player.js b/src/Player.js
index 27ad67086..b8236a692 100644
--- a/src/Player.js
+++ b/src/Player.js
@@ -1072,7 +1072,7 @@ PlayerObject.prototype.workForFaction = function(numCycles) {
 
     var txt = document.getElementById("work-in-progress-text");
     txt.innerHTML = "You are currently " + this.currentWorkFactionDescription + " for your faction " + faction.name +
-                    " (Current Faction Reputation: " + formatNumber(faction.playerReputation, 0) + "). " +
+                    " (Current Faction Reputation: " + formatNumber(faction.playerReputation, 0) + "). <br>" +
                     "You have been doing this for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" +
                     "You have earned: <br><br>" +
                     "$" + formatNumber(this.workMoneyGained, 2) + " (" + formatNumber(this.workMoneyGainRate * cyclesPerSec, 2) + " / sec) <br><br>" +
diff --git a/src/SaveObject.js b/src/SaveObject.js
index 55db3250e..1c3eae367 100644
--- a/src/SaveObject.js
+++ b/src/SaveObject.js
@@ -516,9 +516,9 @@ function loadImportedGame(saveObj, saveString) {
 
     Player.lastUpdate = Engine._lastUpdate;
     Engine.start();                 //Run main game loop and Scripts loop
-    dialogBoxCreate("While you were offline, your scripts generated $" +
-                    formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" +
-                    formatNumber(offlineProductionFromHacknetNodes, 2));
+    dialogBoxCreate("While you were offline, your scripts generated <span class='money-gold'>$" +
+                    formatNumber(offlineProductionFromScripts, 2) + "</span> and your Hacknet Nodes generated <span class='money-gold'>$" +
+                    formatNumber(offlineProductionFromHacknetNodes, 2) + "</span>");
     return true;
 }
 
diff --git a/src/Terminal.js b/src/Terminal.js
index c61d0ebf7..ea575513b 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -68,10 +68,10 @@ $(document).keydown(function(event) {
             event.preventDefault(); //Prevent newline from being entered in Script Editor
 			var command = $('input[class=terminal-input]').val();
 			      post(
-                "[" +
+                "<span class='prompt'>[" +
                 (FconfSettings.ENABLE_TIMESTAMPS ? getTimestamp() + " " : "") +
                 Player.getCurrentServer().hostname +
-                " ~]> " + command
+                " ~]&gt;</span> " + command
             );
 
             if (command.length > 0) {
@@ -525,7 +525,7 @@ let Terminal = {
 
     resetTerminalInput: function() {
         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");
         hdr.style.display = "inline";
diff --git a/src/engine.js b/src/engine.js
index 034be3ebb..f7e20b8d1 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -1324,9 +1324,9 @@ let Engine = {
             Player.lastUpdate = Engine._lastUpdate;
             Engine.start();                 //Run main game loop and Scripts loop
             removeLoadingScreen();
-            dialogBoxCreate("While you were offline, your scripts generated $" +
-                            formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" +
-                            formatNumber(offlineProductionFromHacknetNodes, 2));
+            dialogBoxCreate("While you were offline, your scripts generated <span class='money-gold'>$" +
+                            formatNumber(offlineProductionFromScripts, 2) + "</span> and your Hacknet Nodes generated <span class='money-gold'>$" +
+                            formatNumber(offlineProductionFromHacknetNodes, 2) + "</span>");
             //Close main menu accordions for loaded game
             var visibleMenuTabs = [terminal, createScript, activeScripts, stats,
                                    hacknetnodes, city, tutorial, options, dev];
diff --git a/src/index.html b/src/index.html
index e3e0cf485..76cfe57d3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -189,9 +189,9 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         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 id="active-scripts-total-production-active">$0.000</span> / sec<br />
-            Total online production since last Aug installation: <span id="active-scripts-total-prod-aug-total">$0.000</span>
-            (<span id="active-scripts-total-prod-aug-avg">$0.000</span> / sec)</p>
+            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;">
 		</ul>
 	</div>
@@ -203,20 +203,20 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         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"></span><br/>
-                <span>Total Hacknet Node Production:</span><span id="hacknet-nodes-total-production"></span>
+                <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">
                 <a id="hacknet-nodes-1x-multiplier" class="a-link-button-inactive"> x1 </a>
@@ -627,7 +627,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         <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>
@@ -674,7 +674,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
 
     <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.
@@ -687,7 +687,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
             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>
@@ -697,7 +697,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         <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>
@@ -715,7 +715,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         <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;">
@@ -757,7 +757,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
             <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>
@@ -770,8 +770,8 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         <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>
@@ -857,7 +857,7 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %>
         <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>
diff --git a/utils/InfiltrationBox.js b/utils/InfiltrationBox.js
index efd86089b..8c1290179 100644
--- a/utils/InfiltrationBox.js
+++ b/utils/InfiltrationBox.js
@@ -57,9 +57,9 @@ function infiltrationBoxCreate(inst) {
                    CONSTANTS.InfiltrationRepValue * BitNodeMultipliers.InfiltrationRep;
     var moneyValue = totalValue * CONSTANTS.InfiltrationMoneyValue * BitNodeMultipliers.InfiltrationMoney;
     infiltrationSetText("You can sell the classified documents and secrets " +
-                        "you stole from " + inst.companyName + " for $" +
-                        formatNumber(moneyValue, 2) + " on the black market or you can give it " +
-                        "to a faction to gain " + formatNumber(facValue, 3) + " reputation with " +
+                        "you stole from " + inst.companyName + " for <span class='money-gold'>$" +
+                        formatNumber(moneyValue, 2) + "</span> on the black market or you can give it " +
+                        "to a faction to gain <span class='light-yellow'>" + formatNumber(facValue, 3) + " reputation</span> with " +
                         "that faction.");
     var selector = document.getElementById("infiltration-faction-select");
     selector.innerHTML = "";
@@ -85,7 +85,7 @@ function infiltrationBoxCreate(inst) {
         if (!e.isTrusted) {return false;}
         Player.gainMoney(moneyValue);
         dialogBoxCreate("You sold the classified information you stole from " + inst.companyName +
-                        " for $" + moneyValue + " on the black market!<br><br>" +
+                        " for <span class='money-gold'>$" + formatNumber(moneyValue, 2) + "</span> on the black market!<br><br>" +
                         "You gained:<br>" +
                         formatNumber(inst.hackingExpGained, 3) + " hacking exp<br>" +
                         formatNumber(inst.strExpGained, 3) + " str exp<br>" +
@@ -111,7 +111,7 @@ function infiltrationBoxCreate(inst) {
         }
         faction.playerReputation += facValue;
         dialogBoxCreate("You gave the classified information you stole from " + inst.companyName +
-                        " to " + facName + " and gained " + formatNumber(facValue, 3) + " reputation with the faction. <br><br>" +
+                        " to " + facName + " and gained <span class='light-yellow'>" + formatNumber(facValue, 3) + " reputation</span> with the faction. <br><br>" +
                         "You gained:<br>" +
                         formatNumber(inst.hackingExpGained, 3) + " hacking exp<br>" +
                         formatNumber(inst.strExpGained, 3) + " str exp<br>" +
diff --git a/utils/JSONReviver.d.ts b/utils/JSONReviver.d.ts
index 08ff98bd4..f4405df83 100644
--- a/utils/JSONReviver.d.ts
+++ b/utils/JSONReviver.d.ts
@@ -7,4 +7,4 @@ export function Generic_toJSON(ctorName: string, obj: object, keys?: string[]):
 export function Reviver(key, value: IReviverValue);
 export namespace Reviver {
     export var constructors: any;
-}
\ No newline at end of file
+}